January 2017 - tor-commits - lists.torproject.org

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 04 Jan '17

04 Jan '17

commit 3e6eb2c5c65ad71a9df0a9823ba7182ec3d9c61f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 4 23:15:26 2017 +0000 Update translations for https_everywhere_completed --- ru/https-everywhere.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ru/https-everywhere.properties b/ru/https-everywhere.properties index c558aae..8780077 100644 --- a/ru/https-everywhere.properties +++ b/ru/https-everywhere.properties @@ -1,8 +1,8 @@ https-everywhere.menu.globalEnable = Активировать HTTPS Everywhere https-everywhere.menu.globalDisable = Отключить HTTPS Everywhere https-everywhere.menu.enableDisable = Запустить / Отключить правила -https-everywhere.menu.noRules = Нет правил для этой страницы -https-everywhere.menu.unknownRules = Правила для этой страницы неизвестны -https-everywhere.toolbar.hint = Теперь HTTPS Everywhere активен. Вы можете переключать его для каждого сайта кликая по значку. -https-everywhere.migration.notification0 = По причине установки критических обновлений, данное обновление сбрасывает настройки правил HTTPS Everywhere к значениям по умолчанию. -https-everywhere.menu.ruleset-tests = Запустить тесты правил HTTPS Everywhere +https-everywhere.menu.noRules = (Не заданно правило для этой страницы) +https-everywhere.menu.unknownRules = (Правило для этой страницы, неопределенно) +https-everywhere.toolbar.hint = HTTPS Everywhere активен сейчас. В адресном меню вы сможете включить или отключить плагин. +https-everywhere.migration.notification0 = Критические обновления могут сбросить настройки правил HTTPS Everywhere к значениям по умолчанию. +https-everywhere.menu.ruleset-tests = Запустить тестирование правил для HTTPS Everywhere

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Jan '17

04 Jan '17

commit 4f79b31b993fb8e5060c07d199975c94e5b48dfe Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 4 23:15:21 2017 +0000 Update translations for https_everywhere --- ru/https-everywhere.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ru/https-everywhere.properties b/ru/https-everywhere.properties index c558aae..8780077 100644 --- a/ru/https-everywhere.properties +++ b/ru/https-everywhere.properties @@ -1,8 +1,8 @@ https-everywhere.menu.globalEnable = Активировать HTTPS Everywhere https-everywhere.menu.globalDisable = Отключить HTTPS Everywhere https-everywhere.menu.enableDisable = Запустить / Отключить правила -https-everywhere.menu.noRules = Нет правил для этой страницы -https-everywhere.menu.unknownRules = Правила для этой страницы неизвестны -https-everywhere.toolbar.hint = Теперь HTTPS Everywhere активен. Вы можете переключать его для каждого сайта кликая по значку. -https-everywhere.migration.notification0 = По причине установки критических обновлений, данное обновление сбрасывает настройки правил HTTPS Everywhere к значениям по умолчанию. -https-everywhere.menu.ruleset-tests = Запустить тесты правил HTTPS Everywhere +https-everywhere.menu.noRules = (Не заданно правило для этой страницы) +https-everywhere.menu.unknownRules = (Правило для этой страницы, неопределенно) +https-everywhere.toolbar.hint = HTTPS Everywhere активен сейчас. В адресном меню вы сможете включить или отключить плагин. +https-everywhere.migration.notification0 = Критические обновления могут сбросить настройки правил HTTPS Everywhere к значениям по умолчанию. +https-everywhere.menu.ruleset-tests = Запустить тестирование правил для HTTPS Everywhere

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 04 Jan '17

04 Jan '17

commit 2b37a680312defb6426c9fe0a971dd3f2e80f01d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 4 22:45:32 2017 +0000 Update translations for https_everywhere_completed --- ru/https-everywhere.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru/https-everywhere.properties b/ru/https-everywhere.properties index 5990746..c558aae 100644 --- a/ru/https-everywhere.properties +++ b/ru/https-everywhere.properties @@ -1,6 +1,6 @@ -https-everywhere.menu.globalEnable = Включить HTTPS Everywhere -https-everywhere.menu.globalDisable = Выключить HTTPS Everywhere -https-everywhere.menu.enableDisable = Включить / Выключить правила +https-everywhere.menu.globalEnable = Активировать HTTPS Everywhere +https-everywhere.menu.globalDisable = Отключить HTTPS Everywhere +https-everywhere.menu.enableDisable = Запустить / Отключить правила https-everywhere.menu.noRules = Нет правил для этой страницы https-everywhere.menu.unknownRules = Правила для этой страницы неизвестны https-everywhere.toolbar.hint = Теперь HTTPS Everywhere активен. Вы можете переключать его для каждого сайта кликая по значку.

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Jan '17

