Merge lp:~salgado/offspring/project-ssh-key-ui into lp:offspring

[Guilherme Salgado]

This branch adds the UI for setting the private SSH key and LP user ID. It uses a jquery plugin to display some help text inside a text area. Because of that it uses also the jquery that is included in Django (for the admin UI).

Also, the view code is not as simple as I'd like because we want to hide the SSH key when a user comes to the +editcredentials page after a key was set.

[lp:~salgado/offspring/project-ssh-key-ui]

118. By Guilherme Salgado on 2012-01-13

Merge trunk

119. By Guilherme Salgado on 2012-01-16

merge trunk

Unmerged revisions

119. By Guilherme Salgado on 2012-01-16

merge trunk

118. By Guilherme Salgado on 2012-01-13

Merge trunk

117. By Guilherme Salgado on 2012-01-11

Make it possible to set per-project SSH key and LP user to use when fetching private branches from Launchpad

=== 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	2012-01-16 18:18:24 +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);

=== modified file 'lib/offspring/web/queuemanager/admin.py'
--- lib/offspring/web/queuemanager/admin.py	2011-09-26 20:02:27 +0000
+++ lib/offspring/web/queuemanager/admin.py	2012-01-16 18:18:24 +0000
@@ -3,7 +3,7 @@
 
 from django.contrib import admin
 
-from offspring.web.queuemanager.forms import ProjectBaseForm
+from offspring.web.queuemanager.forms import ProjectSSHCredForm
 from offspring.web.queuemanager.models import (
     BuildRequest,
     BuildResult,
@@ -43,12 +43,14 @@
 
 
 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', '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']
     actions = ['raise_priority', 'drop_priority', 'make_disabled', 'make_enabled']
-    form = ProjectBaseForm
+    form = ProjectSSHCredForm
 
     def raise_priority(self, request, queryset):
         for project in queryset:

=== modified file 'lib/offspring/web/queuemanager/forms.py'
--- lib/offspring/web/queuemanager/forms.py	2012-01-11 18:26:45 +0000
+++ lib/offspring/web/queuemanager/forms.py	2012-01-16 18:18:24 +0000
@@ -3,8 +3,8 @@
 
 from django.contrib.auth.models import User
 from django.forms import (
-    Form, ModelChoiceField, ModelForm, Textarea, TextInput, ValidationError)
-from django.forms import fields
+    Form, ModelChoiceField, ModelForm, Select, Textarea, TextInput,
+    ValidationError)
 
 from offspring.web.queuemanager.models import (
     Project,
@@ -14,9 +14,8 @@
 
 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 Meta:
         model = Project
@@ -24,7 +23,10 @@
             '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}),
+            'status': Select(choices=Project.STATUS_CHOICES),
+            'lp_user' : TextInput(attrs={'size': 50}),
+            'lp_ssh_key' : Textarea(attrs={'cols': 70, 'rows' : 4}),
         }
 
     def clean_name(self):
@@ -50,11 +52,38 @@
         exclude = ("priority", "is_active", "suite", "access_groups")
 
 
+class ProjectSSHCredForm(ProjectBaseForm):
+    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. Leave this empty if you do not want to "
+        "change the existing key.")
+    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 clean_lp_ssh_key(self):
+        # The text entry for lp_ssh_key will never contain the existing value,
+        # so when it's not present in the request it's because the user didn't
+        # change it, so we just return the existing value for the rest of the
+        # validation to proceed normally.
+        new_key = self.cleaned_data["lp_ssh_key"]
+        if not new_key:
+            return self.instance.lp_ssh_key
+        return self.cleaned_data["lp_ssh_key"]
+
+
 class EditProjectForm(ProjectBaseForm):
     launchpad_project = ModelChoiceField(
         LaunchpadProject.objects, widget=SelectWithAddNew, required=False)
     class Meta(ProjectBaseForm.Meta):
-        exclude = ("name", "priority", "is_active", "access_groups")
+        exclude = ("name", "priority", "is_active", "access_groups",
+                   "lp_user", "lp_ssh_key")
+
+
+class EditProjectSSHCredentialsForm(ProjectSSHCredForm):
+    class Meta(ProjectSSHCredForm.Meta):
+        fields = ("lp_user", "lp_ssh_key")
 
 
 class AccessGroupMemberForm(Form):

=== modified file 'lib/offspring/web/queuemanager/models.py'
--- lib/offspring/web/queuemanager/models.py	2012-01-16 17:28:38 +0000
+++ lib/offspring/web/queuemanager/models.py	2012-01-16 18:18:24 +0000
@@ -2,9 +2,11 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 import math
+import re
 from datetime import date, datetime, timedelta
 
 from django.contrib.auth.models import AnonymousUser, User
