February 2020 - tor-commits - lists.torproject.org

[tor/master] Move DNS TTL manipulation code to src/core/or
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit 1f06f494c8ce45946e565237a8a52785a8ece447 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 12:08:29 2020 -0500 Move DNS TTL manipulation code to src/core/or This removes a dependency from the client code on feature/relay. --- src/core/or/connection_edge.c | 15 +++++++++++++++ src/core/or/connection_edge.h | 15 +++++++++++++++ src/feature/client/addressmap.c | 1 - src/feature/relay/dns.c | 16 ---------------- src/feature/relay/dns.h | 14 -------------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index eae07141c..23c6e230c 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -432,6 +432,21 @@ warn_if_hs_unreachable(const edge_connection_t *conn, uint8_t reason) } } +/** Given a TTL (in seconds) from a DNS response or from a relay, determine + * what TTL clients and relays should actually use for caching it. */ +uint32_t +clip_dns_ttl(uint32_t ttl) +{ + /* This logic is a defense against "DefectTor" DNS-based traffic + * confirmation attacks, as in https://nymity.ch/tor-dns/tor-dns.pdf . + * We only give two values: a "low" value and a "high" value. + */ + if (ttl < MIN_DNS_TTL) + return MIN_DNS_TTL; + else + return MAX_DNS_TTL; +} + /** Send a relay end cell from stream conn down conn's circuit, and * remember that we've done so. If this is not a client connection, set the * relay end cell's reason for closing as reason. diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h index 11cb25293..8c06af566 100644 --- a/src/core/or/connection_edge.h +++ b/src/core/or/connection_edge.h @@ -182,6 +182,21 @@ void connection_ap_warn_and_unmark_if_pending_circ( entry_connection_t *entry_conn, const char *where); +/** Lowest value for DNS ttl that a server should give or a client should + * believe. */ +#define MIN_DNS_TTL (5*60) +/** Highest value for DNS ttl that a server should give or a client should + * believe. */ +#define MAX_DNS_TTL (60*60) +/** How long do we keep DNS cache entries before purging them (regardless of + * their TTL)? */ +#define MAX_DNS_ENTRY_AGE (3*60*60) +/** How long do we cache/tell clients to cache DNS records when no TTL is + * known? */ +#define DEFAULT_DNS_TTL (30*60) + +uint32_t clip_dns_ttl(uint32_t ttl); + int connection_half_edge_is_valid_data(const smartlist_t *half_conns, streamid_t stream_id); int connection_half_edge_is_valid_sendme(const smartlist_t *half_conns, diff --git a/src/feature/client/addressmap.c b/src/feature/client/addressmap.c index af76253e4..cc97166f3 100644 --- a/src/feature/client/addressmap.c +++ b/src/feature/client/addressmap.c @@ -23,7 +23,6 @@ #include "app/config/config.h" #include "core/or/connection_edge.h" #include "feature/control/control_events.h" -#include "feature/relay/dns.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerset.h" diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 08fe4d39c..5f4bddab9 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -268,22 +268,6 @@ has_dns_init_failed(void) return nameserver_config_failed; } -/** Helper: Given a TTL from a DNS response, determine what TTL to give the - * OP that asked us to resolve it, and how long to cache that record - * ourselves. */ -uint32_t -clip_dns_ttl(uint32_t ttl) -{ - /* This logic is a defense against "DefectTor" DNS-based traffic - * confirmation attacks, as in https://nymity.ch/tor-dns/tor-dns.pdf . - * We only give two values: a "low" value and a "high" value. - */ - if (ttl < MIN_DNS_TTL) - return MIN_DNS_TTL; - else - return MAX_DNS_TTL; -} - /** Helper: free storage held by an entry in the DNS cache. */ static void free_cached_resolve_(cached_resolve_t *r) diff --git a/src/feature/relay/dns.h b/src/feature/relay/dns.h index e445b2333..a2275c724 100644 --- a/src/feature/relay/dns.h +++ b/src/feature/relay/dns.h @@ -12,22 +12,9 @@ #ifndef TOR_DNS_H #define TOR_DNS_H -/** Lowest value for DNS ttl that a server will give. */ -#define MIN_DNS_TTL (5*60) -/** Highest value for DNS ttl that a server will give. */ -#define MAX_DNS_TTL (60*60) - -/** How long do we keep DNS cache entries before purging them (regardless of - * their TTL)? */ -#define MAX_DNS_ENTRY_AGE (3*60*60) -/** How long do we cache/tell clients to cache DNS records when no TTL is - * known? */ -#define DEFAULT_DNS_TTL (30*60) - int dns_init(void); int has_dns_init_failed(void); void dns_free_all(void); -uint32_t clip_dns_ttl(uint32_t ttl); int dns_reset(void); void connection_dns_remove(edge_connection_t *conn); void assert_connection_edge_not_dns_pending(edge_connection_t *conn); @@ -74,4 +61,3 @@ launch_resolve,(cached_resolve_t *resolve)); #endif /* defined(DNS_PRIVATE) */ #endif /* !defined(TOR_DNS_H) */ -

