January 2015 - tor-commits - lists.torproject.org

[webwml/master] 4.0.2 is not recommended anymore
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit 26eade65d132af8b75a40ff3b8ca8596345d4c48 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 07:18:16 2015 +0000 4.0.2 is not recommended anymore --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 5839ab7..4785612 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,8 +1,4 @@ [ -"4.0.2", -"4.0.2-Linux", -"4.0.2-MacOS", -"4.0.2-Windows", "4.0.3", "4.0.3-Linux", "4.0.3-MacOS",

1 0

[webwml/master] Bump TBB version to fix 404.
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit b238c22b8f850ff9b4f619bb7db31343ea0a8bfc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 13 21:33:20 2015 -0800 Bump TBB version to fix 404. --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 55bb32f..0075fef 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -23,10 +23,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>4.0.2</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>4.0.3</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>4.5-alpha-2</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>4.0.2</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>4.0.3</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -37,8 +37,8 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.2</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.2</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.3</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.3</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -47,7 +47,7 @@ <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.2</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.3</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index c75968c..5839ab7 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "4.0.2-Linux", "4.0.2-MacOS", "4.0.2-Windows", +"4.0.3", +"4.0.3-Linux", +"4.0.3-MacOS", +"4.0.3-Windows", "4.5-alpha-2", "4.5-alpha-2-Linux", "4.5-alpha-2-MacOS",

1 0

[tor/master] Fix new unused variable warning in connection_listener_new
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit 17c568b95cddeab7bfd4bcd388c1e5735bef4ed1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 13 13:45:35 2015 -0500 Fix new unused variable warning in connection_listener_new --- src/or/connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/connection.c b/src/or/connection.c index a3c7019..36277d3 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1075,7 +1075,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, static int global_next_session_group = SESSION_GROUP_FIRST_AUTO; tor_addr_t addr; - if (get_n_open_sockets() >= get_options()->ConnLimit_-1) { + if (get_n_open_sockets() >= options->ConnLimit_-1) { warn_too_many_conns(); return NULL; }

1 0

[tor/master] update bug12585 changes file
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit 8d1fa0c87dd84f7f2ce7f9429140f1282330fce8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 13 13:13:19 2015 -0500 update bug12585 changes file --- changes/bug12585 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug12585 b/changes/bug12585 index ccdcd17..495a2f0 100644 --- a/changes/bug12585 +++ b/changes/bug12585 @@ -6,4 +6,4 @@ with AF_UNIX, it may directly communicate with Tor as if it were an other SOCKS proxy. This should allow high risk applications to be entirely prevented from connecting directly with TCP/IP, they will be able to only connect to the - internet through AF_UNIX and only through Tor. + internet through AF_UNIX and only through Tor. Closes ticket 12585.

1 0

[tor/master] Add support for a default list of paths and passing '0' to disable it to parse_unix_socket_config()
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit 0729b2be535df8a114c6c219e90aa3258caefcdb Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jan 9 20:49:54 2015 +0000 Add support for a default list of paths and passing '0' to disable it to parse_unix_socket_config() --- src/or/config.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index e080e77..87bf834 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6021,22 +6021,66 @@ parse_port_config(smartlist_t *out, /** Parse a list of config_line_t for an AF_UNIX unix socket listener option * from cfg and add them to out. No fancy options are - * supported: the line contains nothing but the path to the AF_UNIX socket. */ + * supported: the line contains nothing but the path to the AF_UNIX socket. + * We support a *Socket 0 syntax to explicitly disable if we enable by + * default. To use this, pass an initial list containing the default + * paths into this function, and if the list passed in is nonempty and + * contains paths they will replace it. If it contains only '0' the + * initial list will be cleared. */ static int parse_unix_socket_config(smartlist_t *out, const config_line_t *cfg, int listener_type) { + /* We can say things like SocksSocket 0 or ControlSocket 0 to explicitly + * disable this feature; use this to track if we've seen a disable line + */ + + int unix_socket_disable = 0, initial_len; + size_t len; if (!out) return 0; + /* + * Keep track of this so we know if we added things later; it's + * invalid to say both *Socket 0 to disable and list paths + */ + initial_len = smartlist_len(out); + for ( ; cfg; cfg = cfg->next) { - size_t len = strlen(cfg->value); - port_cfg_t *port = tor_malloc_zero(sizeof(port_cfg_t) + len + 1); - port->is_unix_addr = 1; - memcpy(port->unix_addr, cfg->value, len+1); - port->type = listener_type; - smartlist_add(out, port); + if (strcmp(cfg->value, "0") != 0) { + /* Clear the default list if we have one */ + if (initial_len > 0) { + SMARTLIST_FOREACH(out, port_cfg_t *, port, tor_free(port)); + smartlist_clear(out); + initial_len = 0; + } + /* Now add it */ + len = strlen(cfg->value); + port_cfg_t *port = tor_malloc_zero(sizeof(port_cfg_t) + len + 1); + port->is_unix_addr = 1; + memcpy(port->unix_addr, cfg->value, len+1); + port->type = listener_type; + smartlist_add(out, port); + } else { + /* Keep track that we've seen a disable */ + unix_socket_disable = 1; + } + } + + if (unix_socket_disable) { + if (initial_len == 0 && smartlist_len(out) > 0) { + /* We saw a disable line and a path; bad news */ + return -1; + } else if (initial_len > 0) { + /* + * We had a non-empty default list, and still have it, so we have + * to clear it. + */ + SMARTLIST_FOREACH(out, port_cfg_t *, port, tor_free(port)); + smartlist_clear(out); + initial_len = 0; + } } return 0;

1 0

[tor/master] Kill duplicated code in connection_listener_new()
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit 62f297fff062afa5aabfb5cd5152897a1ca4591b Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Jan 12 16:26:34 2015 +0000 Kill duplicated code in connection_listener_new() --- src/or/connection.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index c78ceba..9866c4c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1234,18 +1234,10 @@ connection_listener_new(const struct sockaddr *listensockaddr, } #endif - if (type == CONN_TYPE_CONTROL_LISTENER && - options->ControlSocketsGroupWritable) { - /* We need to use chmod; fchmod doesn't work on sockets on all - * platforms. */ - if (chmod(address, 0660) < 0) { - log_warn(LD_FS,"Unable to make %s group-writable.", address); - goto err; - } - } - - if (type == CONN_TYPE_AP_LISTENER && - options->SocksSocketsGroupWritable) { + if ((type == CONN_TYPE_CONTROL_LISTENER && + options->ControlSocketsGroupWritable) || + (type == CONN_TYPE_AP_LISTENER && + options->SocksSocketsGroupWritable)) { /* We need to use chmod; fchmod doesn't work on sockets on all * platforms. */ if (chmod(address, 0660) < 0) {

1 0

[tor/master] Explicitly chmod AF_UNIX sockets to 0600 when *GroupWritable isn't specified
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit 066acaf6b9e5c38fc392e85c14457f338d3c1dff Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Jan 13 00:27:04 2015 +0000 Explicitly chmod AF_UNIX sockets to 0600 when *GroupWritable isn't specified --- src/or/connection.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/or/connection.c b/src/or/connection.c index 0a7a6a8..a3c7019 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1244,6 +1244,16 @@ connection_listener_new(const struct sockaddr *listensockaddr, log_warn(LD_FS,"Unable to make %s group-writable.", address); goto err; } + } else if ((type == CONN_TYPE_CONTROL_LISTENER && + !(options->ControlSocketsGroupWritable)) || + (type == CONN_TYPE_AP_LISTENER && + !(options->SocksSocketsGroupWritable))) { + /* We need to use chmod; fchmod doesn't work on sockets on all + * platforms. */ + if (chmod(address, 0600) < 0) { + log_warn(LD_FS,"Unable to make %s group-writable.", address); + goto err; + } } if (listen(s, SOMAXCONN) < 0) {

1 0

[tor/master] Document disable option for ControlSocket and SocksSocket
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit 78956f5d857f573106fd4dd4d2f9220af32be1b3 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jan 9 20:54:59 2015 +0000 Document disable option for ControlSocket and SocksSocket --- doc/tor.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 43aade9..7f280d1 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -294,7 +294,7 @@ GENERAL OPTIONS [[ControlSocket]] **ControlSocket** __Path__:: Like ControlPort, but listens on a Unix domain socket, rather than a TCP - socket. (Unix and Unix-like systems only.) + socket. '0' disables ControlSocket (Unix and Unix-like systems only.) [[ControlSocketsGroupWritable]] **ControlSocketsGroupWritable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read and @@ -485,7 +485,7 @@ GENERAL OPTIONS [[SocksSocket]] **SocksSocket** __Path__:: Like SocksPort, but listens on a Unix domain socket, rather than a TCP - socket. (Unix and Unix-like systems only.) + socket. '0' disables SocksSocket (Unix and Unix-like systems only.) [[SocksSocketsGroupWritable]] **SocksSocketsGroupWritable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read and

1 0

[tor/master] Merge remote-tracking branch 'andrea/ticket12585_v3'
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit d8b7dcca8de8894c147571dd3e259f00a708e348 Merge: 732c885 066acaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 13 12:50:55 2015 -0500 Merge remote-tracking branch 'andrea/ticket12585_v3' changes/bug12585 | 9 ++++ doc/tor.1.txt | 11 +++- src/common/address.c | 18 +++++++ src/or/config.c | 110 +++++++++++++++++++++++++++++++++---- src/or/connection.c | 146 ++++++++++++++++++++++++++++++++++++++++---------- src/or/main.c | 4 ++ src/or/or.h | 8 +++ src/or/relay.c | 4 +- 8 files changed, 268 insertions(+), 42 deletions(-)

1 0

[tor/master] Fix default list handling for parse_unix_socket_config(); avoid clearing whole pre-existing list
by nickm＠torproject.org 13 Jan '15

13 Jan '15

commit f50068b17e77f9749fe798ef46124baa811d5b0a Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Jan 12 22:12:18 2015 +0000 Fix default list handling for parse_unix_socket_config(); avoid clearing whole pre-existing list --- src/or/config.c | 70 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 87bf834..aea0498 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6023,45 +6023,37 @@ parse_port_config(smartlist_t *out, * from cfg and add them to out. No fancy options are * supported: the line contains nothing but the path to the AF_UNIX socket. * We support a *Socket 0 syntax to explicitly disable if we enable by - * default. To use this, pass an initial list containing the default - * paths into this function, and if the list passed in is nonempty and - * contains paths they will replace it. If it contains only '0' the - * initial list will be cleared. */ + * default. To use this, pass a non-NULL list containing the default + * paths into this function as the 2nd parameter, and if no config lines at all + * are present they will be added to the output list. If the only config line + * present is '0' the input list will be unmodified. + */ static int -parse_unix_socket_config(smartlist_t *out, const config_line_t *cfg, - int listener_type) +parse_unix_socket_config(smartlist_t *out, smartlist_t *defaults, + const config_line_t *cfg, int listener_type) { /* We can say things like SocksSocket 0 or ControlSocket 0 to explicitly * disable this feature; use this to track if we've seen a disable line */ - int unix_socket_disable = 0, initial_len; + int unix_socket_disable = 0; size_t len; + smartlist_t *ports_to_add = NULL; if (!out) return 0; - /* - * Keep track of this so we know if we added things later; it's - * invalid to say both *Socket 0 to disable and list paths - */ - initial_len = smartlist_len(out); + ports_to_add = smartlist_new(); for ( ; cfg; cfg = cfg->next) { if (strcmp(cfg->value, "0") != 0) { - /* Clear the default list if we have one */ - if (initial_len > 0) { - SMARTLIST_FOREACH(out, port_cfg_t *, port, tor_free(port)); - smartlist_clear(out); - initial_len = 0; - } - /* Now add it */ + /* We have a non-disable; add it */ len = strlen(cfg->value); port_cfg_t *port = tor_malloc_zero(sizeof(port_cfg_t) + len + 1); port->is_unix_addr = 1; memcpy(port->unix_addr, cfg->value, len+1); port->type = listener_type; - smartlist_add(out, port); + smartlist_add(ports_to_add, port); } else { /* Keep track that we've seen a disable */ unix_socket_disable = 1; @@ -6069,18 +6061,33 @@ parse_unix_socket_config(smartlist_t *out, const config_line_t *cfg, } if (unix_socket_disable) { - if (initial_len == 0 && smartlist_len(out) > 0) { + if (smartlist_len(ports_to_add) > 0) { /* We saw a disable line and a path; bad news */ + SMARTLIST_FOREACH(ports_to_add, port_cfg_t *, port, tor_free(port)); + smartlist_free(ports_to_add); return -1; - } else if (initial_len > 0) { - /* - * We had a non-empty default list, and still have it, so we have - * to clear it. - */ - SMARTLIST_FOREACH(out, port_cfg_t *, port, tor_free(port)); - smartlist_clear(out); - initial_len = 0; } + /* else we have a disable and nothing else, so add nothing to out */ + } else { + /* No disable; do we have any ports to add that we parsed? */ + if (smartlist_len(ports_to_add) > 0) { + SMARTLIST_FOREACH_BEGIN(ports_to_add, port_cfg_t *, port) { + smartlist_add(out, port); + } SMARTLIST_FOREACH_END(port); + } else if (defaults != NULL && smartlist_len(defaults) > 0) { + /* No, but we have some defaults to copy */ + SMARTLIST_FOREACH_BEGIN(defaults, const port_cfg_t *, defport) { + tor_assert(defport->is_unix_addr); + tor_assert(defport->unix_addr); + len = sizeof(port_cfg_t) + strlen(defport->unix_addr) + 1; + port_cfg_t *port = tor_malloc_zero(len); + memcpy(port, defport, len); + smartlist_add(out, port); + } SMARTLIST_FOREACH_END(defport); + } + + /* Free the temporary smartlist we used */ + smartlist_free(ports_to_add); } return 0; @@ -6174,13 +6181,14 @@ parse_ports(or_options_t *options, int validate_only, "configuration"); goto err; } - if (parse_unix_socket_config(ports, + + if (parse_unix_socket_config(ports, NULL, options->ControlSocket, CONN_TYPE_CONTROL_LISTENER) < 0) { *msg = tor_strdup("Invalid ControlSocket configuration"); goto err; } - if (parse_unix_socket_config(ports, + if (parse_unix_socket_config(ports, NULL, options->SocksSocket, CONN_TYPE_AP_LISTENER) < 0) { *msg = tor_strdup("Invalid SocksSocket configuration");

1 0