04 Jan '17

commit 362c2dc3cd88794d17a0d4db7e8bae0d2f98f86a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 4 22:45:22 2017 +0000 Update translations for https_everywhere --- ru/https-everywhere.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru/https-everywhere.properties b/ru/https-everywhere.properties index 5990746..c558aae 100644 --- a/ru/https-everywhere.properties +++ b/ru/https-everywhere.properties @@ -1,6 +1,6 @@ -https-everywhere.menu.globalEnable = Включить HTTPS Everywhere -https-everywhere.menu.globalDisable = Выключить HTTPS Everywhere -https-everywhere.menu.enableDisable = Включить / Выключить правила +https-everywhere.menu.globalEnable = Активировать HTTPS Everywhere +https-everywhere.menu.globalDisable = Отключить HTTPS Everywhere +https-everywhere.menu.enableDisable = Запустить / Отключить правила https-everywhere.menu.noRules = Нет правил для этой страницы https-everywhere.menu.unknownRules = Правила для этой страницы неизвестны https-everywhere.toolbar.hint = Теперь HTTPS Everywhere активен. Вы можете переключать его для каждого сайта кликая по значку.

1 0

[depictor/master] Collapse some span tags and move the class attribute to the td
by tom＠torproject.org 04 Jan '17

04 Jan '17