1 0

[tor/master] Disable dns.c when relay mode is disabled.
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit c43a2452921ac86e65eb70797c8a82b82c2b4076 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 12:32:00 2020 -0500 Disable dns.c when relay mode is disabled. This saves about 1% for me on a binary compiled without relay mode. Closes ticket 33366. --- changes/ticket33366 | 3 +++ src/feature/relay/dns.h | 39 +++++++++++++++++++++++++++++++++++++++ src/feature/relay/include.am | 2 +- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/changes/ticket33366 b/changes/ticket33366 new file mode 100644 index 000000000..1310c493c --- /dev/null +++ b/changes/ticket33366 @@ -0,0 +1,3 @@ + o Minor features (compilation size): + - Most Server-side DNS code is now disabled when building without + support for relay mode. Closes ticket 33366. diff --git a/src/feature/relay/dns.h b/src/feature/relay/dns.h index a2275c724..4e5766af0 100644 --- a/src/feature/relay/dns.h +++ b/src/feature/relay/dns.h @@ -12,6 +12,8 @@ #ifndef TOR_DNS_H #define TOR_DNS_H +#ifdef HAVE_MODULE_RELAY + int dns_init(void); int has_dns_init_failed(void); void dns_free_all(void); @@ -29,6 +31,43 @@ size_t dns_cache_total_allocation(void); void dump_dns_mem_usage(int severity); size_t dns_cache_handle_oom(time_t now, size_t min_remove_bytes); +#else /* !defined(HAVE_MODULE_RELAY) */ + +#define dns_init() (0) +#define dns_seems_to_be_broken() (0) +#define has_dns_init_failed() (0) +#define dns_cache_total_allocation() (0) + +#define dns_reset_correctness_checks() STMT_NIL + +#define assert_connection_edge_not_dns_pending(conn) \ + ((void)(conn)) +#define dump_dns_mem_usage(severity)\ + ((void)(severity)) +#define dns_cache_handle_oom(now, bytes) \ + ((void)(now), (void)(bytes), 0) + +#define connection_dns_remove(conn) \ + STMT_BEGIN \ + (void)(conn); \ + tor_assert_nonfatal_unreached(); \ + STMT_END + +static inline int +dns_reset(void) +{ + return 0; +} +static inline int +dns_resolve(edge_connection_t *exitconn) +{ + (void)exitconn; + tor_assert_nonfatal_unreached(); + return -1; +} + +#endif /* defined(HAVE_MODULE_RELAY) */ + #ifdef DNS_PRIVATE #include "feature/relay/dns_structs.h" diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am index a4c025ae1..ad81e60d7 100644 --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@ -1,7 +1,6 @@ # Legacy shared relay code: migrate to the relay module over time LIBTOR_APP_A_SOURCES += \ - src/feature/relay/dns.c \ src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ src/feature/relay/router.c \ @@ -12,6 +11,7 @@ LIBTOR_APP_A_SOURCES += \ # ADD_C_FILE: INSERT SOURCES HERE. MODULE_RELAY_SOURCES = \ + src/feature/relay/dns.c \ src/feature/relay/routermode.c \ src/feature/relay/relay_config.c \ src/feature/relay/relay_periodic.c \

