Merge remote-tracking branch 'origin/Issue#164-support-custom-security-providers' into Issue#164-support-custom-security-providers

Author: rakillen

core/src/main/python/discover.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 
 The entry point for the discoverDomain tool.
@@ -20,7 +20,6 @@
 from oracle.weblogic.deploy.util import TranslateException
 from oracle.weblogic.deploy.util import WLSDeployArchive
 from oracle.weblogic.deploy.util import WLSDeployArchiveIOException
-from oracle.weblogic.deploy.util import WLSDeployExit
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 from oracle.weblogic.deploy.validate import ValidateException
 
@@ -72,7 +71,8 @@
     CommandLineArgUtil.VARIABLE_PROPERTIES_FILE_SWITCH,
     CommandLineArgUtil.ADMIN_URL_SWITCH,
     CommandLineArgUtil.ADMIN_USER_SWITCH,
-    CommandLineArgUtil.ADMIN_PASS_SWITCH
+    CommandLineArgUtil.ADMIN_PASS_SWITCH,
+    CommandLineArgUtil.TARGET_MODE_SWITCH
 ]
 
 
@@ -153,6 +153,7 @@ def __process_online_args(optional_arg_map):
             optional_arg_map[CommandLineArgUtil.ADMIN_PASS_SWITCH] = String(password)
 
         mode = WlstModes.ONLINE
+        optional_arg_map[CommandLineArgUtil.TARGET_MODE_SWITCH] = 'online'
     return mode
 
 

core/src/main/python/wlsdeploy/tool/create/creator.py

@@ -4,6 +4,7 @@
 """
 
 from oracle.weblogic.deploy.util import WLSDeployArchive
+from oracle.weblogic.deploy.exception import BundleAwareException
 
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.validation_codes import ValidationCodes
@@ -179,7 +180,7 @@ def _create_security_provider_mbeans(self, type_name, model_nodes, base_location
 
         self.logger.entering(type_name, str(base_location), log_created,
                              class_name=self.__class_name, method_name=_method_name)
-        if model_nodes is None or len(model_nodes) == 0 or not self._is_type_valid(base_location, type_name):
+        if not self._is_type_valid(base_location, type_name):
             return
 
         location = LocationContext(base_location).append_location(type_name)
@@ -188,20 +189,19 @@ def _create_security_provider_mbeans(self, type_name, model_nodes, base_location
         # For create, delete the existing nodes, and re-add in order found in model in iterative code below
         self._delete_existing_providers(location)
 
+        if model_nodes is None or len(model_nodes) == 0:
+            return
+
         token_name = self.alias_helper.get_name_token(location)
         create_path = self.alias_helper.get_wlst_create_path(location)
         list_path = self.alias_helper.get_wlst_list_path(location)
         existing_folder_names = self._get_existing_folders(list_path)
         known_providers = self.alias_helper.get_model_subfolder_names(location)
         allow_custom = str(self.alias_helper.is_custom_folder_allowed(location))
-        self.logger.finer('create path {0}, list_path {1}, existing folders {2}', create_path, list_path,
-                          str(existing_folder_names))
 
         for model_name in model_nodes:
             model_node = model_nodes[model_name]
 
-            # Need to create the node first ?
-            self.logger.fine('Adding the provider {0} at location {1}', model_name, str(location))
             if model_node is None:
                 # The node is empty so nothing to do... move to the next named node.
                 continue
@@ -391,23 +391,22 @@ def _create_subfolders(self, location, model_nodes):
         """
         _method_name = '_create_subfolders'
 
-        self.logger.entering(str(location), class_name=self.__class_name, method_name=_method_name)
+        self.logger.entering(location.get_folder_path(), class_name=self.__class_name, method_name=_method_name)
         model_subfolder_names = self.alias_helper.get_model_subfolder_names(location)
-
         for key in model_nodes:
             if key in model_subfolder_names:
-
                 subfolder_nodes = model_nodes[key]
-                if len(subfolder_nodes) != 0:
-                    sub_location = LocationContext(location).append_location(key)
+                sub_location = LocationContext(location).append_location(key)
+                # both create and update are merge to model so will process a subfolder with an empty node
+                if self.alias_helper.requires_artificial_type_subfolder_handling(sub_location):
+                    self.logger.finest('WLSDPLY-12116', key, str(sub_location), subfolder_nodes,
+                                       class_name=self.__class_name, method_name=_method_name)
+                    self._create_security_provider_mbeans(key, subfolder_nodes, location)
+                elif len(subfolder_nodes) != 0:
                     if self.alias_helper.supports_multiple_mbean_instances(sub_location):
                         self.logger.finest('WLSDPLY-12109', key, str(sub_location), subfolder_nodes,
                                            class_name=self.__class_name, method_name=_method_name)
                         self._create_named_mbeans(key, subfolder_nodes, location)
