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

[Guilherme Salgado]

Add .ssh_key and .lp_user to Project

[Kevin McDermott (bigkevmcd)]

There's a typo ;-)

+ # per LaunchpadProject, anyone who could create a Project referencing that

I'd prefer to see this rolled up into the lp:~salgado/offspring/passing-ssh-key-to-slave branch.

review: Needs Fixing

=== modified file 'lib/offspring/master/models.py'
--- lib/offspring/master/models.py	2011-09-20 18:58:04 +0000
+++ lib/offspring/master/models.py	2011-11-30 14:34:38 +0000
@@ -165,6 +165,12 @@
     status = Unicode()
     config_url = Unicode()
     notes = Unicode()
+
+    # 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 = Unicode()
+    lp_ssh_key = Unicode()
     
     def __init__(self, name, priority=40):
         self.title = unicode(name.capitalize())

=== modified file 'lib/offspring/web/queuemanager/models.py'
--- lib/offspring/web/queuemanager/models.py	2011-11-30 14:34:38 +0000
+++ lib/offspring/web/queuemanager/models.py	2011-11-30 14:34:38 +0000
@@ -218,6 +218,15 @@
     launchpad_project = models.ForeignKey("LaunchpadProject", blank=True, null=True)
     status = models.CharField('status', max_length=200, null=True, choices=STATUS_CHOICES)
     config_url = models.CharField('config URL', max_length=200) # Add some kind of validator here.
+
+    # 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,
+                               blank=True)
+    lp_ssh_key = models.TextField("Launchpad User's SSH Key", blank=True,
+                                  null=True, editable=False)
+
     notes = models.TextField(blank=True, null=True)
 
     class Meta:

=== added file 'migration/002-bzr-ssh-user-key.sql'
--- migration/002-bzr-ssh-user-key.sql	1970-01-01 00:00:00 +0000
+++ migration/002-bzr-ssh-user-key.sql	2011-11-30 14:34:38 +0000
@@ -0,0 +1,2 @@
+ALTER TABLE projects ADD COLUMN "lp_user" text;
+ALTER TABLE projects ADD COLUMN "lp_ssh_key" text;