From e0aaf781f656671694a0aa04d8a665bd4d7956e6 Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Thu, 27 Mar 2008 11:16:04 -0500 Subject: [PATCH 1/2] mktag.c: improve verification of tagger field and tests Since nearly its birth, git's tags have included a "tagger" field which describes the name of tagger, email of tagger, and date and time of tagging. But, this field was only loosely tested by git-mktag. Provide some thorough testing for this field and also ensure that the tag header is separated from the tag body by an empty line to reduce the convenience of creating a flawed tag. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- mktag.c | 61 ++++++++++++++++++---- t/t3800-mktag.sh | 129 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 176 insertions(+), 14 deletions(-) diff --git a/mktag.c b/mktag.c index b05260c83f..8887080a66 100644 --- a/mktag.c +++ b/mktag.c @@ -8,10 +8,11 @@ * message and a signature block that git itself doesn't care about, * but that can be verified with gpg or similar. * - * The first three lines are guaranteed to be at least 63 bytes: + * The first four lines are guaranteed to be at least 83 bytes: * "object \n" is 48 bytes, "type tag\n" at 9 bytes is the - * shortest possible type-line, and "tag .\n" at 6 bytes is the - * shortest single-character-tag line. + * shortest possible type-line, "tag .\n" at 6 bytes is the shortest + * single-character-tag line, and "tagger . <> 0 +0000\n" at 20 bytes is + * the shortest possible tagger-line. */ /* @@ -43,9 +44,9 @@ static int verify_tag(char *buffer, unsigned long size) int typelen; char type[20]; unsigned char sha1[20]; - const char *object, *type_line, *tag_line, *tagger_line; + const char *object, *type_line, *tag_line, *tagger_line, *lb, *rb; - if (size < 64) + if (size < 84) return error("wanna fool me ? you obviously got the size wrong !"); buffer[size] = 0; @@ -97,11 +98,53 @@ static int verify_tag(char *buffer, unsigned long size) /* Verify the tagger line */ tagger_line = tag_line; - if (memcmp(tagger_line, "tagger", 6) || (tagger_line[6] == '\n')) - return error("char" PD_FMT ": could not find \"tagger\"", tagger_line - buffer); + if (memcmp(tagger_line, "tagger ", 7) || (tagger_line[7] == '\n')) + return error("char" PD_FMT ": could not find \"tagger \"", + tagger_line - buffer); - /* TODO: check for committer info + blank line? */ - /* Also, the minimum length is probably + "tagger .", or 63+8=71 */ + /* + * Check for correct form for name and email + * i.e. " <" followed by "> " on _this_ line + */ + tagger_line += 7; + if (!(lb = strstr(tagger_line, " <")) || !(rb = strstr(lb+2, "> ")) || + strchr(tagger_line, '\n') < rb) + return error("char" PD_FMT ": malformed tagger", + tagger_line - buffer); + + /* Check for author name, at least one character, space is acceptable */ + if (lb == tagger_line) + return error("char" PD_FMT ": missing tagger name", + tagger_line - buffer); + + /* timestamp */ + tagger_line = rb + 2; + if (*tagger_line == ' ') + return error("char" PD_FMT ": malformed tag timestamp", + tagger_line - buffer); + for (;;) { + unsigned char c = *tagger_line++; + if (c == ' ') + break; + if (isdigit(c)) + continue; + return error("char" PD_FMT ": malformed tag timestamp", + tagger_line - buffer); + } + + /* timezone, 5 digits [+-]hhmm, max. 1400 */ + if (!((tagger_line[0] == '+' || tagger_line[0] == '-') && + isdigit(tagger_line[1]) && isdigit(tagger_line[2]) && + isdigit(tagger_line[3]) && isdigit(tagger_line[4]) && + tagger_line[5] == '\n' && atoi(tagger_line+1) <= 1400)) + return error("char" PD_FMT ": malformed tag timezone", + tagger_line - buffer); + tagger_line += 6; + + /* Verify the blank line separating the header from the body */ + if (*tagger_line != '\n') + return error("char" PD_FMT ": trailing garbage in tag header", + tagger_line - buffer); /* The actual stuff afterwards we don't care about.. */ return 0; diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index bdc6e132ca..8a27400754 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -44,6 +44,8 @@ cat >tag.sig < 0 +0000 + EOF check_verify_failure '"object" line label check' '^error: char0: .*"object "$' @@ -55,6 +57,8 @@ cat >tag.sig < 0 +0000 + EOF check_verify_failure '"object" line SHA1 check' '^error: char7: .*SHA1 hash$' @@ -66,6 +70,8 @@ cat >tag.sig < 0 +0000 + EOF check_verify_failure '"type" line label check' '^error: char47: .*"\\ntype "$' @@ -85,6 +91,8 @@ cat >tag.sig < 0 +0000 + EOF check_verify_failure '"tag" line label check #1' \ @@ -121,6 +129,8 @@ cat >tag.sig < 0 +0000 + EOF check_verify_failure 'verify object (SHA1/type) check' \ @@ -133,6 +143,8 @@ cat >tag.sig < 0 +0000 + EOF check_verify_failure 'verify tag-name check' \ @@ -145,10 +157,12 @@ cat >tag.sig <tag.sig < 0 +0000 + +This is filler +EOF + +check_verify_failure 'detect missing tag author name' \ + '^error: char77: missing tagger name$' + +############################################################ +# 14. detect missing tag author name + +cat >tag.sig < 0 +0000 + +EOF + +check_verify_failure 'detect malformed tagger' \ + '^error: char77: malformed tagger$' + +############################################################ +# 15. allow empty tag email + +cat >tag.sig < 0 +0000 + +EOF + +test_expect_success \ + 'allow empty tag email' \ + 'git-mktag .git/refs/tags/mytag 2>message' + +############################################################ +# 16. detect missing tag timestamp + +cat >tag.sig < + +EOF + +check_verify_failure 'detect missing tag timestamp' \ + '^error: char107: malformed tag timestamp$' + +############################################################ +# 17. detect invalid tag timestamp + +cat >tag.sig < Tue Mar 25 15:47:44 2008 + +EOF + +check_verify_failure 'detect invalid tag timestamp' \ + '^error: char108: malformed tag timestamp$' + +############################################################ +# 18. detect invalid tag timezone + +cat >tag.sig < 1206478233 GMT + +EOF + +check_verify_failure 'detect invalid tag timezone' \ + '^error: char118: malformed tag timezone$' + +############################################################ +# 19. detect invalid header entry + +cat >tag.sig < 1206478233 -0500 +this line should not be here + +EOF + +check_verify_failure 'detect invalid header entry' \ + '^error: char124: trailing garbage in tag header$' + +############################################################ +# 20. create valid tag + +cat >tag.sig < 1206478233 -0500 + EOF test_expect_success \ @@ -178,7 +297,7 @@ test_expect_success \ 'git-mktag .git/refs/tags/mytag 2>message' ############################################################ -# 14. check mytag +# 21. check mytag test_expect_success \ 'check mytag' \ From ba26ab99d4c6c6a8f939f44cf2f2c47f6fd4f0a1 Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Mon, 31 Mar 2008 18:25:23 -0500 Subject: [PATCH 2/2] mktag.c: tweak validation of tagger field and adjust test script Update the verify_tag() function to remove an unnecessary test, and add additional check for angle brackets in the name and email field, and spaces in the email field. The timestamp and timezone sections are made more straight forward by using strspn(). Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- mktag.c | 31 +++++++++-------- t/t3800-mktag.sh | 88 +++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 87 insertions(+), 32 deletions(-) diff --git a/mktag.c b/mktag.c index 8887080a66..0b34341f71 100644 --- a/mktag.c +++ b/mktag.c @@ -45,6 +45,7 @@ static int verify_tag(char *buffer, unsigned long size) char type[20]; unsigned char sha1[20]; const char *object, *type_line, *tag_line, *tagger_line, *lb, *rb; + size_t len; if (size < 84) return error("wanna fool me ? you obviously got the size wrong !"); @@ -98,18 +99,21 @@ static int verify_tag(char *buffer, unsigned long size) /* Verify the tagger line */ tagger_line = tag_line; - if (memcmp(tagger_line, "tagger ", 7) || (tagger_line[7] == '\n')) + if (memcmp(tagger_line, "tagger ", 7)) return error("char" PD_FMT ": could not find \"tagger \"", tagger_line - buffer); /* * Check for correct form for name and email * i.e. " <" followed by "> " on _this_ line + * No angle brackets within the name or email address fields. + * No spaces within the email address field. */ tagger_line += 7; if (!(lb = strstr(tagger_line, " <")) || !(rb = strstr(lb+2, "> ")) || - strchr(tagger_line, '\n') < rb) - return error("char" PD_FMT ": malformed tagger", + strpbrk(tagger_line, "<>\n") != lb+1 || + strpbrk(lb+2, "><\n ") != rb) + return error("char" PD_FMT ": malformed tagger field", tagger_line - buffer); /* Check for author name, at least one character, space is acceptable */ @@ -117,25 +121,20 @@ static int verify_tag(char *buffer, unsigned long size) return error("char" PD_FMT ": missing tagger name", tagger_line - buffer); - /* timestamp */ + /* timestamp, 1 or more digits followed by space */ tagger_line = rb + 2; - if (*tagger_line == ' ') + if (!(len = strspn(tagger_line, "0123456789"))) + return error("char" PD_FMT ": missing tag timestamp", + tagger_line - buffer); + tagger_line += len; + if (*tagger_line != ' ') return error("char" PD_FMT ": malformed tag timestamp", tagger_line - buffer); - for (;;) { - unsigned char c = *tagger_line++; - if (c == ' ') - break; - if (isdigit(c)) - continue; - return error("char" PD_FMT ": malformed tag timestamp", - tagger_line - buffer); - } + tagger_line++; /* timezone, 5 digits [+-]hhmm, max. 1400 */ if (!((tagger_line[0] == '+' || tagger_line[0] == '-') && - isdigit(tagger_line[1]) && isdigit(tagger_line[2]) && - isdigit(tagger_line[3]) && isdigit(tagger_line[4]) && + strspn(tagger_line+1, "0123456789") == 4 && tagger_line[5] == '\n' && atoi(tagger_line+1) <= 1400)) return error("char" PD_FMT ": malformed tag timezone", tagger_line - buffer); diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index 8a27400754..df1fd6f86f 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -180,7 +180,7 @@ check_verify_failure '"tagger" line label check #2' \ '^error: char70: could not find "tagger "$' ############################################################ -# 13. detect missing tag author name +# 13. disallow missing tag author name cat >tag.sig < 0 +0000 This is filler EOF -check_verify_failure 'detect missing tag author name' \ +check_verify_failure 'disallow missing tag author name' \ '^error: char77: missing tagger name$' ############################################################ -# 14. detect missing tag author name +# 14. disallow missing tag author name cat >tag.sig <.git/refs/tags/mytag 2>message' ############################################################ -# 16. detect missing tag timestamp +# 16. disallow spaces in tag email + +cat >tag.sig < 0 +0000 + +EOF + +check_verify_failure 'disallow spaces in tag email' \ + '^error: char77: malformed tagger field$' + +############################################################ +# 17. disallow missing tag timestamp cat >tag.sig < EOF -check_verify_failure 'detect missing tag timestamp' \ - '^error: char107: malformed tag timestamp$' +check_verify_failure 'disallow missing tag timestamp' \ + '^error: char107: missing tag timestamp$' ############################################################ -# 17. detect invalid tag timestamp +# 18. detect invalid tag timestamp1 cat >tag.sig < Tue Mar 25 15:47:44 2008 EOF -check_verify_failure 'detect invalid tag timestamp' \ - '^error: char108: malformed tag timestamp$' +check_verify_failure 'detect invalid tag timestamp1' \ + '^error: char107: missing tag timestamp$' ############################################################ -# 18. detect invalid tag timezone +# 19. detect invalid tag timestamp2 + +cat >tag.sig < 2008-03-31T12:20:15-0500 + +EOF + +check_verify_failure 'detect invalid tag timestamp2' \ + '^error: char111: malformed tag timestamp$' + +############################################################ +# 20. detect invalid tag timezone1 cat >tag.sig < 1206478233 GMT EOF -check_verify_failure 'detect invalid tag timezone' \ +check_verify_failure 'detect invalid tag timezone1' \ '^error: char118: malformed tag timezone$' ############################################################ -# 19. detect invalid header entry +# 21. detect invalid tag timezone2 + +cat >tag.sig < 1206478233 + 30 + +EOF + +check_verify_failure 'detect invalid tag timezone2' \ + '^error: char118: malformed tag timezone$' + +############################################################ +# 22. detect invalid tag timezone3 + +cat >tag.sig < 1206478233 -1430 + +EOF + +check_verify_failure 'detect invalid tag timezone3' \ + '^error: char118: malformed tag timezone$' + +############################################################ +# 23. detect invalid header entry cat >tag.sig <tag.sig <.git/refs/tags/mytag 2>message' ############################################################ -# 21. check mytag +# 25. check mytag test_expect_success \ 'check mytag' \