Add support for subkey lookup in HKP

debexpo/keyring/views.py

@@ -50,7 +50,12 @@ class HKPSearchView(BaseDetailView):
     def get_object(self, queryset=None):
         key_id = self.request.GET['search'].replace('0x', '')
 
-        return get_object_or_404(Key, fingerprint__endswith=key_id)
+        try:
+            return Key.objects.get(fingerprint__endswith=key_id)
+        except Key.DoesNotExist:
+            pass
+
+        return get_object_or_404(Key, subkey__fingerprint__endswith=key_id)
 
     def render_to_response(self, context, **response_kwargs):
         return HttpResponse(self.object.key + '\n')

tests/unit/keyring/test_hkp.py

@@ -28,6 +28,8 @@
 
 from django.urls import reverse
 
+from debexpo.keyring.models import SubKey
+
 from tests import TestController
 
 _GPGKEY = """-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -93,10 +95,12 @@ class TestHKP(TestController):
         self.assertEquals(response.status_code, 200)
         self.assertIn(self._GPG_KEY, response.content.decode())
 
-        # Matches full fingerprint: 200
+        # Matches full fingerprint of a subkey: 200
+        fingerprint = SubKey.objects.filter(
+            key__fingerprint=self._GPG_FINGERPRINT).first().fingerprint
         response = self.client.get(reverse('hkp'), {
             'op': 'get',
-            'search': self._GPG_FINGERPRINT
+            'search': fingerprint
         })
-        self.assertEquals(response.status_code, 200)
         self.assertIn(self._GPG_KEY, response.content.decode())
+        self.assertEquals(response.status_code, 200)