tor-commits January 2017

tor-commits@lists.torproject.org

22 participants
1796 discussions

[tor/master] Use the correct spelling for "Dependent" in the control protocol.
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit 58172be657fcac81f37e2556bab4c68bacd36c98 Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Thu Dec 29 22:27:04 2016 -0600 Use the correct spelling for "Dependent" in the control protocol. Fixes #18146. --- changes/18146 | 5 +++++ src/or/config.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/18146 b/changes/18146 new file mode 100644 index 0000000..35565da --- /dev/null +++ b/changes/18146 @@ -0,0 +1,5 @@ + o Minor bugfix (control protocol): + - The reply to a "GETINFO config/names" request via the control protocol + now spells the type "Dependent" correctly. This is a breaking change in + the control protocol. (It seems to be ignored by the most common known + clients.) Fixes bug 18146; bugfix on 0.1.1.4-alpha. diff --git a/src/or/config.c b/src/or/config.c index 7f789c4..583bcae 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7859,7 +7859,7 @@ getinfo_helper_config(control_connection_t *conn, case CONFIG_TYPE_CSV: type = "CommaList"; break; case CONFIG_TYPE_CSV_INTERVAL: type = "TimeIntervalCommaList"; break; case CONFIG_TYPE_LINELIST: type = "LineList"; break; - case CONFIG_TYPE_LINELIST_S: type = "Dependant"; break; + case CONFIG_TYPE_LINELIST_S: type = "Dependent"; break; case CONFIG_TYPE_LINELIST_V: type = "Virtual"; break; default: case CONFIG_TYPE_OBSOLETE:

1 0

[tor/master] Merge remote-tracking branch 'jryans/dependant-corrected'
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit 2db858ef610ef28875631ee738ec4b3d6fcdca11 Merge: 6c2b48d 58172be Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 09:28:54 2017 -0500 Merge remote-tracking branch 'jryans/dependant-corrected' changes/18146 | 5 +++++ src/or/config.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[torspec/master] Clarify program name is optional in GETINFO version
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit c5ff1b1965a47152a00b69bf4b66654db596ecc9 Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Tue Dec 20 23:42:35 2016 -0600 Clarify program name is optional in GETINFO version Fixes #20014. --- control-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 82524bb..3e241ee 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -500,8 +500,9 @@ . Recognized keys and their values include: - "version" -- The version of the server's software, including the name - of the software. (example: "Tor 0.0.9.4") + "version" -- The version of the server's software, which MAY include the + name of the software, such as "Tor 0.0.9.4". The name of the software, + if absent, is assumed to be "Tor". "config-file" -- The location of Tor's configuration file ("torrc").

1 0

[torspec/master] Use the correct spelling for "Dependent" in the control protocol.
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit e2f2974d6782de62fb423f8fca74eddefbc73d14 Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Thu Dec 29 22:37:29 2016 -0600 Use the correct spelling for "Dependent" in the control protocol. Fixes #18146. --- control-spec.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 82524bb..cb60796 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -691,8 +691,11 @@ OptionName = Keyword OptionType = "Integer" / "TimeInterval" / "TimeMsecInterval" / "DataSize" / "Float" / "Boolean" / "Time" / "CommaList" / - "Dependant" / "Virtual" / "String" / "LineList" + "Dependent" / "Virtual" / "String" / "LineList" Documentation = Text + Note: The incorrect spelling "Dependant" was used from the time this key + was introduced in Tor 0.1.1.4-alpha until it was corrected in Tor + 0.3.0.2-alpha. It is recommended that clients accept both spellings. "config/defaults" A series of lines listing default values for each configuration

1 0

