tor

commit 9bc0306b8c8675472a6335e9dc1c0a90438444f8
parent 6ce2550468b3ffdbe1c3bbbdaff39d8382622336
Author: Alexander Færøy <ahf@torproject.org>
Date:   Thu, 19 Nov 2020 17:44:00 +0000

Merge branch 'maint-0.4.5'

Diffstat:
A
changes/bug40179_part2
 | 
4
++++
M
src/test/test_config.c
 | 
6
++++--

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changes/bug40179_part2 b/changes/bug40179_part2
@@ -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.
diff --git a/src/test/test_config.c b/src/test/test_config.c
@@ -706,11 +706,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);
@@ -723,7 +725,7 @@ test_config_parse_tcp_proxy_line(void *arg)
   tor_free(msg);
 
  done:
-  ;
+  UNMOCK(tor_addr_lookup);
 }
 
 /**