1 0

[tor/master] dns.h: label functions that are only used inside feature/relay
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit 51b470dbc84786f656c8d1f26eb4ff84cc588d00 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 19 12:17:13 2020 -0500 dns.h: label functions that are only used inside feature/relay --- src/feature/relay/dns.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/feature/relay/dns.h b/src/feature/relay/dns.h index 4e5766af0..70abaf138 100644 --- a/src/feature/relay/dns.h +++ b/src/feature/relay/dns.h @@ -16,14 +16,12 @@ int dns_init(void); int has_dns_init_failed(void); -void dns_free_all(void); int dns_reset(void); void connection_dns_remove(edge_connection_t *conn); void assert_connection_edge_not_dns_pending(edge_connection_t *conn); void assert_all_pending_dns_resolves_ok(void); MOCK_DECL(void,dns_cancel_pending_resolve,(const char *question)); int dns_resolve(edge_connection_t *exitconn); -void dns_launch_correctness_checks(void); int dns_seems_to_be_broken(void); int dns_seems_to_be_broken_for_ipv6(void); void dns_reset_correctness_checks(void); @@ -31,6 +29,11 @@ size_t dns_cache_total_allocation(void); void dump_dns_mem_usage(int severity); size_t dns_cache_handle_oom(time_t now, size_t min_remove_bytes); +/* These functions are only used within the feature/relay module, and don't + * need stubs. */ +void dns_free_all(void); +void dns_launch_correctness_checks(void); + #else /* !defined(HAVE_MODULE_RELAY) */ #define dns_init() (0)

1 0

[tor/master] Remove assert_all_pending_dns_resolves_ok().
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit f739aa79620ad47051c4fd5f7e576899da7e80b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 19 12:27:49 2020 -0500 Remove assert_all_pending_dns_resolves_ok(). It hasn't been used since 2009. --- src/core/mainloop/mainloop.c | 1 - src/feature/relay/dns.c | 19 ------------------- src/feature/relay/dns.h | 1 - 3 files changed, 21 deletions(-) diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 260de181e..e4e17f6b7 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -966,7 +966,6 @@ conn_close_if_marked(int i) return 0; /* nothing to see here, move along */ now = time(NULL); assert_connection_ok(conn, now); - /* assert_all_pending_dns_resolves_ok(); */ log_debug(LD_NET,"Cleaning up connection (fd "TOR_SOCKET_T_FORMAT").", conn->s); diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 5f4bddab9..3ff1378df 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -971,25 +971,6 @@ assert_connection_edge_not_dns_pending(edge_connection_t *conn) #endif /* 1 */ } -/** Log an error and abort if any connection waiting for a DNS resolve is - * corrupted. */ -void -assert_all_pending_dns_resolves_ok(void) -{ - pending_connection_t *pend; - cached_resolve_t **resolve; - - HT_FOREACH(resolve, cache_map, &cache_root) { - for (pend = (*resolve)->pending_connections; - pend; - pend = pend->next) { - assert_connection_ok(TO_CONN(pend->conn), 0); - tor_assert(!SOCKET_OK(pend->conn->base_.s)); - tor_assert(!connection_in_array(TO_CONN(pend->conn))); - } - } -} - /** Remove conn from the list of connections waiting for conn-\>address. */ void diff --git a/src/feature/relay/dns.h b/src/feature/relay/dns.h index 70abaf138..462cc6361 100644 --- a/src/feature/relay/dns.h +++ b/src/feature/relay/dns.h @@ -19,7 +19,6 @@ int has_dns_init_failed(void); int dns_reset(void); void connection_dns_remove(edge_connection_t *conn); void assert_connection_edge_not_dns_pending(edge_connection_t *conn); -void assert_all_pending_dns_resolves_ok(void); MOCK_DECL(void,dns_cancel_pending_resolve,(const char *question)); int dns_resolve(edge_connection_t *exitconn); int dns_seems_to_be_broken(void);

