September 2016 - tor-commits - lists.torproject.org

[tor/master] Fix a memory leak in options/validate__single_onion
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit 831649f56eed00728b58c2be27a250df69c99600 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 13 10:40:42 2016 -0400 Fix a memory leak in options/validate__single_onion --- src/test/test_options.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_options.c b/src/test/test_options.c index 1439f95..31a916f 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2868,6 +2868,7 @@ test_options_validate__single_onion(void *ignored) tt_str_op(msg, OP_EQ, "HiddenServiceNonAnonymousMode does not provide any " "server anonymity. It must be used with " "HiddenServiceSingleHopMode set to 1."); + tor_free(msg); free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES

1 0

[tor/master] Replace OnionService* with HiddenService* in option names
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit f311c9ffa2d9cdb64b92e4ceab5b3c582b976228 Author: teor <teor2345(a)gmail.com> Date: Tue Sep 13 17:28:03 2016 +1000 Replace OnionService* with HiddenService* in option names And make consequential line-length adjustments. --- changes/feature17178 | 4 +-- doc/tor.1.txt | 12 ++++----- src/or/config.c | 52 ++++++++++++++++++------------------ src/or/or.h | 12 ++++----- src/or/rendservice.c | 14 +++++----- src/test/test_hs.c | 70 ++++++++++++++++++++++++------------------------- src/test/test_options.c | 64 ++++++++++++++++++++++---------------------- 7 files changed, 114 insertions(+), 114 deletions(-) diff --git a/changes/feature17178 b/changes/feature17178 index 060b85a..172097c 100644 --- a/changes/feature17178 +++ b/changes/feature17178 @@ -1,6 +1,6 @@ o Major features (onion services): - - Add experimental OnionServiceSingleHopMode and - OnionServiceNonAnonymousMode options. When both are set to 1, every + - Add experimental HiddenServiceSingleHopMode and + HiddenServiceNonAnonymousMode options. When both are set to 1, every hidden service on a tor instance becomes a non-anonymous Single Onion Service. Single Onions make one-hop (direct) connections to their introduction and renzedvous points. One-hop circuits make Single Onion diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f353637..ab4dcba 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2379,9 +2379,9 @@ The following options are used to configure a hidden service. Number of introduction points the hidden service will have. You can't have more than 10. (Default: 3) -[[OnionServiceSingleHopMode]] **OnionServiceSingleHopMode** **0**|**1**:: +[[HiddenServiceSingleHopMode]] **HiddenServiceSingleHopMode** **0**|**1**:: **Experimental - Non Anonymous** Hidden Services on a tor instance in - OnionServiceSingleHopMode make one-hop (direct) circuits between the onion + HiddenServiceSingleHopMode make one-hop (direct) circuits between the onion service server, and the introduction and rendezvous points. (Onion service descriptors are still posted using 3-hop paths, to avoid onion service directories blocking the service.) @@ -2392,21 +2392,21 @@ The following options are used to configure a hidden service. statistically distinguishable. **WARNING:** Once a hidden service directory has been used by a tor - instance in OnionServiceSingleHopMode, it can **NEVER** be used again for + instance in HiddenServiceSingleHopMode, it can **NEVER** be used again for a hidden service. It is best practice to create a new hidden service directory, key, and address for each new Single Onion Service and Hidden Service. It is not possible to run Single Onion Services and Hidden Services from the same tor instance: they should be run on different servers with different IP addresses. - OnionServiceSingleHopMode requires OnionServiceNonAnonymousMode to be set + HiddenServiceSingleHopMode requires HiddenServiceNonAnonymousMode to be set to 1. Since a Single Onion is non-anonymous, you can not to run an anonymous SOCKSPort on the same tor instance as a Single Onion service. (Default: 0) -[[OnionServiceNonAnonymousMode]] **OnionServiceNonAnonymousMode** **0**|**1**:: +[[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** **0**|**1**:: Makes hidden services non-anonymous on this tor instance. Allows the - non-anonymous OnionServiceSingleHopMode. Enables direct connections in the + non-anonymous HiddenServiceSingleHopMode. Enables direct connections in the server-side hidden service protocol. (Default: 0) diff --git a/src/or/config.c b/src/or/config.c index 6d168c4..949c8a9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -298,8 +298,8 @@ static config_var_t option_vars_[] = { V(HidServAuth, LINELIST, NULL), V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"), V(CloseHSServiceRendCircuitsImmediatelyOnTimeout, BOOL, "0"), - V(OnionServiceSingleHopMode, BOOL, "0"), - V(OnionServiceNonAnonymousMode,BOOL, "0"), + V(HiddenServiceSingleHopMode, BOOL, "0"), + V(HiddenServiceNonAnonymousMode,BOOL, "0"), V(HTTPProxy, STRING, NULL), V(HTTPProxyAuthenticator, STRING, NULL), V(HTTPSProxy, STRING, NULL), @@ -2826,15 +2826,15 @@ STATIC int options_validate_single_onion(or_options_t *options, char **msg) { /* The two single onion service options must have matching values. */ - if (options->OnionServiceSingleHopMode && - !options->OnionServiceNonAnonymousMode) { - REJECT("OnionServiceSingleHopMode does not provide any server anonymity. " - "It must be used with OnionServiceNonAnonymousMode set to 1."); - } - if (options->OnionServiceNonAnonymousMode && - !options->OnionServiceSingleHopMode) { - REJECT("OnionServiceNonAnonymousMode does not provide any server " - "anonymity. It must be used with OnionServiceSingleHopMode set to " + if (options->HiddenServiceSingleHopMode && + !options->HiddenServiceNonAnonymousMode) { + REJECT("HiddenServiceSingleHopMode does not provide any server anonymity. " + "It must be used with HiddenServiceNonAnonymousMode set to 1."); + } + if (options->HiddenServiceNonAnonymousMode && + !options->HiddenServiceSingleHopMode) { + REJECT("HiddenServiceNonAnonymousMode does not provide any server " + "anonymity. It must be used with HiddenServiceSingleHopMode set to " "1."); } @@ -2849,9 +2849,9 @@ options_validate_single_onion(or_options_t *options, char **msg) options->DNSPort_set); if (rend_service_non_anonymous_mode_enabled(options) && client_port_set && !options->Tor2webMode) { - REJECT("OnionServiceNonAnonymousMode is incompatible with using Tor as an " - "anonymous client. Please set Socks/Trans/NATD/DNSPort to 0, or " - "OnionServiceNonAnonymousMode to 0, or use the non-anonymous " + REJECT("HiddenServiceNonAnonymousMode is incompatible with using Tor as " + "an anonymous client. Please set Socks/Trans/NATD/DNSPort to 0, or " + "HiddenServiceNonAnonymousMode to 0, or use the non-anonymous " "Tor2webMode."); } @@ -2862,7 +2862,7 @@ options_validate_single_onion(or_options_t *options, char **msg) REJECT("Non-anonymous (Tor2web) mode is incompatible with using Tor as a " "hidden service. Please remove all HiddenServiceDir lines, or use " "a version of tor compiled without --enable-tor2web-mode, or use " - " OnionServiceNonAnonymousMode."); + " HiddenServiceNonAnonymousMode."); } if (rend_service_allow_non_anonymous_connection(options) @@ -2875,7 +2875,7 @@ options_validate_single_onion(or_options_t *options, char **msg) * make path bias compatible with single onions. */ log_notice(LD_CONFIG, - "OnionServiceSingleHopMode is enabled; disabling " + "HiddenServiceSingleHopMode is enabled; disabling " "UseEntryGuards."); options->UseEntryGuards = 0; } @@ -2885,9 +2885,9 @@ options_validate_single_onion(or_options_t *options, char **msg) * have. We'll poison new keys in options_act() just before we create them. */ if (rend_service_list_verify_single_onion_poison(NULL, options) < 0) { - log_warn(LD_GENERAL, "We are configured with OnionServiceNonAnonymousMode " - "%d, but one or more hidden service keys were created in %s " - "mode. This is not allowed.", + log_warn(LD_GENERAL, "We are configured with " + "HiddenServiceNonAnonymousMode %d, but one or more hidden " + "service keys were created in %s mode. This is not allowed.", rend_service_non_anonymous_mode_enabled(options) ? 1 : 0, rend_service_non_anonymous_mode_enabled(options) ? "an anonymous" : "a non-anonymous" @@ -3451,9 +3451,9 @@ options_validate(or_options_t *old_options, or_options_t *options, /* Single Onion Services: non-anonymous hidden services */ if (rend_service_non_anonymous_mode_enabled(options)) { log_warn(LD_CONFIG, - "OnionServiceNonAnonymousNode is set. Every hidden service on " + "HiddenServiceNonAnonymousMode is set. Every hidden service on " "this tor instance is NON-ANONYMOUS. If " - "the OnionServiceNonAnonymousMode option is changed, Tor will " + "the HiddenServiceNonAnonymousMode option is changed, Tor will " "refuse to launch hidden services from the same directories, to " "protect your anonymity against config errors. This setting is " "for experimental use only."); @@ -4408,16 +4408,16 @@ options_transition_allowed(const or_options_t *old, return -1; } - if (old->OnionServiceSingleHopMode != new_val->OnionServiceSingleHopMode) { + if (old->HiddenServiceSingleHopMode != new_val->HiddenServiceSingleHopMode) { *msg = tor_strdup("While Tor is running, changing " - "OnionServiceSingleHopMode is not allowed."); + "HiddenServiceSingleHopMode is not allowed."); return -1; } - if (old->OnionServiceNonAnonymousMode != - new_val->OnionServiceNonAnonymousMode) { + if (old->HiddenServiceNonAnonymousMode != + new_val->HiddenServiceNonAnonymousMode) { *msg = tor_strdup("While Tor is running, changing " - "OnionServiceNonAnonymousMode is not allowed."); + "HiddenServiceNonAnonymousMode is not allowed."); return -1; } diff --git a/src/or/or.h b/src/or/or.h index 849cd4c..9179f08 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3701,25 +3701,25 @@ typedef struct { * they reach the normal circuit-build timeout. */ int CloseHSServiceRendCircuitsImmediatelyOnTimeout; - /** Onion Services in OnionServiceSingleHopMode make one-hop (direct) + /** Onion Services in HiddenServiceSingleHopMode make one-hop (direct) * circuits between the onion service server, and the introduction and * rendezvous points. (Onion service descriptors are still posted using * 3-hop paths, to avoid onion service directories blocking the service.) * This option makes every hidden service instance hosted by * this tor instance a Single Onion Service. - * OnionServiceSingleHopMode requires OnionServiceNonAnonymousMode to be set - * to 1. + * HiddenServiceSingleHopMode requires HiddenServiceNonAnonymousMode to be + * set to 1. * Use rend_service_allow_non_anonymous_connection() or * rend_service_reveal_startup_time() instead of using this option directly. */ - int OnionServiceSingleHopMode; + int HiddenServiceSingleHopMode; /* Makes hidden service clients and servers non-anonymous on this tor - * instance. Allows the non-anonymous OnionServiceSingleHopMode. Enables + * instance. Allows the non-anonymous HiddenServiceSingleHopMode. Enables * non-anonymous behaviour in the hidden service protocol. * Use rend_service_non_anonymous_mode_enabled() instead of using this option * directly. */ - int OnionServiceNonAnonymousMode; + int HiddenServiceNonAnonymousMode; int ConnLimit; /**< Demanded minimum number of simultaneous connections. */ int ConnLimit_; /**< Maximum allowed number of simultaneous connections. */ diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 9400b59..cce63f2 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -4179,26 +4179,26 @@ rend_service_set_connection_addr_port(edge_connection_t *conn, return -2; } -/* Are OnionServiceSingleHopMode and OnionServiceNonAnonymousMode consistent? +/* Are HiddenServiceSingleHopMode and HiddenServiceNonAnonymousMode consistent? */ static int rend_service_non_anonymous_mode_consistent(const or_options_t *options) { /* !! is used to make these options boolean */ - return (!! options->OnionServiceSingleHopMode == - !! options->OnionServiceNonAnonymousMode); + return (!! options->HiddenServiceSingleHopMode == + !! options->HiddenServiceNonAnonymousMode); } /* Do the options allow onion services to make direct (non-anonymous) * connections to introduction or rendezvous points? * Must only be called after options_validate_single_onion() has successfully * checked onion service option consistency. - * Returns true if tor is in OnionServiceSingleHopMode. */ + * Returns true if tor is in HiddenServiceSingleHopMode. */ int rend_service_allow_non_anonymous_connection(const or_options_t *options) { tor_assert(rend_service_non_anonymous_mode_consistent(options)); - return options->OnionServiceSingleHopMode ? 1 : 0; + return options->HiddenServiceSingleHopMode ? 1 : 0; } /* Do the options allow us to reveal the exact startup time of the onion @@ -4215,7 +4215,7 @@ rend_service_reveal_startup_time(const or_options_t *options) return rend_service_non_anonymous_mode_enabled(options); } -/* Is non-anonymous mode enabled using the OnionServiceNonAnonymousMode +/* Is non-anonymous mode enabled using the HiddenServiceNonAnonymousMode * config option? * Must only be called after options_validate_single_onion() has successfully * checked onion service option consistency. @@ -4224,5 +4224,5 @@ int rend_service_non_anonymous_mode_enabled(const or_options_t *options) { tor_assert(rend_service_non_anonymous_mode_consistent(options)); - return options->OnionServiceNonAnonymousMode ? 1 : 0; + return options->HiddenServiceNonAnonymousMode ? 1 : 0; } diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 297fb0e..a9cd315 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -538,14 +538,14 @@ test_single_onion_poisoning(void *arg) (void) arg; /* No services, no problem! */ - mock_options->OnionServiceSingleHopMode = 0; - mock_options->OnionServiceNonAnonymousMode = 0; + mock_options->HiddenServiceSingleHopMode = 0; + mock_options->HiddenServiceNonAnonymousMode = 0; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); /* Either way, no problem. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); @@ -572,21 +572,21 @@ test_single_onion_poisoning(void *arg) /* But don't add the second service yet. */ /* Service directories, but no previous keys, no problem! */ - mock_options->OnionServiceSingleHopMode = 0; - mock_options->OnionServiceNonAnonymousMode = 0; + mock_options->HiddenServiceSingleHopMode = 0; + mock_options->HiddenServiceNonAnonymousMode = 0; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); /* Either way, no problem. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); /* Poison! Poison! Poison! - * This can only be done in OnionServiceSingleHopMode. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + * This can only be done in HiddenServiceSingleHopMode. */ + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_poison_new_single_onion_dirs(services); tt_assert(ret == 0); /* Poisoning twice is a no-op. */ @@ -594,14 +594,14 @@ test_single_onion_poisoning(void *arg) tt_assert(ret == 0); /* Poisoned service directories, but no previous keys, no problem! */ - mock_options->OnionServiceSingleHopMode = 0; - mock_options->OnionServiceNonAnonymousMode = 0; + mock_options->HiddenServiceSingleHopMode = 0; + mock_options->HiddenServiceNonAnonymousMode = 0; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); /* Either way, no problem. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); @@ -610,21 +610,21 @@ test_single_onion_poisoning(void *arg) tt_assert(ret == 0); /* Poisoned service directories with previous keys are not allowed. */ - mock_options->OnionServiceSingleHopMode = 0; - mock_options->OnionServiceNonAnonymousMode = 0; + mock_options->HiddenServiceSingleHopMode = 0; + mock_options->HiddenServiceNonAnonymousMode = 0; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret < 0); /* But they are allowed if we're in non-anonymous mode. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); /* Re-poisoning directories with existing keys is a no-op, because * directories with existing keys are ignored. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_poison_new_single_onion_dirs(services); tt_assert(ret == 0); /* And it keeps the poison. */ @@ -635,14 +635,14 @@ test_single_onion_poisoning(void *arg) smartlist_add(services, service_2); /* A new service, and an existing poisoned service. Not ok. */ - mock_options->OnionServiceSingleHopMode = 0; - mock_options->OnionServiceNonAnonymousMode = 0; + mock_options->HiddenServiceSingleHopMode = 0; + mock_options->HiddenServiceNonAnonymousMode = 0; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret < 0); /* But ok to add in non-anonymous mode. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); @@ -655,22 +655,22 @@ test_single_onion_poisoning(void *arg) /* Unpoisoned service directories with previous keys are ok, as are empty * directories. */ - mock_options->OnionServiceSingleHopMode = 0; - mock_options->OnionServiceNonAnonymousMode = 0; + mock_options->HiddenServiceSingleHopMode = 0; + mock_options->HiddenServiceNonAnonymousMode = 0; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); /* But the existing unpoisoned key is not ok in non-anonymous mode, even if * there is an empty service. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret < 0); /* Poisoning directories with existing keys is a no-op, because directories * with existing keys are ignored. But the new directory should poison. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_poison_new_single_onion_dirs(services); tt_assert(ret == 0); /* And the old directory remains unpoisoned. */ @@ -678,14 +678,14 @@ test_single_onion_poisoning(void *arg) tt_assert(ret < 0); /* And the new directory should be ignored, because it has no key. */ - mock_options->OnionServiceSingleHopMode = 0; - mock_options->OnionServiceNonAnonymousMode = 0; + mock_options->HiddenServiceSingleHopMode = 0; + mock_options->HiddenServiceNonAnonymousMode = 0; ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); /* Re-poisoning directories without existing keys is a no-op. */ - mock_options->OnionServiceSingleHopMode = 1; - mock_options->OnionServiceNonAnonymousMode = 1; + mock_options->HiddenServiceSingleHopMode = 1; + mock_options->HiddenServiceNonAnonymousMode = 1; ret = rend_service_poison_new_single_onion_dirs(services); tt_assert(ret == 0); /* And the old directory remains unpoisoned. */ diff --git a/src/test/test_options.c b/src/test/test_options.c index f01e137..bdcb318 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2766,37 +2766,37 @@ test_options_validate__single_onion(void *ignored) options_test_data_t *tdata = NULL; int previous_log = setup_capture_of_logs(LOG_WARN); - /* Test that OnionServiceSingleHopMode must come with - * OnionServiceNonAnonymousMode */ + /* Test that HiddenServiceSingleHopMode must come with + * HiddenServiceNonAnonymousMode */ tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "SOCKSPort 0\n" - "OnionServiceSingleHopMode 1\n" + "HiddenServiceSingleHopMode 1\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_str_op(msg, OP_EQ, "OnionServiceSingleHopMode does not provide any " + tt_str_op(msg, OP_EQ, "HiddenServiceSingleHopMode does not provide any " "server anonymity. It must be used with " - "OnionServiceNonAnonymousMode set to 1."); + "HiddenServiceNonAnonymousMode set to 1."); tor_free(msg); free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "SOCKSPort 0\n" - "OnionServiceSingleHopMode 1\n" - "OnionServiceNonAnonymousMode 0\n" + "HiddenServiceSingleHopMode 1\n" + "HiddenServiceNonAnonymousMode 0\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_str_op(msg, OP_EQ, "OnionServiceSingleHopMode does not provide any " + tt_str_op(msg, OP_EQ, "HiddenServiceSingleHopMode does not provide any " "server anonymity. It must be used with " - "OnionServiceNonAnonymousMode set to 1."); + "HiddenServiceNonAnonymousMode set to 1."); tor_free(msg); free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "SOCKSPort 0\n" - "OnionServiceSingleHopMode 1\n" - "OnionServiceNonAnonymousMode 1\n" + "HiddenServiceSingleHopMode 1\n" + "HiddenServiceNonAnonymousMode 1\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); @@ -2804,26 +2804,26 @@ test_options_validate__single_onion(void *ignored) free_options_test_data(tdata); /* Test that SOCKSPort must come with Tor2webMode if - * OnionServiceSingleHopMode is 1 */ + * HiddenServiceSingleHopMode is 1 */ tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "SOCKSPort 5000\n" - "OnionServiceSingleHopMode 1\n" - "OnionServiceNonAnonymousMode 1\n" + "HiddenServiceSingleHopMode 1\n" + "HiddenServiceNonAnonymousMode 1\n" "Tor2webMode 0\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_str_op(msg, OP_EQ, "OnionServiceNonAnonymousMode is incompatible with " + tt_str_op(msg, OP_EQ, "HiddenServiceNonAnonymousMode is incompatible with " "using Tor as an anonymous client. Please set " - "Socks/Trans/NATD/DNSPort to 0, or OnionServiceNonAnonymousMode " + "Socks/Trans/NATD/DNSPort to 0, or HiddenServiceNonAnonymousMode " "to 0, or use the non-anonymous Tor2webMode."); tor_free(msg); free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "SOCKSPort 0\n" - "OnionServiceSingleHopMode 1\n" - "OnionServiceNonAnonymousMode 1\n" + "HiddenServiceSingleHopMode 1\n" + "HiddenServiceNonAnonymousMode 1\n" "Tor2webMode 0\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -2833,7 +2833,7 @@ test_options_validate__single_onion(void *ignored) tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "SOCKSPort 5000\n" - "OnionServiceSingleHopMode 0\n" + "HiddenServiceSingleHopMode 0\n" "Tor2webMode 0\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -2843,8 +2843,8 @@ test_options_validate__single_onion(void *ignored) tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "SOCKSPort 5000\n" - "OnionServiceSingleHopMode 1\n" - "OnionServiceNonAnonymousMode 1\n" + "HiddenServiceSingleHopMode 1\n" + "HiddenServiceNonAnonymousMode 1\n" "Tor2webMode 1\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -2853,29 +2853,29 @@ test_options_validate__single_onion(void *ignored) free_options_test_data(tdata); /* Test that a hidden service can't be run with Tor2web - * Use OnionServiceNonAnonymousMode instead of Tor2webMode, because + * Use HiddenServiceNonAnonymousMode instead of Tor2webMode, because * Tor2webMode requires a compilation #define */ tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES - "OnionServiceNonAnonymousMode 1\n" + "HiddenServiceNonAnonymousMode 1\n" "HiddenServiceDir /Library/Tor/var/lib/tor/hidden_service/\n" "HiddenServicePort 80 127.0.0.1:8080\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_str_op(msg, OP_EQ, "OnionServiceNonAnonymousMode does not provide any " - "server anonymity. It must be used with OnionServiceSingleHopMode " - "set to 1."); + tt_str_op(msg, OP_EQ, "HiddenServiceNonAnonymousMode does not provide any " + "server anonymity. It must be used with " + "HiddenServiceSingleHopMode set to 1."); tor_free(msg); free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES - "OnionServiceNonAnonymousMode 1\n" + "HiddenServiceNonAnonymousMode 1\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_str_op(msg, OP_EQ, "OnionServiceNonAnonymousMode does not provide any " - "server anonymity. It must be used with OnionServiceSingleHopMode " - "set to 1."); + tt_str_op(msg, OP_EQ, "HiddenServiceNonAnonymousMode does not provide any " + "server anonymity. It must be used with " + "HiddenServiceSingleHopMode set to 1."); free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES @@ -2888,10 +2888,10 @@ test_options_validate__single_onion(void *ignored) free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES - "OnionServiceNonAnonymousMode 1\n" + "HiddenServiceNonAnonymousMode 1\n" "HiddenServiceDir /Library/Tor/var/lib/tor/hidden_service/\n" "HiddenServicePort 80 127.0.0.1:8080\n" - "OnionServiceSingleHopMode 1\n" + "HiddenServiceSingleHopMode 1\n" "SOCKSPort 0\n" ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);

1 0

[tor/master] Fix a check-spaces warning.
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit 2c7d09dfd2e3c77e0f480724c5acbc93917b649b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 13 10:24:45 2016 -0400 Fix a check-spaces warning. --- src/or/rendcommon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 083efd0..d9d39b1 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1115,3 +1115,4 @@ assert_circ_anonymity_ok(origin_circuit_t *circ, tor_assert(rend_allow_non_anonymous_connection(options)); } } +

