fix whitespace

Author: Byron

git-object/src/parsed/tag.rs

@@ -7,6 +7,7 @@ use bstr::{BStr, ByteSlice};
 use btoi::btoi;
 use hex::FromHex;
 use nom::bytes::complete::{is_not, take_till};
+use nom::combinator::{all_consuming, recognize};
 use nom::sequence::delimited;
 use nom::{
     branch::alt,
@@ -167,7 +168,7 @@ pub(crate) fn parse_tag_nom(i: &[u8]) -> IResult<&[u8], Tag, Error> {
 
     let (i, signature) = terminated(preceded(tag(b"tagger "), parse_signature_nom), tag(NL))(i)
         .map_err(Error::context("tagger <signature>"))?;
-    let (i, (message, pgp_signature)) = parse_message_nom(i)?;
+    let (i, (message, pgp_signature)) = all_consuming(parse_message_nom)(i)?;
     Ok((
         i,
         Tag {
@@ -182,9 +183,8 @@ pub(crate) fn parse_tag_nom(i: &[u8]) -> IResult<&[u8], Tag, Error> {
 }
 
 pub(crate) fn parse_message_nom(i: &[u8]) -> IResult<&[u8], (&BStr, Option<&BStr>), Error> {
-    let NLNL: &[u8] = b"\n\n";
-    const PGP_SIGNATURE_BEGIN: &[u8] = b"-----BEGIN PGP SIGNATURE-----";
-    const PGP_SIGNATURE_END: &[u8] = b"-----END PGP SIGNATURE-----";
+    const PGP_SIGNATURE_BEGIN: &[u8] = b"\n-----BEGIN PGP SIGNATURE-----";
+    const PGP_SIGNATURE_END: &[u8] = b"-----END PGP SIGNATURE-----\n";
 
     let (i, _) = tag(NL)(i)?;
     if i.is_empty() {
@@ -197,16 +197,23 @@ pub(crate) fn parse_message_nom(i: &[u8]) -> IResult<&[u8], (&BStr, Option<&BStr
                 "tag message is missing",
             )));
         }
-        tag(NL)(&i[i.len() - 1..]).map_err(Error::context("tag message must end with newline"))?;
-        Ok((&[], (&i[..i.len() - 1], &[])))
+        let (i, _) = tag(NL)(&i[i.len() - 1..])
+            .map_err(Error::context("tag message must end with newline"))?;
+        // an empty signature message signals that there is none - the function signature is needed
+        // to work with 'alt(…)'. PGP signatures are never empty
+        Ok((i, (&i[..i.len() - 1], &[])))
     }
     let (i, (message, signature)) = alt((
         tuple((
             take_until(PGP_SIGNATURE_BEGIN),
             delimited(
-                tag(PGP_SIGNATURE_BEGIN),
-                take_until(PGP_SIGNATURE_END),
-                tag(PGP_SIGNATURE_END),
+                tag(NL),
+                recognize(delimited(
+                    tag(&PGP_SIGNATURE_BEGIN[1..]),
+                    take_until(PGP_SIGNATURE_END),
+                    tag(&PGP_SIGNATURE_END[..PGP_SIGNATURE_END.len() - 1]),
+                )),
+                tag(NL),
             ),
         )),
         all_but_trailing_newline,

git-object/src/parsed/tests/tag.rs

@@ -34,7 +34,7 @@ fn tag_fixture(offset: i32) -> parsed::Tag<'static> {
         target: b"ffa700b4aca13b80cb6b98a078e7c96804f8e0ec".as_bstr(),
         name: b"1.0.0".as_bstr(),
         target_kind: Kind::Commit,
-        message: b"for the signature\n".as_bstr(),
+        message: b"for the signature".as_bstr(),
         pgp_signature: Some(
             b"-----BEGIN PGP SIGNATURE-----
 Comment: GPGTools - https://gpgtools.org
@@ -52,9 +52,8 @@ Z5fFXEUCO8d5WT56jzKDjmVoY01lA87O1YsP/J+zQAlc9v1k6jqeQ53LZNgTN+ue
 cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
 2n8f2douw6624Tn/6Lm4a7AoxmU+CMiYagDxDL3RuZ8CAfh3bn0=
 =aIns
------END PGP SIGNATURE-----
-"
-            .as_bstr(),
+-----END PGP SIGNATURE-----"
+                .as_bstr(),
         ),
         signature: parsed::Signature {
             name: b"Sebastian Thiel".as_bstr(),