1 0

[tor/master] Make dns_cancel_pending_resolve() STATIC.
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit defd941fe7f28264effffbbffb487ee4383ca2ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 19 12:30:09 2020 -0500 Make dns_cancel_pending_resolve() STATIC. It is not called by anything outside of the tests and dns.c. --- src/feature/relay/dns.c | 2 +- src/feature/relay/dns.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 3ff1378df..99f48ab2c 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -1028,7 +1028,7 @@ connection_dns_remove(edge_connection_t *conn) * the resolve for address itself, and remove any cached results for * address from the cache. */ -MOCK_IMPL(void, +MOCK_IMPL(STATIC void, dns_cancel_pending_resolve,(const char *address)) { pending_connection_t *pend; diff --git a/src/feature/relay/dns.h b/src/feature/relay/dns.h index 462cc6361..120b75bf8 100644 --- a/src/feature/relay/dns.h +++ b/src/feature/relay/dns.h @@ -19,7 +19,6 @@ int has_dns_init_failed(void); int dns_reset(void); void connection_dns_remove(edge_connection_t *conn); void assert_connection_edge_not_dns_pending(edge_connection_t *conn); -MOCK_DECL(void,dns_cancel_pending_resolve,(const char *question)); int dns_resolve(edge_connection_t *exitconn); int dns_seems_to_be_broken(void); int dns_seems_to_be_broken_for_ipv6(void); @@ -78,6 +77,7 @@ size_t number_of_configured_nameservers(void); tor_addr_t *configured_nameserver_address(const size_t idx); #endif +MOCK_DECL(STATIC void,dns_cancel_pending_resolve,(const char *question)); MOCK_DECL(STATIC int,dns_resolve_impl,(edge_connection_t *exitconn, int is_resolve,or_circuit_t *oncirc, char **hostname_out, int *made_connection_pending_out, cached_resolve_t **resolve_out));

1 0

[tor/master] Merge branch 'extract_relay_dns'
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit a65efa7e8378fa470b7312509eecf92aa029817f Merge: 65b75ef3d defd941fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 19 13:58:53 2020 -0500 Merge branch 'extract_relay_dns' changes/ticket33366 | 3 ++ src/core/mainloop/mainloop.c | 1 - src/core/or/connection_edge.c | 19 +++++++++++-- src/core/or/connection_edge.h | 15 ++++++++++ src/feature/client/addressmap.c | 3 +- src/feature/relay/dns.c | 45 ++++-------------------------- src/feature/relay/dns.h | 61 +++++++++++++++++++++++++++++------------ src/feature/relay/include.am | 2 +- src/test/test_dns.c | 8 +++--- 9 files changed, 90 insertions(+), 67 deletions(-) diff --cc src/feature/relay/include.am index 5cb0731fb,ad81e60d7..aa7c1b35b --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@@ -1,16 -1,17 +1,16 @@@ # Legacy shared relay code: migrate to the relay module over time LIBTOR_APP_A_SOURCES += \ - src/feature/relay/dns.c \ - src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ src/feature/relay/router.c \ - src/feature/relay/routerkeys.c \ - src/feature/relay/selftest.c + src/feature/relay/routerkeys.c # The Relay module. # ADD_C_FILE: INSERT SOURCES HERE. MODULE_RELAY_SOURCES = \ + src/feature/relay/dns.c \ + src/feature/relay/ext_orport.c \ src/feature/relay/routermode.c \ src/feature/relay/relay_config.c \ src/feature/relay/relay_periodic.c \

1 0

[tor/master] Move ext_orport identifier map into ext_orport.c
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit 1f958b6020ce40484386a722aa31776a67eb5532 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 13:10:57 2020 -0500 Move ext_orport identifier map into ext_orport.c There's no need to move the declarations: those were already in ext_orport.h. This shrinks connection_or.c a little. --- src/core/or/connection_or.c | 69 ------------------------------------------ src/feature/relay/ext_orport.c | 69 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index 76bfbf0b3..12dca97b7 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -109,10 +109,6 @@ TO_OR_CONN(connection_t *c) return DOWNCAST(or_connection_t, c); } -/** Global map between Extended ORPort identifiers and OR - * connections. */ -static digestmap_t *orconn_ext_or_id_map = NULL; - /** Clear clear conn->identity_digest and update other data * structures as appropriate.*/ void @@ -198,71 +194,6 @@ connection_or_set_identity_digest(or_connection_t *conn, channel_set_identity_digest(chan, rsa_digest, ed_id); } -/** Remove the Extended ORPort identifier of conn from the - * global identifier list. Also, clear the identifier from the - * connection itself. */ -void -connection_or_remove_from_ext_or_id_map(or_connection_t *conn) -{ - or_connection_t *tmp; - if (!orconn_ext_or_id_map) - return; - if (!conn->ext_or_conn_id) - return; - - tmp = digestmap_remove(orconn_ext_or_id_map, conn->ext_or_conn_id); - if (!tor_digest_is_zero(conn->ext_or_conn_id)) - tor_assert(tmp == conn); - - memset(conn->ext_or_conn_id, 0, EXT_OR_CONN_ID_LEN); -} - -/** Return the connection whose ext_or_id is id. Return NULL if no such - * connection is found. */ -or_connection_t * -connection_or_get_by_ext_or_id(const char *id) -{ - if (!orconn_ext_or_id_map) - return NULL; - return digestmap_get(orconn_ext_or_id_map, id); -} - -/** Deallocate the global Extended ORPort identifier list */ -void -connection_or_clear_ext_or_id_map(void) -{ - digestmap_free(orconn_ext_or_id_map, NULL); - orconn_ext_or_id_map = NULL; -} - -/** Creates an Extended ORPort identifier for conn and deposits - * it into the global list of identifiers. */ -void -connection_or_set_ext_or_identifier(or_connection_t *conn) -{ - char random_id[EXT_OR_CONN_ID_LEN]; - or_connection_t *tmp; - - if (!orconn_ext_or_id_map) - orconn_ext_or_id_map = digestmap_new(); - - /* Remove any previous identifiers: */ - if (conn->ext_or_conn_id && !tor_digest_is_zero(conn->ext_or_conn_id)) - connection_or_remove_from_ext_or_id_map(conn); - - do { - crypto_rand(random_id, sizeof(random_id)); - } while (digestmap_get(orconn_ext_or_id_map, random_id)); - - if (!conn->ext_or_conn_id) - conn->ext_or_conn_id = tor_malloc_zero(EXT_OR_CONN_ID_LEN); - - memcpy(conn->ext_or_conn_id, random_id, EXT_OR_CONN_ID_LEN); - - tmp = digestmap_set(orconn_ext_or_id_map, random_id, conn); - tor_assert(!tmp); -} - /**************************************************************/ /** Map from a string describing what a non-open OR connection was doing when diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index ce4e043dd..eada68347 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -652,6 +652,75 @@ connection_ext_or_start_auth(or_connection_t *or_conn) return 0; } +/** Global map between Extended ORPort identifiers and OR + * connections. */ +static digestmap_t *orconn_ext_or_id_map = NULL; + +/** Remove the Extended ORPort identifier of conn from the + * global identifier list. Also, clear the identifier from the + * connection itself. */ +void +connection_or_remove_from_ext_or_id_map(or_connection_t *conn) +{ + or_connection_t *tmp; + if (!orconn_ext_or_id_map) + return; + if (!conn->ext_or_conn_id) + return; + + tmp = digestmap_remove(orconn_ext_or_id_map, conn->ext_or_conn_id); + if (!tor_digest_is_zero(conn->ext_or_conn_id)) + tor_assert(tmp == conn); + + memset(conn->ext_or_conn_id, 0, EXT_OR_CONN_ID_LEN); +} + +/** Return the connection whose ext_or_id is id. Return NULL if no such + * connection is found. */ +or_connection_t * +connection_or_get_by_ext_or_id(const char *id) +{ + if (!orconn_ext_or_id_map) + return NULL; + return digestmap_get(orconn_ext_or_id_map, id); +} + +/** Deallocate the global Extended ORPort identifier list */ +void +connection_or_clear_ext_or_id_map(void) +{ + digestmap_free(orconn_ext_or_id_map, NULL); + orconn_ext_or_id_map = NULL; +} + +/** Creates an Extended ORPort identifier for conn and deposits + * it into the global list of identifiers. */ +void +connection_or_set_ext_or_identifier(or_connection_t *conn) +{ + char random_id[EXT_OR_CONN_ID_LEN]; + or_connection_t *tmp; + + if (!orconn_ext_or_id_map) + orconn_ext_or_id_map = digestmap_new(); + + /* Remove any previous identifiers: */ + if (conn->ext_or_conn_id && !tor_digest_is_zero(conn->ext_or_conn_id)) + connection_or_remove_from_ext_or_id_map(conn); + + do { + crypto_rand(random_id, sizeof(random_id)); + } while (digestmap_get(orconn_ext_or_id_map, random_id)); + + if (!conn->ext_or_conn_id) + conn->ext_or_conn_id = tor_malloc_zero(EXT_OR_CONN_ID_LEN); + + memcpy(conn->ext_or_conn_id, random_id, EXT_OR_CONN_ID_LEN); + + tmp = digestmap_set(orconn_ext_or_id_map, random_id, conn); + tor_assert(!tmp); +} + /** Free any leftover allocated memory of the ext_orport.c subsystem. */ void ext_orport_free_all(void)

1 0

[tor/master] Move some declarations into proto_ext_or.h
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit 8ce15933e5e8d9c65c7cca2389e42ff2da604b77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 13:07:33 2020 -0500 Move some declarations into proto_ext_or.h They are for functions declared in that file. --- src/core/proto/proto_ext_or.h | 7 +++++++ src/feature/relay/ext_orport.h | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/core/proto/proto_ext_or.h b/src/core/proto/proto_ext_or.h index daac3e3eb..3408599fb 100644 --- a/src/core/proto/proto_ext_or.h +++ b/src/core/proto/proto_ext_or.h @@ -24,4 +24,11 @@ struct ext_or_cmd_t { int fetch_ext_or_command_from_buf(struct buf_t *buf, struct ext_or_cmd_t **out); +ext_or_cmd_t *ext_or_cmd_new(uint16_t len); + +#define ext_or_cmd_free(cmd) \ + FREE_AND_NULL(ext_or_cmd_t, ext_or_cmd_free_, (cmd)) + +void ext_or_cmd_free_(ext_or_cmd_t *cmd); + #endif /* !defined(TOR_PROTO_EXT_OR_H) */ diff --git a/src/feature/relay/ext_orport.h b/src/feature/relay/ext_orport.h index dbe89fce1..d44c97be8 100644 --- a/src/feature/relay/ext_orport.h +++ b/src/feature/relay/ext_orport.h @@ -33,12 +33,6 @@ int connection_ext_or_start_auth(or_connection_t *or_conn); -ext_or_cmd_t *ext_or_cmd_new(uint16_t len); - -#define ext_or_cmd_free(cmd) \ - FREE_AND_NULL(ext_or_cmd_t, ext_or_cmd_free_, (cmd)) - -void ext_or_cmd_free_(ext_or_cmd_t *cmd); void connection_or_set_ext_or_identifier(or_connection_t *conn); void connection_or_remove_from_ext_or_id_map(or_connection_t *conn); void connection_or_clear_ext_or_id_map(void);

1 0

[tor/master] Make sure callers can handle NULL ext-or auth cookie filename
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit eb07166eb8aed3a37fe0e5ade476d7084bc0c5e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 12:55:57 2020 -0500 Make sure callers can handle NULL ext-or auth cookie filename --- src/app/main/shutdown.c | 3 ++- src/feature/client/transports.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c index 27d92609e..aac15246b 100644 --- a/src/app/main/shutdown.c +++ b/src/app/main/shutdown.c @@ -75,7 +75,8 @@ tor_cleanup(void) /* Remove Extended ORPort cookie authentication file */ { char *cookie_fname = get_ext_or_auth_cookie_file_name(); - tor_remove_file(cookie_fname); + if (cookie_fname) + tor_remove_file(cookie_fname); tor_free(cookie_fname); } if (accounting_is_enabled(options)) diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index a8ea9781a..55069bb60 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1420,8 +1420,10 @@ create_managed_proxy_environment(const managed_proxy_t *mp) smartlist_add_asprintf(envs, "TOR_PT_EXTENDED_SERVER_PORT=%s", ext_or_addrport_tmp); } - smartlist_add_asprintf(envs, "TOR_PT_AUTH_COOKIE_FILE=%s", - cookie_file_loc); + if (cookie_file_loc) { + smartlist_add_asprintf(envs, "TOR_PT_AUTH_COOKIE_FILE=%s", + cookie_file_loc); + } tor_free(ext_or_addrport_tmp); tor_free(cookie_file_loc);

1 0

[tor/master] Make connection_or_get_by_ext_or_id() testing-only
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit df6191f620f92ce2196955a240c45da63c074fee Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 19 12:04:31 2020 -0500 Make connection_or_get_by_ext_or_id() testing-only Apparently it is only used by the unit tests: tor doesn't want it at all. I've opened a new ticket (33383) to we if we should remove this whole feature. --- src/feature/relay/ext_orport.c | 2 ++ src/feature/relay/ext_orport.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index eada68347..533400bff 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -675,6 +675,7 @@ connection_or_remove_from_ext_or_id_map(or_connection_t *conn) memset(conn->ext_or_conn_id, 0, EXT_OR_CONN_ID_LEN); } +#ifdef TOR_UNIT_TESTS /** Return the connection whose ext_or_id is id. Return NULL if no such * connection is found. */ or_connection_t * @@ -684,6 +685,7 @@ connection_or_get_by_ext_or_id(const char *id) return NULL; return digestmap_get(orconn_ext_or_id_map, id); } +#endif /** Deallocate the global Extended ORPort identifier list */ void diff --git a/src/feature/relay/ext_orport.h b/src/feature/relay/ext_orport.h index cf13c5d42..b09fe3b57 100644 --- a/src/feature/relay/ext_orport.h +++ b/src/feature/relay/ext_orport.h @@ -38,8 +38,6 @@ int connection_ext_or_start_auth(or_connection_t *or_conn); void connection_or_set_ext_or_identifier(or_connection_t *conn); void connection_or_remove_from_ext_or_id_map(or_connection_t *conn); void connection_or_clear_ext_or_id_map(void); -or_connection_t *connection_or_get_by_ext_or_id(const char *id); - int connection_ext_or_finished_flushing(or_connection_t *conn); int connection_ext_or_process_inbuf(or_connection_t *or_conn); @@ -91,9 +89,11 @@ STATIC int handle_client_auth_nonce(const char *client_nonce, size_t client_nonce_len, char **client_hash_out, char **reply_out, size_t *reply_len_out); + #ifdef TOR_UNIT_TESTS extern uint8_t *ext_or_auth_cookie; extern int ext_or_auth_cookie_is_set; +or_connection_t *connection_or_get_by_ext_or_id(const char *id); #endif #endif /* defined(EXT_ORPORT_PRIVATE) */

1 0