svn: properly pass credentials from URL during import.

vcsserver/svn.py

@@ -18,7 +18,9 b''
 from __future__ import absolute_import
 
 import os
+import subprocess
 from urllib2 import URLError
+import urlparse
 import logging
 import posixpath as vcspath
 import StringIO
@@ -350,15 +352,27 b' class SvnRemote(object):'
         self._factory.repo(wire, create=True,
                            compatible_version=compatible_version)
 
+    def get_url_and_credentials(self, src_url):
+        obj = urlparse.urlparse(src_url)
+        username = obj.username or None
+        password = obj.password or None
+        return username, password, src_url
+
     def import_remote_repository(self, wire, src_url):
         repo_path = wire['path']
         if not self.is_path_valid_repository(wire, repo_path):
             raise Exception(
                 "Path %s is not a valid Subversion repository." % repo_path)
 
-        import subprocess
+        username, password, src_url = self.get_url_and_credentials(src_url)
+        rdump_cmd = ['svnrdump', 'dump', '--non-interactive',
+                     '--trust-server-cert-failures=unknown-ca']
+        if username and password:
+            rdump_cmd += ['--username', username, '--password', password]
+        rdump_cmd += [src_url]
+
         rdump = subprocess.Popen(
-            ['svnrdump', 'dump', '--non-interactive', src_url],
+            rdump_cmd,
             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         load = subprocess.Popen(
             ['svnadmin', 'load', repo_path], stdin=rdump.stdout)

vcsserver/tests/test_svn.py

@@ -64,3 +64,19 b' def test_svn_libraries_can_be_imported()'
     import svn
     import svn.client
     assert svn.client is not None
+
+
[e-mail]('example_url, parts', [
+    ('http://server.com', (None, None, 'http://server.com')),
+    ('http://[e-mail]', ('user', None, 'http://[e-mail]')),
+    ('http://user:[e-mail]', ('user', 'pass', 'http://user:[e-mail]')),
+    ('<script>', (None, None, '<script>')),
+    ('http://', (None, None, 'http://')),
+])
+def test_username_password_extraction_from_url(example_url, parts):
+    from vcsserver import svn
+
+    remote = svn.SvnRemote(None)
+    remote.is_path_valid_repository = lambda wire, path: True
+
+    assert remote.get_url_and_credentials(example_url) == parts