Merge ~twom/launchpad:gdbpr-add-gpg-key-info into launchpad:master

[Tom Wardill]

Add PGP/GPG key info to GDPR endpoint

[Colin Watson (cjwatson)]

review: Approve

[Otto Co-Pilot (otto-copilot)]

Merging failed
https://jenkins.ols.canonical.com/online-services/job/launchpad/1767/

diff --git a/lib/lp/registry/model/person.py b/lib/lp/registry/model/person.py
index c669daf..70a7933 100644
--- a/lib/lp/registry/model/person.py
+++ b/lib/lp/registry/model/person.py
@@ -4127,6 +4127,9 @@ class PersonSet:
         if not account.sshkeys.is_empty():
             return_data["sshkeys"] = canonical_url(
                 account, view_name="+sshkeys")
+        gpg_keys_urls = self._checkForGPGKeys(account)
+        if gpg_keys_urls:
+            return_data["openpgp-keys"] = gpg_keys_urls
         # This is only an 'account' in terms of the end user view,
         # it does not refer to an `IAccount`.
         if len(return_data.keys()) > 1:
@@ -4228,6 +4231,22 @@ class PersonSet:
         req.prepare_url(answers_url, query_arguments)
         return req.url
 
+    def _checkForGPGKeys(self, account):
+        """Check if we have GPG keys for the given Person."""
+        # We return the keyserver url, not an LP url
+        urls = []
+        keyserver_url = "https://keyserver.ubuntu.com/pks/lookup"
+        keys = account.gpg_keys + account.inactive_gpg_keys
+        for key in keys:
+            req = PreparedRequest()
+            query_arguments = {
+                "fingerprint": "on",
+                "op": "index",
+                "search": "0x{}".format(key.fingerprint)}
+            req.prepare_url(keyserver_url, query_arguments)
+            urls.append(req.url)
+        return urls
+
     def getUserOverview(self, person):
         """See `IPersonSet`."""
         overview = {}
diff --git a/lib/lp/registry/tests/test_personset.py b/lib/lp/registry/tests/test_personset.py
index cee7182..9bf188f 100644
--- a/lib/lp/registry/tests/test_personset.py
+++ b/lib/lp/registry/tests/test_personset.py
@@ -13,6 +13,7 @@ from testtools.matchers import (
     GreaterThan,
     LessThan,
     MatchesDict,
+    MatchesListwise,
     )
 import transaction
 from zope.component import getUtility
@@ -1367,6 +1368,29 @@ class TestGDPRUserRetrieval(TestCaseWithFactory):
             "sshkeys": canonical_url(person, view_name="+sshkeys")
             }, result)
 
+    def test_account_data_gpg_keys(self):
+        person = self.factory.makePerson(email="[e-mail]")
+        with admin_logged_in():
+            self.factory.makeGPGKey(person)
+            result = self.person_set.getUserData(u"[e-mail]")
+        self.assertThat(result, ContainsDict({
+            "status": Equals("account with data"),
+            "person": Equals(canonical_url(person)),
+            "openpgp-keys": MatchesListwise([
+                Contains("https://keyserver.ubuntu.com")])}))
+
+    def test_account_data_gpg_keys_inactive(self):
+        person = self.factory.makePerson(email="[e-mail]")
+        with admin_logged_in():
+            key = self.factory.makeGPGKey(person)
+            key.active = False
+            result = self.person_set.getUserData(u"[e-mail]")
+        self.assertThat(result, ContainsDict({
+            "status": Equals("account with data"),
+            "person": Equals(canonical_url(person)),
+            "openpgp-keys": MatchesListwise([
+                Contains("https://keyserver.ubuntu.com")])}))
+
     def test_getUserOverview(self):
         ppa = self.factory.makeArchive(owner=self.user)