+from django.core.exceptions import ValidationError
 from django.db import (
     connection,
     models
@@ -198,6 +200,25 @@
         return is_visible_to(user)
 
 
+def validate_lp_ssh_key(value):
+    """Check to see if the value looks like an SSH private key"""
+    if not value:
+        return
+
+    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:
+        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 ValidationError(msg)
+
+
 class Project(AccessGroupMixin, MaybePrivateMixin):
     #XXX: This should probably be managed in the database.
     STATUS_CHOICES = (
@@ -233,10 +254,12 @@
     # The Launchpad User and SSH key are stored per project. If we stored them
     # per LaunchpadProject, 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,
-                               blank=True)
-    lp_ssh_key = models.TextField("Launchpad User's SSH Key", blank=True,
-                                  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=True,
+        validators=[validate_lp_ssh_key],
+        help_text=("Enter a private SSH ASCII key block, complete with begin "
+                   "and end markers."))
 
     notes = models.TextField(blank=True, null=True)
 
@@ -249,6 +272,17 @@
     def __unicode__(self):
         return self.display_name()
 
+    def clean(self):
+        if self.lp_user and not self.lp_ssh_key:
+            raise ValidationError(
+                "You must specify the SSH key for the given Launchpad user")
+        elif self.lp_ssh_key and not self.lp_user:
+            raise ValidationError(
+                "You must specify the Launchpad user for the given SSH key")
+        else:
+            # All good, move on.
+            pass
+
     def _is_visible_to(self, user):
         if not self._is_private or user == self.owner:
             return True

=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
--- lib/offspring/web/queuemanager/tests/test_views.py	2012-01-13 15:07:07 +0000
+++ lib/offspring/web/queuemanager/tests/test_views.py	2012-01-16 18:18:24 +0000
@@ -179,6 +179,115 @@
             status_code=200, msg_prefix=response.content)
 
 
+class ProjectEditSSHViewTests(TestCase):
+    def test_edit_ssh_auth(self):
+        project = factory.make_project(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": key,
+                "_save": 1}
+        response = self.client.post(
+            reverse(
+                "offspring.web.queuemanager.views.project_editsshcredentials",
+                args=[project.name]),
+            data, follow=True)
+
+        self.assertNotContains(
+            response, "form-errors", status_code=200,
+            msg_prefix=response.content)
+
+        # 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.make_project(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": 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)
+
+    def test_edit_ssh_auth_private_project(self):
+        project = factory.make_project(is_private=True)
+        user = factory.make_user()
+        self.assertTrue(
+            self.client.login(username=user.username, password=user.username))
+
+        # Check can't read a private projects ssh cred page
+        response = self.client.get(
+            reverse(
+                "offspring.web.queuemanager.views.project_editsshcredentials",
+                args=[project.name]),
+            follow=True)
+        self.assertEqual(200, response.status_code)
+        self.assertContains(response, "Lexbuilder Control Administration")
+        self.assertContains(response, "Username")
+        self.assertContains(response, "Password")
+
+        # Check can't write to a private projects ssh cred page
+        key = ("-----BEGIN type PR---VATE KEY-----\n"
+               "12qwaszx34erdfcv\n"
+               "-----END type PRIVATE KEY-----\n")
+
+        data = {"lp_user": "lpuser",
+                "lp_ssh_key": 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)
+        self.assertContains(response, "Lexbuilder Control Administration")
+        self.assertContains(response, "Username")
+        self.assertContains(response, "Password")
+
+        # re-load the project from the database to pick up changes
+        user_visible_objects = Project.all_objects.accessible_by_user(
+                                project.owner)
+        project = get_possibly_private_object(
+                    project.owner, 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'
 
@@ -199,7 +308,9 @@
                 "_is_private": [u"on"],
                 "_save": [u"Save"],
                 "series": [u"natty"],
-                "arch": [u"amd64"]}
+                "arch": [u"amd64"],
+                "lp_user": "",
+                "lp_ssh_key": ""}
         response = self.client.post(reverse(self.view_path), data)
         self.assertContains(
             response, "A private project needs an owner",

=== modified file 'lib/offspring/web/queuemanager/views.py'
--- lib/offspring/web/queuemanager/views.py	2012-01-11 16:46:24 +0000
+++ lib/offspring/web/queuemanager/views.py	2012-01-16 18:18:24 +0000
@@ -42,6 +42,7 @@
     AccessGroupMemberForm,
     CreateProjectForm,
     EditProjectForm,
+    EditProjectSSHCredentialsForm,
     LaunchpadProjectForm,
     ReleaseForm,
 )
@@ -359,8 +360,8 @@
     else:
         form = AccessGroupMemberForm()
     pageData = {
-        "csrf_token" : csrf.get_token(request),
-        "project" : project,
+        "csrf_token": csrf.get_token(request),
+        "project": project,
         "form": form,
         "allowed_users": allowed_users,
         }
