Merge lp:~mwhudson/launchpad/allow-import-password into lp:launchpad

[Michael Hudson-Doyle]

Allow a username and password to be specified in a code import's URL

Hi,

This branch adds the ability to specify a username and password in code import urls.

Cheers,
mwh

[Jeroen T. Vermeulen (jtv)]

As per IRC, I have one problem with this: you're inviting users to enter complete login credentials which will then be shown publicly in the UI.

An option you proffered was a warning text. Another is to ensure that the password is never displayed except to the user who entered it.

review: Needs Fixing (code)

[Tim Penhey (thumper)]

I think that a warning on the page where they are entering it would be enough.

[Tim Penhey (thumper)]

I think if you add a warning on the page saying it will be publicly visible, we can land this.

review: Approve

=== modified file 'lib/lp/code/browser/codeimport.py'
--- lib/lp/code/browser/codeimport.py	2010-04-22 23:50:51 +0000
+++ lib/lp/code/browser/codeimport.py	2010-04-28 02:54:28 +0000
@@ -211,10 +211,11 @@
     svn_branch_url = URIField(
         title=_("Branch URL"), required=False,
         description=_(
-            "The URL of a Subversion branch, starting with svn:// or"
-            " http(s)://. Only trunk branches are imported."),
+            "The URL of a Subversion branch, starting with svn:// or "
+            "http(s)://.   You can include a username and password as part "
+            "of the url, but this will be displayed on the branch page."),
         allowed_schemes=["http", "https", "svn"],
-        allow_userinfo=False,
+        allow_userinfo=True,
         allow_port=True,
         allow_query=False,
         allow_fragment=False,

=== modified file 'lib/lp/code/interfaces/codeimport.py'
--- lib/lp/code/interfaces/codeimport.py	2010-04-04 16:48:40 +0000
+++ lib/lp/code/interfaces/codeimport.py	2010-04-28 02:54:28 +0000
@@ -102,7 +102,7 @@
         URIField(title=_("URL"), required=False, readonly=True,
             description=_("The URL of the VCS branch."),
             allowed_schemes=["http", "https", "svn", "git"],
-            allow_userinfo=False, # Only anonymous access is supported.
+            allow_userinfo=True,
             allow_port=True,
             allow_query=False,    # Query makes no sense in Subversion.
             allow_fragment=False, # Fragment makes no sense in Subversion.

=== modified file 'lib/lp/code/stories/codeimport/xx-admin-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-admin-codeimport.txt	2010-03-26 02:40:29 +0000
+++ lib/lp/code/stories/codeimport/xx-admin-codeimport.txt	2010-04-28 02:54:28 +0000
@@ -124,13 +124,14 @@
 +++++++++++++++++++++++++++
 
 The +edit-import page allows the import operator to edit the location
-an import is from.
+an import is from, for example to add a user name and password to the
+url.
 
 This is true for Subversion imports,
 
     >>> import_browser.open(svn_import_location + '/+edit-import')
     >>> import_browser.getControl('URL').value = \
-    ...     'svn://svn-new.example.com/fooix/trunk'
+    ...     'svn://user:[e-mail]/fooix/trunk'
     >>> import_browser.getControl('Update').click()
     >>> for message in get_feedback_messages(import_browser.contents):
     ...     print extract_text(message)
@@ -140,7 +141,7 @@
 
     >>> import_browser.open(bzr_svn_import_location + '/+edit-import')
     >>> import_browser.getControl('URL').value = \
-    ...     'svn://svn-new.example.com/bzr-svn/trunk'
+    ...     'svn://user:[e-mail]/bzr-svn/trunk'
     >>> import_browser.getControl('Update').click()
     >>> for message in get_feedback_messages(import_browser.contents):
     ...     print extract_text(message)
@@ -162,7 +163,7 @@
 
     >>> import_browser.open(git_import_location + '/+edit-import')
     >>> import_browser.getControl('URL').value = \
-    ...     'git://git-new.example.org/fooix'
+    ...     'git://user:[e-mail]/fooix'
     >>> import_browser.getControl('Update').click()
     >>> for message in get_feedback_messages(import_browser.contents):
     ...     print extract_text(message)
@@ -172,7 +173,7 @@
 
     >>> import_browser.open(hg_import_location + '/+edit-import')
     >>> import_browser.getControl('URL').value = \
-    ...     'http://metal.example.org/bar'
+    ...     'http://user:[e-mail]/bar'
     >>> import_browser.getControl('Update').click()
     >>> for message in get_feedback_messages(import_browser.contents):
     ...     print extract_text(message)
@@ -312,7 +313,7 @@
     >>> print_import_details(import_browser)
     Import Status: Reviewed
     This branch is an import of the Subversion branch from
-        svn://svn-new.example.com/fooix/trunk.
+        svn://user:[e-mail]/fooix/trunk.
     The next import is scheduled to run in 3 hours.
     Last successful import was on 2007-09-10.
     ...
@@ -349,7 +350,7 @@
     >>> print_import_details(sample_person_browser)
     Import Status: Reviewed
     This branch is an import of the Subversion branch from
-        svn://svn-new.example.com/fooix/trunk.
+        svn://user:[e-mail]/fooix/trunk.
     The next import is scheduled to run as soon as possible (requested
     by Sample Person).
     Last successful import was on 2007-09-10.

=== modified file 'lib/lp/code/stories/codeimport/xx-create-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2010-04-23 01:21:16 +0000
+++ lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2010-04-28 02:54:28 +0000
@@ -41,8 +41,8 @@
     (*) Subversion
     ( ) CVS
 
-The user is required to enter a project that the import is for,
-a name for the import branch, and a subversion branch location.
+The user is required to enter a project that the import is for, a name
+for the import branch, and a subversion branch location.
 
     >>> browser.getControl('Branch Name').value = "imported"
     >>> browser.getControl('Branch URL').value = (
@@ -68,6 +68,20 @@
     >>> print svn_span['title']
     Subversion via bzr-svn
 
+If the user wants, they can include a username and password in the
+URL.
+
+    >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
+    >>> browser.getControl('Branch Name').value = "with-password"
+    >>> browser.getControl('Branch URL').value = (
+    ...     "http://user:[e-mail]/firefox/trunk")
+    >>> browser.getControl('Project').value = "firefox"
+    >>> browser.getControl('Request Import').click()
+    >>> print extract_text(find_tag_by_id(browser.contents, "import-details"))
+    Import Status: Pending Review
+    This branch is an import of the Subversion branch
+    from http://user:[e-mail]/firefox/trunk.
+
 
 Requesting a Git import
 =======================
@@ -234,8 +248,8 @@
 Requesting an import for a product that does not exist
 ======================================================
 
-If there are privacy policies that disallow the user from creating branches
-then an error is shown to the user.
+If the name typed in the product field does not match that of an
+existing product, an error is shown to the user.
 
     >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
     >>> browser.getControl('Project').value = "no-such-product"