proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 06:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

signature: enhance relaxed parsing of bogus signatures

Browse Source 
Final fix for issue #278
This commit is contained in:
nulltoken 2011-07-01 17:59:10 +02:00 committed by Vicent Marti
parent 60caf02465
commit 42a1b5e1ad
2 changed files with 199 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
src/signature.c
View File

@ -99,16 +99,15 @@ git_signature *git_signature_now(const char *name, const char *email)
return git_signature_new(name, email, now, (int)offset);
}
static int parse_timezone_offset(const char *buffer, long *offset_out)
static int parse_timezone_offset(const char *buffer, int *offset_out)
{
long offset, dec_offset;
int mins, hours;
long dec_offset;
int mins, hours, offset;
const char *offset_start;
const char *offset_end;
//we are sure that *buffer == ' '
offset_start = buffer + 1;
offset_start = buffer;
if (*offset_start == '\n') {
*offset_out = 0;
@ -149,14 +148,79 @@ static int parse_timezone_offset(const char *buffer, long *offset_out)
return GIT_SUCCESS;
}
int process_next_token(const char **buffer_out, char **storage,
const char *token_end, const char *line_end)
{
int name_length = 0;
const char *buffer = *buffer_out;
/* Skip leading spaces before the name */
while (*buffer == ' ' && buffer < line_end)
buffer++;
name_length = token_end - buffer;
/* Trim trailing spaces after the name */
while (buffer[name_length - 1] == ' ' && name_length > 0)
name_length--;
*storage = git__malloc(name_length + 1);
if (*storage == NULL)
return GIT_ENOMEM;
memcpy(*storage, buffer, name_length);
(*storage)[name_length] = 0;
buffer = token_end + 1;
if (buffer > line_end)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse signature. Signature too short");
*buffer_out = buffer;
return GIT_SUCCESS;
}
const char* scan_for_previous_token(const char *buffer, const char *left_boundary)
{
const char *start = buffer;
if (start <= left_boundary)
return NULL;
/* Trim potential trailing spaces */
while (*start == ' ' && start > left_boundary)
start--;
/* Search for previous occurence of space */
while (start[-1] != ' ' && start > left_boundary)
start--;
return start;
}
int parse_time(git_time_t *time_out, const char *buffer)
{
long time;
int error;
if (*buffer == '+' || *buffer == '-')
return git__throw(GIT_ERROR, "Failed while parsing time. '%s' rather look like a timezone offset.", buffer);
error = git__strtol32(&time, buffer, &buffer, 10);
if (error < GIT_SUCCESS)
return error;
*time_out = (git_time_t)time;
return GIT_SUCCESS;
}
int git_signature__parse(git_signature *sig, const char **buffer_out,
const char *buffer_end, const char *header)
{
int name_length, email_length;
const char *buffer = *buffer_out;
const char *line_end, *name_end, *email_end;
long offset = 0, time;
const char *line_end, *name_end, *email_end, *tz_start, *time_start;
int error = GIT_SUCCESS;
memset(sig, 0x0, sizeof(git_signature));
@ -178,50 +242,38 @@ int git_signature__parse(git_signature *sig, const char **buffer_out,
if ((name_end = strchr(buffer, '<')) == NULL)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse signature. Cannot find '<' in signature");
name_length = name_end - 1 - buffer;
if (name_length < 0)
name_length = 0;
sig->name = git__malloc(name_length + 1);
if (sig->name == NULL)
return GIT_ENOMEM;
memcpy(sig->name, buffer, name_length);
sig->name[name_length] = 0;
buffer = name_end + 1;
if (buffer > line_end)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse signature. Signature too short");
if ((email_end = strchr(buffer, '>')) == NULL)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse signature. Cannot find '>' in signature");
email_length = email_end - buffer;
sig->email = git__malloc(email_length + 1);
if (sig->name == NULL)
return GIT_ENOMEM;
memcpy(sig->email, buffer, email_length);
sig->email[email_length] = 0;
buffer = email_end + 2;
if (buffer > line_end)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse signature. Signature too short");
if (strpbrk(sig->email, "><\n") != NULL)
if (email_end < name_end)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse signature. Malformed e-mail");
if (git__strtol32(&time, buffer, &buffer, 10) < GIT_SUCCESS)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse signature. Timestamp isn't a number");
error = process_next_token(&buffer, &sig->name, name_end, line_end);
if (error < GIT_SUCCESS)
return error;
sig->when.time = (time_t)time;
error = process_next_token(&buffer, &sig->email, email_end, line_end);
if (error < GIT_SUCCESS)
return error;
if (parse_timezone_offset(buffer, &offset) < GIT_SUCCESS)
return git__throw(GIT_EOBJCORRUPTED, "Failed to parse signature. Could not parse timezone offset");
tz_start = scan_for_previous_token(line_end - 1, buffer);
sig->when.offset = offset;
if (tz_start == NULL)
goto clean_exit; /* No timezone nor date */
time_start = scan_for_previous_token(tz_start - 1, buffer);
if (time_start == NULL || parse_time(&sig->when.time, time_start) < GIT_SUCCESS) {
/* The tz_start might point at the time */
parse_time(&sig->when.time, tz_start);
goto clean_exit;
}
if (parse_timezone_offset(tz_start, &sig->when.offset) < GIT_SUCCESS) {
sig->when.time = 0; /* Bogus timezone, we reset the time */
}
clean_exit:
*buffer_out = line_end + 1;
return GIT_SUCCESS;
}

119
tests/t04-commit.c
View File

@ -263,7 +263,7 @@ BEGIN_TEST(parse1, "parse the signature line in a commit")
TEST_SIGNATURE_PASS(
"committer <tanoku@gmail.com> 123456 -0100 \n",
"committer ",
" ",
"",
"tanoku@gmail.com",
123456,
-60);
@ -282,7 +282,7 @@ BEGIN_TEST(parse1, "parse the signature line in a commit")
"committer Vicent Marti < > 123456 -0100 \n",
"committer ",
"Vicent Marti",
" ",
"",
123456,
-60);
@ -295,12 +295,21 @@ BEGIN_TEST(parse1, "parse the signature line in a commit")
123456,
-60);
/* Parse a signature with empty name and email */
TEST_SIGNATURE_PASS(
"committer <> 123456 -0100 \n",
"committer ",
"",
"",
123456,
-60);
/* Parse a signature with empty name and email */
TEST_SIGNATURE_PASS(
"committer < > 123456 -0100 \n",
"committer ",
"",
" ",
"",
123456,
-60);
@ -308,17 +317,104 @@ BEGIN_TEST(parse1, "parse the signature line in a commit")
TEST_SIGNATURE_PASS(
"committer foo<@bar> 123456 -0100 \n",
"committer ",
"fo",
"foo",
"@bar",
123456,
-60);
TEST_SIGNATURE_FAIL(
/* Parse an obviously invalid signature */
TEST_SIGNATURE_PASS(
"committer foo<@bar>123456 -0100 \n",
"committer ",
"foo",
"@bar",
123456,
-60);
/* Parse an obviously invalid signature */
TEST_SIGNATURE_PASS(
"committer <>\n",
"committer ",
"",
"",
0,
0);
TEST_SIGNATURE_PASS(
"committer Vicent Marti <tanoku@gmail.com> 123456 -1500 \n",
"committer ");
"committer ",
"Vicent Marti",
"tanoku@gmail.com",
0,
0);
TEST_SIGNATURE_PASS(
"committer Vicent Marti <tanoku@gmail.com> 123456 +0163 \n",
"committer ",
"Vicent Marti",
"tanoku@gmail.com",
0,
0);
TEST_SIGNATURE_PASS(
"author Vicent Marti <tanoku@gmail.com> notime \n",
"author ",
"Vicent Marti",
"tanoku@gmail.com",
0,
0);
TEST_SIGNATURE_PASS(
"author Vicent Marti <tanoku@gmail.com> 123456 notimezone \n",
"author ",
"Vicent Marti",
"tanoku@gmail.com",
0,
0);
TEST_SIGNATURE_PASS(
"author Vicent Marti <tanoku@gmail.com> notime +0100\n",
"author ",
"Vicent Marti",
"tanoku@gmail.com",
0,
0);
TEST_SIGNATURE_PASS(
"author Vicent Marti <tanoku@gmail.com>\n",
"author ",
"Vicent Marti",
"tanoku@gmail.com",
0,
0);
TEST_SIGNATURE_PASS(
"author A U Thor <author@example.com>, C O. Miter <comiter@example.com> 1234567890 -0700\n",
"author ",
"A U Thor",
"author@example.com",
1234567890,
-420);
TEST_SIGNATURE_PASS(
"author A U Thor <author@example.com> and others 1234567890 -0700\n",
"author ",
"A U Thor",
"author@example.com",
1234567890,
-420);
TEST_SIGNATURE_PASS(
"author A U Thor <author@example.com> and others 1234567890\n",
"author ",
"A U Thor",
"author@example.com",
1234567890,
0);
TEST_SIGNATURE_FAIL(
"committer Vicent Marti <tanoku@gmail.com> 123456 +0163 \n",
"committer Vicent Marti tanoku@gmail.com> 123456 -0100 \n",
"committer ");
TEST_SIGNATURE_FAIL(
@ -338,12 +434,8 @@ BEGIN_TEST(parse1, "parse the signature line in a commit")
"author ");
TEST_SIGNATURE_FAIL(
"author Vicent Marti <tanoku@gmail.com> notime \n",
"author ");
TEST_SIGNATURE_FAIL(
"author Vicent Marti <tanoku@gmail.com>\n",
"author ");
"committer Vicent Marti ><\n",
"committer ");
TEST_SIGNATURE_FAIL(
"author ",
@ -628,7 +720,6 @@ BEGIN_SUITE(commit)
ADD_TEST(details0);
ADD_TEST(write0);
//ADD_TEST(write1);
ADD_TEST(root0);
END_SUITE