@@ -369,6 +370,49 @@
         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)
+
+        # Don't validate the data (call form.is_valid) before deleting - we
+        # don't care what the form input is since we don't use it.
+        if "delete" in request.POST:
+            project.lp_user = ""
+            project.lp_ssh_key = ""
+            project.save()
+            return HttpResponseRedirect(".")
+
+        if form.is_valid():
+            if "_save" in request.POST:
+                form.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(
         ProjectGroup, pk=projectGroupName)

=== 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	2012-01-16 18:18:24 +0000
@@ -5,7 +5,9 @@
 {% 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">
 /* Override showAddAnotherPopup to use custom height and width. */
 function showAddAnotherPopup(triggeringLink) {
@@ -29,29 +31,67 @@
 {% endblock %}
 
 {% block content %}
-    <form method="POST" action="">{% csrf_token %}
+    {{ form.non_field_errors }}
+    <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" %}
+                    <!-- This catches lp_user and lp_ssh_key so they aren't shown in the top of
+                    the page. They are displayed below in their own section after some help text -->
+                {% 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:
+
+            <br>
+
+            <div class="form-row {{ form.lp_user.name }}">
+                <div class="field-box">
+                    {{ form.lp_user.label_tag }}
+                    {{ form.lp_user }}
+                </div>
+                {{ form.lp_user.errors }}
+            </div>
+
+            <div class="form-row {{ form.lp_ssh_key.name }}">
+                <div class="field-box">
+                    {{ form.lp_ssh_key.label_tag }}
+                    <br>
+                    {{ form.lp_ssh_key }}
+                    {% if form.lp_ssh_key.help_text %}
+                        <p class="help">{{ form.lp_ssh_key.help_text|safe }}</p>
+                    {% endif %}
+                </div>
+                {{ form.lp_ssh_key.errors|linebreaksbr }}
+            </div>
+
+            <br>
+
             <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	2012-01-16 18:18:24 +0000
@@ -44,14 +44,28 @@
                                 {{ field }}
                             {% endif %}
                         {% endif %}
-                        {% if field.field.field.help_text %}
-                            <p class="help">{{ field.field.field.help_text|safe }}</p>
+                        {% if field.help_text %}
+                            <p class="help">{{ field.help_text|safe }}</p>
                         {% endif %}
                     </div>
                     {{ field.errors }}
                 </div>
                 
             {% 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.instance.lp_ssh_key %}
+                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 %}';"/>

=== 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	2012-01-16 18:18:24 +0000
@@ -0,0 +1,70 @@
+{% 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/jquery.min.js"></script>
+<script type="text/javascript" src="/assets/js/jquery.placeholder.js"></script>
+{% endblock %}
+
+{% block title %}
+Update SSH Credentials for {{project.title|capfirst}}
+{% endblock %}
+
+{% block content %}
+    <div id="form-errors">{{ form.non_field_errors }}</div>
+    <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 }}
+                    {{ form.lp_user }}
+                </div>
+                {{ form.lp_user.errors }}
+            </div>
+
+            <div class="form-row {{ form.lp_ssh_key.name }}">
+                <div class="field-box">
+                    {{ form.lp_ssh_key.label_tag }}
+                    <br>
+                    {% if form.errors and form.data.lp_ssh_key %}
+                      <!-- The user submitted a non-empty SSH key and there's
+                      a form error, so we show the submitted key to help
+                      them figure out what is wrong. -->
+                      {{ form.lp_ssh_key }} 
+                    {% else %}
+                      <textarea id="id_lp_ssh_key" rows="4" cols="70" name="lp_ssh_key"
+                                placeholder="{% if form.instance.lp_ssh_key %}{{ form.lp_ssh_set_message }}{% else %}{{ form.lp_ssh_clear_meessage }}{% endif %}"></textarea>
+                    {% endif %}
+                    {% if form.lp_ssh_key.help_text %}
+                        <p class="help">
+                            {{ form.lp_ssh_key.help_text|safe }}
+                                {% if form.instance.lp_ssh_key %}
+                                    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.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-12-15 13:58:03 +0000
+++ lib/offspring/web/urls.py	2012-01-16 18:18:24 +0000
@@ -75,6 +75,8 @@
     (r'^projects/(?P<projectName>[^/]+)/\+build$', 'queue_build'),
     (r'^projects/(?P<projectName>[^/]+)/\+builds$', 'builds'),
     (r'^projects/(?P<projectName>[^/]+)/$', 'project_details'),
+    (r'^projects/(?P<projectName>[^/]+)/\+editcredentials$',
+     'project_editsshcredentials'),
     (r'^projects/$', 'projects'),
     (r'^schedule/\+api/milestones/$', milestone_handler),
     (r'^schedule/\+(?P<milestoneType>[^/]+)-milestones$', 'milestones'),