Merge pull request #352 from helgi/hook_public_key

feat(hooks): expose a ssh public key hook for builder to interact with

Author: helgi

rootfs/api/tests/test_hooks.py

@@ -105,6 +105,27 @@ def test_key_hook(self):
             {'key': public2, 'fingerprint': '43:fd:22:bc:dc:ca:6a:28:ba:71:4c:18:41:1d:d1:e2'}
         ]})
 
+        # Fetch a valid ssh key
+        url = '/v2/hooks/key/54:6d:da:1f:91:b5:2b:6f:a2:83:90:c4:f9:73:76:f5'
+        response = self.client.get(url, HTTP_X_DEIS_BUILDER_AUTH=settings.BUILDER_KEY)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data, {
+            "username": str(self.user),
+            "apps": [
+                app_id
+            ]
+        })
+
+        # Fetch an non-existent base64 encoded ssh key
+        url = '/v2/hooks/key/54:6d:da:1f:91:b5:2b:6f:a2:83:90:c4:f9:73:76:wooooo'
+        response = self.client.get(url, HTTP_X_DEIS_BUILDER_AUTH=settings.BUILDER_KEY)
+        self.assertEqual(response.status_code, 404)
+
+        # Fetch an invalid (not encoded) ssh key
+        url = '/v2/hooks/key/nope'
+        response = self.client.get(url, HTTP_X_DEIS_BUILDER_AUTH=settings.BUILDER_KEY)
+        self.assertEqual(response.status_code, 404)
+
     def test_push_hook(self):
         """Test creating a Push via the API"""
         url = '/v2/apps'

rootfs/api/urls.py

@@ -76,6 +76,8 @@
         views.KeyHookViewSet.as_view({'get': 'users'})),
     url(r'^hooks/keys/(?P<id>{})/?'.format(settings.APP_URL_REGEX),
         views.KeyHookViewSet.as_view({'get': 'app'})),
+    url(r'^hooks/key/(?P<fingerprint>.+)/?',
+        views.KeyHookViewSet.as_view({'get': 'public_key'})),
     url(r'^hooks/push/?',
         views.PushHookViewSet.as_view({'post': 'create'})),
     url(r'^hooks/build/?',

rootfs/api/views.py

@@ -427,6 +427,25 @@ class KeyHookViewSet(BaseHookViewSet):
     model = models.Key
     serializer_class = serializers.KeySerializer
 
+    def public_key(self, request, *args, **kwargs):
+        fingerprint = kwargs['fingerprint'].strip()
+        key = get_object_or_404(models.Key, fingerprint=fingerprint)
+
+        queryset = models.App.objects.all() | \
+            get_objects_for_user(self.request.user, 'api.use_app')
+        items = self.filter_queryset(queryset)
+
+        apps = []
+        for item in items:
+            apps.append(item.id)
+
+        data = {
+            'username': key.owner.username,
+            'apps': apps
+        }
+
+        return Response(data, status=status.HTTP_200_OK)
+
     def app(self, request, *args, **kwargs):
         app = get_object_or_404(models.App, id=kwargs['id'])