mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge remote-tracking branch 'origin/maint-0.2.2'
This commit is contained in:
Nick Mathewson
commit
d732b87e60
8
changes/bug5346
Normal file
8
changes/bug5346
Normal file
@ -0,0 +1,8 @@
|
||||
o Minor bugfixes:
|
||||
- Correct parsing of certain date types in parse_http_time().
|
||||
Without this patch, If-Modified-Since would behave
|
||||
incorrectly. Fix for bug 5346; bugfix on 0.2.0.2-alpha. Patch from
|
||||
Esteban Manchado Velázques.
|
||||
- Reject out-of-range times like 23:59:61. Fix for bug 5346;
|
||||
bugfix on 0.0.8pre3.
|
||||
|
||||
@ -1392,7 +1392,7 @@ format_rfc1123_time(char *buf, time_t t)
|
||||
tor_assert(tm.tm_wday >= 0);
|
||||
tor_assert(tm.tm_wday <= 6);
|
||||
memcpy(buf, WEEKDAY_NAMES[tm.tm_wday], 3);
|
||||
tor_assert(tm.tm_wday >= 0);
|
||||
tor_assert(tm.tm_mon >= 0);
|
||||
tor_assert(tm.tm_mon <= 11);
|
||||
memcpy(buf+8, MONTH_NAMES[tm.tm_mon], 3);
|
||||
}
|
||||
@ -1422,7 +1422,8 @@ parse_rfc1123_time(const char *buf, time_t *t)
|
||||
tor_free(esc);
|
||||
return -1;
|
||||
}
|
||||
if (tm_mday > 31 || tm_hour > 23 || tm_min > 59 || tm_sec > 61) {
|
||||
if (tm_mday < 1 || tm_mday > 31 || tm_hour > 23 || tm_min > 59 ||
|
||||
tm_sec > 60) {
|
||||
char *esc = esc_for_log(buf);
|
||||
log_warn(LD_GENERAL, "Got invalid RFC1123 time %s", esc);
|
||||
tor_free(esc);
|
||||
@ -1512,7 +1513,7 @@ int
|
||||
parse_iso_time(const char *cp, time_t *t)
|
||||
{
|
||||
struct tm st_tm;
|
||||
unsigned int year=0, month=0, day=0, hour=100, minute=100, second=100;
|
||||
unsigned int year=0, month=0, day=0, hour=0, minute=0, second=0;
|
||||
if (tor_sscanf(cp, "%u-%2u-%2u %2u:%2u:%2u", &year, &month,
|
||||
&day, &hour, &minute, &second) < 6) {
|
||||
char *esc = esc_for_log(cp);
|
||||
@ -1521,7 +1522,7 @@ parse_iso_time(const char *cp, time_t *t)
|
||||
return -1;
|
||||
}
|
||||
if (year < 1970 || month < 1 || month > 12 || day < 1 || day > 31 ||
|
||||
hour > 23 || minute > 59 || second > 61) {
|
||||
hour > 23 || minute > 59 || second > 60) {
|
||||
char *esc = esc_for_log(cp);
|
||||
log_warn(LD_GENERAL, "ISO time %s was nonsensical", esc);
|
||||
tor_free(esc);
|
||||
@ -1561,12 +1562,15 @@ parse_http_time(const char *date, struct tm *tm)
|
||||
/* First, try RFC1123 or RFC850 format: skip the weekday. */
|
||||
if ((cp = strchr(date, ','))) {
|
||||
++cp;
|
||||
if (tor_sscanf(date, "%2u %3s %4u %2u:%2u:%2u GMT",
|
||||
if (*cp != ' ')
|
||||
return -1;
|
||||
++cp;
|
||||
if (tor_sscanf(cp, "%2u %3s %4u %2u:%2u:%2u GMT",
|
||||
&tm_mday, month, &tm_year,
|
||||
&tm_hour, &tm_min, &tm_sec) == 6) {
|
||||
/* rfc1123-date */
|
||||
tm_year -= 1900;
|
||||
} else if (tor_sscanf(date, "%2u-%3s-%2u %2u:%2u:%2u GMT",
|
||||
} else if (tor_sscanf(cp, "%2u-%3s-%2u %2u:%2u:%2u GMT",
|
||||
&tm_mday, month, &tm_year,
|
||||
&tm_hour, &tm_min, &tm_sec) == 6) {
|
||||
/* rfc850-date */
|
||||
@ -1591,18 +1595,20 @@ parse_http_time(const char *date, struct tm *tm)
|
||||
|
||||
month[3] = '\0';
|
||||
/* Okay, now decode the month. */
|
||||
/* set tm->tm_mon to dummy value so the check below fails. */
|
||||
tm->tm_mon = -1;
|
||||
for (i = 0; i < 12; ++i) {
|
||||
if (!strcasecmp(MONTH_NAMES[i], month)) {
|
||||
tm->tm_mon = i+1;
|
||||
tm->tm_mon = i;
|
||||
}
|
||||
}
|
||||
|
||||
if (tm->tm_year < 0 ||
|
||||
tm->tm_mon < 1 || tm->tm_mon > 12 ||
|
||||
tm->tm_mday < 0 || tm->tm_mday > 31 ||
|
||||
tm->tm_mon < 0 || tm->tm_mon > 11 ||
|
||||
tm->tm_mday < 1 || tm->tm_mday > 31 ||
|
||||
tm->tm_hour < 0 || tm->tm_hour > 23 ||
|
||||
tm->tm_min < 0 || tm->tm_min > 59 ||
|
||||
tm->tm_sec < 0 || tm->tm_sec > 61)
|
||||
tm->tm_sec < 0 || tm->tm_sec > 60)
|
||||
return -1; /* Out of range, or bad month. */
|
||||
|
||||
return 0;
|
||||
|
||||
@ -173,6 +173,76 @@ test_util_time(void)
|
||||
;
|
||||
}
|
||||
|
||||
static void
|
||||
test_util_parse_http_time(void *arg)
|
||||
{
|
||||
struct tm a_time;
|
||||
char b[ISO_TIME_LEN+1];
|
||||
(void)arg;
|
||||
|
||||
#define T(s) do { \
|
||||
format_iso_time(b, tor_timegm(&a_time)); \
|
||||
tt_str_op(b, ==, (s)); \
|
||||
b[0]='\0'; \
|
||||
} while (0)
|
||||
|
||||
/* Test parse_http_time */
|
||||
|
||||
test_eq(-1, parse_http_time("", &a_time));
|
||||
test_eq(-1, parse_http_time("Sunday, 32 Aug 2004 00:48:22 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("Sunday, 3 Aug 1869 00:48:22 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("Sunday, 32-Aug-94 00:48:22 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("Sunday, 3-Ago-04 00:48:22", &a_time));
|
||||
test_eq(-1, parse_http_time("Sunday, August the third", &a_time));
|
||||
test_eq(-1, parse_http_time("Wednesday,,04 Aug 1994 00:48:22 GMT", &a_time));
|
||||
|
||||
test_eq(0, parse_http_time("Wednesday, 04 Aug 1994 00:48:22 GMT", &a_time));
|
||||
test_eq((time_t)775961302UL, tor_timegm(&a_time));
|
||||
T("1994-08-04 00:48:22");
|
||||
test_eq(0, parse_http_time("Wednesday, 4 Aug 1994 0:48:22 GMT", &a_time));
|
||||
test_eq((time_t)775961302UL, tor_timegm(&a_time));
|
||||
T("1994-08-04 00:48:22");
|
||||
test_eq(0, parse_http_time("Miercoles, 4 Aug 1994 0:48:22 GMT", &a_time));
|
||||
test_eq((time_t)775961302UL, tor_timegm(&a_time));
|
||||
T("1994-08-04 00:48:22");
|
||||
test_eq(0, parse_http_time("Wednesday, 04-Aug-94 00:48:22 GMT", &a_time));
|
||||
test_eq((time_t)775961302UL, tor_timegm(&a_time));
|
||||
T("1994-08-04 00:48:22");
|
||||
test_eq(0, parse_http_time("Wednesday, 4-Aug-94 0:48:22 GMT", &a_time));
|
||||
test_eq((time_t)775961302UL, tor_timegm(&a_time));
|
||||
T("1994-08-04 00:48:22");
|
||||
test_eq(0, parse_http_time("Miercoles, 4-Aug-94 0:48:22 GMT", &a_time));
|
||||
test_eq((time_t)775961302UL, tor_timegm(&a_time));
|
||||
T("1994-08-04 00:48:22");
|
||||
test_eq(0, parse_http_time("Wed Aug 04 00:48:22 1994", &a_time));
|
||||
test_eq((time_t)775961302UL, tor_timegm(&a_time));
|
||||
T("1994-08-04 00:48:22");
|
||||
test_eq(0, parse_http_time("Wed Aug 4 0:48:22 1994", &a_time));
|
||||
test_eq((time_t)775961302UL, tor_timegm(&a_time));
|
||||
T("1994-08-04 00:48:22");
|
||||
test_eq(0, parse_http_time("Mie Aug 4 0:48:22 1994", &a_time));
|
||||
test_eq((time_t)775961302UL, tor_timegm(&a_time));
|
||||
T("1994-08-04 00:48:22");
|
||||
test_eq(0, parse_http_time("Sun, 1 Jan 2012 00:00:00 GMT", &a_time));
|
||||
test_eq((time_t)1325376000UL, tor_timegm(&a_time));
|
||||
T("2012-01-01 00:00:00");
|
||||
test_eq(0, parse_http_time("Mon, 31 Dec 2012 00:00:00 GMT", &a_time));
|
||||
test_eq((time_t)1356912000UL, tor_timegm(&a_time));
|
||||
T("2012-12-31 00:00:00");
|
||||
test_eq(-1, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("2011-03-32 00:00:00 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("2011-03-30 24:00:00 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("2011-03-30 23:60:00 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("2011-03-30 23:59:62 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("1969-03-30 23:59:59 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("2011-00-30 23:59:59 GMT", &a_time));
|
||||
test_eq(-1, parse_http_time("2011-03-30 23:59", &a_time));
|
||||
|
||||
#undef T
|
||||
done:
|
||||
;
|
||||
}
|
||||
|
||||
static void
|
||||
test_util_config_line(void)
|
||||
{
|
||||
@ -2921,6 +2991,7 @@ test_util_set_env_var_in_sl(void *ptr)
|
||||
|
||||
struct testcase_t util_tests[] = {
|
||||
UTIL_LEGACY(time),
|
||||
UTIL_TEST(parse_http_time, 0),
|
||||
UTIL_LEGACY(config_line),
|
||||
UTIL_LEGACY(config_line_quotes),
|
||||
UTIL_LEGACY(config_line_comment_character),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user