[torspec/master] Merge remote-tracking branch 'jryans/getinfo-program-name'
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit a129533e0ce7c530139cdbcbfa9e24e90f5dcc05 Merge: f2756e0 c5ff1b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 09:27:19 2017 -0500 Merge remote-tracking branch 'jryans/getinfo-program-name' control-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[torspec/master] Merge remote-tracking branch 'jryans/dependant-corrected'
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit 2c52061ab3122ad906c9c2155109139d6f46ff10 Merge: a129533 e2f2974 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 09:28:09 2017 -0500 Merge remote-tracking branch 'jryans/dependant-corrected' control-spec.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/bug21122'
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit 6c2b48dab73f7c4fb0ed79185b9f123dc2349be8 Merge: b9054c6 ceeaf04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 09:23:02 2017 -0500 Merge remote-tracking branch 'teor/bug21122' changes/bug21122 | 4 ++++ doc/tor.1.txt | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 11 deletions(-)

1 0

[tor/master] Document options that can't be changed while tor is running
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit ceeaf04d16ba0b898acb53e44a5b41b8ab9115bb Author: teor <teor2345(a)gmail.com> Date: Tue Jan 3 14:51:46 2017 +1100 Document options that can't be changed while tor is running Closes #21122, bug on multiple tor versions. --- changes/bug21122 | 4 ++++ doc/tor.1.txt | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/changes/bug21122 b/changes/bug21122 new file mode 100644 index 0000000..72d09b2 --- /dev/null +++ b/changes/bug21122 @@ -0,0 +1,4 @@ + o Minor bugfixes (documentation): + - Update the tor manual page to document every option that can not be + changed while tor is running. Fixes bug 21122; bugfix on multiple tor + versions. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4c6ba0f..32f8908 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -390,7 +390,8 @@ GENERAL OPTIONS file readable by the default GID. (Default: 0) [[DataDirectory]] **DataDirectory** __DIR__:: - Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor) + Store working data in DIR. Can not be changed while tor is running. + (Default: @LOCALSTATEDIR@/lib/tor) [[DataDirectoryGroupReadable]] **DataDirectoryGroupReadable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read the @@ -464,7 +465,8 @@ GENERAL OPTIONS not supported. We believe that this feature works on modern Gnu/Linux distributions, and that it should work on *BSD systems (untested). This option requires that you start your Tor as root, and you should use the - **User** option to properly reduce Tor's privileges. (Default: 0) + **User** option to properly reduce Tor's privileges. + Can not be changed while tor is running. (Default: 0) [[DisableDebuggerAttachment]] **DisableDebuggerAttachment** **0**|**1**:: If set to 1, Tor will attempt to prevent basic debugging attachment attempts @@ -539,7 +541,20 @@ GENERAL OPTIONS [[Sandbox]] **Sandbox** **0**|**1**:: If set to 1, Tor will run securely through the use of a syscall sandbox. Otherwise the sandbox will be disabled. The option is currently an - experimental feature. (Default: 0) + experimental feature. Can not be changed while tor is running. + + When the Sandbox is 1, the following options can not be changed when tor + is running: + Address + ConnLimit + CookieAuthFile + DirPortFrontPage + ExtORPortCookieAuthFile + Logs + ServerDNSResolvConfFile + Tor must remain in client or server mode (some changes to ClientOnly and + ORPort are not allowed). + (Default: 0) [[Socks4Proxy]] **Socks4Proxy** __host__[:__port__]:: Tor will make all OR connections through the SOCKS 4 proxy at host:port @@ -627,7 +642,7 @@ GENERAL OPTIONS [[PidFile]] **PidFile** __FILE__:: On startup, write our PID to FILE. On clean shutdown, remove - FILE. + FILE. Can not be changed while tor is running. [[ProtocolWarnings]] **ProtocolWarnings** **0**|**1**:: If 1, Tor will log with severity \'warn' various cases of other parties not @@ -643,6 +658,7 @@ GENERAL OPTIONS [[RunAsDaemon]] **RunAsDaemon** **0**|**1**:: If 1, Tor forks and daemonizes to the background. This option has no effect on Windows; instead you should use the --service command-line option. + Can not be changed while tor is running. (Default: 0) [[LogTimeGranularity]] **LogTimeGranularity** __NUM__:: @@ -659,7 +675,8 @@ GENERAL OPTIONS [[SyslogIdentityTag]] **SyslogIdentityTag** __tag__:: When logging to syslog, adds a tag to the syslog identity such that - log entries are marked with "Tor-__tag__". (Default: none) + log entries are marked with "Tor-__tag__". Can not be changed while tor is + running. (Default: none) [[SafeLogging]] **SafeLogging** **0**|**1**|**relay**:: Tor can scrub potentially sensitive strings from log messages (e.g. @@ -674,6 +691,7 @@ GENERAL OPTIONS [[User]] **User** __Username__:: On startup, setuid to this user and setgid to their primary group. + Can not be changed while tor is running. [[KeepBindCapabilities]] **KeepBindCapabilities** **0**|**1**|**auto**:: On Linux, when we are started as root and we switch our identity using @@ -681,20 +699,23 @@ GENERAL OPTIONS try to retain our ability to bind to low ports. If this value is 1, we try to keep the capability; if it is 0 we do not; and if it is **auto**, we keep the capability only if we are configured to listen on a low port. + Can not be changed while tor is running. (Default: auto.) [[HardwareAccel]] **HardwareAccel** **0**|**1**:: If non-zero, try to use built-in (static) crypto hardware acceleration when - available. (Default: 0) + available. Can not be changed while tor is running. (Default: 0) [[AccelName]] **AccelName** __NAME__:: When using OpenSSL hardware crypto acceleration attempt to load the dynamic engine of this name. This must be used for any dynamic hardware engine. - Names can be verified with the openssl engine command. + Names can be verified with the openssl engine command. Can not be changed + while tor is running. [[AccelDir]] **AccelDir** __DIR__:: Specify this option if using dynamic hardware acceleration and the engine implementation library resides somewhere other than the OpenSSL default. + Can not be changed while tor is running. [[AvoidDiskWrites]] **AvoidDiskWrites** **0**|**1**:: If non-zero, try to write to disk less frequently than we would otherwise. @@ -1181,7 +1202,8 @@ The following options are useful only for clients (that is, if NUM must be between 1 and 1000, inclusive. Note that the configured bandwidth limits are still expressed in bytes per second: this option only affects the frequency with which Tor checks to see whether - previously exhausted connections may read again. (Default: 100 msec) + previously exhausted connections may read again. + Can not be changed while tor is running. (Default: 100 msec) [[TrackHostExits]] **TrackHostExits** __host__,__.domain__,__...__:: For each value in the comma separated list, Tor will track recent @@ -2436,7 +2458,7 @@ The following options are used to configure a hidden service. HiddenServiceSingleHopMode requires HiddenServiceNonAnonymousMode to be set to 1. Since a Single Onion service is non-anonymous, you can not configure a SOCKSPort on a tor instance that is running in - **HiddenServiceSingleHopMode**. + **HiddenServiceSingleHopMode**. Can not be changed while tor is running. (Default: 0) [[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** **0**|**1**:: @@ -2444,8 +2466,8 @@ The following options are used to configure a hidden service. non-anonymous HiddenServiceSingleHopMode. Enables direct connections in the server-side hidden service protocol. If you are using this option, you need to disable all client-side services on your Tor instance, - including setting SOCKSPort to "0". - (Default: 0) + including setting SOCKSPort to "0". Can not be changed while tor is + running. (Default: 0) TESTING NETWORK OPTIONS -----------------------

1 0

[tor/master] Merge branch 'bug20987_squashed'
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit b9054c6ee45a595580f89b4afd021ce70c6fc768 Merge: 4f1a5da 3a3e88d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 09:21:09 2017 -0500 Merge branch 'bug20987_squashed' changes/bug20987 | 3 +++ src/or/rendservice.c | 62 ++++++++++++++++++++++++---------------------------- 2 files changed, 31 insertions(+), 34 deletions(-)

1 0

[tor/master] Fix memory leak when failing to configure hidden services.
by nickm＠torproject.org 11 Jan '17

11 Jan '17

commit 3a3e88dbd4296c6bea8a324a0fa8ccd4628a79f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 15 08:12:59 2016 -0500 Fix memory leak when failing to configure hidden services. In 8a0ea3ee43da0063c2546092662fa7ce4900bc2c we added a temp_service_list local variable to rend_config_services, but we didn't add a corresponding "free" for it to all of the exit paths. Fixes bug 20987; bugfix on 0.3.0.1-alpha. --- changes/bug20987 | 3 +++ src/or/rendservice.c | 62 ++++++++++++++++++++++++---------------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/changes/bug20987 b/changes/bug20987 new file mode 100644 index 0000000..9922d73 --- /dev/null +++ b/changes/bug20987 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a memory leak when configuring hidden services. Fixes bug 20987; + bugfix on 0.3.0.1-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 00ede48..e0d163d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -556,6 +556,7 @@ rend_config_services(const or_options_t *options, int validate_only) smartlist_t *old_service_list = NULL; smartlist_t *temp_service_list = NULL; int ok = 0; + int rv = -1; /* Use a temporary service list, so that we can check the new services' * consistency with each other */ @@ -568,7 +569,8 @@ rend_config_services(const or_options_t *options, int validate_only) * which is registered below the loop */ if (rend_service_check_dir_and_add(temp_service_list, options, service, validate_only) < 0) { - return -1; + service = NULL; + goto free_and_return; } service = tor_malloc_zero(sizeof(rend_service_t)); service->directory = tor_strdup(line->value); @@ -580,8 +582,7 @@ rend_config_services(const or_options_t *options, int validate_only) if (!service) { log_warn(LD_CONFIG, "%s with no preceding HiddenServiceDir directive", line->key); - rend_service_free(service); - return -1; + goto free_and_return; } if (!strcasecmp(line->key, "HiddenServicePort")) { char *err_msg = NULL; @@ -590,8 +591,7 @@ rend_config_services(const or_options_t *options, int validate_only) if (err_msg) log_warn(LD_CONFIG, "%s", err_msg); tor_free(err_msg); - rend_service_free(service); - return -1; + goto free_and_return; } tor_assert(!err_msg); smartlist_add(service->ports, portcfg); @@ -602,8 +602,8 @@ rend_config_services(const or_options_t *options, int validate_only) log_warn(LD_CONFIG, "HiddenServiceAllowUnknownPorts should be 0 or 1, not %s", line->value); - rend_service_free(service); - return -1; + smartlist_free(temp_service_list); + goto free_and_return; } log_info(LD_CONFIG, "HiddenServiceAllowUnknownPorts=%d for %s", @@ -617,8 +617,7 @@ rend_config_services(const or_options_t *options, int validate_only) log_warn(LD_CONFIG, "HiddenServiceDirGroupReadable should be 0 or 1, not %s", line->value); - rend_service_free(service); - return -1; + goto free_and_return; } log_info(LD_CONFIG, "HiddenServiceDirGroupReadable=%d for %s", @@ -631,8 +630,7 @@ rend_config_services(const or_options_t *options, int validate_only) log_warn(LD_CONFIG, "HiddenServiceMaxStreams should be between 0 and %d, not %s", 65535, line->value); - rend_service_free(service); - return -1; + goto free_and_return; } log_info(LD_CONFIG, "HiddenServiceMaxStreams=%d for %s", @@ -646,8 +644,7 @@ rend_config_services(const or_options_t *options, int validate_only) "HiddenServiceMaxStreamsCloseCircuit should be 0 or 1, " "not %s", line->value); - rend_service_free(service); - return -1; + goto free_and_return; } log_info(LD_CONFIG, "HiddenServiceMaxStreamsCloseCircuit=%d for %s", @@ -664,8 +661,7 @@ rend_config_services(const or_options_t *options, int validate_only) "should be between %d and %d, not %s", NUM_INTRO_POINTS_DEFAULT, NUM_INTRO_POINTS_MAX, line->value); - rend_service_free(service); - return -1; + goto free_and_return; } log_info(LD_CONFIG, "HiddenServiceNumIntroductionPoints=%d for %s", service->n_intro_points_wanted, @@ -680,8 +676,7 @@ rend_config_services(const or_options_t *options, int validate_only) if (service->auth_type != REND_NO_AUTH) { log_warn(LD_CONFIG, "Got multiple HiddenServiceAuthorizeClient " "lines for a single service."); - rend_service_free(service); - return -1; + goto free_and_return; } type_names_split = smartlist_new(); smartlist_split_string(type_names_split, line->value, " ", 0, 2); @@ -689,9 +684,7 @@ rend_config_services(const or_options_t *options, int validate_only) log_warn(LD_BUG, "HiddenServiceAuthorizeClient has no value. This " "should have been prevented when parsing the " "configuration."); - smartlist_free(type_names_split); - rend_service_free(service); - return -1; + goto free_and_return; } authname = smartlist_get(type_names_split, 0); if (!strcasecmp(authname, "basic")) { @@ -705,8 +698,7 @@ rend_config_services(const or_options_t *options, int validate_only) (char *) smartlist_get(type_names_split, 0)); SMARTLIST_FOREACH(type_names_split, char *, cp, tor_free(cp)); smartlist_free(type_names_split); - rend_service_free(service); - return -1; + goto free_and_return; } service->clients = smartlist_new(); if (smartlist_len(type_names_split) < 2) { @@ -743,8 +735,7 @@ rend_config_services(const or_options_t *options, int validate_only) client_name, REND_CLIENTNAME_MAX_LEN); SMARTLIST_FOREACH(clients, char *, cp, tor_free(cp)); smartlist_free(clients); - rend_service_free(service); - return -1; + goto free_and_return; } client = tor_malloc_zero(sizeof(rend_authorized_client_t)); client->client_name = tor_strdup(client_name); @@ -766,16 +757,14 @@ rend_config_services(const or_options_t *options, int validate_only) smartlist_len(service->clients), service->auth_type == REND_BASIC_AUTH ? 512 : 16, service->auth_type == REND_BASIC_AUTH ? "basic" : "stealth"); - rend_service_free(service); - return -1; + goto free_and_return; } } else { tor_assert(!strcasecmp(line->key, "HiddenServiceVersion")); if (strcmp(line->value, "2")) { log_warn(LD_CONFIG, "The only supported HiddenServiceVersion is 2."); - rend_service_free(service); - return -1; + goto free_and_return; } } } @@ -784,16 +773,15 @@ rend_config_services(const or_options_t *options, int validate_only) * within the loop. It is ok for this service to be NULL, it is ignored. */ if (rend_service_check_dir_and_add(temp_service_list, options, service, validate_only) < 0) { - return -1; + service = NULL; + goto free_and_return; } + service = NULL; /* Free the newly added services if validating */ if (validate_only) { - SMARTLIST_FOREACH(temp_service_list, rend_service_t *, ptr, - rend_service_free(ptr)); - smartlist_free(temp_service_list); - temp_service_list = NULL; - return 0; + rv = 0; + goto free_and_return; } /* Otherwise, use the newly added services as the new service list @@ -889,6 +877,12 @@ rend_config_services(const or_options_t *options, int validate_only) } return 0; + free_and_return: + rend_service_free(service); + SMARTLIST_FOREACH(temp_service_list, rend_service_t *, ptr, + rend_service_free(ptr)); + smartlist_free(temp_service_list); + return rv; } /** Add the ephemeral service <b>pk</b>/<b>ports</b> if possible, using

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2017