Merge lp:~patrick-hetu/jrapi/ssh-master-key into lp:jrapi

[Patrick Hetu]

1. Minor fix to get the environment tests to work
2. Use an ssh master key for bootstraping

Unmerged revisions

80. By Patrick Hetu on 2012-08-26

use a master ssh key for bootstraping

79. By Patrick Hetu on 2012-08-26

fix environment tests

=== modified file 'debian/jrapi.postinst'
--- debian/jrapi.postinst	2012-05-25 20:48:33 +0000
+++ debian/jrapi.postinst	2012-08-26 19:06:19 +0000
@@ -35,11 +35,17 @@
             usermod -g jrapi jrapi
         fi
 
+        if [ ! -e /var/lib/jrapi/.ssh/ ]; then
+            mkdir /var/lib/jrapi/.ssh/
+            ssh-keygen -q -t rsa -f /var/lib/jrapi/.ssh/id_rsa  -C 'juju_master_key' -N ''
+        fi
+
         if [ -z "$2" ]; then
             # New install - blanket permissions
             chown -R jrapi:jrapi /var/lib/jrapi/ /etc/jrapi /var/log/jrapi
         fi
 
+
         chmod 0600 /etc/jrapi/jrapi.conf
         chmod 0700 /etc/jrapi
         chmod 0700 /var/log/jrapi
 
=== modified file 'jrapi/api/base.py'
--- jrapi/api/base.py	2012-07-20 00:14:50 +0000
+++ jrapi/api/base.py	2012-08-26 19:06:19 +0000
@@ -45,17 +45,8 @@
         :param failure: The failure object ( type )
         :param request: The twisted request object
         '''
-        if failure.type == errors.EnvironmentNotFound:
-            error_type = "EnvironmentNotFound"
-            msg = failure.getErrorMessage()
-            request.setResponseCode(404)
-        else:
-            error_type = "Unknown"
-            msg = failure.getErrorMessage()
-            request.setResponseCode(500)
-
+        msg = failure.getErrorMessage()
         logging.error(msg)
-        request.write(jsonify({"error": {error_type: msg}}))
 
         request.finish()
 
 
=== modified file 'jrapi/api/environment.py'
--- jrapi/api/environment.py	2012-07-24 17:17:20 +0000
+++ jrapi/api/environment.py	2012-08-26 19:06:19 +0000
@@ -60,7 +60,8 @@
     try:
         env_conf_yaml = storage.get_environment(username, name)
     except IOError:
-        raise EnvironmentNotFound('Environment not found.')
+        request.setResponseCode(404, "Environment not found")
+        raise EnvironmentNotFound("Environment not found.")
 
     env_config = EnvironmentsConfig()
 
@@ -82,19 +83,18 @@
 
     # continue when we will have a dns_name
     dns_name = machine.dns_name
+
     LOG.debug("Got dns_name: %s" % dns_name)
 
     if not dns_name:
         request.setResponseCode(503)
         raise EnvironmentNotFound("Environment not ready yet.")
 
+    environment.dns_name = dns_name
+
     # get the fingerprint
     LOG.debug("add_known_host")
-    storage.add_known_host(username, name, dns_name)  # #@UndefinedVariable
-
-    LOG.debug("add_ssh_config")
-    # add ssh config for the new host
-    storage.add_ssh_config(username, name, dns_name)  # #@UndefinedVariable
+    storage.add_known_host(username, name, dns_name)
 
     returnValue(environment)
 
@@ -161,6 +161,7 @@
             return self
         else:
             deferred = get_environment(request, name, self.username)
+            deferred.addErrback(self._errorRender, request)
             environment = Environment(deferred, name, self.username)
             return environment
 
@@ -186,20 +187,13 @@
         if not hasattr(conf, 'admin-secret'):
             conf['admin-secret'] = uuid.uuid4().hex
 
-        # upload/create ssh private/public key
-        private_key_path = storage.add_sshkey(  # @UndefinedVariable
-                                              self.username, conf['name'])
-
-        LOG.debug('Setting private_key_path to : %s' % \
-                  private_key_path + '.pub')
-        conf['authorized-keys-path'] = private_key_path + '.pub'
+        if 'authorized-keys' in conf.keys():
+            conf['authorized-keys'] += '\n    %s' % (open('/var/lib/jrapi/.ssh/id_rsa.pub').read())
+        else:
+            conf['authorized-keys'] = open('/var/lib/jrapi/.ssh/id_rsa.pub').read()
 
         env_conf_yaml = yaml.safe_dump({'environments': {conf['name']: conf}})
 
-        LOG.debug("Add environment: %s" % env_conf_yaml)
-        storage.add_environment(self.username,   # #@UndefinedVariable
-                                conf['name'], env_conf_yaml)
-
         env_config = EnvironmentsConfig()
 
         LOG.debug("Configuring the environment")
@@ -217,6 +211,9 @@
         LOG.debug("Launch the actual bootstrap")
         yield provider.bootstrap(my_constraints)
 
+        LOG.debug("Save the environment: %s" % env_conf_yaml)
+        storage.add_environment(self.username, conf['name'], env_conf_yaml)
+
         request.setResponseCode(201)
 
 
@@ -255,9 +252,10 @@
         '''
         LOG.debug("Received an environment details request")
 
