September 2012 - tor-commits - lists.torproject.org

[tor/maint-0.2.3] Fix assertion failure in tor_timegm.
by nickm＠torproject.org 11 Sep '12

11 Sep '12

commit 973c18bf0e84d14d8006a9ae97fde7f7fb97e404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 10:41:59 2012 -0400 Fix assertion failure in tor_timegm. Fixes bug 6811. --- changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/changes/bug6811 b/changes/bug6811 new file mode 100644 index 0000000..841ec1c --- /dev/null +++ b/changes/bug6811 @@ -0,0 +1,5 @@ + o Major security fixes: + - Fix an assertion failure in tor_timegm that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + diff --git a/src/common/util.c b/src/common/util.c index a03a576..698f989 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1212,11 +1212,11 @@ n_leapdays(int y1, int y2) static const int days_per_month[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; -/** Return a time_t given a struct tm. The result is given in GMT, and - * does not account for leap seconds. +/** Compute a time_t given a struct tm. The result is given in GMT, and + * does not account for leap seconds. Return 0 on success, -1 on failure. */ -time_t -tor_timegm(struct tm *tm) +int +tor_timegm(const struct tm *tm, time_t *time_out) { /* This is a pretty ironclad timegm implementation, snarfed from Python2.2. * It's way more brute-force than fiddling with tzset(). @@ -1224,11 +1224,11 @@ tor_timegm(struct tm *tm) time_t year, days, hours, minutes, seconds; int i; year = tm->tm_year + 1900; - if (year < 1970 || tm->tm_mon < 0 || tm->tm_mon > 11) { + if (year < 1970 || tm->tm_mon < 0 || tm->tm_mon > 11 || + tm->tm_year >= INT32_MAX-1900) { log_warn(LD_BUG, "Out-of-range argument to tor_timegm"); return -1; } - tor_assert(year < INT_MAX); days = 365 * (year-1970) + n_leapdays(1970,(int)year); for (i = 0; i < tm->tm_mon; ++i) days += days_per_month[i]; @@ -1239,7 +1239,8 @@ tor_timegm(struct tm *tm) minutes = hours*60 + tm->tm_min; seconds = minutes*60 + tm->tm_sec; - return seconds; + *time_out = seconds; + return 0; } /* strftime is locale-specific, so we need to replace those parts */ @@ -1299,7 +1300,7 @@ parse_rfc1123_time(const char *buf, time_t *t) return -1; } if (tm_mday < 1 || tm_mday > 31 || tm_hour > 23 || tm_min > 59 || - tm_sec > 60) { + tm_sec > 60 || tm_year >= INT32_MAX || tm_year < 1970) { char *esc = esc_for_log(buf); log_warn(LD_GENERAL, "Got invalid RFC1123 time %s", esc); tor_free(esc); @@ -1335,8 +1336,7 @@ parse_rfc1123_time(const char *buf, time_t *t) } tm.tm_year -= 1900; - *t = tor_timegm(&tm); - return 0; + return tor_timegm(&tm, t); } /** Set buf to the ISO8601 encoding of the local value of t. @@ -1378,13 +1378,13 @@ 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 > 60) { + hour > 23 || minute > 59 || second > 60 || year >= INT32_MAX) { char *esc = esc_for_log(cp); log_warn(LD_GENERAL, "ISO time %s was nonsensical", esc); tor_free(esc); return -1; } - st_tm.tm_year = year-1900; + st_tm.tm_year = (int)year-1900; st_tm.tm_mon = month-1; st_tm.tm_mday = day; st_tm.tm_hour = hour; @@ -1397,8 +1397,7 @@ parse_iso_time(const char *cp, time_t *t) tor_free(esc); return -1; } - *t = tor_timegm(&st_tm); - return 0; + return tor_timegm(&st_tm, t); } /** Given a date in one of the three formats allowed by HTTP (ugh), diff --git a/src/common/util.h b/src/common/util.h index d477156..75de342 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -232,7 +232,7 @@ int64_t tv_to_msec(const struct timeval *tv); int64_t tv_to_usec(const struct timeval *tv); long tv_udiff(const struct timeval *start, const struct timeval *end); long tv_mdiff(const struct timeval *start, const struct timeval *end); -time_t tor_timegm(struct tm *tm); +int tor_timegm(const struct tm *tm, time_t *time_out); #define RFC1123_TIME_LEN 29 void format_rfc1123_time(char *buf, time_t t); int parse_rfc1123_time(const char *buf, time_t *t); diff --git a/src/or/directory.c b/src/or/directory.c index 29cf10c..975f891 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2493,7 +2493,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, if ((header = http_get_header(headers, "If-Modified-Since: "))) { struct tm tm; if (parse_http_time(header, &tm) == 0) { - if_modified_since = tor_timegm(&tm); + if (tor_timegm(&tm, &if_modified_since)<0) + if_modified_since = 0; } /* The correct behavior on a malformed If-Modified-Since header is to * act as if no If-Modified-Since header had been given. */ diff --git a/src/or/dirvote.c b/src/or/dirvote.c index ab08fd0..a557fc7 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2536,7 +2536,7 @@ time_t dirvote_get_start_of_next_interval(time_t now, int interval) { struct tm tm; - time_t midnight_today; + time_t midnight_today=0; time_t midnight_tomorrow; time_t next; @@ -2545,7 +2545,9 @@ dirvote_get_start_of_next_interval(time_t now, int interval) tm.tm_min = 0; tm.tm_sec = 0; - midnight_today = tor_timegm(&tm); + if (tor_timegm(&tm, &midnight_today) < 0) { + log_warn(LD_BUG, "Ran into an invalid time when trying to find midnight."); + } midnight_tomorrow = midnight_today + (24*60*60); next = midnight_today + ((now-midnight_today)/interval + 1)*interval; diff --git a/src/test/test_util.c b/src/test/test_util.c index f9a83a3..12e3fa9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -13,6 +13,19 @@ #include "mempool.h" #include "memarea.h" +/* XXXX this is a minimal wrapper to make the unit tests compile with the + * changed tor_timegm interface. */ +static time_t +tor_timegm_wrapper(const struct tm *tm) +{ + time_t t; + if (tor_timegm(tm, &t) < 0) + return -1; + return t; +} + +#define tor_timegm tor_timegm_wrapper + static void test_util_time(void) {

1 0

[tor/maint-0.2.3] Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2
by nickm＠torproject.org 11 Sep '12

11 Sep '12

commit 84f47ffc462dface8db1def322414daa43400d1c Merge: 1c30e6a 973c18b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:14:43 2012 -0400 Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2 changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-)

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by nickm＠torproject.org 11 Sep '12

