nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-15 07:43:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
9dd04396ba
tor/src/test/test_config.c

6185 lines
213 KiB
C
Raw Normal View History

bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
/* Copyright (c) 2001-2004, Roger Dingledine.
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
Bump copyright date to 2019
2019-01-16 18:33:22 +01:00
* Copyright (c) 2007-2019, The Tor Project, Inc. */
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
/* See LICENSE for licensing information */
#include "orconfig.h"
Fix warnings in test_config_fix_my_family
2013-09-03 19:35:44 +02:00
#define CONFIG_PRIVATE
Fix a bunch of memory leaks in the unit tests. Found with valgrind
2014-12-22 18:27:26 +01:00
#define PT_PRIVATE
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
#define ROUTERSET_PRIVATE
Fix every include path changed in the previous commit (automated) I am very glad to have written this script.
2018-07-05 22:34:59 +02:00
#include "core/or/or.h"
rectify include paths (automatic) for address.h
2018-06-27 15:13:04 +02:00
#include "lib/net/address.h"
Isolate resolve.h usage in the modules that really need it. (Almost none of Tor should actually need to touch the platform resolver.)
2018-07-10 19:36:45 +02:00
#include "lib/net/resolve.h"
Fix every include path changed in the previous commit (automated) I am very glad to have written this script.
2018-07-05 22:34:59 +02:00
#include "feature/client/addressmap.h"
#include "feature/client/bridges.h"
#include "core/or/circuitmux_ewma.h"
#include "core/or/circuitbuild.h"
#include "app/config/config.h"
Update #includes to point to confparse.h in its new location. This commit was automatically generated by running scripts/maint/rectify_include_paths.py .
2019-09-11 16:17:20 +02:00
#include "lib/confmgt/confparse.h"
Fix every include path changed in the previous commit (automated) I am very glad to have written this script.
2018-07-05 22:34:59 +02:00
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h"
Run rectify_include_paths.py
2018-06-20 15:35:05 +02:00
#include "test/test.h"
Fix every include path changed in the previous commit (automated) I am very glad to have written this script.
2018-07-05 22:34:59 +02:00
#include "core/or/connection_or.h"
#include "feature/control/control.h"
#include "core/mainloop/cpuworker.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirauth/dirvote.h"
#include "feature/relay/dns.h"
#include "feature/client/entrynodes.h"
#include "feature/client/transports.h"
#include "feature/relay/ext_orport.h"
Extract the non-stats part of geoip into a new src/lib/geoip.
2018-09-27 16:26:01 +02:00
#include "lib/geoip/geoip.h"
Fix every include path changed in the previous commit (automated) I am very glad to have written this script.
2018-07-05 22:34:59 +02:00
#include "feature/hibernate/hibernate.h"
Split main.c into main.c and mainloop.c The main.c code is responsible for initialization and shutdown; the mainloop.c code is responsible for running the main loop of Tor. Splitting the "generic event loop" part of mainloop.c from the event-loop-specific part is not done as part of this patch.
2018-09-20 21:19:43 +02:00
#include "core/mainloop/mainloop.h"
Fix every include path changed in the previous commit (automated) I am very glad to have written this script.
2018-07-05 22:34:59 +02:00
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/policies.h"
#include "feature/rend/rendclient.h"
#include "feature/rend/rendservice.h"
#include "feature/relay/router.h"
Extract all the "am I a server" functions from router.c
2018-09-25 22:00:50 +02:00
#include "feature/relay/routermode.h"
Split routerlist.c into 4 separate modules There are now separate modules for: * the list of router descriptors * the list of authorities and fallbacks * managing authority certificates * selecting random nodes
2018-09-19 20:10:15 +02:00
#include "feature/nodelist/dirlist.h"
Fix every include path changed in the previous commit (automated) I am very glad to have written this script.
2018-07-05 22:34:59 +02:00
#include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerset.h"
#include "app/config/statefile.h"
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
Run rectify_include_paths.py
2018-06-20 15:35:05 +02:00
#include "test/test_helpers.h"
Use {mock,unmock}_hostname_resolver() in relevant tests These tests all invoke the hostname resolver in one way or another, and therefore potentially block if our DNS server is missing, absent, or extremely slow. Closes ticket 31841.
2019-10-03 14:57:14 +02:00
#include "test/resolve_test_helpers.h"
Move dir_server_t into its own header.
2018-06-14 22:58:01 +02:00
Fix every include path changed in the previous commit (automated) I am very glad to have written this script.
2018-07-05 22:34:59 +02:00
#include "feature/dirclient/dir_server_st.h"
#include "core/or/port_cfg_st.h"
#include "feature/nodelist/routerinfo_st.h"
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.
2017-01-03 16:11:23 +01:00
Fix the include paths for storagedir,conffile (automated)
2018-06-28 15:42:33 +02:00
#include "lib/fs/conffile.h"
Move fd and memory-info functions.
2018-06-29 15:44:39 +02:00
#include "lib/meminfo/meminfo.h"
Move tor_gethostname to lib/net
2018-06-28 17:57:01 +02:00
#include "lib/net/gethostname.h"
Remove needless includes from or.h or.h should really include only the minimum of stuff from or/*, common/*, and lib/*.
2018-07-01 17:32:11 +02:00
#include "lib/encoding/confline.h"
Add code to parse K=V lines into config_line_t format. Closes ticket 28755
2018-12-06 20:13:29 +01:00
#include "lib/encoding/kvline.h"
Split confline into confline and conffile. The "conffile" module knows about includes and filesystem access, whereas confline doesn't. This will make it possible to put these functions into libraries without introducing a cycle.
2018-06-27 22:43:01 +02:00
Remove system headers from or.h
2018-07-01 21:02:01 +02:00
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
static void
No new "LEGACY" tests allowed.
2011-09-08 17:19:06 +02:00
test_config_addressmap(void *arg)
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
{
char buf[1024];
char address[256];
time_t expires = TIME_MAX;
No new "LEGACY" tests allowed.
2011-09-08 17:19:06 +02:00
(void)arg;
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
strlcpy(buf, "MapAddress .invalidwildcard.com *.torserver.exit\n" // invalid
"MapAddress *invalidasterisk.com *.torserver.exit\n" // invalid
"MapAddress *.google.com *.torserver.exit\n"
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2010-12-13 23:13:01 +01:00
"MapAddress *.yahoo.com *.google.com.torserver.exit\n"
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
"MapAddress *.cn.com www.cnn.com\n"
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2010-12-13 23:13:01 +01:00
"MapAddress *.cnn.com www.cnn.com\n"
"MapAddress ex.com www.cnn.com\n"
"MapAddress ey.com *.cnn.com\n"
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
"MapAddress www.torproject.org 1.1.1.1\n"
"MapAddress other.torproject.org "
"this.torproject.org.otherserver.exit\n"
"MapAddress test.torproject.org 2.2.2.2\n"
"MapAddress www.google.com 3.3.3.3\n"
"MapAddress www.example.org 4.4.4.4\n"
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
"MapAddress 4.4.4.4 7.7.7.7\n"
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
"MapAddress 4.4.4.4 5.5.5.5\n"
"MapAddress www.infiniteloop.org 6.6.6.6\n"
"MapAddress 6.6.6.6 www.infiniteloop.org\n"
, sizeof(buf));
Merge branch 'bug933_nm_rebased_v2' Conflicts: src/test/test.c
2011-11-30 20:10:22 +01:00
config_get_lines(buf, &(get_options_mutable()->AddressMap), 0);
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
config_register_addressmaps(get_options());
Implement option to turn off DNS cache use on a client port (This is part 2 of making DNS cache use enabled/disabled on a per-client port basis. This implements the CacheIPv[46]DNS options, but not the UseCachedIPv[46] ones.)
2012-11-25 19:45:36 +01:00
/* Use old interface for now, so we don't need to rewrite the unit tests */
#define addressmap_rewrite(a,s,eo,ao) \
Allow MapAddress and Automap to work together The trick here is to apply mapaddress first, and only then apply automapping. Otherwise, the automap checks don't get done. Fix for bug 7555; bugfix on all versions of Tor supporting both MapAddress and AutoMap.
2014-04-09 00:02:03 +02:00
addressmap_rewrite((a),(s), ~0, (eo),(ao))
Implement option to turn off DNS cache use on a client port (This is part 2 of making DNS cache use enabled/disabled on a per-client port basis. This implements the CacheIPv[46]DNS options, but not the UseCachedIPv[46] ones.)
2012-11-25 19:45:36 +01:00
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
/* MapAddress .invalidwildcard.com .torserver.exit - no match */
strlcpy(address, "www.invalidwildcard.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
/* MapAddress *invalidasterisk.com .torserver.exit - no match */
strlcpy(address, "www.invalidasterisk.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
/* Where no mapping for FQDN match on top-level domain */
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2010-12-13 23:13:01 +01:00
/* MapAddress .google.com .torserver.exit */
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "reader.google.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "reader.torserver.exit");
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2010-12-13 23:13:01 +01:00
/* MapAddress *.yahoo.com *.google.com.torserver.exit */
strlcpy(address, "reader.yahoo.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "reader.google.com.torserver.exit");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2010-12-13 23:13:01 +01:00
/*MapAddress *.cnn.com www.cnn.com */
strlcpy(address, "cnn.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "www.cnn.com");
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2010-12-13 23:13:01 +01:00
/* MapAddress .cn.com www.cnn.com */
strlcpy(address, "www.cn.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "www.cnn.com");
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2010-12-13 23:13:01 +01:00
/* MapAddress ex.com www.cnn.com - no match */
strlcpy(address, "www.ex.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2010-12-13 23:13:01 +01:00
/* MapAddress ey.com *.cnn.com - invalid expression */
strlcpy(address, "ey.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2010-12-13 23:13:01 +01:00
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
/* Where mapping for FQDN match on FQDN */
strlcpy(address, "www.google.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "3.3.3.3");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "www.torproject.org", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "1.1.1.1");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "other.torproject.org", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "this.torproject.org.otherserver.exit");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "test.torproject.org", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "2.2.2.2");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
/* Test a chain of address mappings and the order in which they were added:
"MapAddress www.example.org 4.4.4.4"
"MapAddress 4.4.4.4 7.7.7.7"
"MapAddress 4.4.4.4 5.5.5.5"
*/
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "www.example.org", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "5.5.5.5");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
/* Test infinite address mapping results in no change */
strlcpy(address, "www.infiniteloop.org", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "www.infiniteloop.org");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
/* Test we don't find false positives */
strlcpy(address, "www.example.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
/* Test top-level-domain matching a bit harder */
Memory leaks in test_config_addressmap
2014-04-26 06:27:21 +02:00
config_free_lines(get_options_mutable()->AddressMap);
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
addressmap_clear_configured();
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
strlcpy(buf, "MapAddress *.com *.torserver.exit\n"
"MapAddress *.torproject.org 1.1.1.1\n"
"MapAddress *.net 2.2.2.2\n"
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
, sizeof(buf));
Merge branch 'bug933_nm_rebased_v2' Conflicts: src/test/test.c
2011-11-30 20:10:22 +01:00
config_get_lines(buf, &(get_options_mutable()->AddressMap), 0);
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
config_register_addressmaps(get_options());
strlcpy(address, "www.abc.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "www.abc.torserver.exit");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "www.def.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "www.def.torserver.exit");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "www.torproject.org", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "1.1.1.1");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "test.torproject.org", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "1.1.1.1");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "torproject.net", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(address,OP_EQ, "2.2.2.2");
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
/* We don't support '*' as a mapping directive */
Memory leaks in test_config_addressmap
2014-04-26 06:27:21 +02:00
config_free_lines(get_options_mutable()->AddressMap);
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
addressmap_clear_configured();
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2010-12-27 18:35:16 +01:00
strlcpy(buf, "MapAddress * *.torserver.exit\n", sizeof(buf));
Merge branch 'bug933_nm_rebased_v2' Conflicts: src/test/test.c
2011-11-30 20:10:22 +01:00
config_get_lines(buf, &(get_options_mutable()->AddressMap), 0);
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
config_register_addressmaps(get_options());
strlcpy(address, "www.abc.com", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "www.def.net", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
strlcpy(address, "www.torproject.org", sizeof(address));
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
Implement option to turn off DNS cache use on a client port (This is part 2 of making DNS cache use enabled/disabled on a per-client port basis. This implements the CacheIPv[46]DNS options, but not the UseCachedIPv[46] ones.)
2012-11-25 19:45:36 +01:00
#undef addressmap_rewrite
Appease check-spaces
2011-12-02 06:16:47 +01:00
done:
Memory leaks in test_config_addressmap
2014-04-26 06:27:21 +02:00
config_free_lines(get_options_mutable()->AddressMap);
get_options_mutable()->AddressMap = NULL;
Try to fix some more memory leaks in the unit tests
2015-01-23 17:35:05 +01:00
addressmap_free_all();
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
}
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
static int
is_private_dir(const char* path)
{
struct stat st;
int r = stat(path, &st);
if (r) {
return 0;
}
Remove code for Windows CE support As far as I know, nobody has used this in ages. It would be a pretty big surprise if it had worked. Closes ticket 11446.
2014-06-20 15:49:36 +02:00
#if !defined (_WIN32)
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
if ((st.st_mode & (S_IFDIR | 0777)) != (S_IFDIR | 0700)) {
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
return 0;
}
#endif
return 1;
}
static void
test_config_check_or_create_data_subdir(void *arg)
{
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
or_options_t *options = get_options_mutable();
Fix leaks in tests related to setting options->DataDirectory We pre-populate that value in main(), and we weren't freeing it before overriding it.
2014-04-26 20:48:30 +02:00
char *datadir;
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
const char *subdir = "test_stats";
Fix leaks in tests related to setting options->DataDirectory We pre-populate that value in main(), and we weren't freeing it before overriding it.
2014-04-26 20:48:30 +02:00
char *subpath;
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
struct stat st;
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
int r;
Remove code for Windows CE support As far as I know, nobody has used this in ages. It would be a pretty big surprise if it had worked. Closes ticket 11446.
2014-06-20 15:49:36 +02:00
#if !defined (_WIN32)
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
unsigned group_permission;
Fix windows compilation warning in test_config.c bugfix on 78cc5833a1da038331186ddf07f4add7f8f1094b; bug not in any released Tor. Spotted by weasel using Jenkins.
2013-05-29 18:08:28 +02:00
#endif
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
(void)arg;
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
Fix leaks in tests related to setting options->DataDirectory We pre-populate that value in main(), and we weren't freeing it before overriding it.
2014-04-26 20:48:30 +02:00
tor_free(options->DataDirectory);
datadir = options->DataDirectory = tor_strdup(get_fname("datadir-0"));
subpath = get_datadir_fname(subdir);
Remove code for Windows CE support As far as I know, nobody has used this in ages. It would be a pretty big surprise if it had worked. Closes ticket 11446.
2014-06-20 15:49:36 +02:00
#if defined (_WIN32)
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_int_op(mkdir(options->DataDirectory), OP_EQ, 0);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
#else
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_int_op(mkdir(options->DataDirectory, 0700), OP_EQ, 0);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
#endif
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
r = stat(subpath, &st);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
// The subdirectory shouldn't exist yet,
// but should be created by the call to check_or_create_data_subdir.
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(r && (errno == ENOENT));
tt_assert(!check_or_create_data_subdir(subdir));
tt_assert(is_private_dir(subpath));
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
// The check should return 0, if the directory already exists
// and is private to the user.
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!check_or_create_data_subdir(subdir));
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
Restitute a successful stat call to this test case. Since the first stat call is made for it to deliberately fail, and we reference st.st_mode without st having valid data, st.st_mode can contain garbage and cause chmod to fail with EINVAL. We rerun stat and ensure it succeeded. Also make use of tt_abort_perror, to properly convey failure reasons to the user.
2014-02-15 11:48:58 +01:00
r = stat(subpath, &st);
if (r) {
tt_abort_perror("stat");
}
Remove code for Windows CE support As far as I know, nobody has used this in ages. It would be a pretty big surprise if it had worked. Closes ticket 11446.
2014-06-20 15:49:36 +02:00
#if !defined (_WIN32)
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
group_permission = st.st_mode | 0070;
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
r = chmod(subpath, group_permission);
if (r) {
Restitute a successful stat call to this test case. Since the first stat call is made for it to deliberately fail, and we reference st.st_mode without st having valid data, st.st_mode can contain garbage and cause chmod to fail with EINVAL. We rerun stat and ensure it succeeded. Also make use of tt_abort_perror, to properly convey failure reasons to the user.
2014-02-15 11:48:58 +01:00
tt_abort_perror("chmod");
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
}
// If the directory exists, but its mode is too permissive
// a call to check_or_create_data_subdir should reset the mode.
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!is_private_dir(subpath));
tt_assert(!check_or_create_data_subdir(subdir));
tt_assert(is_private_dir(subpath));
Run our #else/#endif annotator on our source code.
2017-09-15 22:24:44 +02:00
#endif /* !defined (_WIN32) */
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
done:
rmdir(subpath);
tor_free(datadir);
Fix a couple of resource leaks in test_config.c Spotted by Coverity Scan. Not in any released Tor.
2013-06-18 17:28:30 +02:00
tor_free(subpath);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
}
static void
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
test_config_write_to_data_subdir(void *arg)
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
{
or_options_t* options = get_options_mutable();
Fix leaks in tests related to setting options->DataDirectory We pre-populate that value in main(), and we weren't freeing it before overriding it.
2014-04-26 20:48:30 +02:00
char *datadir;
Free leakable values in the unit tests. Thanks, Coverity! (CID 1171414, 1171415, 1171416)
2014-02-12 00:10:33 +01:00
char *cp = NULL;
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
const char* subdir = "test_stats";
const char* fname = "test_file";
const char* str =
"Lorem ipsum dolor sit amet, consetetur sadipscing\n"
"elitr, sed diam nonumy eirmod\n"
"tempor invidunt ut labore et dolore magna aliquyam\n"
"erat, sed diam voluptua.\n"
"At vero eos et accusam et justo duo dolores et ea\n"
"rebum. Stet clita kasd gubergren,\n"
"no sea takimata sanctus est Lorem ipsum dolor sit amet.\n"
"Lorem ipsum dolor sit amet,\n"
"consetetur sadipscing elitr, sed diam nonumy eirmod\n"
"tempor invidunt ut labore et dolore\n"
"magna aliquyam erat, sed diam voluptua. At vero eos et\n"
"accusam et justo duo dolores et\n"
"ea rebum. Stet clita kasd gubergren, no sea takimata\n"
"sanctus est Lorem ipsum dolor sit amet.";
Fix test_config_write_to_data_subdir Bugfix on aa0eb2022342798fc78b2bde89d393f37c59fe78; bugfix not on any released Tor.
2014-05-01 19:27:20 +02:00
char* filepath = NULL;
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
(void)arg;
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
Fix leaks in tests related to setting options->DataDirectory We pre-populate that value in main(), and we weren't freeing it before overriding it.
2014-04-26 20:48:30 +02:00
tor_free(options->DataDirectory);
datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1"));
Fix test_config_write_to_data_subdir Bugfix on aa0eb2022342798fc78b2bde89d393f37c59fe78; bugfix not on any released Tor.
2014-05-01 19:27:20 +02:00
filepath = get_datadir_fname2(subdir, fname);
Fix leaks in tests related to setting options->DataDirectory We pre-populate that value in main(), and we weren't freeing it before overriding it.
2014-04-26 20:48:30 +02:00
Remove code for Windows CE support As far as I know, nobody has used this in ages. It would be a pretty big surprise if it had worked. Closes ticket 11446.
2014-06-20 15:49:36 +02:00
#if defined (_WIN32)
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_int_op(mkdir(options->DataDirectory), OP_EQ, 0);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
#else
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_int_op(mkdir(options->DataDirectory, 0700), OP_EQ, 0);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
#endif
Fix spelling mistakes corresponding to ticket #23650
2018-01-24 09:55:15 +01:00
// Write attempt should fail, if subdirectory doesn't exist.
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(write_to_data_subdir(subdir, fname, str, NULL));
tt_assert(! check_or_create_data_subdir(subdir));
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
// Content of file after write attempt should be
// equal to the original string.
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!write_to_data_subdir(subdir, fname, str, NULL));
Free leakable values in the unit tests. Thanks, Coverity! (CID 1171414, 1171415, 1171416)
2014-02-12 00:10:33 +01:00
cp = read_file_to_str(filepath, 0, NULL);
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(cp,OP_EQ, str);
Free leakable values in the unit tests. Thanks, Coverity! (CID 1171414, 1171415, 1171416)
2014-02-12 00:10:33 +01:00
tor_free(cp);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
// A second write operation should overwrite the old content.
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(!write_to_data_subdir(subdir, fname, str, NULL));
Free leakable values in the unit tests. Thanks, Coverity! (CID 1171414, 1171415, 1171416)
2014-02-12 00:10:33 +01:00
cp = read_file_to_str(filepath, 0, NULL);
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(cp,OP_EQ, str);
Free leakable values in the unit tests. Thanks, Coverity! (CID 1171414, 1171415, 1171416)
2014-02-12 00:10:33 +01:00
tor_free(cp);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
done:
Check more return values in the unit tests
2013-06-18 18:31:03 +02:00
(void) unlink(filepath);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
rmdir(options->DataDirectory);
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
tor_free(datadir);
Fix a couple of resource leaks in test_config.c Spotted by Coverity Scan. Not in any released Tor.
2013-06-18 17:28:30 +02:00
tor_free(filepath);
Free leakable values in the unit tests. Thanks, Coverity! (CID 1171414, 1171415, 1171416)
2014-02-12 00:10:33 +01:00
tor_free(cp);
Unit tests for check_or_create_data_subdir and write_to_data_subdir.
2013-02-02 01:40:41 +01:00
}
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
/* Test helper function: Make sure that a bridge line gets parsed
* properly. Also make sure that the resulting bridge_line_t structure
* has its fields set correctly. */
static void
good_bridge_line_test(const char *string, const char *test_addrport,
const char *test_digest, const char *test_transport,
const smartlist_t *test_socks_args)
{
char *tmp = NULL;
bridge_line_t *bridge_line = parse_bridge_line(string);
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(bridge_line);
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
/* test addrport */
tmp = tor_strdup(fmt_addrport(&bridge_line->addr, bridge_line->port));
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(test_addrport,OP_EQ, tmp);
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
tor_free(tmp);
/* If we were asked to validate a digest, but we did not get a
digest after parsing, we failed. */
if (test_digest && tor_digest_is_zero(bridge_line->digest))
apply ahf's test_assert_zero.cocci
2017-08-24 21:34:34 +02:00
tt_abort();
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
/* If we were not asked to validate a digest, and we got a digest
after parsing, we failed again. */
if (!test_digest && !tor_digest_is_zero(bridge_line->digest))
apply ahf's test_assert_zero.cocci
2017-08-24 21:34:34 +02:00
tt_abort();
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
/* If we were asked to validate a digest, and we got a digest after
parsing, make sure it's correct. */
if (test_digest) {
tmp = tor_strdup(hex_str(bridge_line->digest, DIGEST_LEN));
tor_strlower(tmp);
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(test_digest,OP_EQ, tmp);
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
tor_free(tmp);
}
/* If we were asked to validate a transport name, make sure tha it
matches with the transport name that was parsed. */
if (test_transport && !bridge_line->transport_name)
apply ahf's test_assert_zero.cocci
2017-08-24 21:34:34 +02:00
tt_abort();
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
if (!test_transport && bridge_line->transport_name)
apply ahf's test_assert_zero.cocci
2017-08-24 21:34:34 +02:00
tt_abort();
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
if (test_transport)
Replace operators used as macro arguments with OP_XX macros Part of fix for 13172
2014-11-12 19:28:07 +01:00
tt_str_op(test_transport,OP_EQ, bridge_line->transport_name);
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
/* Validate the SOCKS argument smartlist. */
if (test_socks_args && !bridge_line->socks_args)
apply ahf's test_assert_zero.cocci
2017-08-24 21:34:34 +02:00
tt_abort();
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
if (!test_socks_args && bridge_line->socks_args)
apply ahf's test_assert_zero.cocci
2017-08-24 21:34:34 +02:00
tt_abort();
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
if (test_socks_args)
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(smartlist_strings_eq(test_socks_args,
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
bridge_line->socks_args));
done:
tor_free(tmp);
bridge_line_free(bridge_line);
}
/* Test helper function: Make sure that a bridge line is
* unparseable. */
static void
bad_bridge_line_test(const char *string)
{
bridge_line_t *bridge_line = parse_bridge_line(string);
test_config.c: log which address should have failed
2014-02-03 22:21:32 +01:00
if (bridge_line)
TT_FAIL(("%s was supposed to fail, but it didn't.", string));
apply ahf's test_assert_null.cocci
2017-08-24 21:55:27 +02:00
tt_ptr_op(bridge_line, OP_EQ, NULL);
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
done:
bridge_line_free(bridge_line);
}
static void
test_config_parse_bridge_line(void *arg)
{
(void) arg;
good_bridge_line_test("192.0.2.1:4123",
"192.0.2.1:4123", NULL, NULL, NULL);
good_bridge_line_test("192.0.2.1",
"192.0.2.1:443", NULL, NULL, NULL);
good_bridge_line_test("transport [::1]",
"[::1]:443", NULL, "transport", NULL);
good_bridge_line_test("transport 192.0.2.1:12 "
"4352e58420e68f5e40bf7c74faddccd9d1349413",
"192.0.2.1:12",
"4352e58420e68f5e40bf7c74faddccd9d1349413",
"transport", NULL);
{
smartlist_t *sl_tmp = smartlist_new();
smartlist_add_asprintf(sl_tmp, "twoandtwo=five");
good_bridge_line_test("transport 192.0.2.1:12 "
"4352e58420e68f5e40bf7c74faddccd9d1349413 twoandtwo=five",
"192.0.2.1:12", "4352e58420e68f5e40bf7c74faddccd9d1349413",
"transport", sl_tmp);
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
smartlist_free(sl_tmp);
}
{
smartlist_t *sl_tmp = smartlist_new();
smartlist_add_asprintf(sl_tmp, "twoandtwo=five");
smartlist_add_asprintf(sl_tmp, "z=z");
good_bridge_line_test("transport 192.0.2.1:12 twoandtwo=five z=z",
"192.0.2.1:12", NULL, "transport", sl_tmp);
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
smartlist_free(sl_tmp);
Add another unit test for parse_bridge_line().
2014-04-11 20:06:40 +02:00
}
{
smartlist_t *sl_tmp = smartlist_new();
smartlist_add_asprintf(sl_tmp, "dub=come");
smartlist_add_asprintf(sl_tmp, "save=me");
good_bridge_line_test("transport 192.0.2.1:12 "
"4352e58420e68f5e40bf7c74faddccd9d1349666 "
"dub=come save=me",
"192.0.2.1:12",
"4352e58420e68f5e40bf7c74faddccd9d1349666",
"transport", sl_tmp);
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
smartlist_free(sl_tmp);
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
}
good_bridge_line_test("192.0.2.1:1231 "
"4352e58420e68f5e40bf7c74faddccd9d1349413",
"192.0.2.1:1231",
"4352e58420e68f5e40bf7c74faddccd9d1349413",
NULL, NULL);
/* Empty line */
bad_bridge_line_test("");
/* bad transport name */
bad_bridge_line_test("tr$n_sp0r7 190.20.2.2");
/* weird ip address */
bad_bridge_line_test("a.b.c.d");
/* invalid fpr */
bad_bridge_line_test("2.2.2.2:1231 4352e58420e68f5e40bf7c74faddccd9d1349");
/* no k=v in the end */
bad_bridge_line_test("obfs2 2.2.2.2:1231 "
"4352e58420e68f5e40bf7c74faddccd9d1349413 what");
/* no addrport */
bad_bridge_line_test("asdw");
/* huge k=v value that can't fit in SOCKS fields */
bad_bridge_line_test(
"obfs2 2.2.2.2:1231 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aa=b");
}
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
static void
test_config_parse_transport_options_line(void *arg)
{
Fix memory leaks in test_config_parse_transport_options_line
2013-07-15 19:26:47 +02:00
smartlist_t *options_sl = NULL, *sl_tmp = NULL;
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
(void) arg;
{ /* too small line */
options_sl = get_options_from_transport_options_line("valley", NULL);
apply ahf's test_assert_null.cocci
2017-08-24 21:55:27 +02:00
tt_ptr_op(options_sl, OP_EQ, NULL);
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
}
{ /* no k=v values */
options_sl = get_options_from_transport_options_line("hit it!", NULL);
apply ahf's test_assert_null.cocci
2017-08-24 21:55:27 +02:00
tt_ptr_op(options_sl, OP_EQ, NULL);
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
}
{ /* correct line, but wrong transport specified */
options_sl =
get_options_from_transport_options_line("trebuchet k=v", "rook");
apply ahf's test_assert_null.cocci
2017-08-24 21:55:27 +02:00
tt_ptr_op(options_sl, OP_EQ, NULL);
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
}
{ /* correct -- no transport specified */
Fix memory leaks in test_config_parse_transport_options_line
2013-07-15 19:26:47 +02:00
sl_tmp = smartlist_new();
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
smartlist_add_asprintf(sl_tmp, "ladi=dadi");
smartlist_add_asprintf(sl_tmp, "weliketo=party");
options_sl =
get_options_from_transport_options_line("rook ladi=dadi weliketo=party",
NULL);
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(options_sl);
tt_assert(smartlist_strings_eq(options_sl, sl_tmp));
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
smartlist_free(sl_tmp);
Fix memory leaks in test_config_parse_transport_options_line
2013-07-15 19:26:47 +02:00
sl_tmp = NULL;
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s));
smartlist_free(options_sl);
Fix memory leaks in test_config_parse_transport_options_line
2013-07-15 19:26:47 +02:00
options_sl = NULL;
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
}
{ /* correct -- correct transport specified */
Fix memory leaks in test_config_parse_transport_options_line
2013-07-15 19:26:47 +02:00
sl_tmp = smartlist_new();
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
smartlist_add_asprintf(sl_tmp, "ladi=dadi");
smartlist_add_asprintf(sl_tmp, "weliketo=party");
options_sl =
get_options_from_transport_options_line("rook ladi=dadi weliketo=party",
"rook");
Use coccinelle scripts to clean up our unit tests This should get rid of most of the users of the old test_* functions. Some are in macros and will need manual cleanup, though. This patch is for 13119, and was automatically generated with these scripts. The perl scripts are there because coccinelle hates operators as macro arguments. ------------------------------ s/==,/_X_EQ_,/g; s/!=,/_X_NE_,/g; s/<,/_X_LT_,/g; s/>,/_X_GT_,/g; s/>=,/_X_GEQ_,/g; s/<=,/_X_LEQ_,/g; ------------------------------ @@ expression a; identifier func; @@ func (...) { <... -test_fail_msg +TT_DIE ( +( a +) ) ...> } @@ identifier func; @@ func (...) { <... -test_fail() +TT_DIE(("Assertion failed.")) ...> } @@ expression a; identifier func; @@ func (...) { <... -test_assert +tt_assert (a) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq +tt_int_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_neq +tt_int_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_streq +tt_str_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_strneq +tt_str_op (a, +_X_NEQ_, b) ...> } @@ expression a, b; identifier func; @@ func (...) { <... -test_eq_ptr +tt_ptr_op (a, +_X_EQ_, b) ...> } @@ expression a, b; identifier func; @@ func() { <... -test_neq_ptr +tt_ptr_op (a, +_X_NEQ_, b) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memeq +tt_mem_op (a, +_X_EQ_, b, len) ...> } @@ expression a, b, len; identifier func; @@ func (...) { <... -test_memneq +tt_mem_op (a, +_X_NEQ_, b, len) ...> } ------------------------------ @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a == b +a, _X_EQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a != b +a, _X_NEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a >= b +a, _X_GEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a <= b +a, _X_LEQ_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a > b +a, _X_GT_, b ) ...> } @@ char a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_int_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned int a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } @@ unsigned long a, b; identifier func; @@ func (...) { <... -tt_assert +tt_uint_op ( -a < b +a, _X_LT_, b ) ...> } ------------------------------ s/_X_NEQ_/!=/g; s/_X_NE_/!=/g; s/_X_EQ_/==/g; s/_X_GT_/>/g; s/_X_LT_/</g; s/_X_GEQ_/>=/g; s/_X_LEQ_/<=/g; s/test_mem_op\(/tt_mem_op\(/g;
2014-09-16 03:18:21 +02:00
tt_assert(options_sl);
tt_assert(smartlist_strings_eq(options_sl, sl_tmp));
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
smartlist_free(sl_tmp);
Fix memory leaks in test_config_parse_transport_options_line
2013-07-15 19:26:47 +02:00
sl_tmp = NULL;
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s));
smartlist_free(options_sl);
Fix memory leaks in test_config_parse_transport_options_line
2013-07-15 19:26:47 +02:00
options_sl = NULL;
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
}
done:
Fix memory leaks in test_config_parse_transport_options_line
2013-07-15 19:26:47 +02:00
if (options_sl) {
SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s));
smartlist_free(options_sl);
}
if (sl_tmp) {
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
smartlist_free(sl_tmp);
}
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
}
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
/* Mocks needed for the compute_max_mem_in_queues test */
static int get_total_system_memory_mock(size_t *mem_out);
static size_t total_system_memory_output = 0;
static int total_system_memory_return = 0;
static int
get_total_system_memory_mock(size_t *mem_out)
{
if (! mem_out)
return -1;
*mem_out = total_system_memory_output;
return total_system_memory_return;
}
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Mocks needed for the transport plugin line test */
static void pt_kickstart_proxy_mock(const smartlist_t *transport_list,
char **proxy_argv, int is_server);
static int transport_add_from_config_mock(const tor_addr_t *addr,
uint16_t port, const char *name,
int socks_ver);
static int transport_is_needed_mock(const char *transport_name);
static int pt_kickstart_proxy_mock_call_count = 0;
static int transport_add_from_config_mock_call_count = 0;
static int transport_is_needed_mock_call_count = 0;
static int transport_is_needed_mock_return = 0;
static void
pt_kickstart_proxy_mock(const smartlist_t *transport_list,
char **proxy_argv, int is_server)
{
Fix unused-argument warnings
2014-11-04 15:54:51 +01:00
(void) transport_list;
(void) proxy_argv;
(void) is_server;
/* XXXX check that args are as expected. */
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
++pt_kickstart_proxy_mock_call_count;
Fix a bunch of memory leaks in the unit tests. Found with valgrind
2014-12-22 18:27:26 +01:00
free_execve_args(proxy_argv);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
}
static int
transport_add_from_config_mock(const tor_addr_t *addr,
uint16_t port, const char *name,
int socks_ver)
{
Fix unused-argument warnings
2014-11-04 15:54:51 +01:00
(void) addr;
(void) port;
(void) name;
(void) socks_ver;
/* XXXX check that args are as expected. */
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
++transport_add_from_config_mock_call_count;
return 0;
}
static int
transport_is_needed_mock(const char *transport_name)
{
Fix unused-argument warnings
2014-11-04 15:54:51 +01:00
(void) transport_name;
/* XXXX check that arg is as expected. */
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
++transport_is_needed_mock_call_count;
return transport_is_needed_mock_return;
}
test: Add TCPProxy option for haproxy protocol
2019-08-22 04:25:04 +02:00
static void
test_config_parse_tcp_proxy_line(void *arg)
{
(void)arg;
int ret;
char *msg = NULL;
or_options_t *options = get_options_mutable();
/* Bad TCPProxy line - too short. */
ret = parse_tcp_proxy_line("haproxy", options, &msg);
/* Return error. */
tt_int_op(ret, OP_EQ, -1);
/* Correct error message. */
tt_str_op(msg, OP_EQ, "TCPProxy has no address/port. Please fix.");
/* Free error message. */
tor_free(msg);
/* Bad TCPProxy line - unsupported protocol. */
ret = parse_tcp_proxy_line("unsupported 95.216.163.36:443", options, &msg);
tt_int_op(ret, OP_EQ, -1);
tt_str_op(msg, OP_EQ, "TCPProxy protocol is not supported. Currently the "
"only supported protocol is 'haproxy'. Please fix.");
tor_free(msg);
/* Bad TCPProxy line - unparsable address/port. */
ret = parse_tcp_proxy_line("haproxy 95.216.163.36/443", 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);
/* Good TCPProxy line - ipv4. */
ret = parse_tcp_proxy_line("haproxy 95.216.163.36:443", options, &msg);
tt_int_op(ret, OP_EQ, 0);
tt_ptr_op(msg, OP_EQ, NULL);
tt_int_op(options->TCPProxyProtocol, OP_EQ, TCP_PROXY_PROTOCOL_HAPROXY);
/* Correct the address. */
tt_assert(tor_addr_eq_ipv4h(&options->TCPProxyAddr, 0x5fd8a324));
tt_int_op(options->TCPProxyPort, OP_EQ, 443);
tor_free(msg);
done:
;
}
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/**
* Test parsing for the ClientTransportPlugin and ServerTransportPlugin config
* options.
*/
static void
test_config_parse_transport_plugin_line(void *arg)
{
Fix unused-argument warnings
2014-11-04 15:54:51 +01:00
(void)arg;
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
or_options_t *options = get_options_mutable();
int r, tmp;
int old_pt_kickstart_proxy_mock_call_count;
int old_transport_add_from_config_mock_call_count;
int old_transport_is_needed_mock_call_count;
/* Bad transport lines - too short */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options, "bad", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options, "bad", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options, "bad bad", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options, "bad bad", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Test transport list parsing */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 exec /usr/bin/fake-transport", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 exec /usr/bin/fake-transport", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1,transport_2 exec /usr/bin/fake-transport", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1,transport_2 exec /usr/bin/fake-transport", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Bad transport identifiers */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_* exec /usr/bin/fake-transport", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_* exec /usr/bin/fake-transport", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Check SOCKS cases for client transport */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 socks4 1.2.3.4:567", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 socks5 1.2.3.4:567", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Proxy case for server transport */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 proxy 1.2.3.4:567", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Multiple-transport error exit */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1,transport_2 socks5 1.2.3.4:567", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1,transport_2 proxy 1.2.3.4:567", 1, 1);
Clear up dead-assignment warnings from scan-build
2017-09-12 23:46:09 +02:00
tt_int_op(r, OP_LT, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* No port error exit */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 socks5 1.2.3.4", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 proxy 1.2.3.4", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Unparsable address error exit */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 socks5 1.2.3:6x7", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 proxy 1.2.3:6x7", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* "Strange {Client|Server}TransportPlugin field" error exit */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 foo bar", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 foo bar", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* No sandbox mode error exit */
tmp = options->Sandbox;
options->Sandbox = 1;
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 exec /usr/bin/fake-transport", 1, 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 exec /usr/bin/fake-transport", 1, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_LT, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
options->Sandbox = tmp;
/*
* These final test cases cover code paths that only activate without
* validate_only, so they need mocks in place.
*/
MOCK(pt_kickstart_proxy, pt_kickstart_proxy_mock);
old_pt_kickstart_proxy_mock_call_count =
pt_kickstart_proxy_mock_call_count;
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 exec /usr/bin/fake-transport", 0, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(pt_kickstart_proxy_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_pt_kickstart_proxy_mock_call_count + 1);
UNMOCK(pt_kickstart_proxy);
/* This one hits a log line in the !validate_only case only */
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 proxy 1.2.3.4:567", 0, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Check mocked client transport cases */
MOCK(pt_kickstart_proxy, pt_kickstart_proxy_mock);
MOCK(transport_add_from_config, transport_add_from_config_mock);
MOCK(transport_is_needed, transport_is_needed_mock);
/* Unnecessary transport case */
transport_is_needed_mock_return = 0;
old_pt_kickstart_proxy_mock_call_count =
pt_kickstart_proxy_mock_call_count;
old_transport_add_from_config_mock_call_count =
transport_add_from_config_mock_call_count;
old_transport_is_needed_mock_call_count =
transport_is_needed_mock_call_count;
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 exec /usr/bin/fake-transport", 0, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Should have succeeded */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* transport_is_needed() should have been called */
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(transport_is_needed_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_transport_is_needed_mock_call_count + 1);
/*
* pt_kickstart_proxy() and transport_add_from_config() should
* not have been called.
*/
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(pt_kickstart_proxy_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_pt_kickstart_proxy_mock_call_count);
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(transport_add_from_config_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_transport_add_from_config_mock_call_count);
/* Necessary transport case */
transport_is_needed_mock_return = 1;
old_pt_kickstart_proxy_mock_call_count =
pt_kickstart_proxy_mock_call_count;
old_transport_add_from_config_mock_call_count =
transport_add_from_config_mock_call_count;
old_transport_is_needed_mock_call_count =
transport_is_needed_mock_call_count;
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 exec /usr/bin/fake-transport", 0, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Should have succeeded */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/*
* transport_is_needed() and pt_kickstart_proxy() should have been
* called.
*/
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(pt_kickstart_proxy_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_pt_kickstart_proxy_mock_call_count + 1);
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(transport_is_needed_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_transport_is_needed_mock_call_count + 1);
/* transport_add_from_config() should not have been called. */
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(transport_add_from_config_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_transport_add_from_config_mock_call_count);
/* proxy case */
transport_is_needed_mock_return = 1;
old_pt_kickstart_proxy_mock_call_count =
pt_kickstart_proxy_mock_call_count;
old_transport_add_from_config_mock_call_count =
transport_add_from_config_mock_call_count;
old_transport_is_needed_mock_call_count =
transport_is_needed_mock_call_count;
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
2014-07-29 04:32:23 +02:00
r = parse_transport_line(options,
"transport_1 socks5 1.2.3.4:567", 0, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/* Should have succeeded */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(r, OP_EQ, 0);
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
/*
* transport_is_needed() and transport_add_from_config() should have
* been called.
*/
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(transport_add_from_config_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_transport_add_from_config_mock_call_count + 1);
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(transport_is_needed_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_transport_is_needed_mock_call_count + 1);
/* pt_kickstart_proxy() should not have been called. */
Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c
2014-11-04 15:49:35 +01:00
tt_assert(pt_kickstart_proxy_mock_call_count ==
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
old_pt_kickstart_proxy_mock_call_count);
/* Done with mocked client transport cases */
UNMOCK(transport_is_needed);
UNMOCK(transport_add_from_config);
UNMOCK(pt_kickstart_proxy);
done:
/* Make sure we undo all mocks */
UNMOCK(pt_kickstart_proxy);
UNMOCK(transport_add_from_config);
UNMOCK(transport_is_needed);
return;
}
MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.
2013-08-31 05:49:04 +02:00
// Tests if an options with MyFamily fingerprints missing '$' normalises
// them correctly and also ensure it also works with multiple fingerprints
static void
test_config_fix_my_family(void *arg)
{
char *err = NULL;
MyFamily config string is now a list. #4998
2017-04-14 14:04:37 +02:00
config_line_t *family = tor_malloc_zero(sizeof(config_line_t));
family->key = tor_strdup("MyFamily");
family->value = tor_strdup("$1111111111111111111111111111111111111111, "
"1111111111111111111111111111111111111112, "
"$1111111111111111111111111111111111111113");
config_line_t *family2 = tor_malloc_zero(sizeof(config_line_t));
family2->key = tor_strdup("MyFamily");
family2->value = tor_strdup("1111111111111111111111111111111111111114");
config_line_t *family3 = tor_malloc_zero(sizeof(config_line_t));
family3->key = tor_strdup("MyFamily");
family3->value = tor_strdup("$1111111111111111111111111111111111111115");
family->next = family2;
family2->next = family3;
family3->next = NULL;
MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.
2013-08-31 05:49:04 +02:00
or_options_t* options = options_new();
or_options_t* defaults = options_new();
Fix warnings in test_config_fix_my_family
2013-09-03 19:35:44 +02:00
(void) arg;
MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.
2013-08-31 05:49:04 +02:00
options_init(options);
options_init(defaults);
Split MyFamily into user-specified version and normalized version This change prevents a no-longer-supported behavior where we change options that would later be written back to torrc with a SAVECONF. Also, use the "Pointer to final pointer" trick to build the normalized list, to avoid special-casing the first element.
2017-05-09 14:18:41 +02:00
options->MyFamily_lines = family;
MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.
2013-08-31 05:49:04 +02:00
options_validate(NULL, options, defaults, 0, &err) ;
if (err != NULL) {
Fix warnings in test_config_fix_my_family
2013-09-03 19:35:44 +02:00
TT_FAIL(("options_validate failed: %s", err));
MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.
2013-08-31 05:49:04 +02:00
}
MyFamily config string is now a list. #4998
2017-04-14 14:04:37 +02:00
const char *valid[] = { "$1111111111111111111111111111111111111111",
"$1111111111111111111111111111111111111112",
"$1111111111111111111111111111111111111113",
"$1111111111111111111111111111111111111114",
"$1111111111111111111111111111111111111115" };
int ret_size = 0;
config_line_t *ret;
for (ret = options->MyFamily; ret && ret_size < 5; ret = ret->next) {
tt_str_op(ret->value, OP_EQ, valid[ret_size]);
ret_size++;
}
tt_int_op(ret_size, OP_EQ, 5);
MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.
2013-08-31 05:49:04 +02:00
Minor cleanups in test_config. Use a more standard indentation style for the end block; remove redundant if() around tor_free.
2017-05-09 14:20:14 +02:00
done:
tor_free(err);
or_options_free(options);
or_options_free(defaults);
MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.
2013-08-31 05:49:04 +02:00
}
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
static int n_hostname_01010101 = 0;
/** This mock function is meant to replace tor_lookup_hostname().
* It answers with 1.1.1.1 as IP adddress that resulted from lookup.
* This function increments <b>n_hostname_01010101</b> counter by one
* every time it is called.
*/
static int
tor_lookup_hostname_01010101(const char *name, uint32_t *addr)
{
n_hostname_01010101++;
if (name && addr) {
*addr = ntohl(0x01010101);
}
return 0;
}
static int n_hostname_localhost = 0;
/** This mock function is meant to replace tor_lookup_hostname().
* It answers with 127.0.0.1 as IP adddress that resulted from lookup.
* This function increments <b>n_hostname_localhost</b> counter by one
* every time it is called.
*/
static int
tor_lookup_hostname_localhost(const char *name, uint32_t *addr)
{
n_hostname_localhost++;
if (name && addr) {
*addr = 0x7f000001;
}
return 0;
}
static int n_hostname_failure = 0;
/** This mock function is meant to replace tor_lookup_hostname().
* It pretends to fail by returning -1 to caller. Also, this function
* increments <b>n_hostname_failure</b> every time it is called.
*/
static int
tor_lookup_hostname_failure(const char *name, uint32_t *addr)
{
(void)name;
(void)addr;
n_hostname_failure++;
return -1;
}
static int n_gethostname_replacement = 0;
/** This mock function is meant to replace tor_gethostname(). It
Make the resolvemyaddr unit tests pass when local dns is hijacked If you are in a coffee shop that returns a helpful redirect page for "onionrouter", or on an ISP that does the same, the test as written would fail.
2014-12-29 15:41:37 +01:00
* responds with string "onionrouter!" as hostname. This function
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
* increments <b>n_gethostname_replacement</b> by one every time
* it is called.
*/
static int
tor_gethostname_replacement(char *name, size_t namelen)
{
n_gethostname_replacement++;
if (name && namelen) {
Make the resolvemyaddr unit tests pass when local dns is hijacked If you are in a coffee shop that returns a helpful redirect page for "onionrouter", or on an ISP that does the same, the test as written would fail.
2014-12-29 15:41:37 +01:00
strlcpy(name,"onionrouter!",namelen);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
}
return 0;
}
static int n_gethostname_localhost = 0;
/** This mock function is meant to replace tor_gethostname(). It
* responds with string "127.0.0.1" as hostname. This function
* increments <b>n_gethostname_localhost</b> by one every time
* it is called.
*/
static int
tor_gethostname_localhost(char *name, size_t namelen)
{
n_gethostname_localhost++;
if (name && namelen) {
strlcpy(name,"127.0.0.1",namelen);
}
return 0;
}
static int n_gethostname_failure = 0;
/** This mock function is meant to replace tor_gethostname.
* It pretends to fail by returning -1. This function increments
* <b>n_gethostname_failure</b> by one every time it is called.
*/
static int
tor_gethostname_failure(char *name, size_t namelen)
{
Fix compilation errors in resolvemyaddr tests
2014-12-29 15:29:32 +01:00
(void)name;
(void)namelen;
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
n_gethostname_failure++;
return -1;
}
static int n_get_interface_address = 0;
/** This mock function is meant to replace get_interface_address().
* It answers with address 8.8.8.8. This function increments
* <b>n_get_interface_address</b> by one every time it is called.
*/
static int
get_interface_address_08080808(int severity, uint32_t *addr)
{
(void)severity;
n_get_interface_address++;
if (addr) {
*addr = ntohl(0x08080808);
}
return 0;
}
static int n_get_interface_address6 = 0;
static sa_family_t last_address6_family;
/** This mock function is meant to replace get_interface_address6().
* It answers with IP address 9.9.9.9 iff both of the following are true:
* - <b>family</b> is AF_INET
* - <b>addr</b> pointer is not NULL.
* This function increments <b>n_get_interface_address6</b> by one every
* time it is called.
*/
static int
get_interface_address6_replacement(int severity, sa_family_t family,
tor_addr_t *addr)
{
(void)severity;
last_address6_family = family;
n_get_interface_address6++;
if ((family != AF_INET) || !addr) {
return -1;
}
tor_addr_from_ipv4h(addr,0x09090909);
return 0;
}
static int n_get_interface_address_failure = 0;
/**
* This mock function is meant to replace get_interface_address().
* It pretends to fail getting interface address by returning -1.
* <b>n_get_interface_address_failure</b> is incremented by one
* every time this function is called.
*/
static int
get_interface_address_failure(int severity, uint32_t *addr)
{
(void)severity;
(void)addr;
n_get_interface_address_failure++;
return -1;
}
static int n_get_interface_address6_failure = 0;
/**
* This mock function is meant to replace get_interface_addres6().
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
* It will pretend to fail by return -1.
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
* <b>n_get_interface_address6_failure</b> is incremented by one
* every time this function is called and <b>last_address6_family</b>
* is assigned the value of <b>family</b> argument.
*/
static int
get_interface_address6_failure(int severity, sa_family_t family,
tor_addr_t *addr)
{
Fix compilation errors in resolvemyaddr tests
2014-12-29 15:29:32 +01:00
(void)severity;
(void)addr;
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
n_get_interface_address6_failure++;
last_address6_family = family;
return -1;
}
static void
test_config_resolve_my_address(void *arg)
{
or_options_t *options;
uint32_t resolved_addr;
const char *method_used;
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
char *hostname_out = NULL;
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
int retval;
int prev_n_hostname_01010101;
int prev_n_hostname_localhost;
int prev_n_hostname_failure;
int prev_n_gethostname_replacement;
int prev_n_gethostname_failure;
int prev_n_gethostname_localhost;
int prev_n_get_interface_address;
int prev_n_get_interface_address_failure;
int prev_n_get_interface_address6;
int prev_n_get_interface_address6_failure;
Fix compilation errors in resolvemyaddr tests
2014-12-29 15:29:32 +01:00
(void)arg;
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
options = options_new();
options_init(options);
/*
* CASE 1:
* If options->Address is a valid IPv4 address string, we want
* the corresponding address to be parsed and returned.
*/
options->Address = tor_strdup("128.52.128.105");
retval = resolve_my_address(LOG_NOTICE,options,&resolved_addr,
&method_used,&hostname_out);
tt_want(retval == 0);
Fix operator usage in src/test/*.c This patch fixes the operator usage in src/test/*.c to use the symbolic operators instead of the normal C comparison operators. This patch was generated using: ./scripts/coccinelle/test-operator-cleanup src/test/*.[ch]
2017-06-05 16:23:02 +02:00
tt_want_str_op(method_used,OP_EQ,"CONFIGURED");
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
tt_want(hostname_out == NULL);
Fix endianness issues in test_config_resolve_my_address(). Since resolve_my_address() yields IP address in host order there is no need to use byteorder functions for conversion.
2015-02-22 11:41:08 +01:00
tt_assert(resolved_addr == 0x80348069);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
tor_free(options->Address);
/*
* CASE 2:
* If options->Address is a valid DNS address, we want resolve_my_address()
* function to ask tor_lookup_hostname() for help with resolving it
* and return the address that was resolved (in host order).
*/
MOCK(tor_lookup_hostname,tor_lookup_hostname_01010101);
tor_free(options->Address);
options->Address = tor_strdup("www.torproject.org");
prev_n_hostname_01010101 = n_hostname_01010101;
retval = resolve_my_address(LOG_NOTICE,options,&resolved_addr,
&method_used,&hostname_out);
tt_want(retval == 0);
tt_want(n_hostname_01010101 == prev_n_hostname_01010101 + 1);
Fix operator usage in src/test/*.c This patch fixes the operator usage in src/test/*.c to use the symbolic operators instead of the normal C comparison operators. This patch was generated using: ./scripts/coccinelle/test-operator-cleanup src/test/*.[ch]
2017-06-05 16:23:02 +02:00
tt_want_str_op(method_used,OP_EQ,"RESOLVED");
tt_want_str_op(hostname_out,OP_EQ,"www.torproject.org");
Fix endianness issues in test_config_resolve_my_address(). Since resolve_my_address() yields IP address in host order there is no need to use byteorder functions for conversion.
2015-02-22 11:41:08 +01:00
tt_assert(resolved_addr == 0x01010101);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(tor_lookup_hostname);
tor_free(options->Address);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 3:
* Given that options->Address is NULL, we want resolve_my_address()
* to try and use tor_gethostname() to get hostname AND use
* tor_lookup_hostname() to get IP address.
*/
resolved_addr = 0;
tor_free(options->Address);
options->Address = NULL;
MOCK(tor_gethostname,tor_gethostname_replacement);
MOCK(tor_lookup_hostname,tor_lookup_hostname_01010101);
prev_n_gethostname_replacement = n_gethostname_replacement;
prev_n_hostname_01010101 = n_hostname_01010101;
retval = resolve_my_address(LOG_NOTICE,options,&resolved_addr,
&method_used,&hostname_out);
tt_want(retval == 0);
tt_want(n_gethostname_replacement == prev_n_gethostname_replacement + 1);
tt_want(n_hostname_01010101 == prev_n_hostname_01010101 + 1);
Fix operator usage in src/test/*.c This patch fixes the operator usage in src/test/*.c to use the symbolic operators instead of the normal C comparison operators. This patch was generated using: ./scripts/coccinelle/test-operator-cleanup src/test/*.[ch]
2017-06-05 16:23:02 +02:00
tt_want_str_op(method_used,OP_EQ,"GETHOSTNAME");
tt_want_str_op(hostname_out,OP_EQ,"onionrouter!");
Fix endianness issues in test_config_resolve_my_address(). Since resolve_my_address() yields IP address in host order there is no need to use byteorder functions for conversion.
2015-02-22 11:41:08 +01:00
tt_assert(resolved_addr == 0x01010101);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(tor_gethostname);
UNMOCK(tor_lookup_hostname);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 4:
* Given that options->Address is a local host address, we want
* resolve_my_address() function to fail.
*/
resolved_addr = 0;
tor_free(options->Address);
options->Address = tor_strdup("127.0.0.1");
retval = resolve_my_address(LOG_NOTICE,options,&resolved_addr,
&method_used,&hostname_out);
tt_want(resolved_addr == 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(retval, OP_EQ, -1);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
tor_free(options->Address);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 5:
* We want resolve_my_address() to fail if DNS address in options->Address
* cannot be resolved.
*/
MOCK(tor_lookup_hostname,tor_lookup_hostname_failure);
prev_n_hostname_failure = n_hostname_failure;
tor_free(options->Address);
options->Address = tor_strdup("www.tor-project.org");
retval = resolve_my_address(LOG_NOTICE,options,&resolved_addr,
&method_used,&hostname_out);
tt_want(n_hostname_failure == prev_n_hostname_failure + 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(retval, OP_EQ, -1);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(tor_lookup_hostname);
tor_free(options->Address);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 6:
* If options->Address is NULL AND gettting local hostname fails, we want
* resolve_my_address() to fail as well.
*/
MOCK(tor_gethostname,tor_gethostname_failure);
prev_n_gethostname_failure = n_gethostname_failure;
retval = resolve_my_address(LOG_NOTICE,options,&resolved_addr,
&method_used,&hostname_out);
tt_want(n_gethostname_failure == prev_n_gethostname_failure + 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(retval, OP_EQ, -1);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(tor_gethostname);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 7:
* We want resolve_my_address() to try and get network interface address via
* get_interface_address() if hostname returned by tor_gethostname() cannot be
* resolved into IP address.
*/
MOCK(tor_gethostname,tor_gethostname_replacement);
Make the resolvemyaddr unit tests pass when local dns is hijacked If you are in a coffee shop that returns a helpful redirect page for "onionrouter", or on an ISP that does the same, the test as written would fail.
2014-12-29 15:41:37 +01:00
MOCK(tor_lookup_hostname,tor_lookup_hostname_failure);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
MOCK(get_interface_address,get_interface_address_08080808);
prev_n_gethostname_replacement = n_gethostname_replacement;
prev_n_get_interface_address = n_get_interface_address;
retval = resolve_my_address(LOG_NOTICE,options,&resolved_addr,
&method_used,&hostname_out);
tt_want(retval == 0);
Fix operator usage in src/test/*.c This patch fixes the operator usage in src/test/*.c to use the symbolic operators instead of the normal C comparison operators. This patch was generated using: ./scripts/coccinelle/test-operator-cleanup src/test/*.[ch]
2017-06-05 16:23:02 +02:00
tt_want_int_op(n_gethostname_replacement, OP_EQ,
Make the resolvemyaddr unit tests pass when local dns is hijacked If you are in a coffee shop that returns a helpful redirect page for "onionrouter", or on an ISP that does the same, the test as written would fail.
2014-12-29 15:41:37 +01:00
prev_n_gethostname_replacement + 1);
Fix operator usage in src/test/*.c This patch fixes the operator usage in src/test/*.c to use the symbolic operators instead of the normal C comparison operators. This patch was generated using: ./scripts/coccinelle/test-operator-cleanup src/test/*.[ch]
2017-06-05 16:23:02 +02:00
tt_want_int_op(n_get_interface_address, OP_EQ,
Make the resolvemyaddr unit tests pass when local dns is hijacked If you are in a coffee shop that returns a helpful redirect page for "onionrouter", or on an ISP that does the same, the test as written would fail.
2014-12-29 15:41:37 +01:00
prev_n_get_interface_address + 1);
Fix operator usage in src/test/*.c This patch fixes the operator usage in src/test/*.c to use the symbolic operators instead of the normal C comparison operators. This patch was generated using: ./scripts/coccinelle/test-operator-cleanup src/test/*.[ch]
2017-06-05 16:23:02 +02:00
tt_want_str_op(method_used,OP_EQ,"INTERFACE");
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
tt_want(hostname_out == NULL);
Fix endianness issues in test_config_resolve_my_address(). Since resolve_my_address() yields IP address in host order there is no need to use byteorder functions for conversion.
2015-02-22 11:41:08 +01:00
tt_assert(resolved_addr == 0x08080808);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(get_interface_address);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 8:
* Suppose options->Address is NULL AND hostname returned by tor_gethostname()
* is unresolvable. We want resolve_my_address to fail if
* get_interface_address() fails.
*/
MOCK(get_interface_address,get_interface_address_failure);
prev_n_get_interface_address_failure = n_get_interface_address_failure;
prev_n_gethostname_replacement = n_gethostname_replacement;
retval = resolve_my_address(LOG_NOTICE,options,&resolved_addr,
&method_used,&hostname_out);
tt_want(n_get_interface_address_failure ==
prev_n_get_interface_address_failure + 1);
tt_want(n_gethostname_replacement ==
prev_n_gethostname_replacement + 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(retval, OP_EQ, -1);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(get_interface_address);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 9:
* Given that options->Address is NULL AND tor_lookup_hostname()
* fails AND hostname returned by gethostname() resolves
* to local IP address, we want resolve_my_address() function to
* call get_interface_address6(.,AF_INET,.) and return IP address
* the latter function has found.
*/
MOCK(tor_lookup_hostname,tor_lookup_hostname_failure);
MOCK(tor_gethostname,tor_gethostname_replacement);
MOCK(get_interface_address6,get_interface_address6_replacement);
prev_n_gethostname_replacement = n_gethostname_replacement;
prev_n_hostname_failure = n_hostname_failure;
prev_n_get_interface_address6 = n_get_interface_address6;
retval = resolve_my_address(LOG_NOTICE,options,&resolved_addr,
&method_used,&hostname_out);
tt_want(last_address6_family == AF_INET);
tt_want(n_get_interface_address6 == prev_n_get_interface_address6 + 1);
tt_want(n_hostname_failure == prev_n_hostname_failure + 1);
tt_want(n_gethostname_replacement == prev_n_gethostname_replacement + 1);
tt_want(retval == 0);
Fix operator usage in src/test/*.c This patch fixes the operator usage in src/test/*.c to use the symbolic operators instead of the normal C comparison operators. This patch was generated using: ./scripts/coccinelle/test-operator-cleanup src/test/*.[ch]
2017-06-05 16:23:02 +02:00
tt_want_str_op(method_used,OP_EQ,"INTERFACE");
Fix endianness issues in test_config_resolve_my_address(). Since resolve_my_address() yields IP address in host order there is no need to use byteorder functions for conversion.
2015-02-22 11:41:08 +01:00
tt_assert(resolved_addr == 0x09090909);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(tor_lookup_hostname);
UNMOCK(tor_gethostname);
UNMOCK(get_interface_address6);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 10: We want resolve_my_address() to fail if all of the following
* are true:
* 1. options->Address is not NULL
* 2. ... but it cannot be converted to struct in_addr by
* tor_inet_aton()
* 3. ... and tor_lookup_hostname() fails to resolve the
* options->Address
*/
MOCK(tor_lookup_hostname,tor_lookup_hostname_failure);
prev_n_hostname_failure = n_hostname_failure;
tor_free(options->Address);
options->Address = tor_strdup("some_hostname");
retval = resolve_my_address(LOG_NOTICE, options, &resolved_addr,
&method_used,&hostname_out);
tt_want(n_hostname_failure == prev_n_hostname_failure + 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(retval, OP_EQ, -1);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(tor_gethostname);
UNMOCK(tor_lookup_hostname);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 11:
* Suppose the following sequence of events:
* 1. options->Address is NULL
* 2. tor_gethostname() succeeds to get hostname of machine Tor
* if running on.
* 3. Hostname from previous step cannot be converted to
* address by using tor_inet_aton() function.
Fix spelling mistakes corresponding to ticket #23650
2018-01-24 09:55:15 +01:00
* 4. However, tor_lookup_hostname() succeeds in resolving the
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
* hostname from step 2.
* 5. Unfortunately, tor_addr_is_internal() deems this address
* to be internal.
* 6. get_interface_address6(.,AF_INET,.) returns non-internal
* IPv4
*
* We want resolve_my_addr() to succeed with method "INTERFACE"
* and address from step 6.
*/
tor_free(options->Address);
options->Address = NULL;
MOCK(tor_gethostname,tor_gethostname_replacement);
MOCK(tor_lookup_hostname,tor_lookup_hostname_localhost);
MOCK(get_interface_address6,get_interface_address6_replacement);
prev_n_gethostname_replacement = n_gethostname_replacement;
prev_n_hostname_localhost = n_hostname_localhost;
prev_n_get_interface_address6 = n_get_interface_address6;
retval = resolve_my_address(LOG_DEBUG, options, &resolved_addr,
&method_used,&hostname_out);
tt_want(n_gethostname_replacement == prev_n_gethostname_replacement + 1);
tt_want(n_hostname_localhost == prev_n_hostname_localhost + 1);
tt_want(n_get_interface_address6 == prev_n_get_interface_address6 + 1);
Fix operator usage in src/test/*.c This patch fixes the operator usage in src/test/*.c to use the symbolic operators instead of the normal C comparison operators. This patch was generated using: ./scripts/coccinelle/test-operator-cleanup src/test/*.[ch]
2017-06-05 16:23:02 +02:00
tt_str_op(method_used,OP_EQ,"INTERFACE");
apply ahf's test_assert_null.cocci
2017-08-24 21:55:27 +02:00
tt_ptr_op(hostname_out, OP_EQ, NULL);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(retval, OP_EQ, 0);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
/*
* CASE 11b:
* 1-5 as above.
* 6. get_interface_address6() fails.
*
* In this subcase, we want resolve_my_address() to fail.
*/
UNMOCK(get_interface_address6);
MOCK(get_interface_address6,get_interface_address6_failure);
prev_n_gethostname_replacement = n_gethostname_replacement;
prev_n_hostname_localhost = n_hostname_localhost;
prev_n_get_interface_address6_failure = n_get_interface_address6_failure;
retval = resolve_my_address(LOG_DEBUG, options, &resolved_addr,
&method_used,&hostname_out);
tt_want(n_gethostname_replacement == prev_n_gethostname_replacement + 1);
tt_want(n_hostname_localhost == prev_n_hostname_localhost + 1);
tt_want(n_get_interface_address6_failure ==
prev_n_get_interface_address6_failure + 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(retval, OP_EQ, -1);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(tor_gethostname);
UNMOCK(tor_lookup_hostname);
UNMOCK(get_interface_address6);
/* CASE 12:
* Suppose the following happens:
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
* 1. options->Address is NULL AND options->DirAuthorities is non-NULL
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
* 2. tor_gethostname() succeeds in getting hostname of a machine ...
* 3. ... which is successfully parsed by tor_inet_aton() ...
* 4. into IPv4 address that tor_addr_is_inernal() considers to be
* internal.
*
* In this case, we want resolve_my_address() to fail.
*/
tor_free(options->Address);
options->Address = NULL;
options->DirAuthorities = tor_malloc_zero(sizeof(config_line_t));
MOCK(tor_gethostname,tor_gethostname_localhost);
prev_n_gethostname_localhost = n_gethostname_localhost;
retval = resolve_my_address(LOG_DEBUG, options, &resolved_addr,
&method_used,&hostname_out);
tt_want(n_gethostname_localhost == prev_n_gethostname_localhost + 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(retval, OP_EQ, -1);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(tor_gethostname);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
done:
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
tor_free(options->Address);
tor_free(options->DirAuthorities);
or_options_free(options);
Fix memory leaks in resolvemyaddr tests
2014-12-29 15:33:36 +01:00
tor_free(hostname_out);
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
UNMOCK(tor_gethostname);
UNMOCK(tor_lookup_hostname);
UNMOCK(get_interface_address);
UNMOCK(get_interface_address6);
UNMOCK(tor_gethostname);
}
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
static void
test_config_adding_trusted_dir_server(void *arg)
{
(void)arg;
const char digest[DIGEST_LEN] = "";
dir_server_t *ds = NULL;
tor_addr_port_t ipv6;
int rv = -1;
clear_dir_servers();
routerlist_free_all();
/* create a trusted ds without an IPv6 address and port */
ds = trusted_dir_server_new("ds", "127.0.0.1", 9059, 9060, NULL, digest,
NULL, V3_DIRINFO, 1.0);
tt_assert(ds);
dir_server_add(ds);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 1);
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 1);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
/* create a trusted ds with an IPv6 address and port */
rv = tor_addr_port_parse(LOG_WARN, "[::1]:9061", &ipv6.addr, &ipv6.port, -1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(rv, OP_EQ, 0);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
ds = trusted_dir_server_new("ds", "127.0.0.1", 9059, 9060, &ipv6, digest,
NULL, V3_DIRINFO, 1.0);
tt_assert(ds);
dir_server_add(ds);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 2);
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 2);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
done:
clear_dir_servers();
routerlist_free_all();
}
static void
test_config_adding_fallback_dir_server(void *arg)
{
(void)arg;
const char digest[DIGEST_LEN] = "";
dir_server_t *ds = NULL;
tor_addr_t ipv4;
tor_addr_port_t ipv6;
int rv = -1;
clear_dir_servers();
routerlist_free_all();
rv = tor_addr_parse(&ipv4, "127.0.0.1");
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(rv, OP_EQ, AF_INET);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
/* create a trusted ds without an IPv6 address and port */
ds = fallback_dir_server_new(&ipv4, 9059, 9060, NULL, digest, 1.0);
tt_assert(ds);
dir_server_add(ds);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 1);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
/* create a trusted ds with an IPv6 address and port */
rv = tor_addr_port_parse(LOG_WARN, "[::1]:9061", &ipv6.addr, &ipv6.port, -1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(rv, OP_EQ, 0);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
ds = fallback_dir_server_new(&ipv4, 9059, 9060, &ipv6, digest, 1.0);
tt_assert(ds);
dir_server_add(ds);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 2);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
done:
clear_dir_servers();
routerlist_free_all();
}
/* No secrets here:
* v3ident is `echo "onion" | shasum | cut -d" " -f1 | tr "a-f" "A-F"`
* fingerprint is `echo "unionem" | shasum | cut -d" " -f1 | tr "a-f" "A-F"`
* with added spaces
*/
#define TEST_DIR_AUTH_LINE_START \
"foobar orport=12345 " \
"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
#define TEST_DIR_AUTH_LINE_END \
"1.2.3.4:54321 " \
"FDB2 FBD2 AAA5 25FA 2999 E617 5091 5A32 C777 3B17"
#define TEST_DIR_AUTH_IPV6_FLAG \
"ipv6=[feed::beef]:9 "
static void
test_config_parsing_trusted_dir_server(void *arg)
{
(void)arg;
int rv = -1;
/* parse a trusted dir server without an IPv6 address and port */
rv = parse_dir_authority_line(TEST_DIR_AUTH_LINE_START
TEST_DIR_AUTH_LINE_END,
V3_DIRINFO, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(rv, OP_EQ, 0);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
/* parse a trusted dir server with an IPv6 address and port */
rv = parse_dir_authority_line(TEST_DIR_AUTH_LINE_START
TEST_DIR_AUTH_IPV6_FLAG
TEST_DIR_AUTH_LINE_END,
V3_DIRINFO, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(rv, OP_EQ, 0);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
/* Since we are only validating, there is no cleanup. */
done:
;
}
#undef TEST_DIR_AUTH_LINE_START
#undef TEST_DIR_AUTH_LINE_END
#undef TEST_DIR_AUTH_IPV6_FLAG
Validate that DirAuthority address is IPv4
2018-06-26 13:30:02 +02:00
#define TEST_DIR_AUTH_LINE_START \
"foobar orport=12345 " \
"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
#define TEST_DIR_AUTH_LINE_END_BAD_IP \
"0.256.3.4:54321 " \
"FDB2 FBD2 AAA5 25FA 2999 E617 5091 5A32 C777 3B17"
#define TEST_DIR_AUTH_LINE_END_WITH_DNS_ADDR \
"torproject.org:54321 " \
"FDB2 FBD2 AAA5 25FA 2999 E617 5091 5A32 C777 3B17"
static void
test_config_parsing_invalid_dir_address(void *arg)
{
(void)arg;
int rv;
rv = parse_dir_authority_line(TEST_DIR_AUTH_LINE_START
TEST_DIR_AUTH_LINE_END_BAD_IP,
V3_DIRINFO, 1);
tt_int_op(rv, OP_EQ, -1);
rv = parse_dir_authority_line(TEST_DIR_AUTH_LINE_START
TEST_DIR_AUTH_LINE_END_WITH_DNS_ADDR,
V3_DIRINFO, 1);
tt_int_op(rv, OP_EQ, -1);
done:
return;
}
#undef TEST_DIR_AUTH_LINE_START
#undef TEST_DIR_AUTH_LINE_END_BAD_IP
#undef TEST_DIR_AUTH_LINE_END_WITH_DNS_ADDR
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
/* No secrets here:
* id is `echo "syn-propanethial-S-oxide" | shasum | cut -d" " -f1`
*/
#define TEST_DIR_FALLBACK_LINE \
"1.2.3.4:54321 orport=12345 " \
"id=50e643986f31ea1235bcc1af17a1c5c5cfc0ee54 "
#define TEST_DIR_FALLBACK_IPV6_FLAG \
"ipv6=[2015:c0de::deed]:9"
static void
test_config_parsing_fallback_dir_server(void *arg)
{
(void)arg;
int rv = -1;
/* parse a trusted dir server without an IPv6 address and port */
rv = parse_dir_fallback_line(TEST_DIR_FALLBACK_LINE, 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(rv, OP_EQ, 0);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
/* parse a trusted dir server with an IPv6 address and port */
rv = parse_dir_fallback_line(TEST_DIR_FALLBACK_LINE
TEST_DIR_FALLBACK_IPV6_FLAG,
1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(rv, OP_EQ, 0);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
/* Since we are only validating, there is no cleanup. */
done:
;
}
#undef TEST_DIR_FALLBACK_LINE
#undef TEST_DIR_FALLBACK_IPV6_FLAG
static void
test_config_adding_default_trusted_dir_servers(void *arg)
{
(void)arg;
clear_dir_servers();
routerlist_free_all();
/* Assume we only have one bridge authority */
add_default_trusted_dir_authorities(BRIDGE_DIRINFO);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(get_n_authorities(BRIDGE_DIRINFO), OP_EQ, 1);
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 1);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
Repair unit test that assumed we have 9 dirauths.
2016-07-05 18:52:19 +02:00
/* Assume we have eight V3 authorities */
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
add_default_trusted_dir_authorities(V3_DIRINFO);
Adjust test, now that there are 9 dirauths again
2017-10-23 15:11:07 +02:00
tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
done:
clear_dir_servers();
routerlist_free_all();
}
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
static int n_add_default_fallback_dir_servers_known_default = 0;
/**
* This mock function is meant to replace add_default_fallback_dir_servers().
* It will parse and add one known default fallback dir server,
* which has a dir_port of 99.
* <b>n_add_default_fallback_dir_servers_known_default</b> is incremented by
* one every time this function is called.
*/
static void
add_default_fallback_dir_servers_known_default(void)
{
int i;
const char *fallback[] = {
"127.0.0.1:60099 orport=9009 "
"id=0923456789012345678901234567890123456789",
NULL
};
for (i=0; fallback[i]; i++) {
if (parse_dir_fallback_line(fallback[i], 0)<0) {
log_err(LD_BUG, "Couldn't parse internal FallbackDir line %s",
fallback[i]);
}
}
n_add_default_fallback_dir_servers_known_default++;
}
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
/* Helper for test_config_adding_dir_servers(), which should be
* refactored: clear the fields in the options which the options object
* does not really own. */
static void
ads_clear_helper(or_options_t *options)
{
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = NULL;
options->AlternateDirAuthority = NULL;
options->FallbackDir = NULL;
}
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
/* Test all the different combinations of adding dir servers */
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
static void
test_config_adding_dir_servers(void *arg)
{
(void)arg;
/* allocate options */
Use config_new() to construct configuration objects. We'll need to do it this way once the objects become more complex.
2019-07-23 16:13:29 +02:00
or_options_t *options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Allocate and populate configuration lines:
*
* Use the same format as the hard-coded directories in
* add_default_trusted_dir_authorities().
* Zeroing the structure has the same effect as initialising to:
* { NULL, NULL, NULL, CONFIG_LINE_NORMAL, 0};
*/
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
config_line_t *test_dir_authority = tor_malloc_zero(sizeof(config_line_t));
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
test_dir_authority->key = tor_strdup("DirAuthority");
test_dir_authority->value = tor_strdup(
"D0 orport=9000 "
"v3ident=0023456789012345678901234567890123456789 "
"127.0.0.1:60090 0123 4567 8901 2345 6789 0123 4567 8901 2345 6789"
);
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
config_line_t *test_alt_bridge_authority = tor_malloc_zero(
sizeof(config_line_t));
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
test_alt_bridge_authority->key = tor_strdup("AlternateBridgeAuthority");
test_alt_bridge_authority->value = tor_strdup(
"B1 orport=9001 bridge "
"127.0.0.1:60091 1123 4567 8901 2345 6789 0123 4567 8901 2345 6789"
);
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
config_line_t *test_alt_dir_authority = tor_malloc_zero(
sizeof(config_line_t));
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
test_alt_dir_authority->key = tor_strdup("AlternateDirAuthority");
test_alt_dir_authority->value = tor_strdup(
"A2 orport=9002 "
"v3ident=0223456789012345678901234567890123456789 "
"127.0.0.1:60092 2123 4567 8901 2345 6789 0123 4567 8901 2345 6789"
);
/* Use the format specified in the manual page */
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
config_line_t *test_fallback_directory = tor_malloc_zero(
sizeof(config_line_t));
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
test_fallback_directory->key = tor_strdup("FallbackDir");
test_fallback_directory->value = tor_strdup(
"127.0.0.1:60093 orport=9003 id=0323456789012345678901234567890123456789"
);
/* We need to know if add_default_fallback_dir_servers is called,
Add Fallback Directory Candidate Selection Script "Tor has included a feature to fetch the initial consensus from nodes other than the authorities for a while now. We just haven't shipped a list of alternate locations for clients to go to yet. Reasons why we might want to ship tor with a list of additional places where clients can find the consensus is that it makes authority reachability and BW less important. We want them to have been around and using their current key, address, and port for a while now (120 days), and have been running, a guard, and a v2 directory mirror for most of that time." Features: * whitelist and blacklist for an opt-in/opt-out trial. * excludes BadExits, tor versions that aren't recommended, and low consensus weight directory mirrors. * reduces the weighting of Exits to avoid overloading them. * places limits on the weight of any one fallback. * includes an IPv6 address and orport for each FallbackDir, as implemented in #17327. (Tor won't bootstrap using IPv6 fallbacks until #17840 is merged.) * generated output includes timestamps & Onionoo URL for traceability. * unit test ensures that we successfully load all included default fallback directories. Closes ticket #15775. Patch by "teor". OnionOO script by "weasel", "teor", "gsathya", and "karsten".
2015-05-12 20:10:39 +02:00
* whatever the size of the list in fallback_dirs.inc,
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
* so we use a version of add_default_fallback_dir_servers that adds
Add Fallback Directory Candidate Selection Script "Tor has included a feature to fetch the initial consensus from nodes other than the authorities for a while now. We just haven't shipped a list of alternate locations for clients to go to yet. Reasons why we might want to ship tor with a list of additional places where clients can find the consensus is that it makes authority reachability and BW less important. We want them to have been around and using their current key, address, and port for a while now (120 days), and have been running, a guard, and a v2 directory mirror for most of that time." Features: * whitelist and blacklist for an opt-in/opt-out trial. * excludes BadExits, tor versions that aren't recommended, and low consensus weight directory mirrors. * reduces the weighting of Exits to avoid overloading them. * places limits on the weight of any one fallback. * includes an IPv6 address and orport for each FallbackDir, as implemented in #17327. (Tor won't bootstrap using IPv6 fallbacks until #17840 is merged.) * generated output includes timestamps & Onionoo URL for traceability. * unit test ensures that we successfully load all included default fallback directories. Closes ticket #15775. Patch by "teor". OnionOO script by "weasel", "teor", "gsathya", and "karsten".
2015-05-12 20:10:39 +02:00
* one known default fallback directory. */
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
MOCK(add_default_fallback_dir_servers,
add_default_fallback_dir_servers_known_default);
/* There are 16 different cases, covering each combination of set/NULL for:
* DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority &
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
* FallbackDir. (We always set UseDefaultFallbackDirs to 1.)
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
* But validate_dir_servers() ensures that:
* "You cannot set both DirAuthority and Alternate*Authority."
* This reduces the number of cases to 10.
*
* Let's count these cases using binary, with 1 meaning set & 0 meaning NULL
* So 1001 or case 9 is:
* DirAuthorities set,
* AlternateBridgeAuthority NULL,
* AlternateDirAuthority NULL
* FallbackDir set
* The valid cases are cases 0-9 counting using this method, as every case
* greater than or equal to 10 = 1010 is invalid.
*
* 1. Outcome: Use Set Directory Authorities
* - No Default Authorities
* - Use AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir
* if they are set
* Cases expected to yield this outcome:
* 8 & 9 (the 2 valid cases where DirAuthorities is set)
* 6 & 7 (the 2 cases where DirAuthorities is NULL, and
* AlternateBridgeAuthority and AlternateDirAuthority are both set)
*
* 2. Outcome: Use Set Bridge Authority
* - Use Default Non-Bridge Directory Authorities
* - Use FallbackDir if it is set, otherwise use default FallbackDir
* Cases expected to yield this outcome:
* 4 & 5 (the 2 cases where DirAuthorities is NULL,
* AlternateBridgeAuthority is set, and
* AlternateDirAuthority is NULL)
*
* 3. Outcome: Use Set Alternate Directory Authority
* - Use Default Bridge Authorities
* - Use FallbackDir if it is set, otherwise No Default Fallback Directories
* Cases expected to yield this outcome:
* 2 & 3 (the 2 cases where DirAuthorities and AlternateBridgeAuthority
* are both NULL, but AlternateDirAuthority is set)
*
* 4. Outcome: Use Set Custom Fallback Directory
* - Use Default Bridge & Directory Authorities
* Cases expected to yield this outcome:
* 1 (DirAuthorities, AlternateBridgeAuthority and AlternateDirAuthority
* are all NULL, but FallbackDir is set)
*
* 5. Outcome: Use All Defaults
* - Use Default Bridge & Directory Authorities, and
* Default Fallback Directories
* Cases expected to yield this outcome:
* 0 (DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority
* and FallbackDir are all NULL)
*/
/*
* Find out how many default Bridge, Non-Bridge and Fallback Directories
* are hard-coded into this build.
* This code makes some assumptions about the implementation.
* If they are wrong, one or more of cases 0-5 could fail.
*/
int n_default_alt_bridge_authority = 0;
int n_default_alt_dir_authority = 0;
int n_default_fallback_dir = 0;
#define n_default_authorities ((n_default_alt_bridge_authority) \
+ (n_default_alt_dir_authority))
/* Pre-Count Number of Authorities of Each Type
* Use 0000: No Directory Authorities or Fallback Directories Set
*/
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 0000 */
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = NULL;
options->AlternateDirAuthority = NULL;
options->FallbackDir = NULL;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we have more fallbacks than just the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* Count Bridge Authorities */
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if it's a bridge auth */
n_default_alt_bridge_authority +=
((ds->is_authority && (ds->type & BRIDGE_DIRINFO)) ?
1 : 0)
);
/* If we have no default bridge authority, something has gone wrong */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_default_alt_bridge_authority, OP_GE, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Count v3 Authorities */
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment found counter if it's a v3 auth */
n_default_alt_dir_authority +=
((ds->is_authority && (ds->type & V3_DIRINFO)) ?
1 : 0)
);
/* If we have no default authorities, something has gone really wrong */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_default_alt_dir_authority, OP_GE, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Calculate Fallback Directory Count */
n_default_fallback_dir = (smartlist_len(fallback_servers) -
n_default_alt_bridge_authority -
n_default_alt_dir_authority);
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* If we have a negative count, something has gone really wrong,
* or some authorities aren't being added as fallback directories.
* (networkstatus_consensus_can_use_extra_fallbacks depends on all
* authorities being fallback directories.) */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_default_fallback_dir, OP_GE, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
}
}
/*
* 1. Outcome: Use Set Directory Authorities
* - No Default Authorities
* - Use AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir
* if they are set
* Cases expected to yield this outcome:
* 8 & 9 (the 2 valid cases where DirAuthorities is set)
* 6 & 7 (the 2 cases where DirAuthorities is NULL, and
* AlternateBridgeAuthority and AlternateDirAuthority are both set)
*/
/* Case 9: 1001 - DirAuthorities Set, AlternateBridgeAuthority Not Set,
AlternateDirAuthority Not Set, FallbackDir Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 1001 */
options->DirAuthorities = test_dir_authority;
options->AlternateBridgeAuthority = NULL;
options->AlternateDirAuthority = NULL;
options->FallbackDir = test_fallback_directory;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must not have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we have more fallbacks than just the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* D0, (No B1), (No A2) */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(dir_servers), OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* DirAuthority - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* D0, (No B1), (No A2), Custom Fallback */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(fallback_servers), OP_EQ, 2);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* DirAuthority - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Custom FallbackDir - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Default FallbackDir) - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
}
}
/* Case 8: 1000 - DirAuthorities Set, Others Not Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 1000 */
options->DirAuthorities = test_dir_authority;
options->AlternateBridgeAuthority = NULL;
options->AlternateDirAuthority = NULL;
options->FallbackDir = NULL;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must not have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we just have the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* D0, (No B1), (No A2) */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(dir_servers), OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* DirAuthority - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* D0, (No B1), (No A2), (No Fallback) */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(fallback_servers), OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* DirAuthority - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Custom FallbackDir) - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Default FallbackDir) - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
}
}
/* Case 7: 0111 - DirAuthorities Not Set, Others Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 0111 */
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = test_alt_bridge_authority;
options->AlternateDirAuthority = test_alt_dir_authority;
options->FallbackDir = test_fallback_directory;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must not have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we have more fallbacks than just the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* (No D0), B1, A2 */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(dir_servers), OP_EQ, 2);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No DirAuthority) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateBridgeAuthority - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateDirAuthority - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* (No D0), B1, A2, Custom Fallback */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(fallback_servers), OP_EQ, 3);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No DirAuthority) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateBridgeAuthority - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateDirAuthority - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Custom FallbackDir - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Default FallbackDir) - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
}
}
/* Case 6: 0110 - DirAuthorities Not Set, AlternateBridgeAuthority &
AlternateDirAuthority Set, FallbackDir Not Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 0110 */
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = test_alt_bridge_authority;
options->AlternateDirAuthority = test_alt_dir_authority;
options->FallbackDir = NULL;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must not have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we have more fallbacks than just the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* (No D0), B1, A2 */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(dir_servers), OP_EQ, 2);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No DirAuthority) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateBridgeAuthority - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateDirAuthority - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* (No D0), B1, A2, (No Fallback) */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(smartlist_len(fallback_servers), OP_EQ, 2);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No DirAuthority) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateBridgeAuthority - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateDirAuthority - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Custom FallbackDir) - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Default FallbackDir) - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
}
}
/*
2. Outcome: Use Set Bridge Authority
- Use Default Non-Bridge Directory Authorities
- Use FallbackDir if it is set, otherwise use default FallbackDir
Cases expected to yield this outcome:
4 & 5 (the 2 cases where DirAuthorities is NULL,
AlternateBridgeAuthority is set, and
AlternateDirAuthority is NULL)
*/
/* Case 5: 0101 - DirAuthorities Not Set, AlternateBridgeAuthority Set,
AlternateDirAuthority Not Set, FallbackDir Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 0101 */
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = test_alt_bridge_authority;
options->AlternateDirAuthority = NULL;
options->FallbackDir = test_fallback_directory;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must not have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we have more fallbacks than just the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* (No D0), B1, (No A2), Default v3 Non-Bridge Authorities */
tt_assert(smartlist_len(dir_servers) == 1 + n_default_alt_dir_authority);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateBridgeAuthority - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default v3 non-Bridge directory authorities, so let's assume that
* if the total count above is correct, we have the right ones.
*/
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* (No D0), B1, (No A2), Default v3 Non-Bridge Authorities,
* Custom Fallback */
tt_assert(smartlist_len(fallback_servers) ==
2 + n_default_alt_dir_authority);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateBridgeAuthority - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Custom FallbackDir - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Default FallbackDir) - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default v3 non-Bridge directory authorities, so let's assume that
* if the total count above is correct, we have the right ones.
*/
}
}
/* Case 4: 0100 - DirAuthorities Not Set, AlternateBridgeAuthority Set,
AlternateDirAuthority & FallbackDir Not Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 0100 */
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = test_alt_bridge_authority;
options->AlternateDirAuthority = NULL;
options->FallbackDir = NULL;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we have more fallbacks than just the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* (No D0), B1, (No A2), Default v3 Non-Bridge Authorities */
tt_assert(smartlist_len(dir_servers) == 1 + n_default_alt_dir_authority);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateBridgeAuthority - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default v3 non-Bridge directory authorities, so let's assume that
* if the total count above is correct, we have the right ones.
*/
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* (No D0), B1, (No A2), Default v3 Non-Bridge Authorities,
* Default Fallback */
tt_assert(smartlist_len(fallback_servers) ==
2 + n_default_alt_dir_authority);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateBridgeAuthority - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Custom FallbackDir) - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Default FallbackDir - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default v3 non-Bridge directory authorities, so let's assume that
* if the total count above is correct, we have the right ones.
*/
}
}
/*
3. Outcome: Use Set Alternate Directory Authority
- Use Default Bridge Authorities
- Use FallbackDir if it is set, otherwise No Default Fallback Directories
Cases expected to yield this outcome:
2 & 3 (the 2 cases where DirAuthorities and AlternateBridgeAuthority
are both NULL, but AlternateDirAuthority is set)
*/
/* Case 3: 0011 - DirAuthorities & AlternateBridgeAuthority Not Set,
AlternateDirAuthority & FallbackDir Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 0011 */
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = NULL;
options->AlternateDirAuthority = test_alt_dir_authority;
options->FallbackDir = test_fallback_directory;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must not have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we have more fallbacks than just the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* (No D0), (No B1), Default Bridge Authorities, A2 */
tt_assert(smartlist_len(dir_servers) ==
1 + n_default_alt_bridge_authority);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateDirAuthority - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default Bridge authorities (except for hard-coding tonga's details),
* so let's assume that if the total count above is correct,
* we have the right ones.
*/
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* (No D0), (No B1), Default Bridge Authorities, A2,
* Custom Fallback Directory, (No Default Fallback Directories) */
tt_assert(smartlist_len(fallback_servers) ==
2 + n_default_alt_bridge_authority);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateDirAuthority - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Custom FallbackDir - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Default FallbackDir) - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default Bridge authorities (except for hard-coding tonga's details),
* so let's assume that if the total count above is correct,
* we have the right ones.
*/
}
}
/* Case 2: 0010 - DirAuthorities & AlternateBridgeAuthority Not Set,
AlternateDirAuthority Set, FallbackDir Not Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 0010 */
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = NULL;
options->AlternateDirAuthority = test_alt_dir_authority;
options->FallbackDir = NULL;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must not have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we just have the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* (No D0), (No B1), Default Bridge Authorities, A2,
* No Default or Custom Fallback Directories */
tt_assert(smartlist_len(dir_servers) ==
1 + n_default_alt_bridge_authority);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateDirAuthority - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default Bridge authorities (except for hard-coding tonga's details),
* so let's assume that if the total count above is correct,
* we have the right ones.
*/
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* (No D0), (No B1), Default Bridge Authorities, A2,
* No Custom or Default Fallback Directories */
tt_assert(smartlist_len(fallback_servers) ==
1 + n_default_alt_bridge_authority);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* AlternateDirAuthority - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Custom FallbackDir) - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Default FallbackDir) - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default Bridge authorities (except for hard-coding tonga's details),
* so let's assume that if the total count above is correct,
* we have the right ones.
*/
}
}
/*
4. Outcome: Use Set Custom Fallback Directory
- Use Default Bridge & Directory Authorities
Cases expected to yield this outcome:
1 (DirAuthorities, AlternateBridgeAuthority and AlternateDirAuthority
are all NULL, but FallbackDir is set)
*/
/* Case 1: 0001 - DirAuthorities, AlternateBridgeAuthority
& AlternateDirAuthority Not Set, FallbackDir Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 0001 */
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = NULL;
options->AlternateDirAuthority = NULL;
options->FallbackDir = test_fallback_directory;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must not have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we have more fallbacks than just the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* (No D0), (No B1), Default Bridge Authorities,
* (No A2), Default v3 Directory Authorities */
tt_assert(smartlist_len(dir_servers) == n_default_authorities);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default Bridge & V3 Directory authorities, so let's assume that
* if the total count above is correct, we have the right ones.
*/
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* (No D0), (No B1), Default Bridge Authorities,
* (No A2), Default v3 Directory Authorities,
* Custom Fallback Directory, (No Default Fallback Directories) */
tt_assert(smartlist_len(fallback_servers) ==
1 + n_default_authorities);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Custom FallbackDir - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Default FallbackDir) - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default Bridge & V3 Directory authorities, so let's assume that
* if the total count above is correct, we have the right ones.
*/
}
}
/*
5. Outcome: Use All Defaults
- Use Default Bridge & Directory Authorities, Default Fallback Directories
Cases expected to yield this outcome:
0 (DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority
and FallbackDir are all NULL)
*/
/* Case 0: 0000 - All Not Set */
{
/* clear fallback dirs counter */
n_add_default_fallback_dir_servers_known_default = 0;
/* clear options*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
or_options_free(options);
options = options_new();
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* clear any previous dir servers:
consider_adding_dir_servers() should do this anyway */
clear_dir_servers();
/* assign options: 0001 */
options->DirAuthorities = NULL;
options->AlternateBridgeAuthority = NULL;
options->AlternateDirAuthority = NULL;
options->FallbackDir = NULL;
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
options->UseDefaultFallbackDirs = 1;
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* parse options - ensure we always update by passing NULL old_options */
consider_adding_dir_servers(options, NULL);
/* check outcome */
/* we must have added the default fallback dirs */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(n_add_default_fallback_dir_servers_known_default, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* we have more fallbacks than just the authorities */
tt_assert(networkstatus_consensus_can_use_extra_fallbacks(options) == 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
{
/* trusted_dir_servers */
const smartlist_t *dir_servers = router_get_trusted_dir_servers();
/* (No D0), (No B1), Default Bridge Authorities,
* (No A2), Default v3 Directory Authorities */
tt_assert(smartlist_len(dir_servers) == n_default_authorities);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(dir_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default Bridge & V3 Directory authorities, so let's assume that
* if the total count above is correct, we have the right ones.
*/
}
{
/* fallback_dir_servers */
const smartlist_t *fallback_servers = router_get_fallback_dir_servers();
/* (No D0), (No B1), Default Bridge Authorities,
* (No A2), Default v3 Directory Authorities,
* (No Custom Fallback Directory), Default Fallback Directories */
tt_assert(smartlist_len(fallback_servers) ==
n_default_authorities + n_default_fallback_dir);
/* (No DirAuthorities) - D0 - dir_port: 60090 */
int found_D0 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_D0 +=
(ds->dir_port == 60090 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_D0, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateBridgeAuthority) - B1 - dir_port: 60091 */
int found_B1 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_B1 +=
(ds->dir_port == 60091 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_B1, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No AlternateDirAuthority) - A2 - dir_port: 60092 */
int found_A2 = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_A2 +=
(ds->dir_port == 60092 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_A2, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* Custom FallbackDir - No Nickname - dir_port: 60093 */
int found_non_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_non_default_fallback +=
(ds->dir_port == 60093 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_non_default_fallback, OP_EQ, 0);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* (No Default FallbackDir) - No Nickname - dir_port: 60099 */
int found_default_fallback = 0;
SMARTLIST_FOREACH(fallback_servers,
dir_server_t *,
ds,
/* increment the found counter if dir_port matches */
found_default_fallback +=
(ds->dir_port == 60099 ?
1 : 0)
);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(found_default_fallback, OP_EQ, 1);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
/* There's no easy way of checking that we have included all the
* default Bridge & V3 Directory authorities, and the default
* Fallback Directories, so let's assume that if the total count
* above is correct, we have the right ones.
*/
}
}
done:
clear_dir_servers();
tor_free(test_dir_authority->key);
tor_free(test_dir_authority->value);
tor_free(test_dir_authority);
tor_free(test_alt_dir_authority->key);
tor_free(test_alt_dir_authority->value);
tor_free(test_alt_dir_authority);
tor_free(test_alt_bridge_authority->key);
tor_free(test_alt_bridge_authority->value);
tor_free(test_alt_bridge_authority);
tor_free(test_fallback_directory->key);
tor_free(test_fallback_directory->value);
tor_free(test_fallback_directory);
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
ads_clear_helper(options);
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
or_options_free(options);
UNMOCK(add_default_fallback_dir_servers);
}
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
static void
test_config_default_dir_servers(void *arg)
{
or_options_t *opts = NULL;
(void)arg;
int trusted_count = 0;
int fallback_count = 0;
Add FallbackDir list to GETINFO config/defaults
2015-12-11 07:55:42 +01:00
/* new set of options should stop fallback parsing */
Use config_new() to construct configuration objects. We'll need to do it this way once the objects become more complex.
2019-07-23 16:13:29 +02:00
opts = options_new();
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
opts->UseDefaultFallbackDirs = 0;
Add FallbackDir list to GETINFO config/defaults
2015-12-11 07:55:42 +01:00
/* set old_options to NULL to force dir update */
consider_adding_dir_servers(opts, NULL);
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
trusted_count = smartlist_len(router_get_trusted_dir_servers());
fallback_count = smartlist_len(router_get_fallback_dir_servers());
or_options_free(opts);
opts = NULL;
/* assume a release will never go out with less than 7 authorities */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(trusted_count, OP_GE, 7);
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
/* if we disable the default fallbacks, there must not be any extra */
tt_assert(fallback_count == trusted_count);
Use config_new() to construct configuration objects. We'll need to do it this way once the objects become more complex.
2019-07-23 16:13:29 +02:00
opts = options_new();
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
opts->UseDefaultFallbackDirs = 1;
consider_adding_dir_servers(opts, opts);
trusted_count = smartlist_len(router_get_trusted_dir_servers());
fallback_count = smartlist_len(router_get_fallback_dir_servers());
or_options_free(opts);
opts = NULL;
/* assume a release will never go out with less than 7 authorities */
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(trusted_count, OP_GE, 7);
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
/* XX/teor - allow for default fallbacks to be added without breaking
* the unit tests. Set a minimum fallback count once the list is stable. */
tt_assert(fallback_count >= trusted_count);
done:
or_options_free(opts);
}
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
static int mock_router_pick_published_address_result = 0;
static int
refactor router_pick_published_address to have another arg no change in behavior except fewer log entries in the case where we use a cached result.
2016-11-16 22:13:03 +01:00
mock_router_pick_published_address(const or_options_t *options,
uint32_t *addr, int cache_only)
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
{
(void)options;
(void)addr;
refactor router_pick_published_address to have another arg no change in behavior except fewer log entries in the case where we use a cached result.
2016-11-16 22:13:03 +01:00
(void)cache_only;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
return mock_router_pick_published_address_result;
}
static int mock_router_my_exit_policy_is_reject_star_result = 0;
static int
mock_router_my_exit_policy_is_reject_star(void)
{
return mock_router_my_exit_policy_is_reject_star_result;
}
static int mock_advertised_server_mode_result = 0;
static int
mock_advertised_server_mode(void)
{
return mock_advertised_server_mode_result;
}
static routerinfo_t *mock_router_get_my_routerinfo_result = NULL;
static const routerinfo_t *
mock_router_get_my_routerinfo(void)
{
return mock_router_get_my_routerinfo_result;
}
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
static void
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
test_config_directory_fetch(void *arg)
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
{
(void)arg;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
/* Test Setup */
Use config_new() to construct configuration objects. We'll need to do it this way once the objects become more complex.
2019-07-23 16:13:29 +02:00
or_options_t *options = options_new();
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
routerinfo_t routerinfo;
memset(&routerinfo, 0, sizeof(routerinfo));
mock_router_pick_published_address_result = -1;
mock_router_my_exit_policy_is_reject_star_result = 1;
mock_advertised_server_mode_result = 0;
mock_router_get_my_routerinfo_result = NULL;
MOCK(router_pick_published_address, mock_router_pick_published_address);
MOCK(router_my_exit_policy_is_reject_star,
mock_router_my_exit_policy_is_reject_star);
MOCK(advertised_server_mode, mock_advertised_server_mode);
MOCK(router_get_my_routerinfo, mock_router_get_my_routerinfo);
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
or_options_free(options);
options = options_new();
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* Clients can use multiple directory mirrors for bootstrap */
options->ClientOnly = 1;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
tt_assert(server_mode(options) == 0);
tt_assert(public_server_mode(options) == 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 0);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 1);
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* Bridge Clients can use multiple directory mirrors for bootstrap */
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
or_options_free(options);
options = options_new();
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
options->UseBridges = 1;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
tt_assert(server_mode(options) == 0);
tt_assert(public_server_mode(options) == 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 0);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 1);
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
/* Bridge Relays (Bridges) must act like clients, and use multiple
* directory mirrors for bootstrap */
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
or_options_free(options);
options = options_new();
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
options->BridgeRelay = 1;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
options->ORPort_set = 1;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 0);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 1);
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
/* Clients set to FetchDirInfoEarly must fetch it from the authorities,
* but can use multiple authorities for bootstrap */
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
or_options_free(options);
options = options_new();
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
options->FetchDirInfoEarly = 1;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
tt_assert(server_mode(options) == 0);
tt_assert(public_server_mode(options) == 0);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 1);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 1);
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
/* OR servers only fetch the consensus from the authorities when they don't
* know their own address, but never use multiple directories for bootstrap
*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
or_options_free(options);
options = options_new();
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
options->ORPort_set = 1;
mock_router_pick_published_address_result = -1;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 1);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 0);
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
mock_router_pick_published_address_result = 0;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 0);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 0);
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
/* Exit OR servers only fetch the consensus from the authorities when they
* refuse unknown exits, but never use multiple directories for bootstrap
*/
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
or_options_free(options);
options = options_new();
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
options->ORPort_set = 1;
options->ExitRelay = 1;
mock_router_pick_published_address_result = 0;
mock_router_my_exit_policy_is_reject_star_result = 0;
mock_advertised_server_mode_result = 1;
mock_router_get_my_routerinfo_result = &routerinfo;
Fix config/directory_fetch after 12538 merge
2015-12-18 19:36:41 +01:00
routerinfo.supports_tunnelled_dir_requests = 1;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
options->RefuseUnknownExits = 1;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 1);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 0);
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
options->RefuseUnknownExits = 0;
mock_router_pick_published_address_result = 0;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 0);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 0);
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
/* Dir servers fetch the consensus from the authorities, unless they are not
* advertising themselves (hibernating) or have no routerinfo or are not
* advertising their dirport, and never use multiple directories for
* bootstrap. This only applies if they are also OR servers.
* (We don't care much about the behaviour of non-OR directory servers.) */
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
or_options_free(options);
options = options_new();
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
options->DirPort_set = 1;
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
options->ORPort_set = 1;
Fix config/directory_fetch after 12538 merge
2015-12-18 19:36:41 +01:00
options->DirCache = 1;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
mock_router_pick_published_address_result = 0;
mock_router_my_exit_policy_is_reject_star_result = 1;
mock_advertised_server_mode_result = 1;
routerinfo.dir_port = 1;
mock_router_get_my_routerinfo_result = &routerinfo;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 1);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 0);
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
mock_advertised_server_mode_result = 0;
routerinfo.dir_port = 1;
mock_router_get_my_routerinfo_result = &routerinfo;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 0);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 0);
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
mock_advertised_server_mode_result = 1;
mock_router_get_my_routerinfo_result = NULL;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 0);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 0);
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
mock_advertised_server_mode_result = 1;
routerinfo.dir_port = 0;
Fix config/directory_fetch after 12538 merge
2015-12-18 19:36:41 +01:00
routerinfo.supports_tunnelled_dir_requests = 0;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
mock_router_get_my_routerinfo_result = &routerinfo;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 0);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 0);
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
mock_advertised_server_mode_result = 1;
routerinfo.dir_port = 1;
Fix config/directory_fetch after 12538 merge
2015-12-18 19:36:41 +01:00
routerinfo.supports_tunnelled_dir_requests = 1;
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
mock_router_get_my_routerinfo_result = &routerinfo;
tt_assert(server_mode(options) == 1);
tt_assert(public_server_mode(options) == 1);
apply ahf's test_assert_int.cocci
2017-08-24 21:49:59 +02:00
tt_int_op(directory_fetches_from_authorities(options), OP_EQ, 1);
tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
OP_EQ, 0);
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
done:
Refactor config free logic to use a single path. The right way to free a config object is now to wrap config_free(), always. Instead of creating an alternative free function, objects should provide an alternative clear callback to free any fields that the configuration manager doesn't manage. This lets us simplify our code a little, and lets us extend the confparse.c code to manage additional fields in config_free.
2019-07-23 18:04:59 +02:00
or_options_free(options);
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
UNMOCK(router_pick_published_address);
UNMOCK(router_get_my_routerinfo);
UNMOCK(advertised_server_mode);
UNMOCK(router_my_exit_policy_is_reject_star);
Prop210: Close excess connections once a consensus is downloading Once tor is downloading a usable consensus, any other connection attempts are not needed. Choose a connection to keep, favouring: * fallback directories over authorities, * connections initiated earlier over later connections Close all other connections downloading a consensus.
2015-12-07 08:07:44 +01:00
}
Add Fallback Directory Candidate Selection Script "Tor has included a feature to fetch the initial consensus from nodes other than the authorities for a while now. We just haven't shipped a list of alternate locations for clients to go to yet. Reasons why we might want to ship tor with a list of additional places where clients can find the consensus is that it makes authority reachability and BW less important. We want them to have been around and using their current key, address, and port for a while now (120 days), and have been running, a guard, and a v2 directory mirror for most of that time." Features: * whitelist and blacklist for an opt-in/opt-out trial. * excludes BadExits, tor versions that aren't recommended, and low consensus weight directory mirrors. * reduces the weighting of Exits to avoid overloading them. * places limits on the weight of any one fallback. * includes an IPv6 address and orport for each FallbackDir, as implemented in #17327. (Tor won't bootstrap using IPv6 fallbacks until #17840 is merged.) * generated output includes timestamps & Onionoo URL for traceability. * unit test ensures that we successfully load all included default fallback directories. Closes ticket #15775. Patch by "teor". OnionOO script by "weasel", "teor", "gsathya", and "karsten".
2015-05-12 20:10:39 +02:00
static void
test_config_default_fallback_dirs(void *arg)
{
const char *fallback[] = {
Fix our build system to know the new locations of the src/or stuff
2018-07-05 22:52:12 +02:00
#include "app/config/fallback_dirs.inc"
Add Fallback Directory Candidate Selection Script "Tor has included a feature to fetch the initial consensus from nodes other than the authorities for a while now. We just haven't shipped a list of alternate locations for clients to go to yet. Reasons why we might want to ship tor with a list of additional places where clients can find the consensus is that it makes authority reachability and BW less important. We want them to have been around and using their current key, address, and port for a while now (120 days), and have been running, a guard, and a v2 directory mirror for most of that time." Features: * whitelist and blacklist for an opt-in/opt-out trial. * excludes BadExits, tor versions that aren't recommended, and low consensus weight directory mirrors. * reduces the weighting of Exits to avoid overloading them. * places limits on the weight of any one fallback. * includes an IPv6 address and orport for each FallbackDir, as implemented in #17327. (Tor won't bootstrap using IPv6 fallbacks until #17840 is merged.) * generated output includes timestamps & Onionoo URL for traceability. * unit test ensures that we successfully load all included default fallback directories. Closes ticket #15775. Patch by "teor". OnionOO script by "weasel", "teor", "gsathya", and "karsten".
2015-05-12 20:10:39 +02:00
NULL
};
int n_included_fallback_dirs = 0;
int n_added_fallback_dirs = 0;
(void)arg;
clear_dir_servers();
while (fallback[n_included_fallback_dirs])
n_included_fallback_dirs++;
add_default_fallback_dir_servers();
n_added_fallback_dirs = smartlist_len(router_get_fallback_dir_servers());
tt_assert(n_included_fallback_dirs == n_added_fallback_dirs);
done:
clear_dir_servers();
}
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
static void
test_config_port_cfg_line_extract_addrport(void *arg)
{
(void)arg;
int unixy = 0;
const char *rest = NULL;
char *a = NULL;
tt_int_op(port_cfg_line_extract_addrport("", &a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 0);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("hello", &a, &unixy, &rest),
OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 0);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "hello");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport(" flipperwalt gersplut",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 0);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "flipperwalt");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "gersplut");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport(" flipperwalt \t gersplut",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 0);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "flipperwalt");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "gersplut");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("flipperwalt \t gersplut",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 0);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "flipperwalt");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "gersplut");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:flipperwalt \t gersplut",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 1);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "flipperwalt");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "gersplut");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("lolol",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 0);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "lolol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:lolol",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 1);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "lolol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:lolol ",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 1);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "lolol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport(" unix:lolol",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 1);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "lolol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("foobar:lolol",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 0);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "foobar:lolol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport(":lolol",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 0);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, ":lolol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:\"lolol\"",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 1);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "lolol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:\"lolol\" ",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 1);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "lolol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:\"lolol\" foo ",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 1);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "lolol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "foo ");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:\"lol ol\" foo ",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 1);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "lol ol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "foo ");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:\"lol\\\" ol\" foo ",
&a, &unixy, &rest), OP_EQ, 0);
tt_int_op(unixy, OP_EQ, 1);
Replace accumulated C ;;s with ;s I don't know where these came from.
2017-09-15 22:43:17 +02:00
tt_str_op(a, OP_EQ, "lol\" ol");
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
tt_str_op(rest, OP_EQ, "foo ");
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:\"lol\\\" ol foo ",
&a, &unixy, &rest), OP_EQ, -1);
tor_free(a);
tt_int_op(port_cfg_line_extract_addrport("unix:\"lol\\0\" ol foo ",
&a, &unixy, &rest), OP_EQ, -1);
tor_free(a);
done:
tor_free(a);
}
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
static config_line_t *
mock_config_line(const char *key, const char *val)
{
config_line_t *config_line = tor_malloc(sizeof(config_line_t));
memset(config_line, 0, sizeof(config_line_t));
config_line->key = tor_strdup(key);
config_line->value = tor_strdup(val);
return config_line;
}
static void
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
test_config_parse_port_config__ports__no_ports_given(void *data)
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
{
(void)data;
int ret;
smartlist_t *slout = NULL;
port_cfg_t *port_cfg = NULL;
slout = smartlist_new();
// Test no defaultport, no defaultaddress and no out
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, NULL, "DNS", 0, NULL, 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test with defaultport, no defaultaddress and no out
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, NULL, "DNS", 0, NULL, 42, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test no defaultport, with defaultaddress and no out
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, NULL, "DNS", 0, "127.0.0.2", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test with defaultport, with defaultaddress and no out
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, NULL, "DNS", 0, "127.0.0.2", 42, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test no defaultport, no defaultaddress and with out
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, NULL, "DNS", 0, NULL, 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 0);
// Test with defaultport, no defaultaddress and with out
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, NULL, "DNS", 0, NULL, 42, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 0);
// Test no defaultport, with defaultaddress and with out
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, NULL, "DNS", 0, "127.0.0.2", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 0);
// Test with defaultport, with defaultaddress and out, adds a new port cfg
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, NULL, "DNS", 0, "127.0.0.2", 42, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
tt_int_op(port_cfg->port, OP_EQ, 42);
tt_int_op(port_cfg->is_unix_addr, OP_EQ, 0);
Fix all spaces
2015-10-05 22:06:34 +02:00
// Test with defaultport, with defaultaddress and out, adds a new port cfg
// for a unix address
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, NULL, "DNS", 0, "/foo/bar/unixdomain",
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
42, CL_PORT_IS_UNIXSOCKET);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->port, OP_EQ, 0);
tt_int_op(port_cfg->is_unix_addr, OP_EQ, 1);
tt_str_op(port_cfg->unix_addr, OP_EQ, "/foo/bar/unixdomain");
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
done:
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
if (slout)
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_free(slout);
}
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
static void
test_config_parse_port_config__ports__ports_given(void *data)
{
(void)data;
int ret;
smartlist_t *slout = NULL;
port_cfg_t *port_cfg = NULL;
config_line_t *config_port_invalid = NULL, *config_port_valid = NULL;
tor_addr_t addr;
slout = smartlist_new();
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
Use {mock,unmock}_hostname_resolver() in relevant tests These tests all invoke the hostname resolver in one way or another, and therefore potentially block if our DNS server is missing, absent, or extremely slow. Closes ticket 31841.
2019-10-03 14:57:14 +02:00
mock_hostname_resolver();
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test error when encounters an invalid Port specification
config_port_invalid = mock_config_line("DNSPort", "");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_invalid, "DNS", 0, NULL,
Fix all spaces
2015-10-05 22:06:34 +02:00
0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test error when encounters an empty unix domain specification
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "unix:");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_invalid, "DNS", 0, NULL,
Fix all spaces
2015-10-05 22:06:34 +02:00
0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
Fix all spaces
2015-10-05 22:06:34 +02:00
// Test error when encounters a unix domain specification but the listener
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
// doesn't support domain sockets
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "unix:/tmp/foo/bar");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_valid, "DNS",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_AP_DNS_LISTENER, NULL, 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test valid unix domain
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0, 0);
Don't expect unix sockets to be accepted on Windows Fixes failures in test_config.c; bug not in any released tor.
2016-02-01 15:57:54 +01:00
#ifdef _WIN32
tt_int_op(ret, OP_EQ, -1);
#else
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->port, OP_EQ, 0);
tt_int_op(port_cfg->is_unix_addr, OP_EQ, 1);
tt_str_op(port_cfg->unix_addr, OP_EQ, "/tmp/foo/bar");
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
/* Test entry port defaults as initialised in parse_port_config */
tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1);
tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1);
tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1);
Fix unit tests for 24050.
2017-11-29 18:05:36 +01:00
tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0);
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1);
Run our #else/#endif annotator on our source code.
2017-09-15 22:24:44 +02:00
#endif /* defined(_WIN32) */
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
// Test failure if we have no ipv4 and no ipv6 and no onion (DNS only)
config_free_lines(config_port_invalid); config_port_invalid = NULL;
config_port_invalid = mock_config_line("SOCKSPort",
"unix:/tmp/foo/bar NoIPv4Traffic "
client: set IPv6Traffic to on by default See: https://trac.torproject.org/projects/tor/ticket/21269 https://bugs.debian.org/851798 Closes #21269 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-23 19:22:11 +01:00
"NoIPv6Traffic "
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
"NoOnionTraffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_invalid, "SOCKS",
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0,
CL_PORT_TAKES_HOSTNAMES);
tt_int_op(ret, OP_EQ, -1);
// Test failure if we have no DNS and we're a DNSPort
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Fix all spaces
2015-10-05 22:06:34 +02:00
config_port_invalid = mock_config_line("DNSPort",
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
"127.0.0.1:80 NoDNSRequest");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_invalid, "DNS",
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
CONN_TYPE_AP_DNS_LISTENER, NULL, 0,
CL_PORT_TAKES_HOSTNAMES);
tt_int_op(ret, OP_EQ, -1);
// If we're a DNSPort, DNS only is ok
// Use a port because DNSPort doesn't support sockets
config_free_lines(config_port_valid); config_port_valid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
config_port_valid = mock_config_line("DNSPort", "127.0.0.1:80 "
client: set IPv6Traffic to on by default See: https://trac.torproject.org/projects/tor/ticket/21269 https://bugs.debian.org/851798 Closes #21269 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-23 19:22:11 +01:00
"NoIPv6Traffic "
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
"NoIPv4Traffic NoOnionTraffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS",
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
CONN_TYPE_AP_DNS_LISTENER, NULL, 0,
CL_PORT_TAKES_HOSTNAMES);
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1);
tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 0);
// Test failure if we have DNS but no ipv4 and no ipv6
config_free_lines(config_port_invalid); config_port_invalid = NULL;
config_port_invalid = mock_config_line("SOCKSPort",
client: set IPv6Traffic to on by default See: https://trac.torproject.org/projects/tor/ticket/21269 https://bugs.debian.org/851798 Closes #21269 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-23 19:22:11 +01:00
"NoIPv6Traffic "
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
"unix:/tmp/foo/bar NoIPv4Traffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_invalid, "SOCKS",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_TAKES_HOSTNAMES);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
// Test success with no DNS, no ipv4, no ipv6 (only onion, using separate
// options)
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Make port names and types consistent in the port unit tests String constant changes only, and only in the unit tests. These strings are used in log messages only.
2016-03-31 14:26:18 +02:00
config_port_valid = mock_config_line("SOCKSPort", "unix:/tmp/foo/bar "
client: set IPv6Traffic to on by default See: https://trac.torproject.org/projects/tor/ticket/21269 https://bugs.debian.org/851798 Closes #21269 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-23 19:22:11 +01:00
"NoIPv6Traffic "
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
"NoDNSRequest NoIPv4Traffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_TAKES_HOSTNAMES);
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
#ifdef _WIN32
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
#else
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1);
Run our #else/#endif annotator on our source code.
2017-09-15 22:24:44 +02:00
#endif /* defined(_WIN32) */
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
// Test success with quoted unix: address.
config_free_lines(config_port_valid); config_port_valid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
config_port_valid = mock_config_line("SOCKSPort", "unix:\"/tmp/foo/ bar\" "
client: set IPv6Traffic to on by default See: https://trac.torproject.org/projects/tor/ticket/21269 https://bugs.debian.org/851798 Closes #21269 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-23 19:22:11 +01:00
"NoIPv6Traffic "
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
"NoDNSRequest NoIPv4Traffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0,
CL_PORT_TAKES_HOSTNAMES);
#ifdef _WIN32
tt_int_op(ret, OP_EQ, -1);
#else
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1);
Run our #else/#endif annotator on our source code.
2017-09-15 22:24:44 +02:00
#endif /* defined(_WIN32) */
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
// Test failure with broken quoted unix: address.
config_free_lines(config_port_valid); config_port_valid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
config_port_valid = mock_config_line("SOCKSPort", "unix:\"/tmp/foo/ bar "
client: set IPv6Traffic to on by default See: https://trac.torproject.org/projects/tor/ticket/21269 https://bugs.debian.org/851798 Closes #21269 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-23 19:22:11 +01:00
"NoIPv6Traffic "
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
"NoDNSRequest NoIPv4Traffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0,
CL_PORT_TAKES_HOSTNAMES);
tt_int_op(ret, OP_EQ, -1);
// Test failure with empty quoted unix: address.
config_free_lines(config_port_valid); config_port_valid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
config_port_valid = mock_config_line("SOCKSPort", "unix:\"\" "
client: set IPv6Traffic to on by default See: https://trac.torproject.org/projects/tor/ticket/21269 https://bugs.debian.org/851798 Closes #21269 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-23 19:22:11 +01:00
"NoIPv6Traffic "
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
"NoDNSRequest NoIPv4Traffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0,
CL_PORT_TAKES_HOSTNAMES);
tt_int_op(ret, OP_EQ, -1);
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
// Test success with OnionTrafficOnly (no DNS, no ipv4, no ipv6)
config_free_lines(config_port_valid); config_port_valid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
Make port names and types consistent in the port unit tests String constant changes only, and only in the unit tests. These strings are used in log messages only.
2016-03-31 14:26:18 +02:00
config_port_valid = mock_config_line("SOCKSPort", "unix:/tmp/foo/bar "
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
"OnionTrafficOnly");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0,
CL_PORT_TAKES_HOSTNAMES);
#ifdef _WIN32
tt_int_op(ret, OP_EQ, -1);
#else
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1);
Run our #else/#endif annotator on our source code.
2017-09-15 22:24:44 +02:00
#endif /* defined(_WIN32) */
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
// Test success with no ipv4 but take ipv6
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Make port names and types consistent in the port unit tests String constant changes only, and only in the unit tests. These strings are used in log messages only.
2016-03-31 14:26:18 +02:00
config_port_valid = mock_config_line("SOCKSPort", "unix:/tmp/foo/bar "
Fix all spaces
2015-10-05 22:06:34 +02:00
"NoIPv4Traffic IPv6Traffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_TAKES_HOSTNAMES);
Don't expect unix sockets to be accepted on Windows Fixes failures in test_config.c; bug not in any released tor.
2016-02-01 15:57:54 +01:00
#ifdef _WIN32
tt_int_op(ret, OP_EQ, -1);
#else
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1);
Run our #else/#endif annotator on our source code.
2017-09-15 22:24:44 +02:00
#endif /* defined(_WIN32) */
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic, and NoIPv6Traffic. Add unit tests for parsing and checking option validity. Add documentation for each flag to the man page. Add changes file for all of #18693. Parsing only: the flags do not change client behaviour (yet!)
2016-03-31 12:26:41 +02:00
// Test success with both ipv4 and ipv6
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Make port names and types consistent in the port unit tests String constant changes only, and only in the unit tests. These strings are used in log messages only.
2016-03-31 14:26:18 +02:00
config_port_valid = mock_config_line("SOCKSPort", "unix:/tmp/foo/bar "
Fix all spaces
2015-10-05 22:06:34 +02:00
"IPv4Traffic IPv6Traffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_AP_LISTENER, NULL, 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_TAKES_HOSTNAMES);
Don't expect unix sockets to be accepted on Windows Fixes failures in test_config.c; bug not in any released tor.
2016-02-01 15:57:54 +01:00
#ifdef _WIN32
tt_int_op(ret, OP_EQ, -1);
#else
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1);
tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1);
Run our #else/#endif annotator on our source code.
2017-09-15 22:24:44 +02:00
#endif /* defined(_WIN32) */
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test failure if we specify world writable for an IP Port
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "42 WorldWritable");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_invalid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test failure if we specify group writable for an IP Port
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "42 GroupWritable");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_invalid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
First RelaxDirModeCheck implementation
2016-03-01 17:08:14 +01:00
// Test failure if we specify group writable for an IP Port
config_free_lines(config_port_invalid); config_port_invalid = NULL;
config_port_invalid = mock_config_line("DNSPort", "42 RelaxDirModeCheck");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_invalid, "DNS", 0,
First RelaxDirModeCheck implementation
2016-03-01 17:08:14 +01:00
"127.0.0.3", 0, 0);
tt_int_op(ret, OP_EQ, -1);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with only a port (this will fail without a default address)
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test success with only a port and isolate destination port
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 IsolateDestPort");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Fix all spaces
2015-10-05 22:06:34 +02:00
tt_int_op(port_cfg->entry_cfg.isolation_flags, OP_EQ,
ISO_DEFAULT | ISO_DESTPORT);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with a negative isolate destination port, and plural
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 NoIsolateDestPorts");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Fix all spaces
2015-10-05 22:06:34 +02:00
tt_int_op(port_cfg->entry_cfg.isolation_flags, OP_EQ,
ISO_DEFAULT & ~ISO_DESTPORT);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with isolate destination address
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 IsolateDestAddr");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Fix all spaces
2015-10-05 22:06:34 +02:00
tt_int_op(port_cfg->entry_cfg.isolation_flags, OP_EQ,
ISO_DEFAULT | ISO_DESTADDR);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with isolate socks AUTH
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 IsolateSOCKSAuth");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Fix all spaces
2015-10-05 22:06:34 +02:00
tt_int_op(port_cfg->entry_cfg.isolation_flags, OP_EQ,
ISO_DEFAULT | ISO_SOCKSAUTH);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with isolate client protocol
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 IsolateClientProtocol");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Fix all spaces
2015-10-05 22:06:34 +02:00
tt_int_op(port_cfg->entry_cfg.isolation_flags, OP_EQ,
ISO_DEFAULT | ISO_CLIENTPROTO);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with isolate client address
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 IsolateClientAddr");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Fix all spaces
2015-10-05 22:06:34 +02:00
tt_int_op(port_cfg->entry_cfg.isolation_flags, OP_EQ,
ISO_DEFAULT | ISO_CLIENTADDR);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with ignored unknown options
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 ThisOptionDoesntExist");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test success with no isolate socks AUTH
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 NoIsolateSOCKSAuth");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.3", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.socks_prefer_no_auth, OP_EQ, 1);
// Test success with prefer ipv6
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Placate "make check-spaces"
2016-09-08 21:43:56 +02:00
config_port_valid = mock_config_line("SOCKSPort",
"42 IPv6Traffic PreferIPv6");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_AP_LISTENER, "127.0.0.42", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_TAKES_HOSTNAMES);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.prefer_ipv6, OP_EQ, 1);
// Test success with cache ipv4 DNS
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 CacheIPv4DNS");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.42", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1);
tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 0);
// Test success with cache ipv6 DNS
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 CacheIPv6DNS");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.42", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Fix unit tests for 24050.
2017-11-29 18:05:36 +01:00
tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 1);
// Test success with no cache ipv4 DNS
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 NoCacheIPv4DNS");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.42", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 0);
// Test success with cache DNS
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 CacheDNS");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
"127.0.0.42", 0, CL_PORT_TAKES_HOSTNAMES);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1);
tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 1);
// Test success with use cached ipv4 DNS
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 UseIPv4Cache");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.42", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.use_cached_ipv4_answers, OP_EQ, 1);
tt_int_op(port_cfg->entry_cfg.use_cached_ipv6_answers, OP_EQ, 0);
// Test success with use cached ipv6 DNS
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 UseIPv6Cache");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.42", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.use_cached_ipv4_answers, OP_EQ, 0);
tt_int_op(port_cfg->entry_cfg.use_cached_ipv6_answers, OP_EQ, 1);
// Test success with use cached DNS
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 UseDNSCache");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.42", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.use_cached_ipv4_answers, OP_EQ, 1);
tt_int_op(port_cfg->entry_cfg.use_cached_ipv6_answers, OP_EQ, 1);
// Test success with not preferring ipv6 automap
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 NoPreferIPv6Automap");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.42", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 0);
// Test success with prefer SOCKS no auth
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 PreferSOCKSNoAuth");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.42", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.socks_prefer_no_auth, OP_EQ, 1);
// Test failure with both a zero port and a non-zero port
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "0");
config_port_valid = mock_config_line("DNSPort", "42");
config_port_invalid->next = config_port_valid;
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.42", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test success with warn non-local control
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "Control",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_CONTROL_LISTENER, "127.0.0.42", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_WARN_NONLOCAL);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test success with warn non-local listener
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "ExtOR",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_EXT_OR_LISTENER, "127.0.0.42", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_WARN_NONLOCAL);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test success with warn non-local other
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
"127.0.0.42", 0, CL_PORT_WARN_NONLOCAL);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test success with warn non-local other without out
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_valid, "DNS", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
"127.0.0.42", 0, CL_PORT_WARN_NONLOCAL);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
// Test success with both ipv4 and ipv6 but without stream options
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
config_port_valid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Fix all spaces
2015-10-05 22:06:34 +02:00
config_port_valid = mock_config_line("DNSPort", "42 IPv4Traffic "
"IPv6Traffic");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.44", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_TAKES_HOSTNAMES |
CL_PORT_NO_STREAM_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1);
client: set IPv6Traffic to on by default See: https://trac.torproject.org/projects/tor/ticket/21269 https://bugs.debian.org/851798 Closes #21269 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-23 19:22:11 +01:00
tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test failure for a SessionGroup argument with invalid value
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=invalid");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
"127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=.
2019-05-31 15:03:16 +02:00
// Test failure for a SessionGroup argument with valid value but with no
// stream options allowed
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=.
2019-05-31 15:03:16 +02:00
"127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test failure for more than one SessionGroup argument
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Fix all spaces
2015-10-05 22:06:34 +02:00
config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123 "
"SessionGroup=321");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=.
2019-05-31 15:03:16 +02:00
"127.0.0.44", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test success with a sessiongroup options
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "42 SessionGroup=1111122");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=.
2019-05-31 15:03:16 +02:00
"127.0.0.44", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->entry_cfg.session_group, OP_EQ, 1111122);
// Test success with a zero unix domain socket, and doesnt add it to out
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "0");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
"127.0.0.45", 0, CL_PORT_IS_UNIXSOCKET);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with a one unix domain socket, and doesnt add it to out
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "something");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
"127.0.0.45", 0, CL_PORT_IS_UNIXSOCKET);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->is_unix_addr, OP_EQ, 1);
tt_str_op(port_cfg->unix_addr, OP_EQ, "something");
// Test success with a port of auto - it uses the default address
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "auto");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.46", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Made 'auto' keyword in torrc case insensitive
2018-07-07 16:15:16 +02:00
tt_int_op(port_cfg->port, OP_EQ, CFG_AUTO_PORT);
tor_addr_parse(&addr, "127.0.0.46");
tt_assert(tor_addr_eq(&port_cfg->addr, &addr))
// Test success with a port of auto in mixed case
config_free_lines(config_port_valid); config_port_valid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
config_port_valid = mock_config_line("DNSPort", "AuTo");
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
"127.0.0.46", 0, 0);
tt_int_op(ret, OP_EQ, 0);
tt_int_op(smartlist_len(slout), OP_EQ, 1);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->port, OP_EQ, CFG_AUTO_PORT);
tor_addr_parse(&addr, "127.0.0.46");
Use tor_addr_eq instead of tt_mem_op
2015-10-05 22:17:11 +02:00
tt_assert(tor_addr_eq(&port_cfg->addr, &addr))
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with parsing both an address and an auto port
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "127.0.0.122:auto");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.46", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->port, OP_EQ, CFG_AUTO_PORT);
tor_addr_parse(&addr, "127.0.0.122");
Use tor_addr_eq instead of tt_mem_op
2015-10-05 22:17:11 +02:00
tt_assert(tor_addr_eq(&port_cfg->addr, &addr))
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test failure when asked to parse an invalid address followed by auto
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "invalidstuff!!:auto");
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.
2017-01-03 16:11:23 +01:00
MOCK(tor_addr_lookup, mock_tor_addr_lookup__fail_on_bad_addrs);
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(NULL, config_port_invalid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.46", 0, 0);
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.
2017-01-03 16:11:23 +01:00
UNMOCK(tor_addr_lookup);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test success with parsing both an address and a real port
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "127.0.0.123:656");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.46", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->port, OP_EQ, 656);
tor_addr_parse(&addr, "127.0.0.123");
Use tor_addr_eq instead of tt_mem_op
2015-10-05 22:17:11 +02:00
tt_assert(tor_addr_eq(&port_cfg->addr, &addr))
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test failure if we can't parse anything at all
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "something wrong");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.46", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test failure if we find both an address, a port and an auto
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "127.0.1.0:123:auto");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0,
Fix all spaces
2015-10-05 22:06:34 +02:00
"127.0.0.46", 0, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
Fix all spaces
2015-10-05 22:06:34 +02:00
// Test that default to group writeable default sets group writeable for
// domain socket
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Make port names and types consistent in the port unit tests String constant changes only, and only in the unit tests. These strings are used in log messages only.
2016-03-31 14:26:18 +02:00
config_port_valid = mock_config_line("SOCKSPort", "unix:/tmp/somewhere");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "SOCKS",
Fix all spaces
2015-10-05 22:06:34 +02:00
CONN_TYPE_AP_LISTENER, "127.0.0.46", 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_DFLT_GROUP_WRITABLE);
Redux: don't expect unix sockets to be accepted on windows
2016-02-01 16:21:11 +01:00
#ifdef _WIN32
tt_int_op(ret, OP_EQ, -1);
#else
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->is_group_writable, OP_EQ, 1);
Run our #else/#endif annotator on our source code.
2017-09-15 22:24:44 +02:00
#endif /* defined(_WIN32) */
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
done:
Use {mock,unmock}_hostname_resolver() in relevant tests These tests all invoke the hostname resolver in one way or another, and therefore potentially block if our DNS server is missing, absent, or extremely slow. Closes ticket 31841.
2019-10-03 14:57:14 +02:00
unmock_hostname_resolver();
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
if (slout)
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_free(slout);
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
config_free_lines(config_port_valid); config_port_valid = NULL;
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
}
static void
test_config_parse_port_config__ports__server_options(void *data)
{
(void)data;
int ret;
smartlist_t *slout = NULL;
port_cfg_t *port_cfg = NULL;
config_line_t *config_port_invalid = NULL, *config_port_valid = NULL;
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
slout = smartlist_new();
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test success with NoAdvertise option
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix all spaces
2015-10-05 22:06:34 +02:00
config_port_valid = mock_config_line("DNSPort",
"127.0.0.124:656 NoAdvertise");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0, NULL, 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_SERVER_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->server_cfg.no_advertise, OP_EQ, 1);
tt_int_op(port_cfg->server_cfg.no_listen, OP_EQ, 0);
// Test success with NoListen option
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 NoListen");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0, NULL, 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_SERVER_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->server_cfg.no_advertise, OP_EQ, 0);
tt_int_op(port_cfg->server_cfg.no_listen, OP_EQ, 1);
// Test failure with both NoAdvertise and NoListen option
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Fix all spaces
2015-10-05 22:06:34 +02:00
config_port_invalid = mock_config_line("DNSPort", "127.0.0.124:656 NoListen "
"NoAdvertise");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0, NULL,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
0, CL_PORT_SERVER_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test success with IPv4Only
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 IPv4Only");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0, NULL, 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_SERVER_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->server_cfg.bind_ipv4_only, OP_EQ, 1);
tt_int_op(port_cfg->server_cfg.bind_ipv6_only, OP_EQ, 0);
// Test success with IPv6Only
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "[::1]:656 IPv6Only");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0, NULL, 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_SERVER_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
port_cfg = (port_cfg_t *)smartlist_get(slout, 0);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(port_cfg->server_cfg.bind_ipv4_only, OP_EQ, 0);
tt_int_op(port_cfg->server_cfg.bind_ipv6_only, OP_EQ, 1);
// Test failure with both IPv4Only and IPv6Only
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Fix all spaces
2015-10-05 22:06:34 +02:00
config_port_invalid = mock_config_line("DNSPort", "127.0.0.124:656 IPv6Only "
"IPv4Only");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0, NULL,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
0, CL_PORT_SERVER_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test success with invalid parameter
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_valid); config_port_valid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 unknown");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_valid, "DNS", 0, NULL, 0,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
CL_PORT_SERVER_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, 0);
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
tt_int_op(smartlist_len(slout), OP_EQ, 1);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
// Test failure when asked to bind only to ipv6 but gets an ipv4 address
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Fix all spaces
2015-10-05 22:06:34 +02:00
config_port_invalid = mock_config_line("DNSPort",
"127.0.0.124:656 IPv6Only");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0, NULL,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
0, CL_PORT_SERVER_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
// Test failure when asked to bind only to ipv4 but gets an ipv6 address
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
smartlist_clear(slout);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
config_port_invalid = mock_config_line("DNSPort", "[::1]:656 IPv4Only");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "DNS", 0, NULL,
Move CL_PORT definitions so they are accessible to the tests as well
2015-10-05 22:10:58 +02:00
0, CL_PORT_SERVER_OPTIONS);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
tt_int_op(ret, OP_EQ, -1);
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
// Check for failure with empty unix: address.
config_free_lines(config_port_invalid); config_port_invalid = NULL;
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
smartlist_clear(slout);
config_port_invalid = mock_config_line("ORPort", "unix:\"\"");
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-25 20:28:38 +02:00
ret = parse_port_config(slout, config_port_invalid, "ORPort", 0, NULL,
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
0, CL_PORT_SERVER_OPTIONS);
tt_int_op(ret, OP_EQ, -1);
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
done:
Fix a huge number of leaks in test_config.c I no longer see asan reporting memory leaks in the unit tests.
2016-02-24 21:44:40 +01:00
if (slout)
SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
smartlist_free(slout);
Fix a bunch of memory leaks in the unit tests
2016-02-22 22:14:03 +01:00
config_free_lines(config_port_invalid); config_port_invalid = NULL;
config_free_lines(config_port_valid); config_port_valid = NULL;
Add tests for parse_port_config
2015-09-15 18:12:14 +02:00
}
Accept non-space whitespace characters in log severity syntax. Adds a test_config_parse_log_severity unit test to verify behavior. Fixes #19965.
2016-12-05 05:26:52 +01:00
static void
test_config_parse_log_severity(void *data)
{
int ret;
const char *severity_log_lines[] = {
"debug file /tmp/debug.log",
"debug\tfile /tmp/debug.log",
"[handshake]debug [~net,~mm]info notice stdout",
"[handshake]debug\t[~net,~mm]info\tnotice\tstdout",
NULL
};
int i;
log_severity_list_t *severity;
(void) data;
severity = tor_malloc(sizeof(log_severity_list_t));
for (i = 0; severity_log_lines[i]; i++) {
memset(severity, 0, sizeof(log_severity_list_t));
ret = parse_log_severity_config(&severity_log_lines[i], severity);
tt_int_op(ret, OP_EQ, 0);
}
done:
tor_free(severity);
}
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
static void
test_config_include_limit(void *data)
{
(void)data;
tt_* macros can "goto done;" so define any freeable things before them.
2017-05-19 14:55:14 +02:00
config_line_t *result = NULL;
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *torrc_path = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_limit"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&torrc_path, "%s"PATH_SEPARATOR"torrc", dir);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char torrc_contents[1000];
tor_snprintf(torrc_contents, sizeof(torrc_contents), "%%include %s",
torrc_path);
tt_int_op(write_str_to_file(torrc_path, torrc_contents, 0), OP_EQ, 0);
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(torrc_contents, &result, 0, NULL, NULL),
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
OP_EQ, -1);
done:
config_free_lines(result);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(torrc_path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tor_free(dir);
}
static void
test_config_include_does_not_exist(void *data)
{
(void)data;
tt_* macros can "goto done;" so define any freeable things before them.
2017-05-19 14:55:14 +02:00
config_line_t *result = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_does_not_exist"));
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *missing_path = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&missing_path, "%s"PATH_SEPARATOR"missing", dir);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char torrc_contents[1000];
tor_snprintf(torrc_contents, sizeof(torrc_contents), "%%include %s",
missing_path);
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(torrc_contents, &result, 0, NULL, NULL),
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
OP_EQ, -1);
done:
config_free_lines(result);
tor_free(dir);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(missing_path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
}
static void
test_config_include_error_in_included_file(void *data)
{
(void)data;
tt_* macros can "goto done;" so define any freeable things before them.
2017-05-19 14:55:14 +02:00
config_line_t *result = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_error_in_included_file"));
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *invalid_path = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&invalid_path, "%s"PATH_SEPARATOR"invalid", dir);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(invalid_path, "unclosed \"", 0), OP_EQ, 0);
char torrc_contents[1000];
tor_snprintf(torrc_contents, sizeof(torrc_contents), "%%include %s",
invalid_path);
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(torrc_contents, &result, 0, NULL, NULL),
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
OP_EQ, -1);
done:
config_free_lines(result);
tor_free(dir);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(invalid_path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
}
static void
test_config_include_empty_file_folder(void *data)
{
(void)data;
tt_* macros can "goto done;" so define any freeable things before them.
2017-05-19 14:55:14 +02:00
config_line_t *result = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *folder_path = NULL;
char *file_path = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_empty_file_folder"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&folder_path, "%s"PATH_SEPARATOR"empty_dir", dir);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
#ifdef _WIN32
tt_int_op(mkdir(folder_path), OP_EQ, 0);
#else
tt_int_op(mkdir(folder_path, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&file_path, "%s"PATH_SEPARATOR"empty_file", dir);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(file_path, "", 0), OP_EQ, 0);
char torrc_contents[1000];
tor_snprintf(torrc_contents, sizeof(torrc_contents),
"%%include %s\n"
"%%include %s\n",
folder_path, file_path);
int include_used;
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(torrc_contents, &result, 0,&include_used,
NULL), OP_EQ, 0);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_ptr_op(result, OP_EQ, NULL);
tt_int_op(include_used, OP_EQ, 1);
done:
config_free_lines(result);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(folder_path);
tor_free(file_path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tor_free(dir);
}
Unit test for case where %included dir exists but is unreadable
2017-09-28 15:49:30 +02:00
#ifndef _WIN32
static void
test_config_include_no_permission(void *data)
{
(void)data;
config_line_t *result = NULL;
char *folder_path = NULL;
Don't expect permission failure if running as root Skip test_config_include_no_permission() when running as root, because it will get an unexpected success from config_get_lines_include(). This affects some continuous integration setups. Fixes bug 23758.
2017-10-04 15:42:05 +02:00
char *dir = NULL;
if (geteuid() == 0)
tt_skip();
dir = tor_strdup(get_fname("test_include_forbidden_folder"));
Unit test for case where %included dir exists but is unreadable
2017-09-28 15:49:30 +02:00
tt_ptr_op(dir, OP_NE, NULL);
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
tor_asprintf(&folder_path, "%s"PATH_SEPARATOR"forbidden_dir", dir);
tt_int_op(mkdir(folder_path, 0100), OP_EQ, 0);
char torrc_contents[1000];
tor_snprintf(torrc_contents, sizeof(torrc_contents),
"%%include %s\n",
folder_path);
int include_used;
Merge branch 'fix-torrcd-sandbox-22605v2'
2017-10-31 18:58:33 +01:00
tt_int_op(config_get_lines_include(torrc_contents, &result, 0,
&include_used, NULL),
Unit test for case where %included dir exists but is unreadable
2017-09-28 15:49:30 +02:00
OP_EQ, -1);
tt_ptr_op(result, OP_EQ, NULL);
done:
config_free_lines(result);
tor_free(folder_path);
if (dir)
chmod(dir, 0700);
tor_free(dir);
}
Run "make autostyle."
2019-06-05 15:33:35 +02:00
#endif /* !defined(_WIN32) */
Unit test for case where %included dir exists but is unreadable
2017-09-28 15:49:30 +02:00
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
static void
test_config_include_recursion_before_after(void *data)
{
(void)data;
tt_* macros can "goto done;" so define any freeable things before them.
2017-05-19 14:55:14 +02:00
config_line_t *result = NULL;
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *torrc_path = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_recursion_before_after"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&torrc_path, "%s"PATH_SEPARATOR"torrc", dir);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char file_contents[1000];
const int limit = MAX_INCLUDE_RECURSION_LEVEL;
int i;
// Loop backwards so file_contents has the contents of the first file by the
// end of the loop
for (i = limit; i > 0; i--) {
if (i < limit) {
tor_snprintf(file_contents, sizeof(file_contents),
"Test %d\n"
"%%include %s%d\n"
"Test %d\n",
i, torrc_path, i + 1, 2 * limit - i);
} else {
tor_snprintf(file_contents, sizeof(file_contents), "Test %d\n", i);
}
if (i > 1) {
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *file_path = NULL;
tor_asprintf(&file_path, "%s%d", torrc_path, i);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(file_path, file_contents, 0), OP_EQ, 0);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(file_path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
}
}
int include_used;
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(file_contents, &result, 0, &include_used,
NULL), OP_EQ, 0);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_ptr_op(result, OP_NE, NULL);
tt_int_op(include_used, OP_EQ, 1);
int len = 0;
config_line_t *next;
for (next = result; next != NULL; next = next->next) {
char expected[10];
tor_snprintf(expected, sizeof(expected), "%d", len + 1);
tt_str_op(next->key, OP_EQ, "Test");
tt_str_op(next->value, OP_EQ, expected);
len++;
}
tt_int_op(len, OP_EQ, 2 * limit - 1);
done:
config_free_lines(result);
tor_free(dir);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(torrc_path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
}
static void
test_config_include_recursion_after_only(void *data)
{
(void)data;
tt_* macros can "goto done;" so define any freeable things before them.
2017-05-19 14:55:14 +02:00
config_line_t *result = NULL;
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *torrc_path = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_recursion_after_only"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&torrc_path, "%s"PATH_SEPARATOR"torrc", dir);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char file_contents[1000];
const int limit = MAX_INCLUDE_RECURSION_LEVEL;
int i;
// Loop backwards so file_contents has the contents of the first file by the
// end of the loop
for (i = limit; i > 0; i--) {
int n = (i - limit - 1) * -1;
if (i < limit) {
tor_snprintf(file_contents, sizeof(file_contents),
"%%include %s%d\n"
"Test %d\n",
torrc_path, i + 1, n);
} else {
tor_snprintf(file_contents, sizeof(file_contents), "Test %d\n", n);
}
if (i > 1) {
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *file_path = NULL;
tor_asprintf(&file_path, "%s%d", torrc_path, i);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(file_path, file_contents, 0), OP_EQ, 0);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(file_path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
}
}
int include_used;
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(file_contents, &result, 0, &include_used,
NULL), OP_EQ, 0);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_ptr_op(result, OP_NE, NULL);
tt_int_op(include_used, OP_EQ, 1);
int len = 0;
config_line_t *next;
for (next = result; next != NULL; next = next->next) {
char expected[10];
tor_snprintf(expected, sizeof(expected), "%d", len + 1);
tt_str_op(next->key, OP_EQ, "Test");
tt_str_op(next->value, OP_EQ, expected);
len++;
}
tt_int_op(len, OP_EQ, limit);
done:
config_free_lines(result);
tor_free(dir);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(torrc_path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
}
static void
test_config_include_folder_order(void *data)
{
(void)data;
tt_* macros can "goto done;" so define any freeable things before them.
2017-05-19 14:55:14 +02:00
config_line_t *result = NULL;
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *torrcd = NULL;
char *path = NULL;
char *path2 = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_folder_order"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&torrcd, "%s"PATH_SEPARATOR"%s", dir, "torrc.d");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
#ifdef _WIN32
tt_int_op(mkdir(torrcd), OP_EQ, 0);
#else
tt_int_op(mkdir(torrcd, 0700), OP_EQ, 0);
#endif
// test that files in subfolders are ignored
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "subfolder");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
#ifdef _WIN32
tt_int_op(mkdir(path), OP_EQ, 0);
#else
tt_int_op(mkdir(path, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&path2, "%s"PATH_SEPARATOR"%s", path, "01_ignore");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(path2, "ShouldNotSee 1\n", 0), OP_EQ, 0);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
// test that files starting with . are ignored
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, ".dot");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(path, "ShouldNotSee 2\n", 0), OP_EQ, 0);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
// test file order
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "01_1st");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(path, "Test 1\n", 0), OP_EQ, 0);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "02_2nd");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(path, "Test 2\n", 0), OP_EQ, 0);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "aa_3rd");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(path, "Test 3\n", 0), OP_EQ, 0);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "ab_4th");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(path, "Test 4\n", 0), OP_EQ, 0);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char torrc_contents[1000];
tor_snprintf(torrc_contents, sizeof(torrc_contents),
"%%include %s\n",
torrcd);
int include_used;
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(torrc_contents, &result, 0, &include_used,
NULL), OP_EQ, 0);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_ptr_op(result, OP_NE, NULL);
tt_int_op(include_used, OP_EQ, 1);
int len = 0;
config_line_t *next;
for (next = result; next != NULL; next = next->next) {
char expected[10];
tor_snprintf(expected, sizeof(expected), "%d", len + 1);
tt_str_op(next->key, OP_EQ, "Test");
tt_str_op(next->value, OP_EQ, expected);
len++;
}
tt_int_op(len, OP_EQ, 4);
done:
config_free_lines(result);
Fix memory leak of "torrcd" in test_config_include_folder_order() Bugfix on 0265ced02b7a652c5941cb2c14ee1e0de0b1d90e; bug not in any released Tor.
2017-08-04 19:50:27 +02:00
tor_free(torrcd);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(path);
tor_free(path2);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tor_free(dir);
}
Fix bug when %including folder with comment only files. #31408 When processing a %included folder, a bug caused the pointer to the last element of the options list to be set to NULL when processing a file with only comments or whitepace. This could cause options from other files on the same folder to be discarded depending on the lines after the affected %include.
2019-09-22 23:30:48 +02:00
static void
test_config_include_blank_file_last(void *data)
{
(void)data;
config_line_t *result = NULL;
char *torrcd = NULL;
char *path = NULL;
char *dir = tor_strdup(get_fname("test_include_blank_file_last"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
tor_asprintf(&torrcd, "%s"PATH_SEPARATOR"%s", dir, "torrc.d");
#ifdef _WIN32
tt_int_op(mkdir(torrcd), OP_EQ, 0);
#else
tt_int_op(mkdir(torrcd, 0700), OP_EQ, 0);
#endif
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "aa_1st");
tt_int_op(write_str_to_file(path, "Test 1\n", 0), OP_EQ, 0);
tor_free(path);
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "bb_2nd");
tt_int_op(write_str_to_file(path, "Test 2\n", 0), OP_EQ, 0);
tor_free(path);
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "cc_comment");
tt_int_op(write_str_to_file(path, "# comment only\n", 0), OP_EQ, 0);
tor_free(path);
char torrc_contents[1000];
tor_snprintf(torrc_contents, sizeof(torrc_contents),
"%%include %s\n"
"Test 3\n",
torrcd);
int include_used;
tt_int_op(config_get_lines_include(torrc_contents, &result, 0, &include_used,
NULL), OP_EQ, 0);
tt_ptr_op(result, OP_NE, NULL);
tt_int_op(include_used, OP_EQ, 1);
int len = 0;
config_line_t *next;
for (next = result; next != NULL; next = next->next) {
char expected[10];
tor_snprintf(expected, sizeof(expected), "%d", len + 1);
tt_str_op(next->key, OP_EQ, "Test");
tt_str_op(next->value, OP_EQ, expected);
len++;
}
tt_int_op(len, OP_EQ, 3);
done:
config_free_lines(result);
tor_free(torrcd);
tor_free(path);
tor_free(dir);
}
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
static void
test_config_include_path_syntax(void *data)
{
(void)data;
tt_* macros can "goto done;" so define any freeable things before them.
2017-05-19 14:55:14 +02:00
config_line_t *result = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_path_syntax"));
Try another approach to fixing the bug in the #1922 test. This isn't elegant, but it seems to be the best way around all of the issues involved in escaping and quoting that we've gotten into over the years.
2017-05-19 21:50:27 +02:00
char *esc_dir = NULL, *dir_with_pathsep = NULL,
*esc_dir_with_pathsep = NULL, *torrc_contents = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Try another approach to fixing the bug in the #1922 test. This isn't elegant, but it seems to be the best way around all of the issues involved in escaping and quoting that we've gotten into over the years.
2017-05-19 21:50:27 +02:00
esc_dir = esc_for_log(dir);
tor_asprintf(&dir_with_pathsep, "%s%s", dir, PATH_SEPARATOR);
esc_dir_with_pathsep = esc_for_log(dir_with_pathsep);
tor_asprintf(&torrc_contents,
"%%include %s\n"
"%%include %s%s \n" // space to avoid suppressing newline
"%%include %s\n",
esc_dir,
dir, PATH_SEPARATOR,
esc_dir_with_pathsep);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
int include_used;
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(torrc_contents, &result, 0,&include_used,
NULL), OP_EQ, 0);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_ptr_op(result, OP_EQ, NULL);
tt_int_op(include_used, OP_EQ, 1);
done:
config_free_lines(result);
tor_free(dir);
Try another approach to fixing the bug in the #1922 test. This isn't elegant, but it seems to be the best way around all of the issues involved in escaping and quoting that we've gotten into over the years.
2017-05-19 21:50:27 +02:00
tor_free(torrc_contents);
tor_free(esc_dir);
tor_free(dir_with_pathsep);
tor_free(esc_dir_with_pathsep);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
}
static void
test_config_include_not_processed(void *data)
{
(void)data;
char torrc_contents[1000] = "%include does_not_exist\n";
config_line_t *result = NULL;
tt_int_op(config_get_lines(torrc_contents, &result, 0),OP_EQ, 0);
tt_ptr_op(result, OP_NE, NULL);
int len = 0;
config_line_t *next;
for (next = result; next != NULL; next = next->next) {
tt_str_op(next->key, OP_EQ, "%include");
tt_str_op(next->value, OP_EQ, "does_not_exist");
len++;
}
tt_int_op(len, OP_EQ, 1);
done:
config_free_lines(result);
}
static void
test_config_include_has_include(void *data)
{
(void)data;
tt_* macros can "goto done;" so define any freeable things before them.
2017-05-19 14:55:14 +02:00
config_line_t *result = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_has_include"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
char torrc_contents[1000] = "Test 1\n";
int include_used;
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(torrc_contents, &result, 0,&include_used,
NULL), OP_EQ, 0);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(include_used, OP_EQ, 0);
config_free_lines(result);
tor_snprintf(torrc_contents, sizeof(torrc_contents), "%%include %s\n", dir);
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(config_get_lines_include(torrc_contents, &result, 0,&include_used,
NULL), OP_EQ, 0);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(include_used, OP_EQ, 1);
done:
config_free_lines(result);
tor_free(dir);
}
static void
test_config_include_flag_both_without(void *data)
{
(void)data;
char *errmsg = NULL;
char conf_empty[1000];
tor_snprintf(conf_empty, sizeof(conf_empty),
"DataDirectory %s\n",
get_fname(NULL));
// test with defaults-torrc and torrc without include
int ret = options_init_from_string(conf_empty, conf_empty, CMD_RUN_UNITTESTS,
NULL, &errmsg);
tt_int_op(ret, OP_EQ, 0);
const or_options_t *options = get_options();
tt_int_op(options->IncludeUsed, OP_EQ, 0);
done:
tor_free(errmsg);
}
static void
test_config_include_flag_torrc_only(void *data)
{
(void)data;
char *errmsg = NULL;
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *path = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_flag_torrc_only"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", dir, "dummy");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(path, "\n", 0), OP_EQ, 0);
char conf_empty[1000];
tor_snprintf(conf_empty, sizeof(conf_empty),
"DataDirectory %s\n",
get_fname(NULL));
char conf_include[1000];
tor_snprintf(conf_include, sizeof(conf_include), "%%include %s", path);
// test with defaults-torrc without include and torrc with include
int ret = options_init_from_string(conf_empty, conf_include,
CMD_RUN_UNITTESTS, NULL, &errmsg);
tt_int_op(ret, OP_EQ, 0);
const or_options_t *options = get_options();
tt_int_op(options->IncludeUsed, OP_EQ, 1);
done:
tor_free(errmsg);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tor_free(dir);
}
static void
test_config_include_flag_defaults_only(void *data)
{
(void)data;
char *errmsg = NULL;
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
char *path = NULL;
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
char *dir = tor_strdup(get_fname("test_include_flag_defaults_only"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", dir, "dummy");
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tt_int_op(write_str_to_file(path, "\n", 0), OP_EQ, 0);
char conf_empty[1000];
tor_snprintf(conf_empty, sizeof(conf_empty),
"DataDirectory %s\n",
get_fname(NULL));
char conf_include[1000];
tor_snprintf(conf_include, sizeof(conf_include), "%%include %s", path);
// test with defaults-torrc with include and torrc without include
int ret = options_init_from_string(conf_include, conf_empty,
CMD_RUN_UNITTESTS, NULL, &errmsg);
tt_int_op(ret, OP_EQ, 0);
const or_options_t *options = get_options();
tt_int_op(options->IncludeUsed, OP_EQ, 0);
done:
tor_free(errmsg);
Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098.
2017-08-03 17:06:26 +02:00
tor_free(path);
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
tor_free(dir);
}
unit test for config_lines_dup_and_filter
2017-09-28 15:40:17 +02:00
static void
test_config_dup_and_filter(void *arg)
{
(void)arg;
/* Test normal input. */
config_line_t *line = NULL;
config_line_append(&line, "abc", "def");
config_line_append(&line, "ghi", "jkl");
config_line_append(&line, "ABCD", "mno");
config_line_t *line_dup = config_lines_dup_and_filter(line, "aBc");
tt_ptr_op(line_dup, OP_NE, NULL);
tt_ptr_op(line_dup->next, OP_NE, NULL);
tt_ptr_op(line_dup->next->next, OP_EQ, NULL);
tt_str_op(line_dup->key, OP_EQ, "abc");
tt_str_op(line_dup->value, OP_EQ, "def");
tt_str_op(line_dup->next->key, OP_EQ, "ABCD");
tt_str_op(line_dup->next->value, OP_EQ, "mno");
/* empty output */
config_free_lines(line_dup);
line_dup = config_lines_dup_and_filter(line, "skdjfsdkljf");
tt_ptr_op(line_dup, OP_EQ, NULL);
/* empty input */
config_free_lines(line_dup);
line_dup = config_lines_dup_and_filter(NULL, "abc");
tt_ptr_op(line_dup, OP_EQ, NULL);
done:
config_free_lines(line);
config_free_lines(line_dup);
}
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
/* If we're not configured to be a bridge, but we set
* BridgeDistribution, then options_validate () should return -1. */
static void
Updates to fix check-spaces/check-changes warnings
2017-10-25 01:35:16 +02:00
test_config_check_bridge_distribution_setting_not_a_bridge(void *arg)
{
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
or_options_t* options = get_options_mutable();
or_options_t* old_options = options;
or_options_t* default_options = options;
Fix memory leak in unit test for bridge distribution config. Also, check for the actual message, and fix some string confusion, while we're at it. Fixes bug 24345; bugfix on 0.3.2.3-alpha.
2017-11-18 03:19:18 +01:00
char* message = NULL;
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
int ret;
(void)arg;
options->BridgeRelay = 0;
options->BridgeDistribution = (char*)("https");
ret = options_validate(old_options, options, default_options, 0, &message);
tt_int_op(ret, OP_EQ, -1);
Fix memory leak in unit test for bridge distribution config. Also, check for the actual message, and fix some string confusion, while we're at it. Fixes bug 24345; bugfix on 0.3.2.3-alpha.
2017-11-18 03:19:18 +01:00
tt_str_op(message, OP_EQ, "You set BridgeDistribution, but you "
"didn't set BridgeRelay!");
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
done:
Fix memory leak in unit test for bridge distribution config. Also, check for the actual message, and fix some string confusion, while we're at it. Fixes bug 24345; bugfix on 0.3.2.3-alpha.
2017-11-18 03:19:18 +01:00
tor_free(message);
options->BridgeDistribution = NULL;
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
}
/* If the BridgeDistribution setting was valid, 0 should be returned. */
static void
Updates to fix check-spaces/check-changes warnings
2017-10-25 01:35:16 +02:00
test_config_check_bridge_distribution_setting_valid(void *arg)
{
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
int ret = check_bridge_distribution_setting("https");
(void)arg;
tt_int_op(ret, OP_EQ, 0);
done:
return;
}
/* If the BridgeDistribution setting was invalid, -1 should be returned. */
static void
Updates to fix check-spaces/check-changes warnings
2017-10-25 01:35:16 +02:00
test_config_check_bridge_distribution_setting_invalid(void *arg)
{
Adjust test to allow hyphens too.
2017-10-25 01:33:38 +02:00
int ret = check_bridge_distribution_setting("hyphens-are-allowed");
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
(void)arg;
Adjust test to allow hyphens too.
2017-10-25 01:33:38 +02:00
tt_int_op(ret, OP_EQ, 0);
ret = check_bridge_distribution_setting("asterisks*are*forbidden");
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
tt_int_op(ret, OP_EQ, -1);
done:
return;
}
/* If the BridgeDistribution setting was unrecognised, a warning should be
* logged and 0 should be returned. */
static void
Updates to fix check-spaces/check-changes warnings
2017-10-25 01:35:16 +02:00
test_config_check_bridge_distribution_setting_unrecognised(void *arg)
{
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
int ret = check_bridge_distribution_setting("unicorn");
(void)arg;
tt_int_op(ret, OP_EQ, 0);
done:
return;
}
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
static void
test_config_include_opened_file_list(void *data)
{
(void)data;
config_line_t *result = NULL;
smartlist_t *opened_files = smartlist_new();
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
2018-08-01 20:37:03 +02:00
char *torrcd = NULL;
char *subfolder = NULL;
char *path = NULL;
char *empty = NULL;
char *file = NULL;
char *dot = NULL;
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
char *dir = tor_strdup(get_fname("test_include_opened_file_list"));
tt_ptr_op(dir, OP_NE, NULL);
#ifdef _WIN32
tt_int_op(mkdir(dir), OP_EQ, 0);
#else
tt_int_op(mkdir(dir, 0700), OP_EQ, 0);
#endif
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
2018-08-01 20:37:03 +02:00
tor_asprintf(&torrcd, "%s"PATH_SEPARATOR"%s", dir, "torrc.d");
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
#ifdef _WIN32
tt_int_op(mkdir(torrcd), OP_EQ, 0);
#else
tt_int_op(mkdir(torrcd, 0700), OP_EQ, 0);
#endif
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
2018-08-01 20:37:03 +02:00
tor_asprintf(&subfolder, "%s"PATH_SEPARATOR"%s", torrcd, "subfolder");
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
#ifdef _WIN32
tt_int_op(mkdir(subfolder), OP_EQ, 0);
#else
tt_int_op(mkdir(subfolder, 0700), OP_EQ, 0);
#endif
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
2018-08-01 20:37:03 +02:00
tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", subfolder,
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
"01_file_in_subfolder");
tt_int_op(write_str_to_file(path, "Test 1\n", 0), OP_EQ, 0);
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
2018-08-01 20:37:03 +02:00
tor_asprintf(&empty, "%s"PATH_SEPARATOR"%s", torrcd, "empty");
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(write_str_to_file(empty, "", 0), OP_EQ, 0);
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
2018-08-01 20:37:03 +02:00
tor_asprintf(&file, "%s"PATH_SEPARATOR"%s", torrcd, "file");
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(write_str_to_file(file, "Test 2\n", 0), OP_EQ, 0);
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
2018-08-01 20:37:03 +02:00
tor_asprintf(&dot, "%s"PATH_SEPARATOR"%s", torrcd, ".dot");
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tt_int_op(write_str_to_file(dot, "Test 3\n", 0), OP_EQ, 0);
char torrc_contents[1000];
tor_snprintf(torrc_contents, sizeof(torrc_contents),
"%%include %s\n",
torrcd);
int include_used;
tt_int_op(config_get_lines_include(torrc_contents, &result, 0, &include_used,
opened_files), OP_EQ, 0);
tt_ptr_op(result, OP_NE, NULL);
tt_int_op(include_used, OP_EQ, 1);
tt_int_op(smartlist_len(opened_files), OP_EQ, 4);
tt_int_op(smartlist_contains_string(opened_files, torrcd), OP_EQ, 1);
tt_int_op(smartlist_contains_string(opened_files, subfolder), OP_EQ, 1);
// files inside subfolders are not opended, only the subfolder is opened
tt_int_op(smartlist_contains_string(opened_files, empty), OP_EQ, 1);
tt_int_op(smartlist_contains_string(opened_files, file), OP_EQ, 1);
// dot files are not opened as we ignore them when we get their name from
// their parent folder
done:
SMARTLIST_FOREACH(opened_files, char *, f, tor_free(f));
smartlist_free(opened_files);
config_free_lines(result);
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
2018-08-01 20:37:03 +02:00
tor_free(torrcd);
tor_free(subfolder);
tor_free(path);
tor_free(empty);
tor_free(file);
tor_free(dot);
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
tor_free(dir);
}
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
static void
test_config_compute_max_mem_in_queues(void *data)
{
Replace U64_LITERAL with the standard UINT64_C
2018-07-03 16:33:50 +02:00
#define GIGABYTE(x) (UINT64_C(x) << 30)
#define MEGABYTE(x) (UINT64_C(x) << 20)
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
(void)data;
MOCK(get_total_system_memory, get_total_system_memory_mock);
/* We are unable to detect the amount of memory on the system. Tor will try
* to use some sensible default values for 64-bit and 32-bit systems. */
total_system_memory_return = -1;
#if SIZEOF_VOID_P >= 8
/* We are on a 64-bit system. */
Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor.
2018-04-12 18:24:36 +02:00
tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(8));
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
#else
/* We are on a 32-bit system. */
Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor.
2018-04-12 18:24:36 +02:00
tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, GIGABYTE(1));
Run "make autostyle."
2019-06-05 15:33:35 +02:00
#endif /* SIZEOF_VOID_P >= 8 */
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
/* We are able to detect the amount of RAM on the system. */
total_system_memory_return = 0;
/* We are running on a system with one gigabyte of RAM. */
total_system_memory_output = GIGABYTE(1);
/* We have 0.75 * RAM available. */
Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor.
2018-04-12 18:24:36 +02:00
tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ,
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
3 * (GIGABYTE(1) / 4));
/* We are running on a tiny machine with 256 MB of RAM. */
total_system_memory_output = MEGABYTE(256);
/* We will now enforce a minimum of 256 MB of RAM available for the
* MaxMemInQueues here, even though we should only have had 0.75 * 256 = 192
* MB available. */
Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor.
2018-04-12 18:24:36 +02:00
tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ, MEGABYTE(256));
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor.
2018-04-12 18:24:36 +02:00
#if SIZEOF_SIZE_T > 4
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
/* We are running on a machine with 8 GB of RAM. */
total_system_memory_output = GIGABYTE(8);
/* We will have 0.4 * RAM available. */
Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor.
2018-04-12 18:24:36 +02:00
tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ,
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
2 * (GIGABYTE(8) / 5));
/* We are running on a machine with 16 GB of RAM. */
total_system_memory_output = GIGABYTE(16);
/* We will have 0.4 * RAM available. */
Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor.
2018-04-12 18:24:36 +02:00
tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ,
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
2 * (GIGABYTE(16) / 5));
/* We are running on a machine with 32 GB of RAM. */
total_system_memory_output = GIGABYTE(32);
/* We will at maximum get MAX_DEFAULT_MEMORY_QUEUE_SIZE here. */
Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor.
2018-04-12 18:24:36 +02:00
tt_u64_op(compute_real_max_mem_in_queues(0, 0), OP_EQ,
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
MAX_DEFAULT_MEMORY_QUEUE_SIZE);
Run "make autostyle."
2019-06-05 15:33:35 +02:00
#endif /* SIZEOF_SIZE_T > 4 */
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
done:
UNMOCK(get_total_system_memory);
#undef GIGABYTE
#undef MEGABYTE
}
Add unit tests for parsing "extended" format of config lines.
2018-08-06 22:57:51 +02:00
static void
test_config_extended_fmt(void *arg)
{
(void)arg;
config_line_t *lines = NULL, *lp;
const char string1[] =
"thing1 is here\n"
"+thing2 is over here\n"
"/thing3\n"
"/thing4 is back here\n";
/* Try with the "extended" flag disabled. */
int r = config_get_lines(string1, &lines, 0);
tt_int_op(r, OP_EQ, 0);
lp = lines;
tt_ptr_op(lp, OP_NE, NULL);
tt_str_op(lp->key, OP_EQ, "thing1");
tt_str_op(lp->value, OP_EQ, "is here");
tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL);
lp = lp->next;
tt_ptr_op(lp, OP_NE, NULL);
tt_str_op(lp->key, OP_EQ, "+thing2");
tt_str_op(lp->value, OP_EQ, "is over here");
tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL);
lp = lp->next;
tt_ptr_op(lp, OP_NE, NULL);
tt_str_op(lp->key, OP_EQ, "/thing3");
tt_str_op(lp->value, OP_EQ, "");
tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL);
lp = lp->next;
tt_ptr_op(lp, OP_NE, NULL);
tt_str_op(lp->key, OP_EQ, "/thing4");
tt_str_op(lp->value, OP_EQ, "is back here");
tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL);
lp = lp->next;
Fix dead-assignment warnings in test_config.c Found by scan-build.
2018-12-17 15:26:57 +01:00
tt_assert(!lp);
Add unit tests for parsing "extended" format of config lines.
2018-08-06 22:57:51 +02:00
config_free_lines(lines);
/* Try with the "extended" flag enabled. */
r = config_get_lines(string1, &lines, 1);
tt_int_op(r, OP_EQ, 0);
lp = lines;
tt_ptr_op(lp, OP_NE, NULL);
tt_str_op(lp->key, OP_EQ, "thing1");
tt_str_op(lp->value, OP_EQ, "is here");
tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL);
lp = lp->next;
tt_ptr_op(lp, OP_NE, NULL);
tt_str_op(lp->key, OP_EQ, "thing2");
tt_str_op(lp->value, OP_EQ, "is over here");
tt_int_op(lp->command, OP_EQ, CONFIG_LINE_APPEND);
lp = lp->next;
tt_ptr_op(lp, OP_NE, NULL);
tt_str_op(lp->key, OP_EQ, "thing3");
tt_str_op(lp->value, OP_EQ, "");
tt_int_op(lp->command, OP_EQ, CONFIG_LINE_CLEAR);
lp = lp->next;
tt_ptr_op(lp, OP_NE, NULL);
tt_str_op(lp->key, OP_EQ, "thing4");
tt_str_op(lp->value, OP_EQ, "");
tt_int_op(lp->command, OP_EQ, CONFIG_LINE_CLEAR);
lp = lp->next;
Fix dead-assignment warnings in test_config.c Found by scan-build.
2018-12-17 15:26:57 +01:00
tt_assert(!lp);
Add unit tests for parsing "extended" format of config lines.
2018-08-06 22:57:51 +02:00
done:
config_free_lines(lines);
}
Add code to parse K=V lines into config_line_t format. Closes ticket 28755
2018-12-06 20:13:29 +01:00
static void
test_config_kvline_parse(void *arg)
{
(void)arg;
config_line_t *lines = NULL;
char *enc = NULL;
lines = kvline_parse("A=B CD=EF", 0);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "A");
tt_str_op(lines->value, OP_EQ, "B");
tt_str_op(lines->next->key, OP_EQ, "CD");
tt_str_op(lines->next->value, OP_EQ, "EF");
enc = kvline_encode(lines, 0);
tt_str_op(enc, OP_EQ, "A=B CD=EF");
tor_free(enc);
enc = kvline_encode(lines, KV_QUOTED|KV_OMIT_KEYS);
tt_str_op(enc, OP_EQ, "A=B CD=EF");
tor_free(enc);
config_free_lines(lines);
lines = kvline_parse("AB CDE=F", 0);
tt_assert(! lines);
lines = kvline_parse("AB CDE=F", KV_OMIT_KEYS);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "");
tt_str_op(lines->value, OP_EQ, "AB");
tt_str_op(lines->next->key, OP_EQ, "CDE");
tt_str_op(lines->next->value, OP_EQ, "F");
tt_assert(lines);
enc = kvline_encode(lines, 0);
tt_assert(!enc);
enc = kvline_encode(lines, KV_QUOTED|KV_OMIT_KEYS);
tt_str_op(enc, OP_EQ, "AB CDE=F");
tor_free(enc);
config_free_lines(lines);
lines = kvline_parse("AB=C CDE=\"F G\"", 0);
tt_assert(!lines);
lines = kvline_parse("AB=C CDE=\"F G\" \"GHI\" ", KV_QUOTED|KV_OMIT_KEYS);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "AB");
tt_str_op(lines->value, OP_EQ, "C");
tt_str_op(lines->next->key, OP_EQ, "CDE");
tt_str_op(lines->next->value, OP_EQ, "F G");
tt_str_op(lines->next->next->key, OP_EQ, "");
tt_str_op(lines->next->next->value, OP_EQ, "GHI");
enc = kvline_encode(lines, 0);
tt_assert(!enc);
enc = kvline_encode(lines, KV_QUOTED|KV_OMIT_KEYS);
tt_str_op(enc, OP_EQ, "AB=C CDE=\"F G\" GHI");
tor_free(enc);
config_free_lines(lines);
lines = kvline_parse("A\"B=C CDE=\"F\" \"GHI\" ", KV_QUOTED|KV_OMIT_KEYS);
tt_assert(! lines);
lines = kvline_parse("AB=", KV_QUOTED);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "AB");
tt_str_op(lines->value, OP_EQ, "");
config_free_lines(lines);
lines = kvline_parse("AB=", 0);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "AB");
tt_str_op(lines->value, OP_EQ, "");
kvline: handle empty alues as well as empty keys The two options are mutually exclusive, since otherwise an entry like "Foo" would be ambiguous. We want to have the ability to treat entries like this as keys, though, since some controller commands interpret them as flags.
2019-04-05 21:29:37 +02:00
config_free_lines(lines);
lines = kvline_parse("AB=", KV_OMIT_VALS);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "AB");
tt_str_op(lines->value, OP_EQ, "");
config_free_lines(lines);
lines = kvline_parse(" AB ", KV_OMIT_VALS);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "AB");
tt_str_op(lines->value, OP_EQ, "");
config_free_lines(lines);
lines = kvline_parse("AB", KV_OMIT_VALS);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "AB");
tt_str_op(lines->value, OP_EQ, "");
enc = kvline_encode(lines, KV_OMIT_VALS);
tt_str_op(enc, OP_EQ, "AB");
tor_free(enc);
config_free_lines(lines);
lines = kvline_parse("AB=CD", KV_OMIT_VALS);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "AB");
tt_str_op(lines->value, OP_EQ, "CD");
enc = kvline_encode(lines, KV_OMIT_VALS);
tt_str_op(enc, OP_EQ, "AB=CD");
tor_free(enc);
config_free_lines(lines);
lines = kvline_parse("AB=CD DE FGH=I", KV_OMIT_VALS);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "AB");
tt_str_op(lines->value, OP_EQ, "CD");
tt_str_op(lines->next->key, OP_EQ, "DE");
tt_str_op(lines->next->value, OP_EQ, "");
tt_str_op(lines->next->next->key, OP_EQ, "FGH");
tt_str_op(lines->next->next->value, OP_EQ, "I");
enc = kvline_encode(lines, KV_OMIT_VALS);
tt_str_op(enc, OP_EQ, "AB=CD DE FGH=I");
tor_free(enc);
config_free_lines(lines);
lines = kvline_parse("AB=\"CD E\" DE FGH=\"I\"", KV_OMIT_VALS|KV_QUOTED);
tt_assert(lines);
tt_str_op(lines->key, OP_EQ, "AB");
tt_str_op(lines->value, OP_EQ, "CD E");
tt_str_op(lines->next->key, OP_EQ, "DE");
tt_str_op(lines->next->value, OP_EQ, "");
tt_str_op(lines->next->next->key, OP_EQ, "FGH");
tt_str_op(lines->next->next->value, OP_EQ, "I");
enc = kvline_encode(lines, KV_OMIT_VALS|KV_QUOTED);
tt_str_op(enc, OP_EQ, "AB=\"CD E\" DE FGH=I");
Add code to parse K=V lines into config_line_t format. Closes ticket 28755
2018-12-06 20:13:29 +01:00
done:
config_free_lines(lines);
tor_free(enc);
}
Test: Make sure NOLIST options are not listed.
2019-09-05 18:29:24 +02:00
static void
test_config_getinfo_config_names(void *arg)
{
(void)arg;
char *answer = NULL;
const char *error = NULL;
int rv;
rv = getinfo_helper_config(NULL, "config/names", &answer, &error);
tt_int_op(rv, OP_EQ, 0);
tt_ptr_op(error, OP_EQ, NULL);
// ContactInfo should be listed.
tt_assert(strstr(answer, "\nContactInfo String\n"));
// V1AuthoritativeDirectory should not be listed, since it is obsolete.
tt_assert(! strstr(answer, "V1AuthoritativeDirectory"));
// ___UsingTestNetworkDefaults should not be listed, since it is invisible.
tt_assert(! strstr(answer, "UsingTestNetworkDefaults"));
done:
tor_free(answer);
}
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
#define CONFIG_TEST(name, flags) \
{ #name, test_config_ ## name, flags, NULL, NULL }
struct testcase_t config_tests[] = {
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
CONFIG_TEST(adding_trusted_dir_server, TT_FORK),
CONFIG_TEST(adding_fallback_dir_server, TT_FORK),
CONFIG_TEST(parsing_trusted_dir_server, 0),
Validate that DirAuthority address is IPv4
2018-06-26 13:30:02 +02:00
CONFIG_TEST(parsing_invalid_dir_address, 0),
Authorities on IPv6: minor fixes and unit tests Update the code for IPv6 authorities and fallbacks for function argument changes. Update unit tests affected by the function argument changes in the patch. Add unit tests for authority and fallback: * adding via a function * line parsing * adding default authorities (Adding default fallbacks is unit tested in #15775.)
2015-12-11 12:14:46 +01:00
CONFIG_TEST(parsing_fallback_dir_server, 0),
CONFIG_TEST(adding_default_trusted_dir_servers, TT_FORK),
Unit tests for consider_adding_dir_servers() as modified in #15642 Unit tests for the 10 valid combinations of set/NULL config options DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority, and FallbackDir. Add assertion in consider_adding_dir_servers() for checks in validate_dir_servers(): "You cannot set both DirAuthority and Alternate*Authority."
2015-04-15 11:02:29 +02:00
CONFIG_TEST(adding_dir_servers, TT_FORK),
Add UseDefaultFallbackDirs for hard-coded directory mirrors UseDefaultFallbackDirs enables any hard-coded fallback directory mirrors. Default is 1, set it to 0 to disable fallbacks. Implements ticket 17576. Patch by "teor".
2015-11-24 22:53:29 +01:00
CONFIG_TEST(default_dir_servers, TT_FORK),
Add Fallback Directory Candidate Selection Script "Tor has included a feature to fetch the initial consensus from nodes other than the authorities for a while now. We just haven't shipped a list of alternate locations for clients to go to yet. Reasons why we might want to ship tor with a list of additional places where clients can find the consensus is that it makes authority reachability and BW less important. We want them to have been around and using their current key, address, and port for a while now (120 days), and have been running, a guard, and a v2 directory mirror for most of that time." Features: * whitelist and blacklist for an opt-in/opt-out trial. * excludes BadExits, tor versions that aren't recommended, and low consensus weight directory mirrors. * reduces the weighting of Exits to avoid overloading them. * places limits on the weight of any one fallback. * includes an IPv6 address and orport for each FallbackDir, as implemented in #17327. (Tor won't bootstrap using IPv6 fallbacks until #17840 is merged.) * generated output includes timestamps & Onionoo URL for traceability. * unit test ensures that we successfully load all included default fallback directories. Closes ticket #15775. Patch by "teor". OnionOO script by "weasel", "teor", "gsathya", and "karsten".
2015-05-12 20:10:39 +02:00
CONFIG_TEST(default_fallback_dirs, 0),
Adding comprehensive test cases for resolve_my_address. Also, improve comments on resolve_my_address to explain what it actually does.
2014-04-28 22:20:58 +02:00
CONFIG_TEST(resolve_my_address, TT_FORK),
No new "LEGACY" tests allowed.
2011-09-08 17:19:06 +02:00
CONFIG_TEST(addressmap, 0),
Add parse_bridge_line() unittests.
2013-02-11 23:45:18 +01:00
CONFIG_TEST(parse_bridge_line, 0),
Write unit tests for the ServerTransportOptions parsing function.
2013-06-12 14:28:48 +02:00
CONFIG_TEST(parse_transport_options_line, 0),
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-26 06:42:12 +02:00
CONFIG_TEST(parse_transport_plugin_line, TT_FORK),
test: Add TCPProxy option for haproxy protocol
2019-08-22 04:25:04 +02:00
CONFIG_TEST(parse_tcp_proxy_line, TT_FORK),
Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up.
2013-05-24 19:31:10 +02:00
CONFIG_TEST(check_or_create_data_subdir, TT_FORK),
CONFIG_TEST(write_to_data_subdir, TT_FORK),
MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.
2013-08-31 05:49:04 +02:00
CONFIG_TEST(fix_my_family, 0),
Prop210: Fix directory fetch tests Check that directory fetches behave as expected under Prop 210.
2015-12-17 01:40:49 +01:00
CONFIG_TEST(directory_fetch, 0),
Allow a unix: address to contain a C-style quoted string. Feature 18753 -- all this to allow spaces.
2016-10-03 22:32:00 +02:00
CONFIG_TEST(port_cfg_line_extract_addrport, 0),
Divide the different parse_port_config groups into separate tests
2015-10-05 22:31:49 +02:00
CONFIG_TEST(parse_port_config__ports__no_ports_given, 0),
CONFIG_TEST(parse_port_config__ports__server_options, 0),
CONFIG_TEST(parse_port_config__ports__ports_given, 0),
Accept non-space whitespace characters in log severity syntax. Adds a test_config_parse_log_severity unit test to verify behavior. Fixes #19965.
2016-12-05 05:26:52 +01:00
CONFIG_TEST(parse_log_severity, 0),
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
CONFIG_TEST(include_limit, 0),
CONFIG_TEST(include_does_not_exist, 0),
CONFIG_TEST(include_error_in_included_file, 0),
CONFIG_TEST(include_empty_file_folder, 0),
Unit test for case where %included dir exists but is unreadable
2017-09-28 15:49:30 +02:00
#ifndef _WIN32
CONFIG_TEST(include_no_permission, 0),
#endif
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
CONFIG_TEST(include_recursion_before_after, 0),
CONFIG_TEST(include_recursion_after_only, 0),
CONFIG_TEST(include_folder_order, 0),
Fix bug when %including folder with comment only files. #31408 When processing a %included folder, a bug caused the pointer to the last element of the options list to be set to NULL when processing a file with only comments or whitepace. This could cause options from other files on the same folder to be discarded depending on the lines after the affected %include.
2019-09-22 23:30:48 +02:00
CONFIG_TEST(include_blank_file_last, 0),
Add support for %include funcionality on torrc #1922 config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-19 00:44:16 +02:00
CONFIG_TEST(include_path_syntax, 0),
CONFIG_TEST(include_not_processed, 0),
CONFIG_TEST(include_has_include, 0),
CONFIG_TEST(include_flag_both_without, TT_FORK),
CONFIG_TEST(include_flag_torrc_only, TT_FORK),
CONFIG_TEST(include_flag_defaults_only, TT_FORK),
unit test for config_lines_dup_and_filter
2017-09-28 15:40:17 +02:00
CONFIG_TEST(dup_and_filter, 0),
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-23 21:44:06 +02:00
CONFIG_TEST(check_bridge_distribution_setting_not_a_bridge, TT_FORK),
CONFIG_TEST(check_bridge_distribution_setting_valid, 0),
CONFIG_TEST(check_bridge_distribution_setting_invalid, 0),
CONFIG_TEST(check_bridge_distribution_setting_unrecognised, 0),
Adds files included by torrc and defaults to sandbox filter #22605
2017-08-30 19:20:07 +02:00
CONFIG_TEST(include_opened_file_list, 0),
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM. This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-03 18:26:52 +02:00
CONFIG_TEST(compute_max_mem_in_queues, 0),
Add unit tests for parsing "extended" format of config lines.
2018-08-06 22:57:51 +02:00
CONFIG_TEST(extended_fmt, 0),
Add code to parse K=V lines into config_line_t format. Closes ticket 28755
2018-12-06 20:13:29 +01:00
CONFIG_TEST(kvline_parse, 0),
Test: Make sure NOLIST options are not listed.
2019-09-05 18:29:24 +02:00
CONFIG_TEST(getinfo_config_names, 0),
bug933 - Match against super-domains in MapAddress Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2010-08-02 21:09:37 +02:00
END_OF_TESTCASES
};
Reference in New Issue Copy Permalink