- tor-commits - lists.torproject.org

[tor/master] Refactor addressmap_match_superdomains and representation of wildcards
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 69d16900aaf1d54b44d2b28514a09873154c63d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 11:54:24 2011 -0400 Refactor addressmap_match_superdomains and representation of wildcards In this new representation for wildcarded addresses, there are no longer any 'magic addresses': rather, "a.b c.d", "*.a.b c.d" and "*.a.b *.c.d" are all represented by a mapping from "a.b" to "c.d". we now distinguish them by setting bits in the addressmap_entry_t structure, where src_wildcard is set if the source address had a wildcard, and dst_wildcard is set if the target address had a wildcard. This lets the case where "*.a.b *.c.d" or "*.a.b c.d" remap the address "a.b" get handled trivially, and lets us simplify and improve the addressmap_match_superdomains implementation: we can now have it run in O(parts of address) rather than O(entries in addressmap). --- src/or/circuituse.c | 2 +- src/or/config.c | 24 ++++++++----- src/or/connection_edge.c | 80 ++++++++++++++++++++++++++++----------------- src/or/connection_edge.h | 3 +- src/or/control.c | 2 +- 5 files changed, 69 insertions(+), 42 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index f7f080d..fc252c9 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1676,7 +1676,7 @@ consider_recording_trackhost(const entry_connection_t *conn, addressmap_register(conn->socks_request->address, new_address, time(NULL) + options->TrackHostExitsExpire, - ADDRMAPSRC_TRACKEXIT); + ADDRMAPSRC_TRACKEXIT,0,0); } /** Attempt to attach the connection conn to circ, and send a diff --git a/src/or/config.c b/src/or/config.c index 1d42413..ef54dcb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4459,6 +4459,7 @@ config_register_addressmaps(const or_options_t *options) addressmap_clear_configured(); elts = smartlist_create(); for (opt = options->AddressMap; opt; opt = opt->next) { + int from_wildcard = 0, to_wildcard = 0; smartlist_split_string(elts, opt->value, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2); if (smartlist_len(elts) < 2) { @@ -4476,27 +4477,32 @@ config_register_addressmaps(const or_options_t *options) goto cleanup; } - /* Remove leading asterisk in expressions of type: '*.example.com' */ - if (!strncmp(from,"*.",2)) - from++; - if (!strncmp(to,"*.",2)) - to++; + /* Detect asterisks in expressions of type: '*.example.com' */ + if (!strncmp(from,"*.",2)) { + from += 2; + from_wildcard = 1; + } + if (!strncmp(to,"*.",2)) { + to += 2; + to_wildcard = 1; + } - if (to[0] == '.' && from[0] != '.') { + if (to_wildcard && !from_wildcard) { log_warn(LD_CONFIG, "Skipping invalid argument '%s' to MapAddress: " "can only use wildcard (i.e. '*.') if 'from' address " - "uses wildcard also", to); + "uses wildcard also", opt->value); goto cleanup; } if (address_is_invalid_destination(to, 1)) { log_warn(LD_CONFIG, - "Skipping invalid argument '%s' to MapAddress", to); + "Skipping invalid argument '%s' to MapAddress", opt->value); goto cleanup; } - addressmap_register(from, tor_strdup(to), 0, ADDRMAPSRC_TORRC); + addressmap_register(from, tor_strdup(to), 0, ADDRMAPSRC_TORRC, + from_wildcard, to_wildcard); if (smartlist_len(elts) > 2) log_warn(LD_CONFIG,"Ignoring extra arguments to MapAddress."); diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 284b320..f7b2411 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -789,12 +789,18 @@ connection_ap_detach_retriable(entry_connection_t *conn, * the configuration file, "1" for mappings set from the control * interface, and other values for DNS and TrackHostExit mappings that can * expire.) + * + * A mapping may be 'wildcarded'. If "src_wildcard" is true, then + * any address that ends with a . followed by the key for this entry will + * get remapped by it. If "dst_wildcard" is also true, then only the + * matching suffix of such addresses will get replaced by new_address. */ typedef struct { char *new_address; time_t expires; addressmap_entry_source_t source:3; - int is_wildcard:1; + unsigned src_wildcard:1; + unsigned dst_wildcard:1; short num_resolve_failures; } addressmap_entry_t; @@ -1041,33 +1047,32 @@ addressmap_free_all(void) /** Try to find a match for AddressMap expressions that use * wildcard notation such as '*.c.d *.e.f' (so 'a.c.d' will map to 'a.e.f') or * '*.c.d a.b.c' (so 'a.c.d' will map to a.b.c). - * Returns the matching entry in AddressMap or 0 if no match is found. - * For expressions such as '*.c.d *.e.f' the address 'a.c.d' will - * get truncated to 'a' before we return the matching AddressMap entry. + * Return the matching entry in AddressMap or NULL if no match is found. + * For expressions such as '*.c.d *.e.f', truncate address 'a.c.d' + * to 'a' before we return the matching AddressMap entry. + * + * This function does not handle the case where a pattern of the form "*.c.d" + * matches the address c.d -- that's done by the main addressmap_rewrite + * function. */ static addressmap_entry_t * addressmap_match_superdomains(char *address) { - strmap_iter_t *iter; - const char *key; - void *_val; addressmap_entry_t *val; - char *matched_domains = NULL; - - for (iter = strmap_iter_init(addressmap); !strmap_iter_done(iter); ) { - strmap_iter_get(iter, &key, &_val); - val = _val; - if (key[0] == '.') { - if (!strcasecmpend(address, key) || !strcasecmp(address, &key[1])) { - matched_domains = strstr(address, key); - if (val->is_wildcard && matched_domains) - *matched_domains = '\0'; - return val; - } + char *cp; + + cp = address; + while ((cp = strchr(cp, '.'))) { + /* cp now points to a suffix of address that begins with a . */ + val = strmap_get_lc(addressmap, cp+1); + if (val && val->src_wildcard) { + if (val->dst_wildcard) + *cp = '\0'; + return val; } - iter = strmap_iter_next(addressmap,iter); + ++cp; } - return 0; + return NULL; } /** Look at address, and rewrite it until it doesn't want any @@ -1098,11 +1103,12 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out) } cp = tor_strdup(escaped_safe_str_client(address)); - if (ent->is_wildcard) - strlcpy(address + strlen(address), ent->new_address, - (maxlen - strlen(address))); - else + if (ent->dst_wildcard) { + strlcat(address, ".", maxlen); + strlcat(address, ent->new_address, maxlen); + } else { strlcpy(address, ent->new_address, maxlen); + } log_info(LD_APP, "Addressmap: rewriting %s to %s", cp, escaped_safe_str_client(address)); @@ -1174,13 +1180,26 @@ addressmap_have_mapping(const char *address, int update_expiry) * * If new_address is NULL, or equal to address, remove * any mappings that exist from address. - */ + * + * If wildcard_addr is true, then the mapping will match any address + * equal to address, or any address ending with a period followed by + * address. If wildcard_addr and wildcard_new_addr are + * both true, the mapping will rewrite addresses that end with + * ".address" into ones that end with ".new_address." + * + * It is an error to set wildcard_new_addr if wildcard_addr is + * not set. */ void addressmap_register(const char *address, char *new_address, time_t expires, - addressmap_entry_source_t source) + addressmap_entry_source_t source, + const int wildcard_addr, + const int wildcard_new_addr) { addressmap_entry_t *ent; + if (wildcard_new_addr) + tor_assert(wildcard_addr); + ent = strmap_get(addressmap, address); if (!new_address || !strcasecmp(address,new_address)) { /* Remove the mapping, if any. */ @@ -1217,7 +1236,8 @@ addressmap_register(const char *address, char *new_address, time_t expires, ent->expires = expires==2 ? 1 : expires; ent->num_resolve_failures = 0; ent->source = source; - ent->is_wildcard = (new_address[0] == '.') ? 1 : 0; + ent->src_wildcard = wildcard_addr ? 1 : 0; + ent->dst_wildcard = wildcard_new_addr ? 1 : 0; log_info(LD_CONFIG, "Addressmap: (re)mapped '%s' to '%s'", safe_str_client(address), @@ -1302,7 +1322,7 @@ client_dns_set_addressmap_impl(const char *address, const char *name, "%s", name); } addressmap_register(extendedaddress, tor_strdup(extendedval), - time(NULL) + ttl, ADDRMAPSRC_DNS); + time(NULL) + ttl, ADDRMAPSRC_DNS, 0, 0); } /** Record the fact that address resolved to val. @@ -1554,7 +1574,7 @@ addressmap_register_virtual_address(int type, char *new_address) log_info(LD_APP, "Registering map from %s to %s", *addrp, new_address); if (vent_needs_to_be_added) strmap_set(virtaddress_reversemap, new_address, vent); - addressmap_register(*addrp, new_address, 2, ADDRMAPSRC_AUTOMAP); + addressmap_register(*addrp, new_address, 2, ADDRMAPSRC_AUTOMAP, 0, 0); #if 0 { diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 830667e..47c9c45 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -78,7 +78,8 @@ int addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out); int addressmap_have_mapping(const char *address, int update_timeout); void addressmap_register(const char *address, char *new_address, - time_t expires, addressmap_entry_source_t source); + time_t expires, addressmap_entry_source_t source, + int address_wildcard, int new_address_wildcard); int parse_virtual_addr_network(const char *val, int validate_only, char **msg); int client_dns_incr_failures(const char *address); diff --git a/src/or/control.c b/src/or/control.c index f852659..ce37aca 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1331,7 +1331,7 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len, smartlist_add(reply, ans); } } else { - addressmap_register(from, tor_strdup(to), 1, ADDRMAPSRC_CONTROLLER); + addressmap_register(from, tor_strdup(to), 1, ADDRMAPSRC_CONTROLLER,0,0); tor_snprintf(ans, anslen, "250-%s", line); smartlist_add(reply, ans); }

1 0

[tor/master] Revise MapAddress manpage
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 00ecc2212660e3d31c1c5098e5bbef618ece5ef8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 12:19:27 2011 -0400 Revise MapAddress manpage make the asciidoc work; make the example more generic; tighten the prose a little; be more specific that *.example.com matches example.com; simplify an example. --- doc/tor.1.txt | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index eb79452..7679126 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -655,18 +655,19 @@ The following options are useful only for clients (that is, if 5050, 5190, 5222, 5223, 6523, 6667, 6697, 8300) **MapAddress** __address__ __newaddress__:: - When a request for address arrives to Tor, it will rewrite it to newaddress + When a request for address arrives to Tor, it will transform to newaddress before processing it. For example, if you always want connections to - www.indymedia.org to exit via __torserver__ (where __torserver__ is the - nickname of the server), use MapAddress www.indymedia.org - www.indymedia.org.torserver.exit. If the value is prepended with a - '*.', it is treated as matching an entire domain. For example, if you - always want connections to any sub-domain of indymedia.org to exit via + www.example.com to exit via __torserver__ (where __torserver__ is the + nickname of the server), use "MapAddress www.example.com + www.example.com.torserver.exit". If the value is prefixed with a + "\*.", matches an entire domain. For example, if you + always want connections to example.com and any if its subdomains + to exit via __torserver__ (where __torserver__ is the nickname of the server), use - MapAddress *.indymedia.org *.indymedia.org.torserver.exit. (Note the - leading '*.' in each part of the directive.) You can also redirect all - subdomains of a domain to a single address. For example, MapAddress - *.indymedia.org www.indymedia.org. + + "MapAddress \*.example.com \*.example.com.torserver.exit". (Note the + leading "*." in each part of the directive.) You can also redirect all + subdomains of a domain to a single address. For example, "MapAddress + *.example.com www.example.com". + + NOTES: @@ -681,18 +682,16 @@ The following options are useful only for clients (that is, if if you have the following in your torrc, www.torproject.org will map to 2.2.2.2: - MapAddress www.torproject.org 3.3.3.3 - MapAddress 1.1.1.1 4.4.4.4 MapAddress 1.1.1.1 2.2.2.2 MapAddress www.torproject.org 1.1.1.1 3. The following MapAddress expression is invalid (and will be - ignored) because you cannot map from a specific address to a wildcarded + ignored) because you cannot map from a specific address to a wildcard address: MapAddress www.torproject.org *.torproject.org.torserver.exit - 4. Using a wildcard as a regular expression (e.g. *ample.com) is + 4. Using a wildcard to match only part of a string (as in *ample.com) is also invalid. **NewCircuitPeriod** __NUM__::

1 0

[tor/master] Forbid remapping of *
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit ff3eb8e023f79edf7b04bf12f770bb3df558c033 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 12:04:34 2011 -0400 Forbid remapping of * It might be nice to support this someday, but for now it would fail with an infinite remap cycle. (If I say "remap * *.foo.exit", then example.com -> example.com.foo.exit -> example.com.foo.exit.foo.exit -> example.com.foo.exit.foo.exit.foo.exit -> ...) --- src/or/config.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index ef54dcb..f841f93 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4477,6 +4477,11 @@ config_register_addressmaps(const or_options_t *options) goto cleanup; } + if (!strcmp(to, "*") || !strcmp(from, "*")) { + log_warn(LD_CONFIG,"MapAddress '%s' is unsupported - can't remap from " + "or to *. Ignoring.",opt->value); + goto cleanup; + } /* Detect asterisks in expressions of type: '*.example.com' */ if (!strncmp(from,"*.",2)) { from += 2;

1 0

[tor/master] Add some post-comma spaces to please arma
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 04c622d72004fb7811bc2996551893119869b802 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 25 19:46:11 2011 -0500 Add some post-comma spaces to please arma Incidentally, we've got 30969 lines in master with a comma in them, of which 1995 have a comma followed by a non-newline, non-space character. So about 93% of our commas are right, but we have a substantial number of "crowded" lines. --- src/or/circuituse.c | 2 +- src/or/control.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index fc252c9..7a2ab83 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1676,7 +1676,7 @@ consider_recording_trackhost(const entry_connection_t *conn, addressmap_register(conn->socks_request->address, new_address, time(NULL) + options->TrackHostExitsExpire, - ADDRMAPSRC_TRACKEXIT,0,0); + ADDRMAPSRC_TRACKEXIT, 0, 0); } /** Attempt to attach the connection conn to circ, and send a diff --git a/src/or/control.c b/src/or/control.c index ce37aca..d570ef9 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1331,7 +1331,8 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len, smartlist_add(reply, ans); } } else { - addressmap_register(from, tor_strdup(to), 1, ADDRMAPSRC_CONTROLLER,0,0); + addressmap_register(from, tor_strdup(to), 1, + ADDRMAPSRC_CONTROLLER, 0, 0); tor_snprintf(ans, anslen, "250-%s", line); smartlist_add(reply, ans); }

1 0

[tor/master] Tweak addressmap_rewrite a little more
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit e8d598c4acc55b655f2e49566bf8802d7d6524ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 14:02:58 2011 -0500 Tweak addressmap_rewrite a little more This resolves a loop warning on "MapAddress *.example.com example.com", makes the rewrite log messages correct, and fixes the behavior of "MapAddress *.a *.b" when just given "a" as an input. --- src/or/connection_edge.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 4f26a6b..3b6231d 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1087,23 +1087,38 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out) { addressmap_entry_t *ent; int rewrites; - char *cp; time_t expires = TIME_MAX; for (rewrites = 0; rewrites < 16; rewrites++) { + int exact_match = 0; + char *addr_orig = tor_strdup(escaped_safe_str_client(address)); + ent = strmap_get(addressmap, address); - if (!ent || !ent->new_address) + if (!ent || !ent->new_address) { ent = addressmap_match_superdomains(address); + } else { + if (ent->src_wildcard && !ent->dst_wildcard && + !strcasecmp(address, ent->new_address)) { + /* This is a rule like *.example.com example.com, and we just got + * "example.com" */ + tor_free(addr_orig); + if (expires_out) + *expires_out = expires; + return rewrites > 0; + } + + exact_match = 1; + } if (!ent || !ent->new_address) { + tor_free(addr_orig); if (expires_out) *expires_out = expires; return (rewrites > 0); /* done, no rewrite needed */ } - cp = tor_strdup(escaped_safe_str_client(address)); - if (ent->dst_wildcard) { + if (ent->dst_wildcard && !exact_match) { strlcat(address, ".", maxlen); strlcat(address, ent->new_address, maxlen); } else { @@ -1111,10 +1126,10 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out) } log_info(LD_APP, "Addressmap: rewriting %s to %s", - cp, escaped_safe_str_client(address)); + addr_orig, escaped_safe_str_client(address)); if (ent->expires > 1 && ent->expires < expires) expires = ent->expires; - tor_free(cp); + tor_free(addr_orig); } log_warn(LD_CONFIG, "Loop detected: we've rewritten %s 16 times! Using it as-is.",

1 0

[tor/master] Merge branch 'bug933_nm_rebased_v2'
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 3b88b638264011158d27d5b451fd07d16f60e16b Merge: 60b41cd e8d598c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 14:10:22 2011 -0500 Merge branch 'bug933_nm_rebased_v2' Conflicts: src/test/test.c changes/bug933 | 4 + doc/tor.1.txt | 41 ++++++++++- src/or/circuituse.c | 2 +- src/or/config.c | 62 +++++++++++++---- src/or/connection_edge.c | 105 +++++++++++++++++++++++++--- src/or/connection_edge.h | 3 +- src/or/control.c | 3 +- src/test/Makefile.am | 1 + src/test/test.c | 2 + src/test/test_config.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 361 insertions(+), 32 deletions(-) diff --cc src/test/Makefile.am index ffe1f94,e675431..73de300 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@@ -19,13 -19,10 +19,14 @@@ test_SOURCES = test_data.c \ test_dir.c \ test_microdesc.c \ + test_pt.c \ test_util.c \ + test_config.c \ tinytest.c +bench_SOURCES = \ + bench.c + test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \ diff --cc src/test/test.c index 092b2c3,76644a7..5fcc31c --- a/src/test/test.c +++ b/src/test/test.c @@@ -1843,7 -1941,7 +1843,8 @@@ extern struct testcase_t container_test extern struct testcase_t util_tests[]; extern struct testcase_t dir_tests[]; extern struct testcase_t microdesc_tests[]; +extern struct testcase_t pt_tests[]; + extern struct testcase_t config_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@@ -1854,7 -1952,7 +1855,8 @@@ { "util/", util_tests }, { "dir/", dir_tests }, { "dir/md/", microdesc_tests }, + { "pt/", pt_tests }, + { "config/", config_tests }, END_OF_GROUPS }; diff --cc src/test/test_config.c index 0000000,99d7215..4ce0fa8 mode 000000,100644..100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@@ -1,0 -1,170 +1,170 @@@ + /* Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2010, The Tor Project, Inc. */ + /* See LICENSE for licensing information */ + + #include "orconfig.h" + #include "or.h" + #include "config.h" + #include "connection_edge.h" + #include "test.h" + + static void + test_config_addressmap(void *arg) + { + char buf[1024]; + char address[256]; + time_t expires = TIME_MAX; + (void)arg; + + strlcpy(buf, "MapAddress .invalidwildcard.com *.torserver.exit\n" // invalid + "MapAddress *invalidasterisk.com *.torserver.exit\n" // invalid + "MapAddress *.google.com *.torserver.exit\n" + "MapAddress *.yahoo.com *.google.com.torserver.exit\n" + "MapAddress *.cn.com www.cnn.com\n" + "MapAddress *.cnn.com www.cnn.com\n" + "MapAddress ex.com www.cnn.com\n" + "MapAddress ey.com *.cnn.com\n" + "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" + "MapAddress 4.4.4.4 7.7.7.7\n" + "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)); + - config_get_lines(buf, &(get_options_mutable()->AddressMap)); ++ config_get_lines(buf, &(get_options_mutable()->AddressMap), 0); + config_register_addressmaps(get_options()); + + /* MapAddress .invalidwildcard.com .torserver.exit - no match */ + strlcpy(address, "www.invalidwildcard.com", sizeof(address)); + test_assert(!addressmap_rewrite(address, sizeof(address), &expires)); + + /* MapAddress *invalidasterisk.com .torserver.exit - no match */ + strlcpy(address, "www.invalidasterisk.com", sizeof(address)); + test_assert(!addressmap_rewrite(address, sizeof(address), &expires)); + + /* Where no mapping for FQDN match on top-level domain */ + /* MapAddress .google.com .torserver.exit */ + strlcpy(address, "reader.google.com", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "reader.torserver.exit"); + + /* MapAddress *.yahoo.com *.google.com.torserver.exit */ + strlcpy(address, "reader.yahoo.com", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "reader.google.com.torserver.exit"); + + /*MapAddress *.cnn.com www.cnn.com */ + strlcpy(address, "cnn.com", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "www.cnn.com"); + + /* MapAddress .cn.com www.cnn.com */ + strlcpy(address, "www.cn.com", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "www.cnn.com"); + + /* MapAddress ex.com www.cnn.com - no match */ + strlcpy(address, "www.ex.com", sizeof(address)); + test_assert(!addressmap_rewrite(address, sizeof(address), &expires)); + + /* MapAddress ey.com *.cnn.com - invalid expression */ + strlcpy(address, "ey.com", sizeof(address)); + test_assert(!addressmap_rewrite(address, sizeof(address), &expires)); + + /* Where mapping for FQDN match on FQDN */ + strlcpy(address, "www.google.com", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "3.3.3.3"); + + strlcpy(address, "www.torproject.org", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "1.1.1.1"); + + strlcpy(address, "other.torproject.org", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "this.torproject.org.otherserver.exit"); + + strlcpy(address, "test.torproject.org", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "2.2.2.2"); + + /* 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" + */ + strlcpy(address, "www.example.org", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "5.5.5.5"); + + /* Test infinite address mapping results in no change */ + strlcpy(address, "www.infiniteloop.org", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "www.infiniteloop.org"); + + /* Test we don't find false positives */ + strlcpy(address, "www.example.com", sizeof(address)); + test_assert(!addressmap_rewrite(address, sizeof(address), &expires)); + + /* Test top-level-domain matching a bit harder */ + addressmap_clear_configured(); + strlcpy(buf, "MapAddress *.com *.torserver.exit\n" + "MapAddress *.torproject.org 1.1.1.1\n" + "MapAddress *.net 2.2.2.2\n" + , sizeof(buf)); - config_get_lines(buf, &(get_options_mutable()->AddressMap)); ++ config_get_lines(buf, &(get_options_mutable()->AddressMap), 0); + config_register_addressmaps(get_options()); + + strlcpy(address, "www.abc.com", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "www.abc.torserver.exit"); + + strlcpy(address, "www.def.com", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "www.def.torserver.exit"); + + strlcpy(address, "www.torproject.org", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "1.1.1.1"); + + strlcpy(address, "test.torproject.org", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "1.1.1.1"); + + strlcpy(address, "torproject.net", sizeof(address)); + test_assert(addressmap_rewrite(address, sizeof(address), &expires)); + test_streq(address, "2.2.2.2"); + + /* We don't support '*' as a mapping directive */ + addressmap_clear_configured(); + strlcpy(buf, "MapAddress * *.torserver.exit\n", sizeof(buf)); - config_get_lines(buf, &(get_options_mutable()->AddressMap)); ++ config_get_lines(buf, &(get_options_mutable()->AddressMap), 0); + config_register_addressmaps(get_options()); + + strlcpy(address, "www.abc.com", sizeof(address)); + test_assert(!addressmap_rewrite(address, sizeof(address), &expires)); + + strlcpy(address, "www.def.net", sizeof(address)); + test_assert(!addressmap_rewrite(address, sizeof(address), &expires)); + + strlcpy(address, "www.torproject.org", sizeof(address)); + test_assert(!addressmap_rewrite(address, sizeof(address), &expires)); + + done: + ; + } + + #define CONFIG_TEST(name, flags) \ + { #name, test_config_ ## name, flags, NULL, NULL } + + struct testcase_t config_tests[] = { + CONFIG_TEST(addressmap, 0), + END_OF_TESTCASES + }; +

1 0

[tor/master] Fix an issue in my mapaddress domains code spotted by arma
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 66859e2d4a7823a98a6842e5cf3b09c9fa47c704 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 25 20:13:55 2011 -0500 Fix an issue in my mapaddress domains code spotted by arma MapAddress *.torproject.org torproject.org would have been interpreted as a map from a domain to itself, and would have cleared the mapping. Now we require not only a match of domains, but of wildcards. --- src/or/connection_edge.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f7b2411..4f26a6b 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1178,15 +1178,18 @@ addressmap_have_mapping(const char *address, int update_expiry) * new_address should be a newly dup'ed string, which we'll use or * free as appropriate. We will leave address alone. * - * If new_address is NULL, or equal to address, remove - * any mappings that exist from address. - * * If wildcard_addr is true, then the mapping will match any address * equal to address, or any address ending with a period followed by * address. If wildcard_addr and wildcard_new_addr are * both true, the mapping will rewrite addresses that end with * ".address" into ones that end with ".new_address." * + * If new_address is NULL, or new_address is equal to + * address and wildcard_addr is equal to + * wildcard_new_addr, remove any mappings that exist from + * address. + * + * * It is an error to set wildcard_new_addr if wildcard_addr is * not set. */ void @@ -1201,7 +1204,8 @@ addressmap_register(const char *address, char *new_address, time_t expires, tor_assert(wildcard_addr); ent = strmap_get(addressmap, address); - if (!new_address || !strcasecmp(address,new_address)) { + if (!new_address || (!strcasecmp(address,new_address) && + wildcard_addr == wildcard_new_addr)) { /* Remove the mapping, if any. */ tor_free(new_address); if (ent) {

1 0

[arm/master] Monkey patch for ACS disabling
by atagar＠torproject.org 30 Nov '11

30 Nov '11

commit bd94f0f5ef5490a48828aebfd4c11e39111daaa9 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 30 10:36:15 2011 -0800 Monkey patch for ACS disabling Making manual ACS disabling transparent to the rest of the interface by monkey patching the ord values of ACS entries to '+', '-', or '|'. This has the advantage that the rest of the arm interface doesn't need to be aware of this complication, however it doesn't address the builtin box() function usage, which still makes most dialogs render incorrectly. --- src/util/panel.py | 25 +++++-------------------- src/util/uiTools.py | 27 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index c0c13d8..50ae2c0 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -23,8 +23,7 @@ FORMAT_TAGS = {"": (_noOp, curses.A_BOLD), "<h>": (_noOp, curses.A_STANDOUT)} for colorLabel in uiTools.COLOR_LIST: FORMAT_TAGS["<%s>" % colorLabel] = (uiTools.getColor, colorLabel) -CONFIG = {"features.acsSupport": True, - "log.panelRecreated": log.DEBUG} +CONFIG = {"log.panelRecreated": log.DEBUG} # prevents curses redraws if set HALT_ACTIVITY = False @@ -426,11 +425,7 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxX - x) - - if CONFIG["features.acsSupport"]: - self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) - else: - self.addstr(y, x, "-" * drawLength, attr) + self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) except: # in edge cases drawing could cause a _curses.error pass @@ -450,12 +445,7 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxY - y) - - if CONFIG["features.acsSupport"]: - self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) - else: - for i in range(drawLength): - self.addch(y + i, x, "|", attr) + self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) except: # in edge cases drawing could cause a _curses.error pass @@ -696,13 +686,8 @@ class Panel(): # draws box around the scroll bar self.vline(drawTop, drawLeft + 1, drawBottom - 1) - - if CONFIG["features.acsSupport"]: - self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) - self.addch(drawBottom, drawLeft, curses.ACS_HLINE) - else: - self.addch(drawBottom, drawLeft + 1, "+") - self.addch(drawBottom, drawLeft, "-") + self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) + self.addch(drawBottom, drawLeft, curses.ACS_HLINE) def _resetSubwindow(self): """ diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 51f5fee..bc1fefe 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -338,15 +338,9 @@ def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): panel.vline(top + 1, left + width - 1, height - 2, attr) # draws the corners - if CONFIG["features.acsSupport"]: - panel.addch(top, left, curses.ACS_ULCORNER, attr) - panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) - panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) - else: - panel.addch(top, left, "+", attr) - panel.addch(top, left + width - 1, "+", attr) - panel.addch(top + height - 1, left, "+", attr) - panel.addch(top + height - 1, left + width - 1, "+", attr) + panel.addch(top, left, curses.ACS_ULCORNER, attr) + panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) + panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) def isSelectionKey(key): """ @@ -714,6 +708,21 @@ def _initColors(): global COLOR_ATTR_INITIALIZED, COLOR_IS_SUPPORTED if not COLOR_ATTR_INITIALIZED: + # hack to replace all ACS characters with '+' if ACS support has been + # manually disabled + if not CONFIG["features.acsSupport"]: + for item in curses.__dict__: + if item.startswith("ACS_"): + curses.__dict__[item] = ord('+') + + # replace a few common border pipes that are better rendered as '|' or + # '-' instead + + curses.ACS_SBSB = ord('|') + curses.ACS_VLINE = ord('|') + curses.ACS_BSBS = ord('-') + curses.ACS_HLINE = ord('-') + COLOR_ATTR_INITIALIZED = True COLOR_IS_SUPPORTED = False if not CONFIG["features.colorInterface"]: return

1 0

[arm/master] Option for disabling ACS support
by atagar＠torproject.org 30 Nov '11

30 Nov '11

commit b96f129b9349ccfb53d5eeb9c54b4c063fce3804 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 30 10:13:55 2011 -0800 Option for disabling ACS support Some terminals have issues with alternate character support which is widely used by arm for borders. Unfortunatley this makes the interface look pretty crappy... http://www.atagar.com/arm/images/acs_display_failure.png Explaining the issue in the README and adding an option to manually remedy the most obvious broken bits. ACS is used throughout arm so it's gonna take a much more invasive change to allow the user to completely replace ACS usage (for instance, we can't use the curses box() function...). Thanks to Robert for explaining the issue! --- README | 15 ++++++++++++++- armrc.sample | 4 ++++ src/util/panel.py | 25 ++++++++++++++++++++----- src/util/uiTools.py | 14 ++++++++++---- 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/README b/README index 87a6141..05f18cb 100644 --- a/README +++ b/README @@ -99,12 +99,25 @@ pid belongs to the open control port. If it's running as a different user (such as being in a chroot jail) then it's probably failing due to permission issues. Arm still runs, just no connection listing or ps stats. -> The bandwidth graph showing up +> The bandwidth graph isn't showing up Some terminals, most notably screen sessions on Gentoo, appear to have a bug where highlighted spaces aren't rendered. A reported workaround is to set: TERM="rxvt-unicode" +> There's borders like 'mwqqqqqqqqj' + +If you're getting something that looks like... +http://www.atagar.com/arm/images/acs_display_failure.png + +then you're encountering a bug between ncurses and your terminal where +alternate character support (ACS) is unavailable. For more information see... +http://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing + +Unfortunately there doesn't seem to be a way for arm to automatically detect +and correct this. To work around some of the issues set this in your armrc... +features.acsSupport false + > When I press enter in the connection panel to get details some of the information is either missing or outdated. Why is this? diff --git a/armrc.sample b/armrc.sample index 7daba30..7a611c0 100644 --- a/armrc.sample +++ b/armrc.sample @@ -28,6 +28,10 @@ queries.useProc true # Renders the interface with color if set and the terminal supports it features.colorInterface true +# Uses ACS (alternate character support) to display nice borders. This may not +# work on all terminals. +features.acsSupport true + # Replaces all colored content (ie, anything that isn't white) with this # color. Valid options are: # none, red, green, yellow, blue, cyan, magenta, black, white diff --git a/src/util/panel.py b/src/util/panel.py index 50ae2c0..c0c13d8 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -23,7 +23,8 @@ FORMAT_TAGS = {"": (_noOp, curses.A_BOLD), "<h>": (_noOp, curses.A_STANDOUT)} for colorLabel in uiTools.COLOR_LIST: FORMAT_TAGS["<%s>" % colorLabel] = (uiTools.getColor, colorLabel) -CONFIG = {"log.panelRecreated": log.DEBUG} +CONFIG = {"features.acsSupport": True, + "log.panelRecreated": log.DEBUG} # prevents curses redraws if set HALT_ACTIVITY = False @@ -425,7 +426,11 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxX - x) - self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) + + if CONFIG["features.acsSupport"]: + self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) + else: + self.addstr(y, x, "-" * drawLength, attr) except: # in edge cases drawing could cause a _curses.error pass @@ -445,7 +450,12 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxY - y) - self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) + + if CONFIG["features.acsSupport"]: + self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) + else: + for i in range(drawLength): + self.addch(y + i, x, "|", attr) except: # in edge cases drawing could cause a _curses.error pass @@ -686,8 +696,13 @@ class Panel(): # draws box around the scroll bar self.vline(drawTop, drawLeft + 1, drawBottom - 1) - self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) - self.addch(drawBottom, drawLeft, curses.ACS_HLINE) + + if CONFIG["features.acsSupport"]: + self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) + self.addch(drawBottom, drawLeft, curses.ACS_HLINE) + else: + self.addch(drawBottom, drawLeft + 1, "+") + self.addch(drawBottom, drawLeft, "-") def _resetSubwindow(self): """ diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 01d2ad1..51f5fee 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -39,6 +39,7 @@ TIME_UNITS = [(86400.0, "d", " day"), (3600.0, "h", " hour"), Ending = enum.Enum("ELLIPSE", "HYPHEN") SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) CONFIG = {"features.colorInterface": True, + "features.acsSupport": True, "features.printUnicode": True, "log.cursesColorSupport": log.INFO, "log.configEntryTypeError": log.NOTICE} @@ -337,10 +338,15 @@ def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): panel.vline(top + 1, left + width - 1, height - 2, attr) # draws the corners - panel.addch(top, left, curses.ACS_ULCORNER, attr) - panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) - panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) - panel.addch(top + height - 1, left + width - 1, curses.ACS_LRCORNER, attr) + if CONFIG["features.acsSupport"]: + panel.addch(top, left, curses.ACS_ULCORNER, attr) + panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) + panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) + else: + panel.addch(top, left, "+", attr) + panel.addch(top, left + width - 1, "+", attr) + panel.addch(top + height - 1, left, "+", attr) + panel.addch(top + height - 1, left + width - 1, "+", attr) def isSelectionKey(key): """

1 0

[tor/master] Move crypto_global_cleanup() to the bottom of crypto.c.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit a708e85236d17abaf16da4c455af8a776ad2f7b9 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Nov 22 15:11:40 2011 +0100 Move crypto_global_cleanup() to the bottom of crypto.c. --- src/common/crypto.c | 63 ++++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index ebaa012..a9d8b04 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -291,37 +291,6 @@ crypto_thread_cleanup(void) ERR_remove_state(0); } -/** Uninitialize the crypto library. Return 0 on success, -1 on failure. - */ -int -crypto_global_cleanup(void) -{ - EVP_cleanup(); - ERR_remove_state(0); - ERR_free_strings(); - -#ifndef DISABLE_ENGINES - ENGINE_cleanup(); -#endif - - CONF_modules_unload(1); - CRYPTO_cleanup_all_ex_data(); -#ifdef TOR_IS_MULTITHREADED - if (_n_openssl_mutexes) { - int n = _n_openssl_mutexes; - tor_mutex_t **ms = _openssl_mutexes; - int i; - _openssl_mutexes = NULL; - _n_openssl_mutexes = 0; - for (i=0;i<n;++i) { - tor_mutex_free(ms[i]); - } - tor_free(ms); - } -#endif - return 0; -} - /** used by tortls.c: wrap an RSA* in a crypto_pk_env_t. */ crypto_pk_env_t * _crypto_new_pk_env_rsa(RSA *rsa) @@ -3090,5 +3059,37 @@ setup_openssl_threading(void) return 0; } #endif + +/** Uninitialize the crypto library. Return 0 on success, -1 on failure. + */ +int +crypto_global_cleanup(void) +{ + EVP_cleanup(); + ERR_remove_state(0); + ERR_free_strings(); + +#ifndef DISABLE_ENGINES + ENGINE_cleanup(); +#endif + + CONF_modules_unload(1); + CRYPTO_cleanup_all_ex_data(); +#ifdef TOR_IS_MULTITHREADED + if (_n_openssl_mutexes) { + int n = _n_openssl_mutexes; + tor_mutex_t **ms = _openssl_mutexes; + int i; + _openssl_mutexes = NULL; + _n_openssl_mutexes = 0; + for (i=0;i<n;++i) { + tor_mutex_free(ms[i]); + } + tor_free(ms); + } +#endif + return 0; +} + /** @} */

1 0