Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change: Drop parsing for $Date #805

Merged
merged 3 commits into from
Jan 15, 2024
Merged

Change: Drop parsing for $Date #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32d9e66
Change: Drop parsing for $Date
jjnicola Jan 10, 2024
7aab91f
Add: tests for nvt_parse_timestamp()
jjnicola Jan 10, 2024
df88998
Merge branch 'main' into date-parse
mattmundell Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 5 additions & 39 deletions base/nvti.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,45 +300,20 @@ parse_nvt_timestamp (const gchar *str_time)
int offset;
struct tm tm;

if ((strcmp ((char *) str_time, "") == 0)
|| (strcmp ((char *) str_time, "$Date: $") == 0)
|| (strcmp ((char *) str_time, "$Date$") == 0)
|| (strcmp ((char *) str_time, "$Date:$") == 0)
|| (strcmp ((char *) str_time, "$Date") == 0)
|| (strcmp ((char *) str_time, "$$") == 0))
{
return 0;
}
if (strcmp ((char *) str_time, "") == 0)
return 0;

/* Parse the time. */

/* 2011-08-09 08:20:34 +0200 (Tue, 09 Aug 2011) */
/* $Date: 2012-02-17 16:05:26 +0100 (Fr, 17. Feb 2012) $ */
/* $Date: Fri, 11 Nov 2011 14:42:28 +0100 $ */
memset (&tm, 0, sizeof (struct tm));
if (strptime ((char *) str_time, "%F %T %z", &tm) == NULL)
{
memset (&tm, 0, sizeof (struct tm));
if (strptime ((char *) str_time, "$Date: %F %T %z", &tm) == NULL)
if (strptime ((char *) str_time, "%a %b %d %T %Y %z", &tm) == NULL)
{
memset (&tm, 0, sizeof (struct tm));
if (strptime ((char *) str_time, "%a %b %d %T %Y %z", &tm) == NULL)
{
memset (&tm, 0, sizeof (struct tm));
if (strptime ((char *) str_time, "$Date: %a, %d %b %Y %T %z", &tm)
== NULL)
{
memset (&tm, 0, sizeof (struct tm));
if (strptime ((char *) str_time, "$Date: %a %b %d %T %Y %z",
&tm)
== NULL)
{
g_warning ("%s: Failed to parse time: %s", __func__,
str_time);
return 0;
}
}
}
g_warning ("%s: Failed to parse time: %s", __func__, str_time);
return 0;
}
}
epoch_time = mktime (&tm);
Expand All @@ -352,17 +327,8 @@ parse_nvt_timestamp (const gchar *str_time)

if ((sscanf ((char *) str_time, "%*u-%*u-%*u %*u:%*u:%*u %d%*[^]]", &offset)
!= 1)
&& (sscanf ((char *) str_time, "$Date: %*u-%*u-%*u %*u:%*u:%*u %d%*[^]]",
&offset)
!= 1)
&& (sscanf ((char *) str_time, "%*s %*s %*s %*u:%*u:%*u %*u %d%*[^]]",
&offset)
!= 1)
&& (sscanf ((char *) str_time,
"$Date: %*s %*s %*s %*u %*u:%*u:%*u %d%*[^]]", &offset)
!= 1)
&& (sscanf ((char *) str_time,
"$Date: %*s %*s %*s %*u:%*u:%*u %*u %d%*[^]]", &offset)
!= 1))
{
g_warning ("%s: Failed to parse timezone offset: %s", __func__, str_time);
Expand Down
20 changes: 20 additions & 0 deletions base/nvti_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,25 @@ Ensure (nvti, nvti_new_never_returns_null)

/* nvti solution_method */

Ensure (nvti, nvti_parse_timestamp)
{
setenv ("TZ", "utc 0", 1);
tzset ();

assert_that (
parse_nvt_timestamp ("2018-09-07 11:08:31 +0200 (Fri, 07 Sep 2018)"),
is_equal_to (1536311311));
assert_that_double (
parse_nvt_timestamp ("2022-05-31 20:54:22 +0100 (Tue, 31 May 2022)"),
is_equal_to_double (1654026862));
assert_that_double (parse_nvt_timestamp ("2012-09-23 02:15:34 +0400"),
is_equal_to_double (1348352134));
assert_that_double (parse_nvt_timestamp ("Fri Feb 10 16:09:30 2023 +0100"),
is_equal_to_double (1676041770));
}

/* nvti solution_method */

Ensure (nvti, nvti_set_solution_method_correct)
{
nvti_t *nvti;
Expand Down Expand Up @@ -195,6 +214,7 @@ main (int argc, char **argv)
add_test_with_context (suite, nvti,
nvti_get_severity_vector_no_severity_vector);
add_test_with_context (suite, nvti, nvti_get_severity_vector_no_cvss_base);
add_test_with_context (suite, nvti, nvti_parse_timestamp);

if (argc > 1)
return run_single_test (suite, argv[1], create_text_reporter ());
Expand Down
Loading