Merge lp:~dooferlad/offspring/ssh_ui_mods into lp:~linaro-automation/offspring/private-builds

[James Tunnicliffe]

Adds to the web UI so Launchpad SSH credentials can be easily added, modified and removed without sharing the value of the SSH private key.

[Guilherme Salgado (salgado)]

Hi James, this branch has a conflict; care to resolve it before I review?

[James Tunnicliffe (dooferlad)]

Have rebased. Should be fine now.

[Guilherme Salgado (salgado)]

Hi James,

In my previous review I suggested creating a new page to edit the SSH keys and lp username because it would:

 1. be simpler to implement
 2. as a consequence, less fragile and easier to test
 3. allow us to provide a simple UI: we could use one form button to save an SSHkey/lp_username change and another to remove the SSHkey/username. Remember that these two things need to be removed together as having just one of them will cause the slave to crash

I see you've added a way to remove an ssh key, but using a checkbox for that is poor UI at best, and it doesn't seem to remove the LP user, as we should do, at the same time (if it did, it'd be even more confusing).

I also suggested placing the "An SSH key is stored for this project...." helper text outside of the textarea instead of using JS to place it inside because the latter doesn't add (IMO) much value and can't be unit tested (unless we spend a significant amount of time writing/configuring some way of testing the JS in our views). This also depends on jquery and an extra jquery plugin, which should not be included without some discussion because Offspring already includes a javascript library (http://www.smartclient.com/product/smartclient.jsp).

I'm not trying to make things perfect here, but I think we should try hard to avoid unnecessary complexity, and I do believe my suggestions would make things just as nice (nicer, in some cases) to the user and much simpler for us.

[lp:~dooferlad/offspring/ssh_ui_mods]

80. By James Tunnicliffe on 2011-10-27

Part way through splitting out SSH Credentials editing into a separate page. It saves and erases correctly, but isn't being fed the data it needs.

81. By James Tunnicliffe on 2011-10-28

For some reason current values aren't making it to projects/cn/+editcredentials. Other stuff seems to be working...

82. By James Tunnicliffe on 2011-10-28

Plumbing fixed. Now can edit SSH credentials on a separate page.

83. By James Tunnicliffe on 2011-10-28

Updated tests for new SSH edit page.
Added some tests that do some value checking.
Removed some obsolete code.

84. By James Tunnicliffe on 2011-10-28

Minor web interface tidy up.
Deleted unused code.

[James Tunnicliffe (dooferlad)]

Right, have moved the SSH credentials editing to a new page, removed the extra jquery, added some more unit tests and made sure that help text is always complete outside the placeholder text inside the SSH key entry box.

review: Needs Resubmitting

[lp:~dooferlad/offspring/ssh_ui_mods]

85. By James Tunnicliffe on 2011-10-29

Removed toggle visible from project_create.html.
Removed unsused showAddAnotherPopup from project_edit_credentials.html.
Removed toggle_visible.js (no longer used).

86. By James Tunnicliffe on 2011-11-03

* Require both or neither ssh user and key.
* Removed bad tests
* Added test to ensure we can't edit a projects SSH credentials if it is private and we don't have permissions
* Code clean up and tidy.

87. By James Tunnicliffe on 2011-11-03

Updated and fixed logic for requiring SSH user and key to be both set, or neither set.

Unmerged revisions

=== added file 'lib/offspring/web/media/js/jquery.placeholder.js'
--- lib/offspring/web/media/js/jquery.placeholder.js	1970-01-01 00:00:00 +0000
+++ lib/offspring/web/media/js/jquery.placeholder.js	2011-10-28 17:07:26 +0000
@@ -0,0 +1,106 @@
+/*
+* Placeholder plugin for jQuery
+* ---
+* Copyright 2010, Daniel Stocks (http://webcloud.se)
+* Released under the MIT, BSD, and GPL Licenses.
+*/
+(function($) {
+    function Placeholder(input) {
+        this.input = input;
+        if (input.attr('type') == 'password') {
+            this.handlePassword();
+        }
+        // Prevent placeholder values from submitting
+        $(input[0].form).submit(function() {
+            if (input.hasClass('placeholder') && input[0].value == input.attr('placeholder')) {
+                input[0].value = '';
+            }
+        });
+    }
+    Placeholder.prototype = {
+        show : function(loading) {
+            // FF and IE saves values when you refresh the page. If the user refreshes the page with
+            // the placeholders showing they will be the default values and the input fields won't be empty.
+            if (this.input[0].value === '' || (loading && this.valueIsPlaceholder())) {
+                if (this.isPassword) {
+                    try {
+                        this.input[0].setAttribute('type', 'text');
+                    } catch (e) {
+                        this.input.before(this.fakePassword.show()).hide();
+                    }
+                }
+                this.input.addClass('placeholder');
+                this.input[0].value = this.input.attr('placeholder');
+            }
+        },
+        hide : function() {
+            if (this.valueIsPlaceholder() && this.input.hasClass('placeholder')) {
+                this.input.removeClass('placeholder');
+                this.input[0].value = '';
+                if (this.isPassword) {
+                    try {
+                        this.input[0].setAttribute('type', 'password');
+                    } catch (e) { }
+                    // Restore focus for Opera and IE
+                    this.input.show();
+                    this.input[0].focus();
+                }
+            }
+        },
+        valueIsPlaceholder : function() {
+            return this.input[0].value == this.input.attr('placeholder');
+        },
+        handlePassword: function() {
+            var input = this.input;
+            input.attr('realType', 'password');
+            this.isPassword = true;
+            // IE < 9 doesn't allow changing the type of password inputs
+            if ($.browser.msie && input[0].outerHTML) {
+                var fakeHTML = $(input[0].outerHTML.replace(/type=(['"])?password\1/gi, 'type=$1text$1'));
+                this.fakePassword = fakeHTML.val(input.attr('placeholder')).addClass('placeholder').focus(function() {
+                    input.trigger('focus');
+                    $(this).hide();
+                });
+                $(input[0].form).submit(function() {
+                    fakeHTML.remove();
+                    input.show()
+                });
+            }
+        }
+    };
+    var NATIVE_SUPPORT = !!("placeholder" in document.createElement( "input" ));
+    $.fn.placeholder = function() {
+        return NATIVE_SUPPORT ? this : this.each(function() {
+            var input = $(this);
+            var placeholder = new Placeholder(input);
+            placeholder.show(true);
+            input.focus(function() {
+                placeholder.hide();
+            });
+            input.blur(function() {
+                placeholder.show(false);
+            });
+
+            // On page refresh, IE doesn't re-populate user input
+            // until the window.onload event is fired.
+            if ($.browser.msie) {
+                $(window).load(function() {
+                    if(input.val()) {
+                        input.removeClass("placeholder");
+                    }
+                    placeholder.show(true);
+                });
+                // What's even worse, the text cursor disappears
+                // when tabbing between text inputs, here's a fix
+                input.focus(function() {
+                    if(this.value == "") {
+                        var range = this.createTextRange();
+                        range.collapse(true);
+                        range.moveStart('character', 0);
+                        range.select();
+                    }
+                });
+            }
+        });
+    }
+})(jQuery);

=== added file 'lib/offspring/web/media/js/toggle_visible.js'
--- lib/offspring/web/media/js/toggle_visible.js	1970-01-01 00:00:00 +0000
+++ lib/offspring/web/media/js/toggle_visible.js	2011-10-28 17:07:26 +0000
@@ -0,0 +1,30 @@
+/* Copyright 2010 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ */
+
+/* Simple show/hide element function offspring-web.
+ */
+ 
+function toggleElementVisible(id)
+{
+    if(typeof toggleElementVisible.state == 'undefined')
+    {
+        toggleElementVisible.state = {};
+    }
+
+    if(typeof toggleElementVisible.state[id] == 'undefined')
+    {
+        toggleElementVisible.state[id] = 'h';
+    }
+
+    if(toggleElementVisible.state[id] == 'h')
+    {
+        document.getElementById(id).style.display = 'block';
+        toggleElementVisible.state[id] = 's'
+    }
+    else
+    {
+        document.getElementById(id).style.display = 'none';
+        toggleElementVisible.state[id] = 'h'
+    }
+}

=== modified file 'lib/offspring/web/queuemanager/admin.py'
--- lib/offspring/web/queuemanager/admin.py	2011-02-24 05:08:42 +0000
+++ lib/offspring/web/queuemanager/admin.py	2011-10-28 17:07:26 +0000
@@ -43,7 +43,9 @@
 
 
 class ProjectAdmin(admin.ModelAdmin):
-    fields = ['title', 'name', 'arch', 'project_group', 'launchpad_project', 'suite', 'series', 'priority', 'status', 'is_active', 'config_url', 'notes']
+    fields = ['title', 'name', 'arch', 'project_group', 'launchpad_project',
+              'suite', 'series', 'priority', 'status', 'is_active',
+              'config_url', 'lp_user', 'lp_ssh_key_input', 'notes']
     list_display = ('display_name', 'arch', 'series', 'project_group', 'launchpad_project', 'is_active', 'status', 'priority', 'config_url')
     list_filter = ['arch', 'series', 'is_active', 'project_group', 'status']
     search_fields = ['title', 'name', 'arch', 'notes']

=== modified file 'lib/offspring/web/queuemanager/forms.py'
--- lib/offspring/web/queuemanager/forms.py	2011-10-19 20:23:49 +0000
+++ lib/offspring/web/queuemanager/forms.py	2011-10-28 17:07:26 +0000
@@ -1,8 +1,11 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+import re
+
 from django.contrib.auth.models import User
 from django.db import models
+from django import forms
 from django.forms import (
     Form, ModelChoiceField, ModelForm, Textarea, TextInput, ValidationError)
 from django.forms import fields
@@ -15,9 +18,81 @@
 
 from offspring.web.queuemanager.widgets import SelectWithAddNew
 
-class ProjectBaseForm(ModelForm):
-    status = fields.CharField(max_length=200,
-        widget=fields.Select(choices=Project.STATUS_CHOICES), required=True)
+class SSHPrivateKeyField(forms.Field):
+
+    def validate(self, value):
+        "Check to see if the value looks like an SSH private key"
+
+        # Use the parent's handling of required fields, etc.
+        super(SSHPrivateKeyField, self).validate(value)
+
+        key_search_regexp = (r"-----BEGIN \w+ PRIVATE KEY-----"+
+                             r".*"+
+                             r"-----END \w+ PRIVATE KEY-----")
+        is_key = re.search(key_search_regexp, value, re.DOTALL | re.MULTILINE)
+
+        if not is_key and not value == "":
+            msg = ("The key you entered doesn't appear to be valid. I am "+
+                   "expecting a key in the form:\n "+
+                   "-----BEGIN <type> PRIVATE KEY-----\n"+
+                   "<ASCII key>\n"+
+                   "-----END <type> PRIVATE KEY-----\n")
+            raise forms.ValidationError(msg)
+
+class ProjectSSHCredForm(ModelForm):
+    ssh_help = ("Enter a private SSH ASCII key block, complete with begin "+
+                "and end markers.")
+
+    lp_ssh_key_input = SSHPrivateKeyField(label="Launchpad User's SSH key",
+                                       required=False,
+                                       widget=forms.Textarea(
+                                               attrs={'cols': 70, 'rows' : 4}),
+                                       help_text=ssh_help)
+
+    lp_fields_set = False
+    lp_ssh_set = False
+    lp_ssh_set_message = ("An SSH key is stored for this project. To replace "+
+                          "it, paste a new SSH private key block here.")
+    lp_ssh_clear_meessage = ("To enable access to private repositories,"+
+                             "enter an SSH private key here in the form of an "+
+                             "ASCII key block.")
+
+    def __init__(self, *args, **kwargs):
+        super(ProjectSSHCredForm, self).__init__(*args, **kwargs)
+        # Set the form fields based on the model object
+        if kwargs.has_key('instance'):
+            instance = kwargs['instance']
+            if instance.lp_ssh_key and instance.lp_ssh_key != "":
+                self.lp_ssh_set = True
+            else:
+                self.lp_ssh_set = False
+
+            self.lp_fields_set = instance.lp_ssh_key or instance.lp_user
+
+    class Meta:
+        model = Project
+        widgets = {
+            'lp_user' : Textarea(attrs={'cols': 70, 'rows' : 1}),
+        }
+
+class ProjectBaseForm(ProjectSSHCredForm):
+    def save(self, commit=True):
+        model = super(ProjectBaseForm, self).save(commit=False)
+
+        if 'lp_ssh_key_input' in self.cleaned_data:
+            # Save the SSH key
+            new_key = self.cleaned_data['lp_ssh_key_input']
+
+            if new_key == "":
+                pass # No new key entered
+
+            else: # Save new key (validated in clean_lp_ssh_key_input)
+                model.lp_ssh_key = new_key
+
+        if commit:
+            model.save()
+
+        return model
 
     class Meta:
         model = Project
@@ -25,7 +100,8 @@
             'name' : TextInput(attrs={'style': 'text-transform: lowercase;'}),
             'series' : TextInput(attrs={'style': 'text-transform: lowercase;'}),
             'config_url': TextInput(attrs={'size': 50}),
-            'notes' : Textarea(attrs={'cols': 73, 'rows' : 4}),
+            'notes' : Textarea(attrs={'cols': 70, 'rows' : 4}),
+            'lp_user' : Textarea(attrs={'cols': 70, 'rows' : 1}),
         }
 
     def clean_name(self):
@@ -55,6 +131,15 @@
         exclude = ('name', 'priority', 'is_active', 'access_groups')
 
 
+class EditProjectSSHCredentialsForm(ProjectSSHCredForm):
+    launchpad_project = ModelChoiceField(
+        LaunchpadProject.objects, widget=SelectWithAddNew, required=False)
+    class Meta(ProjectSSHCredForm.Meta):
+        exclude = ('priority', 'is_active', 'suite', 'access_groups', 'arch',
+                   'config_url', 'name', 'priority', 'series', 'status',
+                   'title')
+
+
 class AccessGroupMemberForm(Form):
     new_user = ModelChoiceField(queryset=User.objects, required=False)
 

=== modified file 'lib/offspring/web/queuemanager/models.py'
--- lib/offspring/web/queuemanager/models.py	2011-10-21 16:44:19 +0000
+++ lib/offspring/web/queuemanager/models.py	2011-10-28 17:07:26 +0000
@@ -233,7 +233,7 @@
     # The Launchpad User and SSH key are stored per project. If we stored them
     # per LauncpadProject, anyone who could create a Project referencing that
     # LaunchpadProject could get access to the private data in it.
-    lp_user = models.TextField('Launchpad User', null=True, editable=False,
+    lp_user = models.TextField('Launchpad User', null=True,
                                blank=True)
     lp_ssh_key = models.TextField("Launchpad User's SSH Key", blank=True,
                                   null=True, editable=False)

=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
--- lib/offspring/web/queuemanager/tests/test_views.py	2011-10-21 14:36:55 +0000
+++ lib/offspring/web/queuemanager/tests/test_views.py	2011-10-28 17:07:26 +0000
@@ -8,6 +8,8 @@
     Template,
     )
 from django.test import TestCase
+from django.test.client import Client
+from django.contrib.auth.models import User
 
 from offspring.enums import ProjectBuildStates
 from offspring.web.queuemanager.models import (
@@ -71,7 +73,33 @@
         self.assertEqual(404, response.status_code)
 
 
-class ProjectDetailsViewTests(TestCase, ProjectViewTestsMixin):
+class CreateProjectUsingWebMixin(object):
+    def create_project_using_web(self, lp_ssh_key=""):
+        user = User.objects.create_user('user', '[e-mail]', 'pass')
+        user.is_staff = True
+        user.is_superuser = True
+        user.save()
+        c = Client()
+        c.login(username='user', password='pass')
+
+        response = c.post('/projects/+add/',
+                          {'_is_private': 0,
+                           'owner': "1",
+                           'name': "testcodename",
+                           'title': "title",
+                           'arch': "i386",
+                           'series': "lucid",
+                           'status': "experimental",
+                           'config_url': "bla",
+                           'lp_user': "lpuser",
+                           'lp_ssh_key_input': lp_ssh_key,
+                           }, follow=True)
+
+        return c, response
+
+
+class ProjectDetailsViewTests(TestCase, ProjectViewTestsMixin,
+                              CreateProjectUsingWebMixin):
     view_path = 'offspring.web.queuemanager.views.project_details'
 
     def get_expected_page_heading(self, project):
@@ -85,6 +113,45 @@
             response, self.get_expected_page_heading(project),
             status_code=200, msg_prefix=response.content)
 
+    def test_public_project_with_ssh_auth(self):
+        project = factory.makeProject(is_private=False)
+        project.lp_ssh_key = "1234"
+        project.lp_user = "user"
+        project.save()
+        response = self.client.get(
+            reverse(self.view_path, args=[project.name]))
+        self.assertContains(
+            response, self.get_expected_page_heading(project),
+            status_code=200, msg_prefix=response.content)
+
+    def test_post_to_create_project_with_ssh_auth(self):
+        key = ("-----BEGIN type PRIVATE KEY-----\n"+
+               "12qwaszx34erdfcv\n"+
+               "-----END type PRIVATE KEY-----\n")
+
+        c, response = self.create_project_using_web(key)
+
+        self.assertEqual(response.redirect_chain[0][0],
+                         "http://testserver/projects/testcodename/")
+        self.assertNotContains(response, "Select a valid choice")
+        self.assertNotContains(response, "This field is required.")
+        self.assertNotContains(response, "is not a valid choice.")
+        self.assertNotContains(response, "The key you entered doesn")
+        self.assertNotContains(response, "12qwaszx34erdfcv")
+
+    def test_post_to_create_project_with_ssh_auth_bad_key(self):
+        key = ("-----BEGIN type PRVATE KEY-----\n"+
+               "12qwaszx34erdfcv\n"+
+               "-----END type PRIVATE KEY-----\n")
+
+        c, response = self.create_project_using_web(key)
+
+        self.assertNotContains(response, "Select a valid choice")
+        self.assertNotContains(response, "This field is required.")
+        self.assertNotContains(response, "is not a valid choice.")
+        self.assertContains(response, "The key you entered doesn")
+        self.assertNotContains(response, "12qwaszx34erdfcv")
+
 
 class ProjectEditViewTests(TestCase, ProjectViewTestsMixin):
     view_path = 'offspring.web.queuemanager.views.project_edit'
@@ -138,6 +205,114 @@
             status_code=200, msg_prefix=response.content)
 
 
+class ProjectEditSSHViewTests(TestCase,
+                           CreateProjectUsingWebMixin):
+    def test_post_to_edit_test_with_ssh_auth(self):
+        c, response = self.create_project_using_web()
+
+        self.assertNotContains(response, "Select a valid choice")
+        self.assertNotContains(response, "This field is required.")
+        self.assertNotContains(response, "is not a valid choice.")
+        self.assertNotContains(response, "The key you entered doesn")
+
+        key = ("-----BEGIN type PRIVATE KEY-----\n"+
+               "12qwaszx34erdfcv\n"+
+               "-----END type PRIVATE KEY-----\n")
+
+        # Now add a valid SSH key
+        response = c.post('/projects/testcodename/+editcredentials',
+                          {'lp_user': "lpuser",
+                           'lp_ssh_key_input': key,
+                           }, follow=True)
+
+        self.assertNotContains(response, "Select a valid choice")
+        self.assertNotContains(response, "This field is required.")
+        self.assertNotContains(response, "is not a valid choice.")
+        self.assertNotContains(response, "The key you entered doesn")
+        self.assertNotContains(response, "12qwaszx34erdfcv")
+
+    def test_post_to_edit_test_with_ssh_auth_bad_key(self):
+        c, response = self.create_project_using_web()
+
+        self.assertNotContains(response, "Select a valid choice")
+        self.assertNotContains(response, "This field is required.")
+        self.assertNotContains(response, "is not a valid choice.")
+        self.assertNotContains(response, "The key you entered doesn")
+
+        key = ("-----BEGIN type PRIVAE KEY-----\n"+
+               "12qwaszx34erdfcv\n"+
+               "-----END type PRIVATE KEY-----\n")
+
+        # Now add a valid SSH key
+        response = c.post('/projects/testcodename/+editcredentials',
+                          {'lp_user': "lpuser",
+                           'lp_ssh_key_input': key,
+                           }, follow=True)
+
+        self.assertNotContains(response, "Select a valid choice")
+        self.assertNotContains(response, "This field is required.")
+        self.assertNotContains(response, "is not a valid choice.")
+        self.assertContains(response, "The key you entered doesn")
+        self.assertNotContains(response, "12qwaszx34erdfcv")
+
+    def test_edit_ssh_auth(self):
+        project = factory.makeProject(is_private=True)
+        user = project.owner
+        grant_permission_to_user(user, 'change_project')
+        self.assertTrue(
+            self.client.login(username=user.username, password=user.username))
+
+        key = ("-----BEGIN type PRIVATE KEY-----\n"+
+               "12qwaszx34erdfcv\n"+
+               "-----END type PRIVATE KEY-----\n")
+
+        data = {'lp_user': "lpuser",
+                'lp_ssh_key_input': key,
+                '_save': 1}
+        response = self.client.post(
+            reverse('offspring.web.queuemanager.views.project_editsshcredentials',
+                    args=[project.name]),
+            data, follow=True)
+
+        self.assertEqual(200, response.status_code)
+
+        # re-load the project from the database to pick up changes
+        user_visible_objects = Project.all_objects.accessible_by_user(user)
+        project = get_possibly_private_object(
+                    user, user_visible_objects, pk=project.name)
+
+        self.assertEqual('lpuser', project.lp_user)
+        self.assertEqual(key, project.lp_ssh_key)
+
+    def test_edit_ssh_auth_bad_key(self):
+        project = factory.makeProject(is_private=True)
+        user = project.owner
+        grant_permission_to_user(user, 'change_project')
+        self.assertTrue(
+            self.client.login(username=user.username, password=user.username))
+
+        key = ("-----BEGIN type PR---VATE KEY-----\n"+
+               "12qwaszx34erdfcv\n"+
+               "-----END type PRIVATE KEY-----\n")
+
+        data = {'lp_user': "lpuser",
+                'lp_ssh_key_input': key,
+                '_save': 1}
+        response = self.client.post(
+            reverse('offspring.web.queuemanager.views.project_editsshcredentials',
+                    args=[project.name]),
+            data, follow=True)
+
+        self.assertEqual(200, response.status_code)
+
+        # re-load the project from the database to pick up changes
+        user_visible_objects = Project.all_objects.accessible_by_user(user)
+        project = get_possibly_private_object(
+                    user, user_visible_objects, pk=project.name)
+
+        self.assertNotEqual('lpuser', project.lp_user)
+        self.assertNotEqual(key, project.lp_ssh_key)
+
 class ProjectCreateViewTests(TestCase):
     view_path = 'offspring.web.queuemanager.views.project_create'
 

=== modified file 'lib/offspring/web/queuemanager/views.py'
--- lib/offspring/web/queuemanager/views.py	2011-10-20 16:08:24 +0000
+++ lib/offspring/web/queuemanager/views.py	2011-10-28 17:07:26 +0000
@@ -45,6 +45,7 @@
     AccessGroupMemberForm,
     CreateProjectForm,
     EditProjectForm,
+    EditProjectSSHCredentialsForm,
     LaunchpadProjectForm,
     ReleaseForm,
 )
@@ -356,6 +357,48 @@
         'queuemanager/project_acl.html', pageData,
         context_instance=RequestContext(request))
 
+@permission_required('queuemanager.change_project')
+def project_editsshcredentials(request, projectName):
+    user_visible_objects = Project.all_objects.accessible_by_user(
+        request.user)
+    project = get_possibly_private_object(
+        request.user, user_visible_objects, pk=projectName)
+    access_group = None
+    allowed_users = []
+    if len(project.access_groups.all()) > 0:
+        # We always use the first access group because there's no way for
+        # users to register more than one access group for any given project.
+        access_group = project.access_groups.all()[0]
+        allowed_users = access_group.members.all()
+
+    if request.method == 'POST':
+
+        form = EditProjectSSHCredentialsForm(request.POST, instance=project)
+        if form.is_valid():
+            if "delete" in request.POST:
+                project.lp_user = ""
+                project.lp_ssh_key = ""
+                project.save()
+
+            elif "_save" in request.POST:
+                project.lp_user = form.cleaned_data['lp_user']
+                if form.cleaned_data['lp_ssh_key_input']:
+                    project.lp_ssh_key = form.cleaned_data['lp_ssh_key_input']
+                project.save()
+
+            return HttpResponseRedirect(".")
+
+    else:
+        form = EditProjectSSHCredentialsForm(instance=project)
+    pageData = {
+        'csrf_token' : csrf.get_token(request),
+        'project' : project,
+        'form': form,
+        'allowed_users': allowed_users,
+        }
+    return render_to_response(
+        'queuemanager/project_edit_credentials.html', pageData,
+        context_instance=RequestContext(request))
 
 def projectgroup_details(request, projectGroupName):
     pg = get_object_or_404(

=== modified file 'lib/offspring/web/templates/queuemanager/project_create.html'
--- lib/offspring/web/templates/queuemanager/project_create.html	2011-02-28 22:48:46 +0000
+++ lib/offspring/web/templates/queuemanager/project_create.html	2011-10-28 17:07:26 +0000
@@ -5,7 +5,10 @@
 {% endblock %}
 
 {% block header_js %}
-<script type="text/javascript" src="/media/js/admin/RelatedObjectLookups.js"></script> 
+<script type="text/javascript" src="/media/js/admin/RelatedObjectLookups.js"></script>
+<script type="text/javascript" src="/media/js/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/js/jquery.placeholder.js"></script>
+<script type="text/javascript" src="/assets/js/toggle_visible.js"></script>
 <script type="text/javascript">
 /* Override showAddAnotherPopup to use custom height and width. */
 function showAddAnotherPopup(triggeringLink) {
@@ -29,29 +32,77 @@
 {% endblock %}
 
 {% block content %}
-    <form method="POST" action="">{% csrf_token %}
+    <form method="POST" action="" name="projsettings">{% csrf_token %}
         <div class="module aligned ">
              {% for field in form %}
-                <div class="form-row {% if line.errors %} errors{% endif %} {{ field.name }}">
-                    <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>
-                        {% if field.is_checkbox %}
-                            {{ field }}{{ field.label_tag }}
-                        {% else %}
-                            {{ field.label_tag }}
-                            {% if field.is_readonly %}
-                                <p>{{ field.contents }}</p>
+                {% if field.html_name == "lp_user" or field.html_name == "lp_ssh_key_input" or field.html_name == "erase_ssh_key" %}
+
+                {% else %}
+                    <div class="form-row {% if line.errors %} errors{% endif %} {{ field.name }}">
+                        <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>
+                            {% if field.is_checkbox %}
+                                {{ field }}{{ field.label_tag }}
                             {% else %}
-                                {{ field }}
-                            {% endif %}
-                        {% endif %}
-                        {% if field.field.field.help_text %}
-                            <p class="help">{{ field.field.field.help_text|safe }}</p>
-                        {% endif %}
+                                {{ field.label_tag }}
+                                {% if field.is_readonly %}
+                                    <p>{{ field.contents }}</p>
+                                {% else %}
+                                    {{ field }}
+                                {% endif %}
+                            {% endif %}
+                            {% if field.field.field.help_text %}
+                                <p class="help">{{ field.field.field.help_text|safe }}</p>
+                            {% endif %}
+                        </div>
+                        {{ field.errors }}
                     </div>
-                    {{ field.errors }}
-                </div>
+                {% endif %}
                 
             {% endfor %}
+
+            <br>
+            If the config URL above points to a Bazaar repository that is only
+            available to authenticated users, you should add a user and private SSH
+            key to give the builder access. The SSH key will never be revealed. It
+            can be changed or deleted later. It should not be passphrase protected.
+            If you would like to add these details, tick here:
+
+            <input type="checkbox" name="C1" value="1" onclick="toggleElementVisible('lpssh')" value=1>
+            <br>
+            <span id="lpssh" style="display: none;">
+                <br>
+
+                <div class="form-row {{ form.lp_user.name }}">
+                    <div class="field-box">
+                        {{ form.lp_user.label_tag }}
+                        <br>
+                        {{ form.lp_user }}
+                    </div>
+                    {{ form.lp_user.errors }}
+                </div>
+
+                <div class="form-row {{ form.lp_ssh_key_input.name }}">
+                    <div class="field-box">
+                        {{ form.lp_ssh_key_input.label_tag }}
+                        <br>
+                        <textarea id="id_lp_ssh_key_input" rows="4" cols="70" name="lp_ssh_key_input"
+                                  placeholder="{% if form.lp_ssh_set %}{{ form.lp_ssh_set_message }}{% else %}{{ form.lp_ssh_clear_meessage }}{% endif %}"></textarea>
+                        {% if form.lp_ssh_key_input.help_text %}
+                            <p class="help">{{ form.lp_ssh_key_input.help_text|safe }}</p>
+                        {% endif %}
+                    </div>
+                    {{ form.lp_ssh_key_input.errors|linebreaksbr }}
+                </div>
+
+            </span>
+            <br>
+            {% if form.lp_ssh_key_input.errors or form.lp_user.errors %}
+            <script>
+            $(document).ready(function(){
+                document.projsettings.C1.click();
+            });
+            </script>
+            {% endif %}
             <div class="submit-row" style="overflow: auto;">
                 <input type="submit" value="Save" class="default" name="_save"/>
                 <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '/';"/>

=== modified file 'lib/offspring/web/templates/queuemanager/project_edit.html'
--- lib/offspring/web/templates/queuemanager/project_edit.html	2011-03-03 01:50:40 +0000
+++ lib/offspring/web/templates/queuemanager/project_edit.html	2011-10-28 17:07:26 +0000
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block header_js %}
-<script type="text/javascript" src="/media/js/admin/RelatedObjectLookups.js"></script> 
+<script type="text/javascript" src="/media/js/admin/RelatedObjectLookups.js"></script>
 <script type="text/javascript">
 /* Override showAddAnotherPopup to use custom height and width. */
 function showAddAnotherPopup(triggeringLink) {
@@ -29,29 +29,46 @@
 {% endblock %}
 
 {% block content %}
-    <form method="POST" action="">{% csrf_token %}
+    <form method="POST" action="" name="projsettings">{% csrf_token %}
         <div class="module aligned ">
              {% for field in form %}
-                <div class="form-row {% if line.errors %} errors{% endif %} {{ field.name }}">
-                    <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>
-                        {% if field.is_checkbox %}
-                            {{ field }}{{ field.label_tag }}
-                        {% else %}
-                            {{ field.label_tag }}
-                            {% if field.is_readonly %}
-                                <p>{{ field.contents }}</p>
+                {% if field.html_name == "lp_user" or field.html_name == "lp_ssh_key_input"%}
+                {% else %}
+                    <div class="form-row {% if line.errors %} errors{% endif %} {{ field.name }}">
+                        <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>
+                            {% if field.is_checkbox %}
+                                {{ field }}{{ field.label_tag }}
                             {% else %}
-                                {{ field }}
-                            {% endif %}
-                        {% endif %}
-                        {% if field.field.field.help_text %}
-                            <p class="help">{{ field.field.field.help_text|safe }}</p>
-                        {% endif %}
+                                {{ field.label_tag }}
+                                {% if field.is_readonly %}
+                                    <p>{{ field.contents }}</p>
+                                {% else %}
+                                    {{ field }}
+                                {% endif %}
+                            {% endif %}
+                            {% if field.help_text %}
+                                <p class="help">{{ field.help_text|safe }}</p>
+                            {% endif %}
+                        </div>
+                        {{ field.errors }}
                     </div>
-                    {{ field.errors }}
-                </div>
+                {%  endif %}
                 
             {% endfor %}
+
+            <br>
+            If the config URL above points to a Bazaar repository that is only
+            available to authenticated users, you should add a user and private SSH
+            key to give the builder access. The SSH key will never be revealed. It
+            can be changed or deleted later. It should not be passphrase protected.
+
+            {% if form.lp_fields_set %}
+                To update or delete these details, use
+            {% else %}
+                If you would like to add these details, 
+            {% endif %}
+            <a href="+editcredentials">use this form.</a>
+
             <div class="submit-row" style="overflow: auto;">
                 <input type="submit" value="Save" class="default" name="_save"/>
                 <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '{% url offspring.web.queuemanager.views.project_details project.name %}';"/>
@@ -61,4 +78,7 @@
 {% endblock %}
 
 {% block two-columns %}
+<script>
+    $('input[placeholder], textarea[placeholder]').placeholder();
+</script>
 {% endblock %}

=== added file 'lib/offspring/web/templates/queuemanager/project_edit_credentials.html'
--- lib/offspring/web/templates/queuemanager/project_edit_credentials.html	1970-01-01 00:00:00 +0000
+++ lib/offspring/web/templates/queuemanager/project_edit_credentials.html	2011-10-28 17:07:26 +0000
@@ -0,0 +1,80 @@
+{% extends "base.html" %}
+
+{% block header_css %}
+<link rel="stylesheet" type="text/css" href="/media/css/forms.css" />
+{% endblock %}
+
+{% block header_js %}
+<script type="text/javascript" src="/media/js/admin/RelatedObjectLookups.js"></script>
+<script type="text/javascript" src="/media/js/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/js/jquery.placeholder.js"></script>
+<script type="text/javascript">
+/* Override showAddAnotherPopup to use custom height and width. */
+function showAddAnotherPopup(triggeringLink) {
+    var name = triggeringLink.id.replace(/^add_/, '');
+    name = id_to_windowname(name);
+    href = triggeringLink.href
+    if (href.indexOf('?') == -1) {
+        href += '?_popup=1';
+    } else {
+        href  += '&_popup=1';
+    }
+    var win = window.open(href, name, 'height=150,width=755');
+    win.focus();
+    return false;
+}
+</script>
+{% endblock %}
+
+{% block title %}
+Update details for {{project.title|capfirst}}
+{% endblock %}
+
+{% block content %}
+    <form method="POST" action="" name="projsettings">{% csrf_token %}
+        <div class="module aligned ">
+            <div class="form-row {{ form.lp_user.name }}">
+                <div class="field-box">
+                    {{ form.lp_user.label_tag }}
+                    <br>
+                    {{ form.lp_user }}
+                </div>
+                {{ form.lp_user.errors }}
+            </div>
+
+            <div class="form-row {{ form.lp_ssh_key_input.name }}">
+                <div class="field-box">
+                    {{ form.lp_ssh_key_input.label_tag }}
+                    <br>
+                    <textarea id="id_lp_ssh_key_input" rows="4" cols="70" name="lp_ssh_key_input"
+                              placeholder="{% if form.lp_ssh_set %}{{ form.lp_ssh_set_message }}{% else %}{{ form.lp_ssh_clear_meessage }}{% endif %}"></textarea>
+                    {% if form.lp_ssh_key_input.help_text %}
+                        <p class="help">
+                            {{ form.lp_ssh_key_input.help_text|safe }}
+                                {% if form.lp_ssh_set %}
+                                    Your saved key is not shown. To replace it, paste a new key in the above box.
+                                {% else %}
+                                    No key is stored for this project. Saved keys are not shown.
+                                {% endif %}
+                        </p>
+                    {% endif %}
+                </div>
+                {{ form.lp_ssh_key_input.errors|linebreaksbr }}
+            </div>
+
+            <br>
+
+            <div class="submit-row" style="overflow: auto;">
+                <input type="submit" value="Save Updated Credentials" class="default" name="_save"/>
+                <input type="submit" value="Delete Existing Credentials" class="default" name="delete"/>
+                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '{% url offspring.web.queuemanager.views.project_details project.name %}';"/>
+            </div>
+        </div>
+    </form>
+{% endblock %}
+
+{% block two-columns %}
+<script>
+    $('input[placeholder], textarea[placeholder]').placeholder();
+</script>
+{% endblock %}

=== modified file 'lib/offspring/web/urls.py'
--- lib/offspring/web/urls.py	2011-10-18 15:17:15 +0000
+++ lib/offspring/web/urls.py	2011-10-28 17:07:26 +0000
@@ -79,6 +79,7 @@
     (r'^projects/(?P<projectName>[^/]+)/\+api/buildrequest/(?P<request_id>[^/]+)/$', buildrequest_handler),
     (r'^projects/(?P<projectName>[^/]+)/\+build$', 'offspring.web.queuemanager.views.queue_build'),
     (r'^projects/(?P<projectName>[^/]+)/\+builds$', 'offspring.web.queuemanager.views.builds'),
+    (r'^projects/(?P<projectName>[^/]+)/\+editcredentials$', 'offspring.web.queuemanager.views.project_editsshcredentials'),
     (r'^projects/(?P<projectName>[^/]+)/$', 'offspring.web.queuemanager.views.project_details'),
     (r'^projects/$', 'offspring.web.queuemanager.views.projects'),
     (r'^schedule/\+api/milestones/$', milestone_handler),