Handle namespaced usernames

Signed-off-by: Aurélien Bompard <[email protected]>

messaging/copr_messaging/private/hierarchy.py

@@ -159,6 +159,15 @@ def package_full_name(self):
             release=release,
         )
 
+    @property
+    def submitter(self):
+        """The username of the person who submitted the build."""
+        username = self._raw_submitter
+        if isinstance(username, str) and ":" in username:
+            # This is namespaced, such as github.com:foobar
+            return None
+        return username
+
     @property
     def usernames(self):
         """

messaging/copr_messaging/private/schema_old.py

@@ -129,8 +129,8 @@ def package_name(self):
         return self.body.get('pkg')
 
     @property
-    def submitter(self):
-        """The username of the person who submitted the build."""
+    def _raw_submitter(self):
+        """The username of the person who submitted the build. May be namespaced."""
         return self.body.get('user')
 
     def _evr(self):

messaging/copr_messaging/private/schema_stomp_old.py

@@ -141,6 +141,6 @@ def package_name(self):
         return name
 
     @property
-    def submitter(self):
-        """The username of the person who submitted the build."""
+    def _raw_submitter(self):
+        """The username of the person who submitted the build. May be namespaced."""
         return self.body.get('submitter')

messaging/copr_messaging/tests/test_schema.py

@@ -112,6 +112,12 @@ def test_agent_name(self):
         message = self.msg_class(body=self.fedmsg_message["msg"])
         assert message.agent_name == "churchyard"
 
+    def test_agent_name_namespaced(self):
+        body = copy.deepcopy(self.fedmsg_message["msg"])
+        body["user"] = "github.com:churchyard"
+        message = self.msg_class(body=body)
+        assert message.agent_name is None
+
     def test_usernames(self):
         message = self.msg_class(body=self.fedmsg_message["msg"])
         assert message.usernames == ["churchyard"]