1 0

[tor/master] options/validate__single_onion test: use new log capture api
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit 223747804568635a9b66f687a71c8a96cca51e91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 13 10:22:34 2016 -0400 options/validate__single_onion test: use new log capture api I changed the API here in deb294ff532d074a7d4, to be less annoying to use. --- src/test/test_options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 9ce7c42..1439f95 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2756,7 +2756,7 @@ test_options_validate__single_onion(void *ignored) int ret; char *msg; options_test_data_t *tdata = NULL; - int previous_log = setup_capture_of_logs(LOG_WARN); + setup_capture_of_logs(LOG_WARN); /* Test that HiddenServiceSingleHopMode must come with * HiddenServiceNonAnonymousMode */ @@ -2892,7 +2892,7 @@ test_options_validate__single_onion(void *ignored) done: policies_free_all(); - teardown_capture_of_logs(previous_log); + teardown_capture_of_logs(); free_options_test_data(tdata); tor_free(msg); }

1 0

[tor/master] Merge branch 'feature-17178-v7-squashed-v2'
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit 9f0cb5af1559d4dab0a49017bdd5f37b0af588f8 Merge: 4b182df f311c9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 13 10:20:08 2016 -0400 Merge branch 'feature-17178-v7-squashed-v2' changes/bug19677 | 6 + changes/feature17178 | 30 +++ doc/tor.1.txt | 39 +++- src/or/circuitbuild.c | 32 ++- src/or/circuitstats.c | 30 ++- src/or/config.c | 221 ++++++++++++++---- src/or/config.h | 2 + src/or/connection_edge.c | 29 ++- src/or/control.c | 22 ++ src/or/directory.c | 12 +- src/or/directory.h | 3 + src/or/main.c | 14 +- src/or/or.h | 48 +++- src/or/rendclient.c | 49 +++- src/or/rendclient.h | 3 + src/or/rendcommon.c | 48 ++++ src/or/rendcommon.h | 6 + src/or/rendservice.c | 574 ++++++++++++++++++++++++++++++++++++----------- src/or/rendservice.h | 68 +++++- src/test/test_hs.c | 207 +++++++++++++++++ src/test/test_options.c | 149 ++++++++++++ 21 files changed, 1371 insertions(+), 221 deletions(-) diff --cc src/or/rendservice.c index 8d3a7d7,cce63f2..4f7d7aa --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@@ -3896,12 -4179,50 +4179,51 @@@ rend_service_set_connection_addr_port(e return -2; } - /* Stub that should be replaced with the #17178 version of the function - * when merging. */ + /* Are HiddenServiceSingleHopMode and HiddenServiceNonAnonymousMode consistent? + */ + static int + rend_service_non_anonymous_mode_consistent(const or_options_t *options) + { + /* !! is used to make these options boolean */ + return (!! options->HiddenServiceSingleHopMode == + !! options->HiddenServiceNonAnonymousMode); + } + + /* Do the options allow onion services to make direct (non-anonymous) + * connections to introduction or rendezvous points? + * Must only be called after options_validate_single_onion() has successfully + * checked onion service option consistency. + * Returns true if tor is in HiddenServiceSingleHopMode. */ int - rend_service_allow_direct_connection(const or_options_t *options) + rend_service_allow_non_anonymous_connection(const or_options_t *options) { - (void)options; - return 0; + tor_assert(rend_service_non_anonymous_mode_consistent(options)); + return options->HiddenServiceSingleHopMode ? 1 : 0; + } + + /* Do the options allow us to reveal the exact startup time of the onion + * service? + * Single Onion Services prioritise availability over hiding their + * startup time, as their IP address is publicly discoverable anyway. + * Must only be called after options_validate_single_onion() has successfully + * checked onion service option consistency. + * Returns true if tor is in non-anonymous hidden service mode. */ + int + rend_service_reveal_startup_time(const or_options_t *options) + { + tor_assert(rend_service_non_anonymous_mode_consistent(options)); + return rend_service_non_anonymous_mode_enabled(options); + } + + /* Is non-anonymous mode enabled using the HiddenServiceNonAnonymousMode + * config option? + * Must only be called after options_validate_single_onion() has successfully + * checked onion service option consistency. + */ + int + rend_service_non_anonymous_mode_enabled(const or_options_t *options) + { + tor_assert(rend_service_non_anonymous_mode_consistent(options)); + return options->HiddenServiceNonAnonymousMode ? 1 : 0; } +

