dsc: Discard PGP from dsc files

It's common for dsc files to be signed with PGP clearsign. This results
in `rfc822-like` throwing with the error `Line 1 doesn't contain a colon`.

Author: ColinKinloch

src/dsc.rs

@@ -98,17 +98,55 @@ pub struct Dsc {
     pub files: Vec<FileEntry>,
 }
 
+pub fn discard_pgp(dsc: &str) -> &str {
+    const PGP_HEADER_START: &str = "-----BEGIN PGP SIGNED MESSAGE-----\n";
+    const PGP_HEADER_END: &str = "\n\n";
+    const PGP_FOOTER_START: &str = "-----BEGIN PGP SIGNATURE-----\n";
+
+    if dsc.starts_with(PGP_HEADER_START) {
+        if let Some((_gpg_header, payload_and_sig)) = dsc.split_once(PGP_HEADER_END) {
+            if let Some((payload, _sig)) = payload_and_sig.split_once(PGP_FOOTER_START) {
+                return payload;
+            }
+        }
+    }
+
+    dsc
+}
+
 #[cfg(test)]
 mod tests {
     use claims::*;
 
     use super::*;
 
+    const TEST_GPG_DSC: &str = "-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+Source: abc
+SomeUnknownAttribute: 10
+Files:
+ hash1 10 file1
+ hash2 27 file2
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAEBCgAdFiEEQxKqmcM1tb5xMnn0axtijDBFQh4FAmebtGQACgkQaxtijDBF
+Qh6iAwf+NfOEM4+DbA8PPZnVz12bBqBNgMdaOx8CisQtd9xTmOMECaF3u2Vpfcha
+zWRVtVh7Js2UidlHEwdzVJuNwrkneBoIHJEyOd/X2EXI8hOlU71OJGCyx1fayDNp
+zf9Fe9kmlF9PJZRpB33YcTDSf5fYMNG2b4osa0ICOKssXoIbNVjaEPDdx3h/gsVm
+x/JPxsxWjuM98ALa3ncn4UUPrn4QQfbu73qFEKyOLqhjCZxb52LG5/w96bXQodPS
+Zhy+ZtJTpPJA9kuz9vZimQMPVimxUhYQQlBTl+3Bcg2Afw1X57H4MpkS+UPi16id
++DdRlEyxB4frFnYXK84u3VYR3Ml+8A==
+=wcHv
+-----END PGP SIGNATURE-----
+";
+
     const TEST_DSC: &str = "Source: abc
 SomeUnknownAttribute: 10
 Files:
  hash1 10 file1
- hash2 27 file2";
+ hash2 27 file2
+";
 
     #[test]
     fn test_de() {
@@ -125,4 +163,9 @@ Files:
         assert_eq!(dsc.files[1].size, 27);
         assert_eq!(dsc.files[1].filename, "file2");
     }
+
+    #[test]
+    fn test_gpg_de() {
+        assert_eq!(discard_pgp(TEST_GPG_DSC), TEST_DSC);
+    }
 }

src/upload.rs

@@ -10,7 +10,11 @@ use md5::{Digest, Md5};
 use open_build_service_api as obs;
 use tracing::{Instrument, debug, info_span, instrument, trace};
 
-use crate::{artifacts::ArtifactDirectory, dsc::Dsc, retry_request};
+use crate::{
+    artifacts::ArtifactDirectory,
+    dsc::{Dsc, discard_pgp},
+    retry_request,
+};
 
 type Md5String = String;
 
@@ -83,8 +87,8 @@ impl ObsDscUploader {
             .read_string(dsc_path.as_str())
             .await
             .wrap_err("Failed to read dsc")?;
-        let dsc: Dsc = rfc822_like::from_str(&dsc_contents).wrap_err("Failed to parse dsc")?;
-
+        let dsc: Dsc =
+            rfc822_like::from_str(discard_pgp(&dsc_contents)).wrap_err("Failed to parse dsc")?;
         let package = dsc.source.to_owned();
 
         if let Some(branch_to) = branch_to {
@@ -188,7 +192,8 @@ impl ObsDscUploader {
                 )?;
 
                 let _span = info_span!("find_files_to_remove:parse", %file);
-                let dsc: Dsc = rfc822_like::from_bytes(&contents[..])?;
+                let dsc: Dsc =
+                    rfc822_like::from_str(discard_pgp(std::str::from_utf8(&contents[..])?))?;
 
                 to_remove.extend(dsc.files.into_iter().map(|f| f.filename));
             } else if file.ends_with(".changes") {