commit 030dc0accc3267cd6388da2f404e71179650e5ec Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Jan 4 14:19:46 2017 -0600 Collapse some span tags and move the class attribute to the td --- website.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/website.py b/website.py index 97ade07..a596450 100755 --- a/website.py +++ b/website.py @@ -228,7 +228,7 @@ class WebsiteWriter: else: self.site.write(" <tr>\n" + " <td>" + dirauth_nickname + "</td>\n" - + " <td><span class=\"oiv\">Vote Not Present<span></td>\n" + + " <td class=\"oiv\">Vote Not Present</td>\n" + " </tr>\n") self.site.write(" <tr>\n" + " <td class=\"ic\">consensus</td>\n" @@ -266,7 +266,7 @@ class WebsiteWriter: else: self.site.write(" <tr>\n" + " <td>" + dirauth_nickname + "</td>\n" - + " <td><span class=\"oiv\">Vote Not Present<span></td>\n" + + " <td class=\"oiv\">Vote Not Present</td>\n" + " </tr>\n") self.site.write("</table>\n") @@ -358,17 +358,17 @@ class WebsiteWriter: + " </tr>\n") else: self.site.write(" <tr>\n" - + " <td><span class=\"oiv\">" - + dirauth_nickname + "</span></td>\n" - + " <td><span class=\"oiv\">consensus-methods") + + " <td class=\"oiv\">" + + dirauth_nickname + "</td>\n" + + " <td class=\"oiv\">consensus-methods") for cm in vote.consensus_methods: self.site.write(" " + str(cm)) - self.site.write("</span></td>\n" + self.site.write("</td>\n" + " </tr>\n") else: self.site.write(" <tr>\n" + " <td>" + dirauth_nickname + "</td>\n" - + " <td><span class=\"oiv\">Vote Not Present<span></td>\n" + + " <td class=\"oiv\">Vote Not Present</td>\n" + " </tr>\n") self.site.write(" <tr>\n" + " <td class=\"ic\">consensus</td>\n" @@ -424,7 +424,7 @@ class WebsiteWriter: else: self.site.write(" <tr>\n" + " <td>" + dirauth_nickname + "</td>\n" - + " <td><span class=\"oiv\">Vote Not Present<span></td>\n" + + " <td class=\"oiv\">Vote Not Present</td>\n" + " </tr>\n") self.site.write(" <tr>\n" + " <td class=\"ic\">consensus</td>\n" @@ -473,7 +473,7 @@ class WebsiteWriter: if conflictOrInvalid: self.site.write(" <tr>\n" - + " <td><span class=\"oiv\">" + dirauth_nickname + "</span></td>\n" + + " <td class=\"oiv\">" + dirauth_nickname + "</td>\n" + " <td>params") for p in vote.params: if p in conflictOrInvalid: @@ -493,7 +493,7 @@ class WebsiteWriter: else: self.site.write(" <tr>\n" + " <td>" + dirauth_nickname + "</td>\n" - + " <td><span class=\"oiv\">Vote Not Present<span></td>\n" + + " <td class=\"oiv\">Vote Not Present</td>\n" + " </tr>\n") self.site.write(" <tr>\n" @@ -548,9 +548,9 @@ class WebsiteWriter: voteDirKeyExpires = vote.directory_authorities[0].key_certificate.expires if voteDirKeyExpires - self.directory_key_warning_time < datetime.datetime.now(): self.site.write(" <tr>\n" - + " <td><span class=\"oiv\">" + dirauth_nickname + "</span></td>\n" - + " <td><span class=\"oiv\">" - + voteDirKeyExpires.isoformat().replace("T", " ") + "</span></td>\n") + + " <td class=\"oiv\">" + dirauth_nickname + "</td>\n" + + " <td class=\"oiv\">" + + voteDirKeyExpires.isoformat().replace("T", " ") + "</td>\n") else: self.site.write(" <tr>\n" + " <td>" + dirauth_nickname + "</td>\n" @@ -965,9 +965,9 @@ class WebsiteWriter: i += 1 if dirauth_nickname in flagsLost and kf in flagsLost[dirauth_nickname]: - self.site.write(" <td><span class=\"oiv\"> " + self.site.write(" <td class=\"oiv\"> " + str(flagsLost[dirauth_nickname][kf]) + " " + kf - + "</span></td>\n") + + "</td>\n") else: self.site.write(" <td></td>\n")

1 0

[depictor/master] Add Flag Thresholds for #21079
by tom＠torproject.org 04 Jan '17

04 Jan '17

commit 626a41231f676e703c282d0e85949529b16d0926 Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Jan 4 14:16:40 2017 -0600 Add Flag Thresholds for #21079 --- website.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/website.py b/website.py index 6bb3e6d..97ade07 100755 --- a/website.py +++ b/website.py @@ -34,6 +34,7 @@ class WebsiteWriter: self._write_valid_after_time() self._write_signatures() self._write_known_flags() + self._write_flag_thresholds() self._write_number_of_relays_voted_about(True) self._write_consensus_methods() self._write_recommended_versions() @@ -239,6 +240,37 @@ class WebsiteWriter: + "</table>\n") #----------------------------------------------------------------------------------------- + def _write_flag_thresholds(self): + """ + Write each dirauth's flag thresholds + """ + self.site.write("<br>\n\n\n" + + " " + + "<a name=\"flagthresholds\">\n" + + "<h3><a href=\"#flagthresholds\" class=\"anchor\">Flag Thresholds</a></h3>\n" + + "<br>\n" + + "<table border=\"0\" cellpadding=\"4\" cellspacing=\"0\" summary=\"\">\n" + + " <colgroup>\n" + + " <col width=\"160\">\n" + + " <col width=\"640\">\n" + + " </colgroup>\n") + for dirauth_nickname in self.known_authorities: + if dirauth_nickname in self.votes: + vote = self.votes[dirauth_nickname] + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td>flag-thresholds"); + for k in vote.flag_thresholds: + self.site.write(" " + k + "=" + str(vote.flag_thresholds[k])) + self.site.write("</td>\n" + " </tr>\n") + else: + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td><span class=\"oiv\">Vote Not Present<span></td>\n" + + " </tr>\n") + self.site.write("</table>\n") + + #----------------------------------------------------------------------------------------- def _write_number_of_relays_voted_about(self, linkToGraph): """ Write the number of relays voted about.

1 0

[depictor/master] Add a Protocol section for #20762
by tom＠torproject.org 04 Jan '17

04 Jan '17

commit 59cf04d4dc0211793764a4c5a8d860e1b7e87967 Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Jan 4 14:05:44 2017 -0600 Add a Protocol section for #20762 --- website.py | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/website.py b/website.py index 232c046..6bb3e6d 100755 --- a/website.py +++ b/website.py @@ -39,6 +39,7 @@ class WebsiteWriter: self._write_recommended_versions() self._write_consensus_parameters() self._write_authority_keys() + self._write_protocols() self._write_bandwidth_scanner_status(True) self._write_fallback_directory_status(True) self._write_authority_versions() @@ -540,6 +541,98 @@ class WebsiteWriter: + "</p>\n") #----------------------------------------------------------------------------------------- + def protocolsToString(self, keys, v, c=None): + s = "" + for k in keys: + s += k + "=" + if c and c[k] != v[k]: + s += "<span class=\"oiv\">" + s += ",".join([str(i) for i in v[k]]) + if c and c[k] != v[k]: + s += "</span>" + s += " " + return s + def _write_protocols(self): + """ + Write the recommended and required protocols + """ + self.site.write("<br>\n\n\n" + + " " + + "<a name=\"protocols\">\n" + + "<h3><a href=\"#protocols\" class=\"anchor\">" + + "Protocols</a></h3>\n" + + "<br>\n" + + "<table border=\"0\" cellpadding=\"4\" cellspacing=\"0\" summary=\"\">\n" + + " <colgroup>\n" + + " <col width=\"140\">\n" + + " <col width=\"180\">\n" + + " <col width=\"480\">\n" + + " </colgroup>\n") + if not self.votes: + self.site.write(" <tr><td>(No votes.)</td><td></td></tr>\n") + else: + protocol_keys = set() + for dirauth_nickname in self.known_authorities: + if dirauth_nickname in self.votes: + vote = self.votes[dirauth_nickname] + protocol_keys = protocol_keys.union(vote.recommended_client_protocols.keys()) + protocol_keys = protocol_keys.union(vote.required_client_protocols.keys()) + protocol_keys = protocol_keys.union(vote.recommended_relay_protocols.keys()) + protocol_keys = protocol_keys.union(vote.required_relay_protocols.keys()) + protocol_keys = list(protocol_keys) + protocol_keys.sort() + for dirauth_nickname in self.known_authorities: + if dirauth_nickname in self.votes: + vote = self.votes[dirauth_nickname] + + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td>Recommended Client</td>\n" + + " <td>" + self.protocolsToString(protocol_keys, vote.recommended_client_protocols, self.consensus.recommended_client_protocols) + "</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td>Required Client</td>\n" + + " <td>" + self.protocolsToString(protocol_keys, vote.required_client_protocols, self.consensus.required_client_protocols) + "</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td>Recommended Relay</td>\n" + + " <td>" + self.protocolsToString(protocol_keys, vote.recommended_relay_protocols, self.consensus.recommended_relay_protocols) + "</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td>Required Relay</td>\n" + + " <td>" + self.protocolsToString(protocol_keys, vote.required_relay_protocols, self.consensus.required_relay_protocols) + "</td>\n" + + " </tr>\n") + else: + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td colspan=\"2\" class=\"oiv\">Vote Not Present</td>\n" + + " </tr>\n") + self.site.write(" <tr>\n" + + " <td class=\"ic\">consensus</td>\n" + + " <td class=\"ic\">Recommended Client</td>\n" + + " <td class=\"ic\">" + self.protocolsToString(protocol_keys, self.consensus.recommended_client_protocols) + "</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td class=\"ic\">Required Client</td>\n" + + " <td class=\"ic\">" + self.protocolsToString(protocol_keys, self.consensus.required_client_protocols) + "</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td class=\"ic\">Recommended Relay</td>\n" + + " <td class=\"ic\">" + self.protocolsToString(protocol_keys, self.consensus.recommended_relay_protocols) + "</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td class=\"ic\">Required Relay</td>\n" + + " <td class=\"ic\">" + self.protocolsToString(protocol_keys, self.consensus.required_relay_protocols) + "</td>\n" + + " </tr>\n" + + "</table>\n") + + #----------------------------------------------------------------------------------------- def _write_bandwidth_scanner_status(self, linkToGraph): """ Write the status of bandwidth scanners and results being contained in votes.

1 0

[metrics-base/master] squash! Corrected source-jar contents, enabled additonal target execution before signing using a new property, and cleaned up jar-task.
by karsten＠torproject.org 04 Jan '17

04 Jan '17

commit 4c0106bf45b63ce4ce5405851eb23f27f63629af Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jan 4 15:00:27 2017 +0100 squash! Corrected source-jar contents, enabled additonal target execution before signing using a new property, and cleaned up jar-task. Corrected path for javadoc-jar. --- java/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/base.xml b/java/base.xml index 5899ec2..0975b25 100644 --- a/java/base.xml +++ b/java/base.xml @@ -261,7 +261,7 @@ <antcall target="jarring" > <param name="destfile" value="${dist}/${jardocsfile}" /> <param name="usebase" value="${docs}" /> - <param name="usepath" value="${docs}" /> + <param name="usepath" value="${sources}" /> <param name="usepattern" value="*" /> <param name="uselibpath" value="${libs}" /> <param name="uselibpattern" value="empty" />

1 0

[tor/master] Make tor_addr_lookup() mockable.
by nickm＠torproject.org 04 Jan '17

04 Jan '17

commit f23ec14d62f82ee424b7aef9ff1c2253c3dd2b10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 3 10:11:15 2017 -0500 Make tor_addr_lookup() mockable. --- src/common/address.c | 4 ++-- src/common/address.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index a5dbae4..2693239 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -237,8 +237,8 @@ tor_addr_make_null(tor_addr_t *a, sa_family_t family) * * Return 0 on success, -1 on failure; 1 on transient failure. */ -int -tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr) +MOCK_IMPL(int, +tor_addr_lookup,(const char *name, uint16_t family, tor_addr_t *addr)) { /* Perhaps eventually this should be replaced by a tor_getaddrinfo or * something. diff --git a/src/common/address.h b/src/common/address.h index 41daf01..0dc6eda 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -190,7 +190,8 @@ tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u) */ #define TOR_ADDR_BUF_LEN 48 -int tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr_out); +MOCK_DECL(int, tor_addr_lookup,(const char *name, uint16_t family, + tor_addr_t *addr_out)); char *tor_addr_to_str_dup(const tor_addr_t *addr) ATTR_MALLOC; /** Wrapper function of fmt_addr_impl(). It does not decorate IPv6

1 0

[tor/master] Fix unit test failures in response to DNS hijacking.
by nickm＠torproject.org 04 Jan '17

04 Jan '17

commit c4a6b56cc19878de4c76e83ce8e38ad709839d92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 3 10:11:23 2017 -0500 Fix unit test failures in response to DNS hijacking. Some DNS NXDOMAIN hijackers hijack truly ridiculous domains, like "invalid-stuff!!" or "1.2.3.4.5". This would provoke unit test failures where we used addresses like that to force tor_addr_lookup() to fail. The fix, for testing, is to mock tor_addr_lookup() with a variant that always fails when it gets a name with a !. Fixes bugs 20862 and 20863. --- changes/bug20862 | 6 ++++++ src/test/test_config.c | 4 ++++ src/test/test_controller.c | 5 ++++- src/test/test_helpers.c | 15 +++++++++++++++ src/test/test_helpers.h | 3 +++ src/test/test_options.c | 11 +++++++++-- 6 files changed, 41 insertions(+), 3 deletions(-) diff --git a/changes/bug20862 b/changes/bug20862 new file mode 100644 index 0000000..fba98c8 --- /dev/null +++ b/changes/bug20862 @@ -0,0 +1,6 @@ + o Minor bugfixes (unit tests): + - Allow the unit tests to pass even when DNS lookups of bogus + addresses do not fail as expected. Fixes bug 20862 and 20863; + bugfix on unit tests introduced in 0.2.8.1-alpha through + 0.2.9.4-alpha. + diff --git a/src/test/test_config.c b/src/test/test_config.c index a540bcc..eeda34e 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -46,6 +46,8 @@ #include "transports.h" #include "util.h" +#include "test_helpers.h" + static void test_config_addressmap(void *arg) { @@ -4701,8 +4703,10 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test failure when asked to parse an invalid address followed by auto config_free_lines(config_port_invalid); config_port_invalid = NULL; config_port_invalid = mock_config_line("DNSPort", "invalidstuff!!:auto"); + MOCK(tor_addr_lookup, mock_tor_addr_lookup__fail_on_bad_addrs); ret = parse_port_config(NULL, config_port_invalid, NULL, "DNS", 0, "127.0.0.46", 0, 0); + UNMOCK(tor_addr_lookup); tt_int_op(ret, OP_EQ, -1); // Test success with parsing both an address and a real port diff --git a/src/test/test_controller.c b/src/test/test_controller.c index 4e65d76..d9c0a1e 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -10,6 +10,7 @@ #include "rendservice.h" #include "routerlist.h" #include "test.h" +#include "test_helpers.h" static void test_add_onion_helper_keyarg(void *arg) @@ -186,8 +187,10 @@ test_rend_service_parse_port_config(void *arg) tor_free(err_msg); /* bogus IP address */ - cfg = rend_service_parse_port_config("100 1.2.3.4.5:9000", + MOCK(tor_addr_lookup, mock_tor_addr_lookup__fail_on_bad_addrs); + cfg = rend_service_parse_port_config("100 foo!!.example.com:9000", " ", &err_msg); + UNMOCK(tor_addr_lookup); tt_assert(!cfg); tt_str_op(err_msg, OP_EQ, "Unparseable address in hidden service port " "configuration."); diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index 132af39..5b84366 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -128,3 +128,18 @@ dummy_origin_circuit_new(int n_cells) return TO_CIRCUIT(circ); } +/** Mock-replacement. As tor_addr_lookup, but always fails on any + * address containing a !. This is necessary for running the unit tests + * on networks where DNS hijackers think it's helpful to give answers + * for things like 1.2.3.4.5 or "invalidstuff!!" + */ +int +mock_tor_addr_lookup__fail_on_bad_addrs(const char *name, + uint16_t family, tor_addr_t *out) +{ + if (name && strchr(name, '!')) { + return -1; + } + return tor_addr_lookup__real(name, family, out); +} + diff --git a/src/test/test_helpers.h b/src/test/test_helpers.h index ba93b10..c6d4d9c 100644 --- a/src/test/test_helpers.h +++ b/src/test/test_helpers.h @@ -17,6 +17,9 @@ void helper_setup_fake_routerlist(void); void connection_write_to_buf_mock(const char *string, size_t len, connection_t *conn, int zlib); +int mock_tor_addr_lookup__fail_on_bad_addrs(const char *name, + uint16_t family, tor_addr_t *out); + extern const char TEST_DESCRIPTORS[]; #endif diff --git a/src/test/test_options.c b/src/test/test_options.c index e85e118..3fe0dc3 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -18,6 +18,7 @@ #include "sandbox.h" #include "memarea.h" #include "policies.h" +#include "test_helpers.h" #define NS_MODULE test_options @@ -648,18 +649,21 @@ test_options_validate__authdir(void *ignored) int ret; char *msg; setup_capture_of_logs(LOG_INFO); + // XXXX But it _can_ exist, if you're DNS-hijacked. options_test_data_t *tdata = get_options_test_data( "AuthoritativeDirectory 1\n" - "Address this.should.not_exist.example.org"); + "Address this.should.not!exist!.example.org"); sandbox_disable_getaddrinfo_cache(); + MOCK(tor_addr_lookup, mock_tor_addr_lookup__fail_on_bad_addrs); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); + UNMOCK(tor_addr_lookup); tt_int_op(ret, OP_EQ, -1); tt_str_op(msg, OP_EQ, "Failed to resolve/guess local address. See logs for" " details."); expect_log_msg("Could not resolve local Address " - "'this.should.not_exist.example.org'. Failing.\n"); + "'this.should.not!exist!.example.org'. Failing.\n"); tor_free(msg); free_options_test_data(tdata); @@ -3037,6 +3041,7 @@ test_options_validate__proxy(void *ignored) options_test_data_t *tdata = NULL; sandbox_disable_getaddrinfo_cache(); setup_capture_of_logs(LOG_WARN); + MOCK(tor_addr_lookup, mock_tor_addr_lookup__fail_on_bad_addrs); free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES @@ -3057,6 +3062,7 @@ test_options_validate__proxy(void *ignored) tor_free(msg); free_options_test_data(tdata); + tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "HttpProxy not_so_valid!\n" ); @@ -3357,6 +3363,7 @@ test_options_validate__proxy(void *ignored) policies_free_all(); // sandbox_free_getaddrinfo_cache(); tor_free(msg); + UNMOCK(tor_addr_lookup); } static void

1 0