-                    elif self.alias_helper.requires_artificial_type_subfolder_handling(sub_location):
-                        self.logger.finest('WLSDPLY-12116', key, str(sub_location), subfolder_nodes,
-                                           class_name=self.__class_name, method_name=_method_name)
-                        self._create_security_provider_mbeans(key, subfolder_nodes, location)
                     elif self.alias_helper.is_artificial_type_folder(sub_location):
                         ex = exception_helper.create_create_exception('WLSDPLY-12120', str(sub_location),
                                                                       key, str(location))
@@ -417,6 +416,7 @@ def _create_subfolders(self, location, model_nodes):
                         self.logger.finest('WLSDPLY-12110', key, str(sub_location), subfolder_nodes,
                                            class_name=self.__class_name, method_name=_method_name)
                         self._create_mbean(key, subfolder_nodes, location)
+
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 
@@ -487,18 +487,27 @@ def _delete_existing_providers(self, location):
         self.logger.entering(location.get_folder_path(), class_name=self.__class_name, method_name=_method_name)
 
         list_path = self.alias_helper.get_wlst_list_path(location)
-        self.logger.finer('Look for providers at location {0}', list_path)
         existing_folder_names = self._get_existing_folders(list_path)
         wlst_base_provider_type = self.alias_helper.get_wlst_mbean_type(location)
         if len(existing_folder_names) == 0:
-            self.logger.finer('No default providers installed for {0} at {1}', wlst_base_provider_type, list_path)
+            self.logger.finer('WLSDPLY-12136', wlst_base_provider_type, list_path, class_name=self.__class_name,
+                              method_name=_method_name)
         else:
             create_path = self.alias_helper.get_wlst_create_path(location)
             self.wlst_helper.cd(create_path)
             for existing_folder_name in existing_folder_names:
-                self.wlst_helper.delete(existing_folder_name, wlst_base_provider_type)
-                self.logger.finer('Removed default provider {0} from provider {1} at location {2}',
-                                  existing_folder_name, wlst_base_provider_type, create_path)
+                try:
+                    self.wlst_helper.delete(existing_folder_name, wlst_base_provider_type)
+                    self.logger.finer('WLSDPLY-12135', existing_folder_name, wlst_base_provider_type, create_path,
+                                      class_name=self.__class_name, method_name=_method_name)
+                except BundleAwareException, bae:
+                    ex = exception_helper.create_exception(self._exception_type, 'WLSDPLY-12134', existing_folder_name,
+                                                           self.wls_helper.get_weblogic_version(),
+                                                           wlst_base_provider_type, bae.getLocalizedMessage(),
+                                                           error=bae)
+                    self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+                    raise ex
+
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 

core/src/main/python/wlsdeploy/tool/util/wlst_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
 from oracle.weblogic.deploy.util import PyWLSTException
@@ -41,19 +41,6 @@ def assign(self, source_type, source_name, target_type, target_name):
             self.__logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex
 
-
-    def reorder_provider(self, provider_type, provider_map, wlst_path):
-        """
-        Retrieve the list of security providers at the provided path and
-        :param provider_type: MBean Type of the Security Provider, i.e. AuthenticationProvider
-        :param provider_map: Map of mbean names and corresponding mbean type
-        :param wlst_path: Location of the realm where the Mbeans will be reordered.
-        :return: Map of provider name and corresponding mbean object
-        """
-        _method_name = 'reorder_provider'
-
-
-
     def cd(self, wlst_path):
         """
         Change WLST directories to the specified path
@@ -172,7 +159,7 @@ def delete(self, wlst_name, wlst_type):
         try:
             wlst_helper.delete(wlst_name, wlst_type)
         except PyWLSTException, pwe:
-            ex = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-19103', wlst_type, wlst_name,
+            ex = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-19135', wlst_type, wlst_name,
                                                    pwe.getLocalizedMessage(), error=pwe)
             self.__logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -959,6 +959,10 @@ WLSDPLY-12130=The set method for attribute {0} has {1} arguments
 WLSDPLY-12131=Unable to invoke method "{0}" with argument {1}: {2}
 WLSDPLY-12132=Unrecognized data type {0}
 WLSDPLY-12133=Unable to convert "{0}" to value of type {1}
+WLSDPLY-12134=Unable to remove "{0}" in target domain release {1}. The remove is required to properly configure \
+  the Realm Provider Type {2}. Consult the WebLogic Deploy Tool documentation for further information. : {3}
+WLSDPLY-12135=Removed Security provider {0} with Provider type {1} at location {2}
+WLSDPLY-12136=No default providers installed for {0} at {1}
 
 # domain_creator.py
 WLSDPLY-12200={0} did not find the required {1} section in the model file {2}