From 1cf3b57b9d336628be254e34efada58998d3f777 Mon Sep 17 00:00:00 2001 From: crountre Date: Fri, 14 Feb 2020 14:38:11 -0600 Subject: [PATCH 1/2] Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator --- .../deploy/aliases/category_modules/Log.json | 3 +-- .../category_modules/SecurityConfiguration.json | 6 +++--- .../deploy/aliases/category_modules/Server.json | 3 +-- core/src/test/python/aliases_test.py | 13 +++++++++++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json index 1284df1ba..a6ca2fac0 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json @@ -33,8 +33,7 @@ "LogMonitoringThrottleThreshold": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogMonitoringThrottleThreshold", "wlst_path": "WP001", "value": {"default": 1500 }, "wlst_type": "integer"} ], "LoggerSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverity", "wlst_path": "WP001", "value": {"default": "${None:Info}" }, "wlst_type": "string" } ], "LoggerSeverityProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ], - "MemoryBufferFilter": [ {"version": "[10,12.1.3)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean"} , - {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean"} ], + "MemoryBufferFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean"} ], "MemoryBufferSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "value": {"default": "${None:Trace}"}, "wlst_type": "string" } ], "MemoryBufferSize": [ {"version": "[10,12.2.1.3)","wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "value": {"default": 10 }, "wlst_type": "integer"} , {"version": "[12.2.1.3,)","wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "value": {"default": "${10:500}"}, "wlst_type": "integer"} ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json index 12160b5cc..e4a3cadbe 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json @@ -160,7 +160,7 @@ "DynamicMemberUrlAttribute": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DynamicMemberUrlAttribute", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], "EnableCacheStatistics": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "EnableCacheStatistics", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], "EnableGroupMembershipLookupHierarchyCaching": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EnableGroupMembershipLookupHierarchyCaching", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], - "EnableSIDtoGroupLookupCaching": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EnableSIDtoGroupLookupCaching", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], + "EnableSIDtoGroupLookupCaching": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EnableSIDtoGroupLookupCaching", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], "FollowReferrals": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FollowReferrals", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ], "GroupBaseDN": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "GroupBaseDN", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], "GroupFromNameFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "GroupFromNameFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], @@ -179,7 +179,7 @@ "ParallelConnectDelay": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ParallelConnectDelay", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ], "Port": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Port", "wlst_path": "WP001", "value": {"default": 389 }, "wlst_type": "integer" } ], "Principal": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Principal", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], - "PropagateCauseForLoginException": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PropagateCauseForLoginException", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], + "PropagateCauseForLoginException": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PropagateCauseForLoginException", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], "ResultsTimeLimit": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ResultsTimeLimit", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ], "RetrievePrincipalFromUserDn": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "RetrievePrincipalFromUserDn", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean", "get_method": "LSA" } ], "RetrieveUserAccountControl": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "RetrieveUserAccountControl", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], @@ -189,7 +189,7 @@ "StaticGroupObjectClass": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StaticGroupObjectClass", "wlst_path": "WP001", "value": {"default": "groupofuniquenames" }, "wlst_type": "string" } ], "StaticMemberDNAttribute": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StaticMemberDNAttribute", "wlst_path": "WP001", "value": {"default": "uniquemember" }, "wlst_type": "string" } ], "UseRetrievedUserNameAsPrincipal": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UseRetrievedUserNameAsPrincipal", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], - "UseTokenGroupsForGroupMembershipLookup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UseTokenGroupsForGroupMembershipLookup", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], + "UseTokenGroupsForGroupMembershipLookup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UseTokenGroupsForGroupMembershipLookup", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], "UserBaseDn": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UserBaseDn", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], "UserDynamicGroupDnAttribute": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UserDynamicGroupDnAttribute", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], "UserFromNameFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UserFromNameFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], 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 03dca88cb..c11d64a83 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 @@ -259,8 +259,7 @@ "LogMonitoringThrottleThreshold": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogMonitoringThrottleThreshold", "wlst_path": "WP001", "value": {"default": 1500 }, "wlst_type": "integer"} ], "LoggerSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverity", "wlst_path": "WP001", "value": {"default": "${None:Info}"}, "wlst_type": "string" } ], "LoggerSeverityProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ], - "MemoryBufferFilter": [ {"version": "[10,12.1.3)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } , - {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], + "MemoryBufferFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], "MemoryBufferSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "value": {"default": "${None:Trace}"}, "wlst_type": "string" } ], "MemoryBufferSize": [ {"version": "[10,12.2.1.3)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "value": {"default": 10 }, "wlst_type": "integer"} , {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "value": {"default": "${10:500}"}, "wlst_type": "integer"} ], diff --git a/core/src/test/python/aliases_test.py b/core/src/test/python/aliases_test.py index 187b18463..741ba7658 100644 --- a/core/src/test/python/aliases_test.py +++ b/core/src/test/python/aliases_test.py @@ -900,6 +900,19 @@ def testGetWlstAttributeJavaBoolean(self): self.assertEqual(value, Boolean('true')) return + def testGetWlstAttributeJavaBooleanNewIssue157(self): + location = LocationContext().append_location(FOLDERS.SECURITY_CONFIGURATION) + token = self.aliases.get_name_token(location) + location.add_name_token(token, 'my-domain') + location.append_location(FOLDERS.REALM, REALM="myrealm"). \ + append_location(FOLDERS.AUTHENTICATION_PROVIDER, PROVIDER='myprovider'). \ + append_location(FOLDERS.ACTIVE_DIRECTORY_AUTHENTICATOR) + name, value = self.aliases.get_wlst_attribute_name_and_value(location, 'UseTokenGroupsForGroupMembershipLookup', + 'true') + self.assertEqual(name, 'UseTokenGroupsForGroupMembershipLookup') + self.assertEqual(value, Boolean('true')) + return + def testSecurityProviderTypeHandling(self): location = LocationContext().append_location(FOLDERS.SECURITY_CONFIGURATION) token = self.aliases.get_name_token(location) From 9a935861f220d04dc8e692da4219b4b0841b2974 Mon Sep 17 00:00:00 2001 From: crountre Date: Tue, 18 Feb 2020 11:05:37 -0600 Subject: [PATCH 2/2] fix empty variable file --- core/src/main/python/wlsdeploy/tool/util/variable_injector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/python/wlsdeploy/tool/util/variable_injector.py b/core/src/main/python/wlsdeploy/tool/util/variable_injector.py index 91ed5468f..856e69474 100644 --- a/core/src/main/python/wlsdeploy/tool/util/variable_injector.py +++ b/core/src/main/python/wlsdeploy/tool/util/variable_injector.py @@ -218,7 +218,7 @@ def inject_variables_keyword_file(self, **kwargs): method_name=_method_name) variable_dictionary = self.get_variable_cache() - if variable_dictionary is not None: + if variable_dictionary is not None and len(variable_dictionary) > 0: variables_inserted = self._write_variables_file(variable_dictionary, variable_file_location, append) if variables_inserted: _logger.info('WLSDPLY-19518', variable_file_location, class_name=_class_name,