Add optional password to destination string

Author: remram44

tej/submission.py

@@ -159,7 +159,9 @@ def escape_queue(s):
 
 _re_ssh = re.compile(r'^'
                      r'(?:ssh://)?'              # 'ssh://' prefix
-                     r'(?:([a-zA-Z0-9_.-]+)@)?'  # 'user@'
+                     r'(?:([a-zA-Z0-9_.-]+)'     # 'user@'
+                     r'(?::([^ @]+))?'           # ':password'
+                     r'@)?'                      # '@'
                      r'([a-zA-Z0-9_.-]+)'        # 'host'
                      r'(?::([0-9]+))?'           # ':port'
                      r'$')
@@ -171,12 +173,14 @@ def parse_ssh_destination(destination):
     match = _re_ssh.match(destination)
     if not match:
         raise InvalidDestination("Invalid destination: %s" % destination)
-    user, host, port = match.groups()
+    user, password, host, port = match.groups()
     info = {}
     if user:
         info['username'] = user
     else:
         info['username'] = getpass.getuser()
+    if password:
+        info['password'] = password
     if port:
         info['port'] = int(port)
     info['hostname'] = host
@@ -185,12 +189,17 @@ def parse_ssh_destination(destination):
 
 
 def destination_as_string(destination):
+    if 'password' in destination:
+        user = '%s:%s' % (destination['username'], destination['password'])
+    else:
+        user = destination['username']
+
     if destination.get('port', 22) != 22:
-        return 'ssh://%s@%s:%d' % (destination['username'],
+        return 'ssh://%s@%s:%d' % (user,
                                    destination['hostname'],
                                    destination['port'])
     else:
-        return 'ssh://%s@%s' % (destination['username'],
+        return 'ssh://%s@%s' % (user,
                                 destination['hostname'])
 
 

tests/test_parsing.py

@@ -39,9 +39,17 @@ def test_parse(self):
         self.assertEqual(parse('me@host:12'), {'hostname': 'host',
                                                'username': 'me',
                                                'port': 12})
+        self.assertEqual(parse('me:p4$$w0rd@host:12'), {'hostname': 'host',
+                                                        'username': 'me',
+                                                        'password': 'p4$$w0rd',
+                                                        'port': 12})
         self.assertEqual(parse('ssh://me@host:12'), {'hostname': 'host',
                                                      'username': 'me',
                                                      'port': 12})
+        self.assertEqual(parse('ssh://me:p@host:12'), {'hostname': 'host',
+                                                       'username': 'me',
+                                                       'password': 'p',
+                                                       'port': 12})
         self.assertEqual(parse('ssh://me@host:22'), {'hostname': 'host',
                                                      'username': 'me',
                                                      'port': 22})
@@ -54,9 +62,15 @@ def test_string(self):
         self.assertEqual(string({'hostname': '127.0.0.1', 'port': 12,
                                  'username': 'somebody'}),
                          'ssh://[email protected]:12')
+        self.assertEqual(string({'hostname': '127.0.0.1', 'port': 12,
+                                 'username': 'somebody', 'password': '$$'}),
+                         'ssh://somebody:[email protected]:12')
         self.assertEqual(string({'hostname': '127.0.0.1', 'port': 22,
                                  'username': 'somebody'}),
                          'ssh://[email protected]')
+        self.assertEqual(string({'hostname': '127.0.0.1', 'port': 22,
+                                 'username': 'somebody', 'password': 'pass'}),
+                         'ssh://somebody:[email protected]')
         self.assertEqual(string({'hostname': '127.0.0.1',
                                  'username': 'somebody'}),
                          'ssh://[email protected]')