11 Sep '12

commit 5833861f62d2667eeda1ed0f6595763aa00250b0 Merge: 8731a4e 84f47ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:20:15 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 Conflicts: src/test/test_util.c changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-) diff --cc src/test/test_util.c index 9eca904,12e3fa9..4f9eb73 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -14,10 -13,19 +14,23 @@@ #include "mempool.h" #include "memarea.h" +#ifdef _WIN32 +#include <tchar.h> +#endif + + /* XXXX this is a minimal wrapper to make the unit tests compile with the + * changed tor_timegm interface. */ + static time_t + tor_timegm_wrapper(const struct tm *tm) + { + time_t t; + if (tor_timegm(tm, &t) < 0) + return -1; + return t; + } + + #define tor_timegm tor_timegm_wrapper + static void test_util_time(void) {

1 0

[tor/maint-0.2.2] Fix assertion failure in tor_timegm.
by nickm＠torproject.org 11 Sep '12

11 Sep '12

commit 973c18bf0e84d14d8006a9ae97fde7f7fb97e404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 10:41:59 2012 -0400 Fix assertion failure in tor_timegm. Fixes bug 6811. --- changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/changes/bug6811 b/changes/bug6811 new file mode 100644 index 0000000..841ec1c --- /dev/null +++ b/changes/bug6811 @@ -0,0 +1,5 @@ + o Major security fixes: + - Fix an assertion failure in tor_timegm that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + diff --git a/src/common/util.c b/src/common/util.c index a03a576..698f989 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1212,11 +1212,11 @@ n_leapdays(int y1, int y2) static const int days_per_month[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; -/** Return a time_t given a struct tm. The result is given in GMT, and - * does not account for leap seconds. +/** Compute a time_t given a struct tm. The result is given in GMT, and + * does not account for leap seconds. Return 0 on success, -1 on failure. */ -time_t -tor_timegm(struct tm *tm) +int +tor_timegm(const struct tm *tm, time_t *time_out) { /* This is a pretty ironclad timegm implementation, snarfed from Python2.2. * It's way more brute-force than fiddling with tzset(). @@ -1224,11 +1224,11 @@ tor_timegm(struct tm *tm) time_t year, days, hours, minutes, seconds; int i; year = tm->tm_year + 1900; - if (year < 1970 || tm->tm_mon < 0 || tm->tm_mon > 11) { + if (year < 1970 || tm->tm_mon < 0 || tm->tm_mon > 11 || + tm->tm_year >= INT32_MAX-1900) { log_warn(LD_BUG, "Out-of-range argument to tor_timegm"); return -1; } - tor_assert(year < INT_MAX); days = 365 * (year-1970) + n_leapdays(1970,(int)year); for (i = 0; i < tm->tm_mon; ++i) days += days_per_month[i]; @@ -1239,7 +1239,8 @@ tor_timegm(struct tm *tm) minutes = hours*60 + tm->tm_min; seconds = minutes*60 + tm->tm_sec; - return seconds; + *time_out = seconds; + return 0; } /* strftime is locale-specific, so we need to replace those parts */ @@ -1299,7 +1300,7 @@ parse_rfc1123_time(const char *buf, time_t *t) return -1; } if (tm_mday < 1 || tm_mday > 31 || tm_hour > 23 || tm_min > 59 || - tm_sec > 60) { + tm_sec > 60 || tm_year >= INT32_MAX || tm_year < 1970) { char *esc = esc_for_log(buf); log_warn(LD_GENERAL, "Got invalid RFC1123 time %s", esc); tor_free(esc); @@ -1335,8 +1336,7 @@ parse_rfc1123_time(const char *buf, time_t *t) } tm.tm_year -= 1900; - *t = tor_timegm(&tm); - return 0; + return tor_timegm(&tm, t); } /** Set buf to the ISO8601 encoding of the local value of t. @@ -1378,13 +1378,13 @@ 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 > 60) { + hour > 23 || minute > 59 || second > 60 || year >= INT32_MAX) { char *esc = esc_for_log(cp); log_warn(LD_GENERAL, "ISO time %s was nonsensical", esc); tor_free(esc); return -1; } - st_tm.tm_year = year-1900; + st_tm.tm_year = (int)year-1900; st_tm.tm_mon = month-1; st_tm.tm_mday = day; st_tm.tm_hour = hour; @@ -1397,8 +1397,7 @@ parse_iso_time(const char *cp, time_t *t) tor_free(esc); return -1; } - *t = tor_timegm(&st_tm); - return 0; + return tor_timegm(&st_tm, t); } /** Given a date in one of the three formats allowed by HTTP (ugh), diff --git a/src/common/util.h b/src/common/util.h index d477156..75de342 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -232,7 +232,7 @@ int64_t tv_to_msec(const struct timeval *tv); int64_t tv_to_usec(const struct timeval *tv); long tv_udiff(const struct timeval *start, const struct timeval *end); long tv_mdiff(const struct timeval *start, const struct timeval *end); -time_t tor_timegm(struct tm *tm); +int tor_timegm(const struct tm *tm, time_t *time_out); #define RFC1123_TIME_LEN 29 void format_rfc1123_time(char *buf, time_t t); int parse_rfc1123_time(const char *buf, time_t *t); diff --git a/src/or/directory.c b/src/or/directory.c index 29cf10c..975f891 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2493,7 +2493,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, if ((header = http_get_header(headers, "If-Modified-Since: "))) { struct tm tm; if (parse_http_time(header, &tm) == 0) { - if_modified_since = tor_timegm(&tm); + if (tor_timegm(&tm, &if_modified_since)<0) + if_modified_since = 0; } /* The correct behavior on a malformed If-Modified-Since header is to * act as if no If-Modified-Since header had been given. */ diff --git a/src/or/dirvote.c b/src/or/dirvote.c index ab08fd0..a557fc7 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2536,7 +2536,7 @@ time_t dirvote_get_start_of_next_interval(time_t now, int interval) { struct tm tm; - time_t midnight_today; + time_t midnight_today=0; time_t midnight_tomorrow; time_t next; @@ -2545,7 +2545,9 @@ dirvote_get_start_of_next_interval(time_t now, int interval) tm.tm_min = 0; tm.tm_sec = 0; - midnight_today = tor_timegm(&tm); + if (tor_timegm(&tm, &midnight_today) < 0) { + log_warn(LD_BUG, "Ran into an invalid time when trying to find midnight."); + } midnight_tomorrow = midnight_today + (24*60*60); next = midnight_today + ((now-midnight_today)/interval + 1)*interval; diff --git a/src/test/test_util.c b/src/test/test_util.c index f9a83a3..12e3fa9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -13,6 +13,19 @@ #include "mempool.h" #include "memarea.h" +/* XXXX this is a minimal wrapper to make the unit tests compile with the + * changed tor_timegm interface. */ +static time_t +tor_timegm_wrapper(const struct tm *tm) +{ + time_t t; + if (tor_timegm(tm, &t) < 0) + return -1; + return t; +} + +#define tor_timegm tor_timegm_wrapper + static void test_util_time(void) {

1 0

[tor/maint-0.2.2] Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2
by nickm＠torproject.org 11 Sep '12

11 Sep '12

commit 84f47ffc462dface8db1def322414daa43400d1c Merge: 1c30e6a 973c18b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:14:43 2012 -0400 Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2 changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-)

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 11 Sep '12

