Handle parsing exception on files with percent signs (#793)

Author: CarolynRountree

core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py

@@ -8,6 +8,7 @@
 
 from java.io import IOException
 from java.net import URI
+from java.net import URISyntaxException
 from java.security import NoSuchAlgorithmException
 
 from oracle.weblogic.deploy.deploy import DeployException
@@ -328,36 +329,47 @@ def discard_current_edit():
     _logger.exiting(class_name=_class_name, method_name=_method_name)
     return
 
+
 def extract_from_uri(model_context, path_value):
     """
     If the MBean path attribute has a URI file scheme, look past the scheme and
-    resolve any global tokens.
+    resolve any global tokens. If the filename contains non-standard RFC 2936 and
+    does not represent a file but rather a future file.
 
     :param model_context: current context containing job information
     :param path_value: MBean attribute path
     :return: fully resolved URI path, or the path_value if not a URI scheme
     """
-    uri = URI(path_value)
-    if uri.getScheme() == 'file':
-        return FILE_URI + model_context.replace_token_string(uri.getPath()[1:])
+    _method_name = 'extract_from_uri'
+    try:
+        uri = URI(path_value)
+        if uri.getScheme() == 'file':
+            return FILE_URI + model_context.replace_token_string(uri.getPath()[1:])
+    except URISyntaxException, use:
+        _logger.fine('WLSDPLY-09113', path_value, use, class_name=_class_name, method_name=_method_name)
     return path_value
 
 
 def get_rel_path_from_uri(model_context, path_value):
     """
     If the MBean attribute is a URI. To extract it from the archive, need to make
-    it into a relative path.
+    it into a relative path. If it contains non-standard RF 2396 characters, assume
+    it is not a file name in the archive.
     :param model_context: current context containing run information
     :param path_value: the full value of the path attribute
     :return: The relative value of the path attribute
     """
-    uri = URI(path_value)
-    if uri.getScheme() == 'file':
-        value = model_context.tokenize_path(uri.getPath())
-        if value.startswith(model_context.DOMAIN_HOME_TOKEN):
-            # point past the token and first slash
-            value = value[len(model_context.DOMAIN_HOME_TOKEN)+1:]
-        return value
+    _method_name = 'get_rel_path_from_uri'
+    try:
+        uri = URI(path_value)
+        if uri.getScheme() == 'file':
+            value = model_context.tokenize_path(uri.getPath())
+            if value.startswith(model_context.DOMAIN_HOME_TOKEN):
+                # point past the token and first slash
+                value = value[len(model_context.DOMAIN_HOME_TOKEN)+1:]
+            return value
+    except URISyntaxException, use:
+        _logger.fine('WLSDPLY-09113', path_value, use, class_name=_class_name, method_name=_method_name)
     return path_value
 
 

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

@@ -1033,6 +1033,8 @@ WLSDPLY-09109=Unable to delete {0} {1}, name does not exist
 WLSDPLY-09110=Deleting {0} {1}
 WLSDPLY-09111=Unable to get delete item name for {0}
 WLSDPLY-09112=Failed to discard current edit session: {0}
+WLSDPLY-09113=Filenames contains unparseable characters {0} : {1}
+
 # wlsdeploy/tool/deploy/deployer.py
 WLSDPLY-09200=Error setting attribute {0} for {1} {2}: {3}
 WLSDPLY-09201=Failed to get existing WLST value for model attribute {0} at location {1} because the \