From 59ca0e5a0442eb46713ad750a7f053009508c074 Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Mon, 18 Jul 2022 16:57:56 -0500 Subject: [PATCH 1/4] fix server and server template alias definition for SSL password field --- core/src/main/python/wlsdeploy/tool/validate/validator.py | 2 +- .../weblogic/deploy/aliases/category_modules/Server.json | 4 +--- .../deploy/aliases/category_modules/ServerTemplate.json | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/src/main/python/wlsdeploy/tool/validate/validator.py b/core/src/main/python/wlsdeploy/tool/validate/validator.py index 9dceb798bf..1ed605a987 100644 --- a/core/src/main/python/wlsdeploy/tool/validate/validator.py +++ b/core/src/main/python/wlsdeploy/tool/validate/validator.py @@ -824,7 +824,7 @@ def __validate_single_path_in_archive(self, path, attribute_name, model_folder_p if not archive_has_file: log_method('WLSDPLY-05024', attribute_name, model_folder_path, path, self._archive_file_name, class_name=_class_name, method_name=_method_name) - elif not self._model_context.is_remote(): + elif not self._model_context.is_remote() and not self._model_context.skip_archive(): log_method('WLSDPLY-05025', attribute_name, model_folder_path, path, class_name=_class_name, method_name=_method_name) else: diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json index 5cc7deda1e..88abc1fc02 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json @@ -1069,9 +1069,7 @@ "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "OutboundCertificateValidation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ], "OutboundPrivateKeyAlias": [ {"version": "[10.3.6,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ], - "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[10.3.6,12.2.1)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "RO", "get_method": "GET"}, - {"version": "[12.2.1]", "wlst_mode": "offline", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted","wlst_path": "WP001", "default_value": null, "wlst_type": "password" }, - {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "access": "RO" } ], + "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.1.1,]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password" }], "SSLRejectionLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], "ServerCertificateChainFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ], "ServerCertificateFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json index 02d5052007..fb37502fba 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json @@ -1079,8 +1079,8 @@ "Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "OutboundCertificateValidation": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ], "OutboundPrivateKeyAlias": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ], - "OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,12.1.3]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "access": "RO" } ], - "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "access": "RO" } ], + "OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,12.1.3]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], + "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], "SSLRejectionLoggingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], "ServerCertificateChainFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ], "ServerCertificateFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ], From 99f7d3b50f876acf3bfb07cdf95eac4ea992a7ba Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Tue, 19 Jul 2022 10:24:43 -0500 Subject: [PATCH 2/4] fix for request --- .../deploy/aliases/category_modules/ServerTemplate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json index fb37502fba..816af533ef 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json @@ -1079,7 +1079,7 @@ "Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "OutboundCertificateValidation": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ], "OutboundPrivateKeyAlias": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ], - "OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,12.1.3]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], + "OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], "SSLRejectionLoggingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], "ServerCertificateChainFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ], From 71277415a9deeb15fdd3c78d49f2ca891364990d Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Tue, 19 Jul 2022 10:28:55 -0500 Subject: [PATCH 3/4] fix for request --- .../deploy/aliases/category_modules/ServerTemplate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json index 816af533ef..abbba11559 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json @@ -1080,7 +1080,7 @@ "OutboundCertificateValidation": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ], "OutboundPrivateKeyAlias": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ], "OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], - "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], + "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], "SSLRejectionLoggingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], "ServerCertificateChainFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ], "ServerCertificateFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ], From 3afc4632ca3d425609f805e46537fa4a05ce3be5 Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Tue, 19 Jul 2022 14:46:25 -0500 Subject: [PATCH 4/4] fix for request --- .../oracle/weblogic/deploy/aliases/category_modules/Server.json | 2 +- .../deploy/aliases/category_modules/ServerTemplate.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json index 88abc1fc02..72183bc6a1 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json @@ -1069,7 +1069,7 @@ "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "OutboundCertificateValidation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ], "OutboundPrivateKeyAlias": [ {"version": "[10.3.6,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ], - "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.1.1,]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password" }], + "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password" }], "SSLRejectionLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], "ServerCertificateChainFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ], "ServerCertificateFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json index abbba11559..efcffaab50 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json @@ -1079,7 +1079,7 @@ "Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "OutboundCertificateValidation": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ], "OutboundPrivateKeyAlias": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ], - "OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], + "OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], "OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ], "SSLRejectionLoggingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], "ServerCertificateChainFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ],