nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.3' into maint-0.4.4

Browse Source
This commit is contained in:
Alexander Færøy 2020-11-19 17:43:59 +00:00
commit 77bb4b0838
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug40179_part2 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (testing):
- Fix the config/parse_tcp_proxy_line test so that it works correctly on
systems where the DNS provider hijacks invalid queries.
Fixes part of bug 40179; bugfix on 0.4.3.1-alpha.

6
src/test/test_config.c
View File

@ -705,11 +705,13 @@ test_config_parse_tcp_proxy_line(void *arg)
tor_free(msg); tor_free(msg);
/* Bad TCPProxy line - unparsable address/port. */ /* Bad TCPProxy line - unparsable address/port. */
ret = parse_tcp_proxy_line("haproxy 95.216.163.36/443", options, &msg); MOCK(tor_addr_lookup, mock_tor_addr_lookup__fail_on_bad_addrs);
ret = parse_tcp_proxy_line("haproxy bogus_address!/300", options, &msg);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
tt_str_op(msg, OP_EQ, "TCPProxy address/port failed to parse or resolve. " tt_str_op(msg, OP_EQ, "TCPProxy address/port failed to parse or resolve. "
"Please fix."); "Please fix.");
tor_free(msg); tor_free(msg);
UNMOCK(tor_addr_lookup);
/* Good TCPProxy line - ipv4. */ /* Good TCPProxy line - ipv4. */
ret = parse_tcp_proxy_line("haproxy 95.216.163.36:443", options, &msg); ret = parse_tcp_proxy_line("haproxy 95.216.163.36:443", options, &msg);
@ -722,7 +724,7 @@ test_config_parse_tcp_proxy_line(void *arg)
tor_free(msg); tor_free(msg);
done: done:
; UNMOCK(tor_addr_lookup);
} }
/** /**