-        result = self._get(request)
-
-        return jsonify(result)
+        self.deferred.addCallback(self._get, request)
+        self.deferred.addCallback(self._delayedRender, request)
+        self.deferred.addErrback(self._errorRender, request)
+        return NOT_DONE_YET
 
     def render_DELETE(self, request):
         '''
@@ -277,7 +275,7 @@
         LOG.debug('Envrionment getChild with name: "%s"' % name)
         return self
 
-    def _get(self, request):
+    def _get(self, environment, request):
         '''
         Returns the details of a single environment
         :param request: A Twisted request object
@@ -286,9 +284,9 @@
 
         try:
             env_conf_yaml = storage.get_environment(self.username, self.name)
-        except EnvironmentNotFound:
-            request.setResponseCode(404)
-            return {'error': {'EnvironmentNotFound': "Environment not found"}}
+        except IOError:
+            request.setResponseCode(404, "Environment not found")
+            raise EnvironmentNotFound("Environment not ready yet.")
 
         env_conf = yaml.load(env_conf_yaml)
 
@@ -297,8 +295,6 @@
                                  env_conf['environments'][self.name]}
         single_environment['environment']['name'] = self.name
 
-        del single_environment['environment']['authorized-keys-path']
-
         request.setResponseCode(200)
         return single_environment
 
@@ -312,7 +308,6 @@
         provider = environment.get_machine_provider()
         yield provider.destroy_environment()
 
-        storage.delete_environment(  # #@UndefinedVariable
-                                   self.username, self.name)
+        storage.delete_environment(self.username, environment.name, environment.dns_name)
 
         request.setResponseCode(204)
 