11 Sep '12

commit 1887c97d4d23c1ee08ca275cb9abee7883f71aa0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 17:15:30 2012 +0000 Update translations for whisperback --- it/it.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/it/it.po b/it/it.po index b7caed3..a490762 100644 --- a/it/it.po +++ b/it/it.po @@ -5,19 +5,20 @@ # Translators: # Luca Marzo <luca(a)jeckodevelopment.it>, 2012. # <michele.mondora(a)gmail.com>, 2012. +# Vincenzo Cerminara <rebek994(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-08-16 09:20+0000\n" -"Last-Translator: Luca Marzo <luca(a)jeckodevelopment.it>\n" +"PO-Revision-Date: 2012-09-11 17:05+0000\n" +"Last-Translator: Vincenzo Cerminara <rebek994(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. XXX use a better exception #: ../whisperBack/whisperback.py:63 @@ -184,7 +185,7 @@ msgstr "Descrizione del bug" #: ../data/whisperback.ui.h:3 msgid "Copyright © 2009-2012 tails(a)boum.org" -msgstr "" +msgstr "Copyright © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:4 msgid "Help"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 11 Sep '12

11 Sep '12

commit 61a64aa882fe9b83aaf9fbad4b6ba599c6c6cbc7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 17:15:12 2012 +0000 Update translations for vidalia_alpha --- it/vidalia_it.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/it/vidalia_it.po b/it/vidalia_it.po index ab822e7..1e4d333 100644 --- a/it/vidalia_it.po +++ b/it/vidalia_it.po @@ -8,19 +8,20 @@ # runasand <runa.sandvik(a)gmail.com>, 2011. # <tru74368(a)yahoo.com>, 2011. # usagetta <usa_getta(a)libero.it>, 2012. +# Vincenzo Cerminara <rebek994(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-08-21 10:04+0000\n" -"Last-Translator: Luca Marzo <luca(a)jeckodevelopment.it>\n" +"PO-Revision-Date: 2012-09-11 17:07+0000\n" +"Last-Translator: Vincenzo Cerminara <rebek994(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -202,7 +203,7 @@ msgstr "Seleziona il percorso del file da usare come socket per Tor" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "Configura ControlPort automaticamente" msgctxt "AdvancedPage" msgid "" @@ -280,7 +281,7 @@ msgstr "Nascondi l'icona nella barra di stato" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "Nascondi l'icona nella Dock" msgctxt "BandwidthGraph" msgid "Since:" @@ -2088,11 +2089,11 @@ msgstr "fallito (%1)" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(probabilmente Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(probabilmente un client email)" msgctxt "MainWindow" msgid ""