1 0

[tor/master] Refactor Single Onion code to improve consistency
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit 365ca3ca0f5d9d391a2156436d1a7c620906e23a Author: teor <teor2345(a)gmail.com> Date: Tue Sep 13 17:20:46 2016 +1000 Refactor Single Onion code to improve consistency * Check consistency between the two single onion torrc options * Use the more relevant option each time we check for single onion mode * Clarify log messages * Clarify comments * Otherwise, no behaviour change --- src/or/circuitstats.c | 2 +- src/or/config.c | 72 ++++++++++++++++++++++++------------------------- src/or/control.c | 21 ++++++++------- src/or/or.h | 7 +++-- src/or/rendcommon.c | 8 +++--- src/or/rendservice.c | 56 +++++++++++++++++++++++++------------- src/test/test_options.c | 8 +++--- 7 files changed, 96 insertions(+), 78 deletions(-) diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 296f852..3d64113 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -104,7 +104,7 @@ circuit_build_times_disabled(void) int config_disabled = !options->LearnCircuitBuildTimeout; int dirauth_disabled = options->AuthoritativeDir; int state_disabled = did_last_state_file_write_fail() ? 1 : 0; - /* LearnCircuitBuildTimeout and Tor2webMode/OnionServiceSingleHopMode are + /* LearnCircuitBuildTimeout and Tor2web/Single Onion Services are * incompatible in two ways: * * - LearnCircuitBuildTimeout results in a low CBT, which diff --git a/src/or/config.c b/src/or/config.c index 48f1ab9..6d168c4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1730,17 +1730,17 @@ options_act(const or_options_t *old_options) * poisoning code checks for existing keys, and refuses to modify their * directories. */ - /* If we use the insecure OnionServiceSingleHopMode, make sure we poison any + /* If we use non-anonymous single onion services, make sure we poison any new hidden service directories, so that we never accidentally launch the non-anonymous hidden services thinking they are anonymous. */ - if (running_tor && rend_service_allow_non_anonymous_connection(options)) { + if (running_tor && rend_service_non_anonymous_mode_enabled(options)) { if (options->RendConfigLines && !num_rend_services()) { log_warn(LD_BUG,"Error: hidden services configured, but not parsed."); return -1; } if (rend_service_poison_new_single_onion_dirs(NULL) < 0) { - log_warn(LD_GENERAL,"Failed to mark new hidden services as Single " - "Onion."); + log_warn(LD_GENERAL,"Failed to mark new hidden services as non-anonymous" + "."); return -1; } } @@ -2818,63 +2818,61 @@ warn_about_relative_paths(or_options_t *options) } } -/* Validate options related to OnionServiceSingleHopMode. - * Modifies some options that are incompatible with OnionServiceSingleHopMode. +/* Validate options related to single onion services. + * Modifies some options that are incompatible with single onion services. * On failure returns -1, and sets *msg to an error string. * Returns 0 on success. */ STATIC int options_validate_single_onion(or_options_t *options, char **msg) { - /* You must set OnionServiceNonAnonymousMode to 1 to use - * OnionServiceSingleHopMode */ + /* The two single onion service options must have matching values. */ if (options->OnionServiceSingleHopMode && - !rend_service_non_anonymous_mode_enabled(options)) { + !options->OnionServiceNonAnonymousMode) { REJECT("OnionServiceSingleHopMode does not provide any server anonymity. " "It must be used with OnionServiceNonAnonymousMode set to 1."); } - - /* If you have OnionServiceNonAnonymousMode set, you must use - * OnionServiceSingleHopMode. */ - if (rend_service_non_anonymous_mode_enabled(options) && + if (options->OnionServiceNonAnonymousMode && !options->OnionServiceSingleHopMode) { REJECT("OnionServiceNonAnonymousMode does not provide any server " "anonymity. It must be used with OnionServiceSingleHopMode set to " "1."); } + /* Now that we've checked that the two options are consistent, we can safely + * call the rend_service_* functions that abstract these options. */ + /* If you run an anonymous client with an active Single Onion service, the * client loses anonymity. */ const int client_port_set = (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || options->DNSPort_set); - if (options->OnionServiceSingleHopMode && client_port_set && + if (rend_service_non_anonymous_mode_enabled(options) && client_port_set && !options->Tor2webMode) { - REJECT("OnionServiceSingleHopMode is incompatible with using Tor as an " + REJECT("OnionServiceNonAnonymousMode is incompatible with using Tor as an " "anonymous client. Please set Socks/Trans/NATD/DNSPort to 0, or " - "OnionServiceSingleHopMode to 0, or use the non-anonymous " + "OnionServiceNonAnonymousMode to 0, or use the non-anonymous " "Tor2webMode."); } /* If you run a hidden service in non-anonymous mode, the hidden service * loses anonymity, even if SOCKSPort / Tor2web mode isn't used. */ - if (!options->OnionServiceSingleHopMode && options->RendConfigLines - && options->Tor2webMode) { + if (!rend_service_non_anonymous_mode_enabled(options) && + options->RendConfigLines && options->Tor2webMode) { REJECT("Non-anonymous (Tor2web) mode is incompatible with using Tor as a " "hidden service. Please remove all HiddenServiceDir lines, or use " "a version of tor compiled without --enable-tor2web-mode, or use " - "the non-anonymous OnionServiceSingleHopMode."); + " OnionServiceNonAnonymousMode."); } - if (options->OnionServiceSingleHopMode + if (rend_service_allow_non_anonymous_connection(options) && options->UseEntryGuards) { - /* Single Onion services do not (and should not) use entry guards - * in any meaningful way. Further, Single Onions causes the hidden - * service code to do things which break the path bias + /* Single Onion services only use entry guards when uploading descriptors, + * all other connections are one-hop. Further, Single Onions causes the + * hidden service code to do things which break the path bias * detector, and it's far easier to turn off entry guards (and * thus the path bias detector with it) than to figure out how to - * make a piece of code which cannot possibly help Single Onions, - * compatible with OnionServiceSingleHopMode. + * make path bias compatible with single onions. */ log_notice(LD_CONFIG, "OnionServiceSingleHopMode is enabled; disabling " @@ -2882,12 +2880,12 @@ options_validate_single_onion(or_options_t *options, char **msg) options->UseEntryGuards = 0; } - /* Check if existing hidden service keys were created with a different - * setting of OnionServiceNonAnonymousMode, and refuse to launch if they + /* Check if existing hidden service keys were created in a different + * single onion service mode, and refuse to launch if they * have. We'll poison new keys in options_act() just before we create them. */ if (rend_service_list_verify_single_onion_poison(NULL, options) < 0) { - log_warn(LD_GENERAL, "We are configured with OnionServiceSingleHopMode " + log_warn(LD_GENERAL, "We are configured with OnionServiceNonAnonymousMode " "%d, but one or more hidden service keys were created in %s " "mode. This is not allowed.", rend_service_non_anonymous_mode_enabled(options) ? 1 : 0, @@ -3427,7 +3425,7 @@ options_validate(or_options_t *old_options, or_options_t *options, if (!(options->UseEntryGuards) && (options->RendConfigLines != NULL) && - !rend_service_non_anonymous_mode_enabled(options)) { + !rend_service_allow_non_anonymous_connection(options)) { log_warn(LD_CONFIG, "UseEntryGuards is disabled, but you have configured one or more " "hidden services on this Tor instance. Your hidden services " @@ -3450,15 +3448,15 @@ options_validate(or_options_t *old_options, or_options_t *options, return -1; } - /* OnionServiceSingleHopMode: one hop between the onion service server and - * intro and rendezvous points */ - if (options->OnionServiceSingleHopMode) { + /* Single Onion Services: non-anonymous hidden services */ + if (rend_service_non_anonymous_mode_enabled(options)) { log_warn(LD_CONFIG, - "OnionServiceSingleHopMode is set. Every hidden service on this " - "tor instance is NON-ANONYMOUS. If OnionServiceSingleHopMode is " - "disabled, Tor will refuse to launch hidden services from the " - "same directories, to protect against config errors. This " - "setting is for experimental use only."); + "OnionServiceNonAnonymousNode is set. Every hidden service on " + "this tor instance is NON-ANONYMOUS. If " + "the OnionServiceNonAnonymousMode option is changed, Tor will " + "refuse to launch hidden services from the same directories, to " + "protect your anonymity against config errors. This setting is " + "for experimental use only."); } if (!options->LearnCircuitBuildTimeout && options->CircuitBuildTimeout && diff --git a/src/or/control.c b/src/or/control.c index 8f3909b..8962075 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4249,7 +4249,7 @@ handle_control_add_onion(control_connection_t *conn, int max_streams = 0; int max_streams_close_circuit = 0; rend_auth_type_t auth_type = REND_NO_AUTH; - /* Default to anonymous if no flag is given */ + /* Default to adding an anonymous hidden service if no flag is given */ int non_anonymous = 0; for (size_t i = 1; i < arg_len; i++) { static const char *port_prefix = "Port="; @@ -4288,10 +4288,9 @@ handle_control_add_onion(control_connection_t *conn, * exceeded. * * 'BasicAuth' - Client authorization using the 'basic' method. * * 'NonAnonymous' - Add a non-anonymous Single Onion Service. If this - * flag is present, OnionServiceSingleHopMode and - * OnionServiceNonAnonymousMode must both be 1. If - * this flag is absent, both these options must be - * 0. + * flag is present, tor must be in non-anonymous + * hidden service mode. If this flag is absent, + * tor must be in anonymous hidden service mode. */ static const char *discard_flag = "DiscardPK"; static const char *detach_flag = "Detach"; @@ -4388,15 +4387,17 @@ handle_control_add_onion(control_connection_t *conn, smartlist_len(auth_clients) > 16)) { connection_printf_to_buf(conn, "512 Too many auth clients\r\n"); goto out; - } else if (non_anonymous != rend_service_allow_non_anonymous_connection( + } else if (non_anonymous != rend_service_non_anonymous_mode_enabled( get_options())) { - /* If we failed, and non-anonymous is set, Tor must be in anonymous mode. + /* If we failed, and the non-anonymous flag is set, Tor must be in + * anonymous hidden service mode. * The error message changes based on the current Tor config: - * 512 Tor is in anonymous onion mode - * 512 Tor is in non-anonymous onion mode + * 512 Tor is in anonymous hidden service mode + * 512 Tor is in non-anonymous hidden service mode * (I've deliberately written them out in full here to aid searchability.) */ - connection_printf_to_buf(conn, "512 Tor is in %sanonymous onion mode\r\n", + connection_printf_to_buf(conn, "512 Tor is in %sanonymous hidden service " + "mode\r\n", non_anonymous ? "" : "non-"); goto out; } diff --git a/src/or/or.h b/src/or/or.h index 07f94b7..849cd4c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3706,8 +3706,7 @@ typedef struct { * rendezvous points. (Onion service descriptors are still posted using * 3-hop paths, to avoid onion service directories blocking the service.) * This option makes every hidden service instance hosted by - * this tor instance a Single Onion Service. One-hop circuits make Single - * Onion servers easily locatable, but clients remain location-anonymous. + * this tor instance a Single Onion Service. * OnionServiceSingleHopMode requires OnionServiceNonAnonymousMode to be set * to 1. * Use rend_service_allow_non_anonymous_connection() or @@ -3716,8 +3715,8 @@ typedef struct { int OnionServiceSingleHopMode; /* Makes hidden service clients and servers non-anonymous on this tor * instance. Allows the non-anonymous OnionServiceSingleHopMode. Enables - * direct connections in the hidden service protocol. - * Use rend_service_non_anonymous_mode() instead of using this option + * non-anonymous behaviour in the hidden service protocol. + * Use rend_service_non_anonymous_mode_enabled() instead of using this option * directly. */ int OnionServiceNonAnonymousMode; diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 12dd0f4..083efd0 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1097,11 +1097,11 @@ rend_non_anonymous_mode_enabled(const or_options_t *options) /* Make sure that tor only builds one-hop circuits when they would not * compromise user anonymity. * - * One-hop circuits are permitted in Tor2webMode or OnionServiceSingleHopMode. + * One-hop circuits are permitted in Tor2web or Single Onion modes. * - * Tor2webMode and OnionServiceSingleHopMode are also allowed to make - * multi-hop circuits. For example, single onion HSDir circuits are 3-hop to - * prevent denial of service. + * Tor2web or Single Onion modes are also allowed to make multi-hop circuits. + * For example, single onion HSDir circuits are 3-hop to prevent denial of + * service. */ void assert_circ_anonymity_ok(origin_circuit_t *circ, diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 04894dd..9400b59 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1025,10 +1025,10 @@ rend_service_private_key_exists(const rend_service_t *service) /** Check the single onion service poison state of all existing hidden service * directories: - * - If each service is poisoned, and we are in OnionServiceSingleHopMode, + * - If each service is poisoned, and we are in Single Onion Mode, + * return 0, + * - If each service is not poisoned, and we are not in Single Onion Mode, * return 0, - * - If each service is not poisoned, and we are not in - * OnionServiceSingleHopMode, return 0, * - Otherwise, the poison state is invalid, and a service that was created in * one mode is being used in the other, return -1. * Hidden service directories without keys are not checked for consistency. @@ -1054,7 +1054,7 @@ rend_service_list_verify_single_onion_poison(const smartlist_t *service_list, int consistent = 1; SMARTLIST_FOREACH_BEGIN(s_list, const rend_service_t *, s) { if (service_is_single_onion_poisoned(s) != - rend_service_allow_non_anonymous_connection(options) && + rend_service_non_anonymous_mode_enabled(options) && rend_service_private_key_exists(s)) { consistent = 0; } @@ -1063,25 +1063,25 @@ rend_service_list_verify_single_onion_poison(const smartlist_t *service_list, return consistent ? 0 : -1; } -/*** Helper for rend_service_poison_new_single_onion_dirs(). When in single - * onion mode, add a file to this hidden service directory that marks it as a - * single onion hidden service. Returns 0 when a directory is successfully - * poisoned, or if it is already poisoned. Returns -1 on a failure to read - * the directory or write the poison file, or if there is an existing private - * key file in the directory. (The service should have been poisoned when the - * key was created.) */ +/*** Helper for rend_service_poison_new_single_onion_dirs(). Add a file to + * this hidden service directory that marks it as a single onion service. + * Tor must be in single onion mode before calling this function. + * Returns 0 when a directory is successfully poisoned, or if it is already + * poisoned. Returns -1 on a failure to read the directory or write the poison + * file, or if there is an existing private key file in the directory. (The + * service should have been poisoned when the key was created.) */ static int poison_new_single_onion_hidden_service_dir(const rend_service_t *service) { /* We must only poison directories if we're in Single Onion mode */ - tor_assert(rend_service_allow_non_anonymous_connection(get_options())); + tor_assert(rend_service_non_anonymous_mode_enabled(get_options())); int fd; int retval = -1; char *poison_fname = NULL; if (!service->directory) { - log_info(LD_REND, "Ephemeral HS started in OnionServiceSingleHopMode."); + log_info(LD_REND, "Ephemeral HS started in non-anonymous mode."); return 0; } @@ -1126,7 +1126,7 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) return retval; } -/** We just got launched in OnionServiceSingleHopMode. That's a non-anoymous +/** We just got launched in Single Onion Mode. That's a non-anoymous * mode for hidden services; hence we should mark all new hidden service * directories appropriately so that they are never launched as * location-private hidden services again. (New directories don't have private @@ -1138,7 +1138,7 @@ int rend_service_poison_new_single_onion_dirs(const smartlist_t *service_list) { /* We must only poison directories if we're in Single Onion mode */ - tor_assert(rend_service_allow_non_anonymous_connection(get_options())); + tor_assert(rend_service_non_anonymous_mode_enabled(get_options())); const smartlist_t *s_list; /* If no special service list is provided, then just use the global one. */ @@ -4179,12 +4179,25 @@ rend_service_set_connection_addr_port(edge_connection_t *conn, return -2; } +/* Are OnionServiceSingleHopMode and OnionServiceNonAnonymousMode consistent? + */ +static int +rend_service_non_anonymous_mode_consistent(const or_options_t *options) +{ + /* !! is used to make these options boolean */ + return (!! options->OnionServiceSingleHopMode == + !! options->OnionServiceNonAnonymousMode); +} + /* Do the options allow onion services to make direct (non-anonymous) * connections to introduction or rendezvous points? + * Must only be called after options_validate_single_onion() has successfully + * checked onion service option consistency. * Returns true if tor is in OnionServiceSingleHopMode. */ int rend_service_allow_non_anonymous_connection(const or_options_t *options) { + tor_assert(rend_service_non_anonymous_mode_consistent(options)); return options->OnionServiceSingleHopMode ? 1 : 0; } @@ -4192,17 +4205,24 @@ rend_service_allow_non_anonymous_connection(const or_options_t *options) * service? * Single Onion Services prioritise availability over hiding their * startup time, as their IP address is publicly discoverable anyway. - * Returns true if tor is in OnionServiceSingleHopMode. */ + * Must only be called after options_validate_single_onion() has successfully + * checked onion service option consistency. + * Returns true if tor is in non-anonymous hidden service mode. */ int rend_service_reveal_startup_time(const or_options_t *options) { - return rend_service_allow_non_anonymous_connection(options); + tor_assert(rend_service_non_anonymous_mode_consistent(options)); + return rend_service_non_anonymous_mode_enabled(options); } /* Is non-anonymous mode enabled using the OnionServiceNonAnonymousMode - * config option? */ + * config option? + * Must only be called after options_validate_single_onion() has successfully + * checked onion service option consistency. + */ int rend_service_non_anonymous_mode_enabled(const or_options_t *options) { + tor_assert(rend_service_non_anonymous_mode_consistent(options)); return options->OnionServiceNonAnonymousMode ? 1 : 0; } diff --git a/src/test/test_options.c b/src/test/test_options.c index cd1821a..f01e137 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2813,10 +2813,10 @@ test_options_validate__single_onion(void *ignored) ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_str_op(msg, OP_EQ, "OnionServiceSingleHopMode is incompatible with using " - "Tor as an anonymous client. Please set Socks/Trans/NATD/DNSPort " - "to 0, or OnionServiceSingleHopMode to 0, or use the " - "non-anonymous Tor2webMode."); + tt_str_op(msg, OP_EQ, "OnionServiceNonAnonymousMode is incompatible with " + "using Tor as an anonymous client. Please set " + "Socks/Trans/NATD/DNSPort to 0, or OnionServiceNonAnonymousMode " + "to 0, or use the non-anonymous Tor2webMode."); tor_free(msg); free_options_test_data(tdata);

1 0

[tor/master] Comments: prefer circuit_build_times_disabled() to LearnCircuitBuildTimeout
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit f686fa2ee600f6670bab7531d404eaf5f8ea91ff Author: teor <teor2345(a)gmail.com> Date: Tue Sep 13 11:55:23 2016 +1000 Comments: prefer circuit_build_times_disabled() to LearnCircuitBuildTimeout --- src/or/or.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/or.h b/src/or/or.h index 7104a5c..07f94b7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3777,7 +3777,8 @@ typedef struct { * unattached before we fail it? */ int LearnCircuitBuildTimeout; /**< If non-zero, we attempt to learn a value * for CircuitBuildTimeout based on timeout - * history */ + * history. Use circuit_build_times_disabled() + * rather than checking this value directly. */ int CircuitBuildTimeout; /**< Cull non-open circuits that were born at * least this many seconds ago. Used until * adaptive algorithm learns a new value. */

1 0

[torspec/master] Merge remote-tracking branch 'public/bug19998'
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit 99b1930a86e8b65f6960700c4593f9abb13ca4fc Merge: dda7a94 e22c36f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 13 08:54:56 2016 -0400 Merge remote-tracking branch 'public/bug19998' tor-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[torspec/master] Remove 3DES as a required suite; add the minimal AES one.
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit e22c36fb77f0c780fc532df1e54cebc8676190b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 5 14:10:48 2016 -0400 Remove 3DES as a required suite; add the minimal AES one. --- tor-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index e85634d..ba9782f 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -182,8 +182,8 @@ see tor-design.pdf. Connections between two Tor relays, or between a client and a relay, use TLS/SSLv3 for link authentication and encryption. All implementations MUST support the SSLv3 ciphersuite - "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA", and SHOULD support the TLS - ciphersuite "TLS_DHE_RSA_WITH_AES_128_CBC_SHA" if it is available. + "TLS_DHE_RSA_WITH_AES_128_CBC_SHA" if it is available. They SHOULD + support better ciphersuites if available. There are three ways to perform TLS handshakes with a Tor server. In the first way, "certificates-up-front", both the initiator and

1 0

[tor/master] Merge remote-tracking branch 'public/ticket19998'
by nickm＠torproject.org 13 Sep '16

13 Sep '16

commit 4b182dfc237ba4457b654a0dbc124f721024dab2 Merge: c897328 c2d1356 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 13 08:54:43 2016 -0400 Merge remote-tracking branch 'public/ticket19998' changes/bug19998 | 6 ++++++ src/common/tortls.c | 11 +++-------- 2 files changed, 9 insertions(+), 8 deletions(-)

1 0