Merge pull request #289 from oracle/jira-wdt-265-custom-provider-password

JIRA WDT-265 - Pass byte array property values correctly; encrypt pla…

Author: CarolynRountree

core/src/main/java/oracle/weblogic/deploy/util/CustomBeanUtils.java

@@ -10,6 +10,7 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 /**
@@ -25,9 +26,10 @@ private CustomBeanUtils() {
      * Invoke the specified set method on the MBean with the provided value, converted to the desired type.
      * The conversion and invocation are done together to avoid automatic Jython data conversion.
      *
-     * @param mbean the value to be converted
+     * @param mbean the MBean containing the value to be set
+     * @param method the method to be called on the specified MBean
      * @param propertyType the class representing the target type
-     * @param propertyValue the class representing the target type
+     * @param propertyValue the value to be converted and set
      * @throws IllegalAccessException if method invocation fails
      * @throws IllegalArgumentException if the data conversion or method invocation fails
      * @throws InvocationTargetException if method invocation fails
@@ -168,6 +170,9 @@ private static Object convertSingleValue(Object value, Class<?> dataType) {
             } else if(dataType == Character.class) {
                 result = TypeUtils.convertToCharacter(textValue);
 
+            } else if(dataType == byte[].class) {
+                result = textValue.getBytes(StandardCharsets.UTF_8);
+
             } else {
                 String message = ExceptionHelper.getMessage("WLSDPLY-12132", dataType);
                 throw new IllegalArgumentException(message);

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

@@ -38,7 +38,7 @@ def __init__(self, model, model_context, aliases, exception_type=ExceptionType.C
         self.model_context = model_context
         self.wls_helper = WebLogicHelper(self.logger)
         self.attribute_setter = AttributeSetter(self.aliases, self.logger, exception_type)
-        self.custom_folder_helper = CustomFolderHelper(self.aliases, self.logger, exception_type)
+        self.custom_folder_helper = CustomFolderHelper(self.aliases, self.logger, self.model_context, exception_type)
 
         # Must be initialized by the subclass since only it has
         # the knowledge required to compute the domain name.

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

@@ -20,9 +20,11 @@ class CustomFolderHelper(object):
     These require special handling, since they do not have alias definitions.
     """
     __class_name = 'CustomFolderHelper'
+    __cipher_text_prefixes = ["{AES}", "{AES-256}"]
 
-    def __init__(self, aliases, logger, exception_type):
+    def __init__(self, aliases, logger, model_context, exception_type):
         self.logger = logger
+        self.model_context = model_context
         self.exception_type = exception_type
         self.alias_helper = AliasHelper(aliases, self.logger, self.exception_type)
         self.weblogic_helper = WebLogicHelper(self.logger)
@@ -107,6 +109,13 @@ def update_security_folder(self, location, model_type, model_subtype, model_name
                 self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
                 raise ex
 
+            # if the property requires encryption, and the value is not encrypted,
+            # encrypt the value with domain encryption.
+
+            requires_encrypted = property_descriptor.getValue('encrypted')
+            if requires_encrypted and not self.is_encrypted(model_value) and isinstance(model_value, str):
+                model_value = self.weblogic_helper.encrypt(model_value, self.model_context.get_domain_home())
+
             property_type = parameter_types[0]
 
             # convert the model value to the target type and call the setter with the target value.
@@ -121,3 +130,9 @@ def update_security_folder(self, location, model_type, model_subtype, model_name
                                                        str(model_value), ex.getLocalizedMessage(), error=ex)
                 self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
                 raise ex
+
+    def is_encrypted(self, text):
+        for prefix in self.__cipher_text_prefixes:
+            if text.startswith(prefix):
+                return True
+        return False