1 0

[flashproxy/master] Add tests for parse_addr_spec.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit 8201762b9ca27ec232270c2d3c7256a3775cabaf Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 11 08:42:37 2012 -0700 Add tests for parse_addr_spec. --- facilitator/fac.py | 6 +++++- facilitator/facilitator-test | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index b9ad435..2382d2b 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -12,11 +12,15 @@ def parse_addr_spec(spec, defhost = None, defport = None, resolve = False): >>> parse_addr_spec("192.168.0.2:8888", defhost="192.168.0.1", defport=9999) ('192.168.0.2', 8888) >>> parse_addr_spec(":8888", defhost="192.168.0.1", defport=9999) - ('192.168.0.1', 9999) + ('192.168.0.1', 8888) + >>> parse_addr_spec("192.168.0.2", defhost="192.168.0.1", defport=9999) + ('192.168.0.2', 9999) >>> parse_addr_spec("192.168.0.2:", defhost="192.168.0.1", defport=9999) ('192.168.0.2', 9999) >>> parse_addr_spec(":", defhost="192.168.0.1", defport=9999) ('192.168.0.1', 9999) + >>> parse_addr_spec("", defhost="192.168.0.1", defport=9999) + ('192.168.0.1', 9999) If resolve is true, then the host in the specification or the defhost may be a domain name, which will be resolved. If resolve is false, then the host diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index b06f5d7..c8946e6 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -86,6 +86,33 @@ class FacilitatorTest(unittest.TestCase): # """Test that the facilitator rejects hostnames.""" # self.fail() +class ParseAddrSpecTest(unittest.TestCase): + def test_ipv4(self): + self.assertEqual(fac.parse_addr_spec("192.168.0.1:9999"), ("192.168.0.1", 9999)) + + def test_ipv6(self): + self.assertEqual(fac.parse_addr_spec("[12::34]:9999"), ("12::34", 9999)) + + def test_defhost_defport_ipv4(self): + self.assertEqual(fac.parse_addr_spec("192.168.0.2:8888", defhost="192.168.0.1", defport=9999), ("192.168.0.2", 8888)) + self.assertEqual(fac.parse_addr_spec("192.168.0.2:", defhost="192.168.0.1", defport=9999), ("192.168.0.2", 9999)) + self.assertEqual(fac.parse_addr_spec("192.168.0.2", defhost="192.168.0.1", defport=9999), ("192.168.0.2", 9999)) + self.assertEqual(fac.parse_addr_spec(":8888", defhost="192.168.0.1", defport=9999), ("192.168.0.1", 8888)) + self.assertEqual(fac.parse_addr_spec(":", defhost="192.168.0.1", defport=9999), ("192.168.0.1", 9999)) + self.assertEqual(fac.parse_addr_spec("", defhost="192.168.0.1", defport=9999), ("192.168.0.1", 9999)) + + def test_defhost_defport_ipv6(self): + self.assertEqual(fac.parse_addr_spec("[1234::2]:8888", defhost="1234::1", defport=9999), ("1234::2", 8888)) + self.assertEqual(fac.parse_addr_spec("[1234::2]:", defhost="1234::1", defport=9999), ("1234::2", 9999)) + self.assertEqual(fac.parse_addr_spec("[1234::2]", defhost="1234::1", defport=9999), ("1234::2", 9999)) + self.assertEqual(fac.parse_addr_spec(":8888", defhost="1234::1", defport=9999), ("1234::1", 8888)) + self.assertEqual(fac.parse_addr_spec(":", defhost="1234::1", defport=9999), ("1234::1", 9999)) + self.assertEqual(fac.parse_addr_spec("", defhost="1234::1", defport=9999), ("1234::1", 9999)) + + def test_noresolve(self): + """Test that parse_addr_spec does not do DNS resolution by default.""" + self.assertRaises(ValueError, fac.parse_addr_spec, "example.com") + class ParseTransactionTest(unittest.TestCase): def test_empty_string(self): self.assertRaises(ValueError, fac.parse_transaction, "")

