aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-11-05 09:47:32 -0500
committerNick Mathewson <nickm@torproject.org>2020-11-05 09:47:32 -0500
commit4154158d79452a5026c25750fae220a529c00fa3 (patch)
tree75a0a7603a34988421b6f30a12cc821b30cdb44b /src/test/test_config.c
parent4876409c2aa7deecd5f57474ee6de6ea9e90a855 (diff)
downloadtor-4154158d79452a5026c25750fae220a529c00fa3.tar.gz
tor-4154158d79452a5026c25750fae220a529c00fa3.zip
Make config/parse_tcp_proxy_line work in the presence of DNS hijacking
We can use our existing mocking functionality to do this: We have been in this position before. Fixes part of #40179; bugfix on 0.4.3.1-alpha.
Diffstat (limited to 'src/test/test_config.c')
-rw-r--r--src/test/test_config.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c
index ae3f04de11..8ea744d4fd 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -703,11 +703,13 @@ test_config_parse_tcp_proxy_line(void *arg)
tor_free(msg);
/* 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_str_op(msg, OP_EQ, "TCPProxy address/port failed to parse or resolve. "
"Please fix.");
tor_free(msg);
+ UNMOCK(tor_addr_lookup);
/* Good TCPProxy line - ipv4. */
ret = parse_tcp_proxy_line("haproxy 95.216.163.36:443", options, &msg);
@@ -720,7 +722,7 @@ test_config_parse_tcp_proxy_line(void *arg)
tor_free(msg);
done:
- ;
+ UNMOCK(tor_addr_lookup);
}
/**