Parse debian maintainer names and emails

AyanSinhaMahapatra · AyanSinhaMahapatra · commit 333268b4ecc9 · 2024-03-12T21:09:02.000+05:30
Signed-off-by: Ayan Sinha Mahapatra &lt;ayansmahapatra@gmail.com&gt;
diff --git a/src/packagedcode/debian.py b/src/packagedcode/debian.py
@@ -646,12 +646,14 @@ def build_package_data(debian_data, datasource_id, package_type='deb', distro=No
 
     maintainer = debian_data.get('maintainer')
     if maintainer:
-        party = models.Party(role='maintainer', name=maintainer)
+        maintainer_name, maintainer_email = parse_debian_maintainers(maintainer)
+        party = models.Party(role='maintainer', name=maintainer_name, email=maintainer_email)
         parties.append(party)
 
     orig_maintainer = debian_data.get('original_maintainer')
     if orig_maintainer:
-        party = models.Party(role='original_maintainer', name=orig_maintainer)
+        maintainer_name, maintainer_email = parse_debian_maintainers(orig_maintainer)
+        party = models.Party(role='maintainer', name=maintainer_name, email=maintainer_email)
         parties.append(party)
 
     keywords = []
@@ -711,6 +713,26 @@ def build_package_data(debian_data, datasource_id, package_type='deb', distro=No
     )
 
 
+def parse_debian_maintainers(maintainer):
+    """
+    Get name and email values from a debian maintainer string.
+
+    Example string:
+    Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
+    """
+    email_wrappers = ["<", ">"]
+    has_email = "@" in maintainer and all([
+        True 
+        for char in email_wrappers
+        if char in maintainer
+    ])
+    if not has_email:
+        return maintainer, None
+
+    name, _, email = maintainer.rpartition("<")
+    return name.rstrip(" "), email.rstrip(">")
+
+
 def populate_debian_namespace(packages):
     """
     For an iterable of debian `packages`, populate the
diff --git a/tests/packagedcode/data/debian/basic-rootfs-expected.json b/tests/packagedcode/data/debian/basic-rootfs-expected.json
@@ -16,8 +16,8 @@
         {
           "type": null,
           "role": "maintainer",
-          "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-          "email": null,
+          "name": "Ubuntu Developers",
+          "email": "ubuntu-devel-discuss@lists.ubuntu.com",
           "url": null
         }
       ],
@@ -209,8 +209,8 @@
         {
           "type": null,
           "role": "maintainer",
-          "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-          "email": null,
+          "name": "Ubuntu Developers",
+          "email": "ubuntu-devel-discuss@lists.ubuntu.com",
           "url": null
         }
       ],
@@ -844,8 +844,8 @@
             {
               "type": null,
               "role": "maintainer",
-              "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-              "email": null,
+              "name": "Ubuntu Developers",
+              "email": "ubuntu-devel-discuss@lists.ubuntu.com",
               "url": null
             }
           ],
@@ -902,8 +902,8 @@
             {
               "type": null,
               "role": "maintainer",
-              "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-              "email": null,
+              "name": "Ubuntu Developers",
+              "email": "ubuntu-devel-discuss@lists.ubuntu.com",
               "url": null
             }
           ],
diff --git a/tests/packagedcode/data/debian/basic/status.expected b/tests/packagedcode/data/debian/basic/status.expected
@@ -15,8 +15,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-        "email": null,
+        "name": "Ubuntu Developers",
+        "email": "ubuntu-devel-discuss@lists.ubuntu.com",
         "url": null
       }
     ],
@@ -73,8 +73,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-        "email": null,
+        "name": "Ubuntu Developers",
+        "email": "ubuntu-devel-discuss@lists.ubuntu.com",
         "url": null
       }
     ],
@@ -131,8 +131,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-        "email": null,
+        "name": "Ubuntu Developers",
+        "email": "ubuntu-devel-discuss@lists.ubuntu.com",
         "url": null
       }
     ],
@@ -189,8 +189,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-        "email": null,
+        "name": "Ubuntu Developers",
+        "email": "ubuntu-devel-discuss@lists.ubuntu.com",
         "url": null
       }
     ],
@@ -247,8 +247,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-        "email": null,
+        "name": "Ubuntu Developers",
+        "email": "ubuntu-devel-discuss@lists.ubuntu.com",
         "url": null
       }
     ],
@@ -303,8 +303,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-        "email": null,
+        "name": "Ubuntu Developers",
+        "email": "ubuntu-devel-discuss@lists.ubuntu.com",
         "url": null
       }
     ],
diff --git a/tests/packagedcode/data/debian/control.expected.json b/tests/packagedcode/data/debian/control.expected.json
@@ -137,8 +137,8 @@
             {
               "type": null,
               "role": "maintainer",
-              "name": "Bdale Garbee <bdale@gag.com>",
-              "email": null,
+              "name": "Bdale Garbee",
+              "email": "bdale@gag.com",
               "url": null
             }
           ],
diff --git a/tests/packagedcode/data/debian/debian-container-layer.tar.xz.get-installed-expected.json b/tests/packagedcode/data/debian/debian-container-layer.tar.xz.get-installed-expected.json
@@ -15,8 +15,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-        "email": null,
+        "name": "Ubuntu Developers",
+        "email": "ubuntu-devel-discuss@lists.ubuntu.com",
         "url": null
       }
     ],
@@ -442,8 +442,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-        "email": null,
+        "name": "Ubuntu Developers",
+        "email": "ubuntu-devel-discuss@lists.ubuntu.com",
         "url": null
       }
     ],
diff --git a/tests/packagedcode/data/debian/debian-container-layer.tar.xz.scan-expected.json b/tests/packagedcode/data/debian/debian-container-layer.tar.xz.scan-expected.json
@@ -16,8 +16,8 @@
         {
           "type": null,
           "role": "maintainer",
-          "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-          "email": null,
+          "name": "Ubuntu Developers",
+          "email": "ubuntu-devel-discuss@lists.ubuntu.com",
           "url": null
         }
       ],
@@ -209,8 +209,8 @@
         {
           "type": null,
           "role": "maintainer",
-          "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-          "email": null,
+          "name": "Ubuntu Developers",
+          "email": "ubuntu-devel-discuss@lists.ubuntu.com",
           "url": null
         }
       ],
@@ -858,8 +858,8 @@
             {
               "type": null,
               "role": "maintainer",
-              "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-              "email": null,
+              "name": "Ubuntu Developers",
+              "email": "ubuntu-devel-discuss@lists.ubuntu.com",
               "url": null
             }
           ],
@@ -916,8 +916,8 @@
             {
               "type": null,
               "role": "maintainer",
-              "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-              "email": null,
+              "name": "Ubuntu Developers",
+              "email": "ubuntu-devel-discuss@lists.ubuntu.com",
               "url": null
             }
           ],
diff --git a/tests/packagedcode/data/debian/dsc_files/adduser_3.118+deb11u1.dsc.expected.json b/tests/packagedcode/data/debian/dsc_files/adduser_3.118+deb11u1.dsc.expected.json
@@ -16,8 +16,8 @@
         {
           "type": null,
           "role": "maintainer",
-          "name": "Debian Adduser Developers <adduser@packages.debian.org>",
-          "email": null,
+          "name": "Debian Adduser Developers",
+          "email": "adduser@packages.debian.org",
           "url": null
         }
       ],
@@ -81,8 +81,8 @@
             {
               "type": null,
               "role": "maintainer",
-              "name": "Debian Adduser Developers <adduser@packages.debian.org>",
-              "email": null,
+              "name": "Debian Adduser Developers",
+              "email": "adduser@packages.debian.org",
               "url": null
             }
           ],
diff --git a/tests/packagedcode/data/debian/end-to-end.tgz.expected.json b/tests/packagedcode/data/debian/end-to-end.tgz.expected.json
@@ -16,8 +16,8 @@
         {
           "type": null,
           "role": "maintainer",
-          "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-          "email": null,
+          "name": "Ubuntu Developers",
+          "email": "ubuntu-devel-discuss@lists.ubuntu.com",
           "url": null
         }
       ],
@@ -298,8 +298,8 @@
             {
               "type": null,
               "role": "maintainer",
-              "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-              "email": null,
+              "name": "Ubuntu Developers",
+              "email": "ubuntu-devel-discuss@lists.ubuntu.com",
               "url": null
             }
           ],
diff --git a/tests/packagedcode/data/debian/mini-status/status.expected b/tests/packagedcode/data/debian/mini-status/status.expected
@@ -15,8 +15,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
-        "email": null,
+        "name": "Ubuntu Developers",
+        "email": "ubuntu-devel-discuss@lists.ubuntu.com",
         "url": null
       }
     ],
diff --git a/tests/packagedcode/data/debian/status-with-source/status.expected b/tests/packagedcode/data/debian/status-with-source/status.expected
@@ -15,8 +15,8 @@
       {
         "type": null,
         "role": "maintainer",
-        "name": "util-linux packagers <util-linux@packages.debian.org>",
-        "email": null,
+        "name": "util-linux packagers",
+        "email": "util-linux@packages.debian.org",
         "url": null
       }
     ],
diff --git a/tests/packagedcode/data/debian/ubuntu-var-lib-dpkg/expected.json b/tests/packagedcode/data/debian/ubuntu-var-lib-dpkg/expected.json
diff --git a/tests/packagedcode/data/license_detection/reference-to-package/fusiondirectory.expected.json b/tests/packagedcode/data/license_detection/reference-to-package/fusiondirectory.expected.json
diff --git a/tests/packagedcode/data/plugin/get_installed_packages-expected.json b/tests/packagedcode/data/plugin/get_installed_packages-expected.json

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`	`{`
`17`	`17`	`"type": null,`
`18`	`18`	`"role": "maintainer",`
`19`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`20`		`- "email": null,`
	`19`	`+ "name": "Ubuntu Developers",`
	`20`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`21`	`21`	`"url": null`
`22`	`22`	`}`
`23`	`23`	`],`
`@@ -209,8 +209,8 @@`
`209`	`209`	`{`
`210`	`210`	`"type": null,`
`211`	`211`	`"role": "maintainer",`
`212`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`213`		`- "email": null,`
	`212`	`+ "name": "Ubuntu Developers",`
	`213`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`214`	`214`	`"url": null`
`215`	`215`	`}`
`216`	`216`	`],`
`@@ -844,8 +844,8 @@`
`844`	`844`	`{`
`845`	`845`	`"type": null,`
`846`	`846`	`"role": "maintainer",`
`847`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`848`		`- "email": null,`
	`847`	`+ "name": "Ubuntu Developers",`
	`848`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`849`	`849`	`"url": null`
`850`	`850`	`}`
`851`	`851`	`],`
`@@ -902,8 +902,8 @@`
`902`	`902`	`{`
`903`	`903`	`"type": null,`
`904`	`904`	`"role": "maintainer",`
`905`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`906`		`- "email": null,`
	`905`	`+ "name": "Ubuntu Developers",`
	`906`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`907`	`907`	`"url": null`
`908`	`908`	`}`
`909`	`909`	`],`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`{`
`16`	`16`	`"type": null,`
`17`	`17`	`"role": "maintainer",`
`18`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`19`		`- "email": null,`
	`18`	`+ "name": "Ubuntu Developers",`
	`19`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`20`	`20`	`"url": null`
`21`	`21`	`}`
`22`	`22`	`],`
`@@ -73,8 +73,8 @@`
`73`	`73`	`{`
`74`	`74`	`"type": null,`
`75`	`75`	`"role": "maintainer",`
`76`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`77`		`- "email": null,`
	`76`	`+ "name": "Ubuntu Developers",`
	`77`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`78`	`78`	`"url": null`
`79`	`79`	`}`
`80`	`80`	`],`
`@@ -131,8 +131,8 @@`
`131`	`131`	`{`
`132`	`132`	`"type": null,`
`133`	`133`	`"role": "maintainer",`
`134`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`135`		`- "email": null,`
	`134`	`+ "name": "Ubuntu Developers",`
	`135`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`136`	`136`	`"url": null`
`137`	`137`	`}`
`138`	`138`	`],`
`@@ -189,8 +189,8 @@`
`189`	`189`	`{`
`190`	`190`	`"type": null,`
`191`	`191`	`"role": "maintainer",`
`192`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`193`		`- "email": null,`
	`192`	`+ "name": "Ubuntu Developers",`
	`193`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`194`	`194`	`"url": null`
`195`	`195`	`}`
`196`	`196`	`],`
`@@ -247,8 +247,8 @@`
`247`	`247`	`{`
`248`	`248`	`"type": null,`
`249`	`249`	`"role": "maintainer",`
`250`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`251`		`- "email": null,`
	`250`	`+ "name": "Ubuntu Developers",`
	`251`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`252`	`252`	`"url": null`
`253`	`253`	`}`
`254`	`254`	`],`
`@@ -303,8 +303,8 @@`
`303`	`303`	`{`
`304`	`304`	`"type": null,`
`305`	`305`	`"role": "maintainer",`
`306`		`- "name": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",`
`307`		`- "email": null,`
	`306`	`+ "name": "Ubuntu Developers",`
	`307`	`+ "email": "ubuntu-devel-discuss@lists.ubuntu.com",`
`308`	`308`	`"url": null`
`309`	`309`	`}`
`310`	`310`	`],`
Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@`
`137`	`137`	`{`
`138`	`138`	`"type": null,`
`139`	`139`	`"role": "maintainer",`
`140`		`- "name": "Bdale Garbee <bdale@gag.com>",`
`141`		`- "email": null,`
	`140`	`+ "name": "Bdale Garbee",`
	`141`	`+ "email": "bdale@gag.com",`
`142`	`142`	`"url": null`
`143`	`143`	`}`
`144`	`144`	`],`