=== modified file 'jrapi/storage/dummy.py'
--- jrapi/storage/dummy.py	2012-07-14 14:53:32 +0000
+++ jrapi/storage/dummy.py	2012-08-26 19:06:19 +0000
@@ -16,14 +16,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from juju import errors
-
 DUMMY_ENV = """
 environments:
   dummy:
     type: dummy
     foo: bar
-    authorized-keys-path: /should/not/see/id_rsa
 """
 
 DUMMY_ENV_JSON ="""{
@@ -44,7 +41,7 @@
         if env_name == 'dummy':
             return DUMMY_ENV
         else:
-            raise errors.EnvironmentNotFound('Environment Not found')
+            raise IOError
 
     def get_environments(self, username):
         return [{'name':'sample'}]
 
=== modified file 'jrapi/storage/filesystem.py'
--- jrapi/storage/filesystem.py	2012-07-24 17:17:20 +0000
+++ jrapi/storage/filesystem.py	2012-08-26 19:06:19 +0000
@@ -22,7 +22,6 @@
 import subprocess
 
 from jrapi.config import CONF
-from jrapi.common import ssh_keygen
 from jrapi.openstack.common import cfg
 
 from jrapi.storage.errors import BadStoreConfiguration
@@ -71,12 +70,12 @@
 #            LOG.error(reason)
 #            raise IOError
 
-#        try:
-#            os.makedirs(env_path)
-#        except IOError:
-#            reason = _("Unable to create user dir: %s") % user_path
-#            LOG.error(reason)
-#            raise
+        try:
+            os.makedirs(env_path)
+        except IOError:
+            reason = _("Unable to create user dir: %s") % user_path
+            LOG.error(reason)
+            raise
 
 
         env_conf_file = os.path.join(env_path, "environments.yaml")
@@ -118,15 +117,14 @@
 
         return environments
 
-
-    def delete_environment(self, username, env_name):
+    def delete_environment(self, username, env_name, ip):
         user_path = self._get_user_path(username)
         env_path = os.path.join(user_path, env_name)
 
         user_known_host_file = os.path.join(env_path, "known_host")
         user_identity_file = os.path.join(env_path, "id_rsa")
 
-        self.remove_ssh_config(username, env_name)
+        subprocess.Popen('ssh-keygen -R %s' % ip)
 
         if os.path.exists(env_path):
             try:
@@ -145,45 +143,8 @@
             LOG.error(reason)
             raise IOError
 
-
-
-    def add_sshkey(self, username, env_name):
-        user_path = self._get_user_path(username)
-        env_path = os.path.join(user_path, env_name)
-        key_file = os.path.join(user_path, env_name, "id_rsa")
-
-        try:
-            os.makedirs(env_path)
-        except IOError:
-            reason = "Unable to create user dir: %s" % user_path
-            LOG.error(reason)
-            raise
-
-        if not os.path.exists(key_file):
-            key_dict = ssh_keygen()
-
-            private_key_fp = open("%s/id_rsa" % env_path, "w")
-            private_key_fp.write(key_dict['private_key'])
-            private_key_fp.close()
-
-            public_key_fp = open("%s/id_rsa.pub" % env_path, "w")
-            public_key_fp.write(key_dict['public_key'])
-            public_key_fp.close()
-
-            os.chmod("%s/id_rsa" % env_path, 0600)
-            os.chmod("%s/id_rsa.pub" % env_path, 0600)
-
-        return key_file
-
-
     def add_known_host(self, username, env_name, ip):
-        user_path = self._get_user_path(username)
-        env_path = os.path.join(user_path, env_name)
-
-        known_host_file = os.path.join(env_path, "known_host")
-
-        if os.path.exists(known_host_file):
-            return
+        known_host_file = os.path.join(self.datadir, ".ssh/known_host")
 
         output = subprocess.check_output(
                  ["ssh-keyscan", "-H", "-t", "ecdsa-sha2-nistp256", ip],
@@ -195,37 +156,3 @@
         except IOError as e:
             raise
 
-    def add_ssh_config(self, username, env_name, ip):
-        user_path = self._get_user_path(username)
-        env_path = os.path.join(user_path, env_name)
-
-        ssh_config_file = os.path.join(self.datadir, ".ssh/config")
-        user_known_host_file = os.path.join(env_path, "known_host")
-        user_identity_file = os.path.join(env_path, "id_rsa")
-
-        config_block = """Host %s
-    UserKnownHostsFile=%s
-    IdentityFile=%s
-""" % (ip, user_known_host_file, user_identity_file)
-
-        with open(ssh_config_file, "r+") as f:
-            old = f.readlines() # read everything in the file
-            if "Host %s\n" % ip in old:
-                return
-            else:
-                f.seek(0) # rewind
-                f.write(config_block + "".join(old))
-
-    def remove_ssh_config(self, username, env_name):
-        user_path = self._get_user_path(username)
-        env_path = os.path.join(user_path, env_name)
-
-        ssh_config_file = os.path.join(self.datadir, ".ssh/config")
-        user_known_host_file = os.path.join(env_path, "known_host")
-        user_identity_file = os.path.join(env_path, "id_rsa")
-
-        with open(ssh_config_file, "r+") as f:
-            old = f.read()
-            old = re.sub(r'.* #%s' % env_path, '', old)
-            f.seek(0)
-            f.write(old)
 
=== modified file 'tests/test_environment.py'
--- tests/test_environment.py	2012-07-14 14:53:32 +0000
+++ tests/test_environment.py	2012-08-26 19:06:19 +0000
@@ -2,7 +2,6 @@
 
 from juju.environment.tests.test_config import EnvironmentsConfigTestBase
 
-from jrapi.auth import JRAPIAuthSessionWrapper
 from jrapi.apiroot import APIRoot
 from jrapi.storage.dummy import DUMMY_ENV, DUMMY_ENV_JSON
 
@@ -14,16 +13,11 @@
     @inlineCallbacks
     def setUp(self):
         yield super(EnvironmentTest, self).setUp()
-        self.web = DummySite(JRAPIAuthSessionWrapper(APIRoot()))
+        self.web = DummySite(APIRoot())
         self.write_config(DUMMY_ENV)
         self.config.load()
 
     @inlineCallbacks
-    def test_bootstrap(self):
-        response = yield self.web.put("/environments/", content=DUMMY_ENV_JSON)
-        self.assertEqual(response.responseCode, 201),
-
-    @inlineCallbacks
     def test_list(self):
         response = yield self.web.get("/environments/")
         self.assertEqual(response.responseCode, 200),
@@ -45,23 +39,8 @@
     def test_get_not_existing(self):
         response = yield self.web.get("/environments/not_existing/")
         self.assertEqual(response.responseCode, 404),
-        self.assertEqual(response.value(), """{
-    "error": {
-        "EnvironmentNotFound": "Environment not found"
-    }
-}""")
-
-#    @inlineCallbacks
-#    def test_zdestroy(self):
-#        response = yield self.web.delete("/environments/dummy/")
-#        self.assertEqual(response.responseCode, 204),
-
-#    @inlineCallbacks
-#    def test_zdestroy_not_existing(self):
-#        response = yield self.web.delete("/environments/not_existing/")
-#        self.assertEqual(response.responseCode, 404),
-#        self.assertEqual(response.value(), """{
-#    "error": {
-#        "EnvironmentNotFound": "juju environment not found: Environment ready yet."
-#    }
-#}""")
+
+    @inlineCallbacks
+    def test_zdestroy_not_existing(self):
+        response = yield self.web.delete("/environments/not_existing/")
+        self.assertEqual(response.responseCode, 404),