Merge pull request #231 from e-sonic/SNC-20326-passwd-enc-fix

Fixed copy command URL invalid - password encoding

CLI/actioner/sonic_cli_file_mgmt.py

@@ -28,6 +28,7 @@
 from pprint import pprint
 import json
 import getpass
+import urllib.parse as urlparse
 
 # URL Pattern
 # Protocol://[Username[:Password]@]Hostname[:Port]/[Filename]
@@ -38,7 +39,7 @@
 # Port - 0-9 (0-99999) - optional
 # Filename - can contain any caharacter other than {:?&@} as these characters have special meaning in URL
 
-url_pattern = r"^(http:\/\/|scp:\/\/|ftp:\/\/)(([a-zA-Z0-9.]+@)?|([a-zA-Z0-9.]+:[^:?&@]+)@)?([.a-zA-Z0-9\-]+(:[0-9]{1,5})?/[^:?&@]+)$"
+url_pattern = r"^(http:\/\/|scp:\/\/|ftp:\/\/)(([a-zA-Z0-9.]+@)?|([a-zA-Z0-9.]+:[^:?&@]+)@)?([.a-zA-Z0-9\-]+(:[0-9]{1,5})?(:)?/[^:?&@]+)$"
 
 def is_remote_url(url):
     remote_url_prefixes = ["http:", "ftp:", "scp:"]
@@ -96,7 +97,8 @@ def get_user_pass(url):
         if (status == False) or (len(password) == 0):
             return False, ""
 
-    url = f"{url_prefix}{username}:{password}@{host_filename}"
+    password_enc = urlparse.quote(password)
+    url = f"{url_prefix}{username}:{password_enc}@{host_filename}"
 
     if (len(url) <= 256) and is_valid_url(url):
         return (True, url)