1 0

[flashproxy/master] Make parse_addr_spec pass new tests.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit fd2df35dc9cdc27c24423f7905f60cc222e27a6d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 11 08:56:38 2012 -0700 Make parse_addr_spec pass new tests. --- facilitator/fac.py | 23 ++++++++++------------- flashproxy-client | 23 ++++++++++------------- flashproxy-reg-http | 23 ++++++++++------------- 3 files changed, 30 insertions(+), 39 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 2382d2b..494b378 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -29,32 +29,29 @@ def parse_addr_spec(spec, defhost = None, defport = None, resolve = False): IPv6 addresses must be enclosed in square brackets.""" host = None port = None + af = 0 m = None # IPv6 syntax. if not m: - m = re.match(ur'^\[(.+)\]:(\d+)$', spec) + m = re.match(ur'^\[(.+)\]:(\d*)$', spec) if m: host, port = m.groups() af = socket.AF_INET6 if not m: - m = re.match(ur'^\[(.+)\]:?$', spec) + m = re.match(ur'^\[(.+)\]$', spec) if m: host, = m.groups() af = socket.AF_INET6 - # IPv4 syntax. + # IPv4/hostname/port-only syntax. if not m: - m = re.match(ur'^(.+):(\d+)$', spec) - if m: - host, port = m.groups() + try: + host, port = spec.split(":", 1) + except ValueError: + host = spec + if re.match(ur'^[\d.]+$', host): af = socket.AF_INET - if not m: - m = re.match(ur'^:?(\d+)$', spec) - if m: - port, = m.groups() + else: af = 0 - if not m: - host = spec - af = 0 host = host or defhost port = port or defport if host is None or port is None: diff --git a/flashproxy-client b/flashproxy-client index f5c9a8b..6f7477e 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -95,32 +95,29 @@ def log(msg): def parse_addr_spec(spec, defhost = None, defport = None): host = None port = None + af = 0 m = None # IPv6 syntax. if not m: - m = re.match(ur'^\[(.+)\]:(\d+)$', spec) + m = re.match(ur'^\[(.+)\]:(\d*)$', spec) if m: host, port = m.groups() af = socket.AF_INET6 if not m: - m = re.match(ur'^\[(.+)\]:?$', spec) + m = re.match(ur'^\[(.+)\]$', spec) if m: host, = m.groups() af = socket.AF_INET6 - # IPv4 syntax. + # IPv4/hostname/port-only syntax. if not m: - m = re.match(ur'^(.+):(\d+)$', spec) - if m: - host, port = m.groups() + try: + host, port = spec.split(":", 1) + except ValueError: + host = spec + if re.match(ur'^[\d.]+$', host): af = socket.AF_INET - if not m: - m = re.match(ur'^:?(\d+)$', spec) - if m: - port, = m.groups() + else: af = 0 - if not m: - host = spec - af = 0 host = host or defhost port = port or defport if port is not None: diff --git a/flashproxy-reg-http b/flashproxy-reg-http index e17abdf..4372c1f 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -34,32 +34,29 @@ remote address registered is "%(remote_addr)s". def parse_addr_spec(spec, defhost = None, defport = None): host = None port = None + af = 0 m = None # IPv6 syntax. if not m: - m = re.match(ur'^\[(.+)\]:(\d+)$', spec) + m = re.match(ur'^\[(.+)\]:(\d*)$', spec) if m: host, port = m.groups() af = socket.AF_INET6 if not m: - m = re.match(ur'^\[(.+)\]:?$', spec) + m = re.match(ur'^\[(.+)\]$', spec) if m: host, = m.groups() af = socket.AF_INET6 - # IPv4 syntax. + # IPv4/hostname/port-only syntax. if not m: - m = re.match(ur'^(.+):(\d+)$', spec) - if m: - host, port = m.groups() + try: + host, port = spec.split(":", 1) + except ValueError: + host = spec + if re.match(ur'^[\d.]+$', host): af = socket.AF_INET - if not m: - m = re.match(ur'^:?(\d+)$', spec) - if m: - port, = m.groups() + else: af = 0 - if not m: - host = spec - af = 0 host = host or defhost port = port or defport if port is not None:

1 0

[flashproxy/master] Make the remote addr a command-line argument in registration helpers.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit f63a12411756bbb72f8ac53c22ec9afa6f243dab Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 11 07:05:49 2012 -0700 Make the remote addr a command-line argument in registration helpers. Before, you registered a remote :1111 with fac.example.com like so: flashproxy-reg-http -a :1111 fac.example.com Now it is like this: flashproxy-reg-http -f fac.example.com :1111 Not all registration helpers will have knowledge of a facilitator address, and I want them to have as uniform an interface as possible. Using -f for the facilitator address also matches flashproxy-client usage. --- flashproxy-client | 4 ++-- flashproxy-reg-http | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index dfe060f..f5c9a8b 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -639,8 +639,8 @@ def register(): if options.facilitator_addr is None: log(u"Registering \"%s\"." % spec) else: - command += [format_addr(options.facilitator_addr)] - command += ["-a", spec] + command += ["-f", format_addr(options.facilitator_addr)] + command += [spec] try: p = subprocess.Popen(command) except OSError, e: diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 1c989c0..e17abdf 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -18,12 +18,13 @@ class options(object): def usage(f = sys.stdout): print >> f, """\ -Usage: %(progname)s [HOSTNAME][:PORT] +Usage: %(progname)s [REMOTE][:PORT] Register with a flash proxy facilitator using an HTTP POST. By default the -facilitator address is "%(fac_addr)s". +remote address registered is "%(remote_addr)s". - -a, --address=ADDRESS register the given address instead of \"%(remote_addr)s\". - -h, --help show this help. \ + -f, --facilitator=HOST[:PORT] register with the given facilitator (by + default "%(fac_addr)s".) + -h, --help show this help. \ """ % { "progname": sys.argv[0], "fac_addr": format_addr((DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT)), @@ -86,10 +87,10 @@ def format_addr(addr): options.facilitator_addr = (DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "a:h", ["address=", "help"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "help"]) for o, a in opts: - if o == "-a" or o == "--address": - options.remote_addr = parse_addr_spec(a, DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) + if o == "-f" or o == "--facilitator": + options.facilitator_addr = parse_addr_spec(a, DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) elif o == "-h" or o == "--help": usage() sys.exit() @@ -97,7 +98,7 @@ for o, a in opts: if len(args) == 0: pass elif len(args) == 1: - options.facilitator_addr = parse_addr_spec(args[0], DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) + options.remote_addr = parse_addr_spec(args[0], DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) else: usage(sys.stderr) sys.exit(1)

1 0