Skip to content

Commit 0055907

Browse files
authored
Change online default for ExcludedCiphersuite in 4 places (#1425)
1 parent e836827 commit 0055907

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,10 @@
362362
"CustomProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CustomProperties", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}", "preferred_model_type": "dict" } ],
363363
"Enabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
364364
"ExternalDNSName": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "ExternalDNSName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
365-
"ExcludedCiphersuite": [ {"version": "[14,)", "wlst_mode": "both", "wlst_name": "ExcludedCiphersuite${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"} ],
365+
"ExcludedCiphersuite": [
366+
{"version": "[14,)", "wlst_mode": "offline", "wlst_name": "ExcludedCiphersuite", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"},
367+
{"version": "[14,)", "wlst_mode": "online", "wlst_name": "ExcludedCiphersuites", "wlst_path": "WP001", "default_value": ["TLS_RSA_*", "*_CBC_*"], "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"}
368+
],
366369
"HostnameVerificationIgnored": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "HostnameVerificationIgnored", "wlst_path": "WP001", "default_value": "false", "derived_default": "${:true}", "wlst_type": "boolean" } ],
367370
"HostnameVerifier": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "HostnameVerifier", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
368371
"HttpEnabledForThisProtocol": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "HttpEnabledForThisProtocol", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
@@ -1140,7 +1143,10 @@
11401143
"ClientCertificateEnforced": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
11411144
"ClientInitSecureRenegotiationAccepted": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClientInitSecureRenegotiationAccepted", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
11421145
"Enabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" } ],
1143-
"ExcludedCiphersuite": [ {"version": "[14,)", "wlst_mode": "both", "wlst_name": "ExcludedCiphersuite${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"} ],
1146+
"ExcludedCiphersuite": [
1147+
{"version": "[14,)", "wlst_mode": "offline", "wlst_name": "ExcludedCiphersuite", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"},
1148+
{"version": "[14,)", "wlst_mode": "online", "wlst_name": "ExcludedCiphersuites", "wlst_path": "WP001", "default_value": ["TLS_RSA_*", "*_CBC_*"], "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"}
1149+
],
11441150
"ExportKeyLifespan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ExportKeyLifespan", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ],
11451151
"HandlerEnabled": [ {"version": "[10,12.2.1)", "wlst_mode": "offline", "wlst_name": "HandlerEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "get_method": "GET", "restart_required": "true" } ,
11461152
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "HandlerEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "get_method": "GET", "restart_required": "true" } ],

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,10 @@
371371
"CustomPrivateKeyPassPhraseEncrypted": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CustomPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET"} ],
372372
"CustomProperties": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CustomProperties", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "preferred_model_type": "dict", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}" } ],
373373
"Enabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
374-
"ExcludedCiphersuite": [ {"version": "[14,)", "wlst_mode": "both", "wlst_name": "ExcludedCiphersuite${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"} ],
374+
"ExcludedCiphersuite": [
375+
{"version": "[14,)", "wlst_mode": "offline", "wlst_name": "ExcludedCiphersuite", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"},
376+
{"version": "[14,)", "wlst_mode": "online", "wlst_name": "ExcludedCiphersuites", "wlst_path": "WP001", "default_value": ["TLS_RSA_*", "*_CBC_*"], "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"}
377+
],
375378
"ExternalDNSName": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "ExternalDNSName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
376379
"HostnameVerificationIgnored": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "HostnameVerificationIgnored", "wlst_path": "WP001", "default_value": "false", "derived_default": "${:true}", "wlst_type": "boolean" } ],
377380
"HostnameVerifier": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "HostnameVerifier", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
@@ -1151,7 +1154,10 @@
11511154
"ClientCertificateEnforced": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
11521155
"ClientInitSecureRenegotiationAccepted": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClientInitSecureRenegotiationAccepted", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
11531156
"Enabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1154-
"ExcludedCiphersuite": [ {"version": "[14,)", "wlst_mode": "both", "wlst_name": "ExcludedCiphersuite${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"} ],
1157+
"ExcludedCiphersuite": [
1158+
{"version": "[14,)", "wlst_mode": "offline", "wlst_name": "ExcludedCiphersuite", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"},
1159+
{"version": "[14,)", "wlst_mode": "online", "wlst_name": "ExcludedCiphersuites", "wlst_path": "WP001", "default_value": ["TLS_RSA_*", "*_CBC_*"], "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"}
1160+
],
11551161
"ExportKeyLifespan": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ExportKeyLifespan", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ],
11561162
"HandlerEnabled": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "offline", "wlst_name": "HandlerEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "get_method": "LSA", "restart_required": "true" } ,
11571163
{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "HandlerEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "get_method": "GET", "restart_required": "true" } ],

0 commit comments

Comments
 (0)