- tor-commits - lists.torproject.org

[tor/master] Set SO_REUSEADDR on all sockets, not just listeners
by nickm＠torproject.org 16 May '11

16 May '11

commit aba7bb705a69697ade1cff24e6693db2cb87236a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 3 22:22:20 2011 -0400 Set SO_REUSEADDR on all sockets, not just listeners See bug 2850 for rationale: it appears that on some busy exits, the OS decides that every single port is now unusable because they have been all used too recently. --- changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/changes/bug2850 b/changes/bug2850 new file mode 100644 index 0000000..77ccbfa --- /dev/null +++ b/changes/bug2850 @@ -0,0 +1,5 @@ + - Minor features + o Set SO_REUSEADDR on all sockets, not just listeners. This should + help busy exit nodes avoid running out of useable ports just because + all the ports have been used in the near past. Resolves issue 2850. + diff --git a/src/or/connection.c b/src/or/connection.c index 6e7bbd5..e90e13f 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -851,6 +851,25 @@ warn_too_many_conns(void) } } +/** Tell the TCP stack that it shouldn't wait for a long time after + * sock has closed before reusing its port. */ +static void +make_socket_reuseable(int sock) +{ +#ifdef MS_WINDOWS + (void) sock; +#else + int one=1; + + /* REUSEADDR on normal places means you can rebind to the port + * right after somebody else has let it go. But REUSEADDR on win32 + * means you can bind to the port _even when somebody else + * already has it bound_. So, don't do that on Win32. */ + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, + (socklen_t)sizeof(one)); +#endif +} + /** Bind a new non-blocking socket listening to the socket described * by listensockaddr. * @@ -873,9 +892,6 @@ connection_create_listener(struct sockaddr *listensockaddr, socklen_t socklen, if (listensockaddr->sa_family == AF_INET) { int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); -#ifndef MS_WINDOWS - int one=1; -#endif if (is_tcp) start_reading = 1; @@ -893,14 +909,7 @@ connection_create_listener(struct sockaddr *listensockaddr, socklen_t socklen, goto err; } -#ifndef MS_WINDOWS - /* REUSEADDR on normal places means you can rebind to the port - * right after somebody else has let it go. But REUSEADDR on win32 - * means you can bind to the port _even when somebody else - * already has it bound_. So, don't do that on Win32. */ - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*) &one, - (socklen_t)sizeof(one)); -#endif + make_socket_reuseable(s); if (bind(s,listensockaddr,socklen) < 0) { const char *helpfulhint = ""; @@ -1088,6 +1097,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) "Connection accepted on socket %d (child of fd %d).", news,conn->s); + make_socket_reuseable(news); set_socket_nonblocking(news); if (options->ConstrainedSockets) @@ -1297,6 +1307,8 @@ connection_connect(connection_t *conn, const char *address, log_debug(LD_NET, "Connecting to %s:%u.", escaped_safe_str_client(address), port); + make_socket_reuseable(s); + if (connect(s, dest_addr, dest_addr_len) < 0) { int e = tor_socket_errno(s); if (!ERRNO_IS_CONN_EINPROGRESS(e)) {

1 0

[tor/master] Increase the length of the buffer in smartlist_string_num_isin().
by nickm＠torproject.org 16 May '11

16 May '11

commit 83fe07d3f26aff703230305c9ff529592af32d4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 22:13:53 2011 -0400 Increase the length of the buffer in smartlist_string_num_isin(). This was harmless, since we only used this for checking for lists of port values, but it's the principle of the thing. Fixes 3175; bugfix on 0.1.0.1-rc --- changes/bug3175 | 7 +++++++ src/common/container.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug3175 b/changes/bug3175 new file mode 100644 index 0000000..3360fbc --- /dev/null +++ b/changes/bug3175 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - Resolve an untriggerable issue in smartlist_string_num_isin(), + where if the function had ever in the future been used to check + for the presence of a too-large number, it would have given an + incorrect result. (Fortunately, we only used it for 16-bit + values.) Fixes bug 3175; bugfix on Tor 0.1.0.1-rc. + diff --git a/src/common/container.c b/src/common/container.c index ca49cbb..da44b7f 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -210,7 +210,7 @@ smartlist_string_isin_case(const smartlist_t *sl, const char *element) int smartlist_string_num_isin(const smartlist_t *sl, int num) { - char buf[16]; + char buf[32]; /* long enough for 64-bit int, and then some. */ tor_snprintf(buf,sizeof(buf),"%d", num); return smartlist_string_isin(sl, buf); }

1 0

[tor/master] Merge remote-tracking branch 'public/bug2850' into maint-0.2.2
by nickm＠torproject.org 16 May '11

16 May '11

commit 919bf6ff3cfb1387f3f9ecf9ce97d8e95e330a05 Merge: 83fe07d aba7bb7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 11:10:17 2011 -0400 Merge remote-tracking branch 'public/bug2850' into maint-0.2.2 Fixed a trivial conflict where this and the ControlSocketGroupWritable code both added different functions to the same part of connection.c. Conflicts: src/or/connection.c changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --cc src/or/connection.c index b7d6fe4,e90e13f..5054909 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -853,43 -851,25 +853,62 @@@ warn_too_many_conns(void } } +#ifdef HAVE_SYS_UN_H +/** Check whether we should be willing to open an AF_UNIX socket in + * path. Return 0 if we should go ahead and -1 if we shouldn't. */ +static int +check_location_for_unix_socket(or_options_t *options, const char *path) +{ + int r = -1; + char *p = tor_strdup(path); + cpd_check_t flags = CPD_CHECK_MODE_ONLY; + if (get_parent_directory(p)<0) + goto done; + + if (options->ControlSocketsGroupWritable) + flags |= CPD_GROUP_OK; + + if (check_private_dir(p, flags) < 0) { + char *escpath, *escdir; + escpath = esc_for_log(path); + escdir = esc_for_log(p); + log_warn(LD_GENERAL, "Before Tor can create a control socket in %s, the " + "directory %s needs to exist, and to be accessible only by the " + "user%s account that is running Tor. (On some Unix systems, " + "anybody who can list a socket can conect to it, so Tor is " + "being careful.)", escpath, escdir, + options->ControlSocketsGroupWritable ? " and group" : ""); + tor_free(escpath); + tor_free(escdir); + goto done; + } + + r = 0; + done: + tor_free(p); + return r; +} +#endif + + /** Tell the TCP stack that it shouldn't wait for a long time after + * sock has closed before reusing its port. */ + static void + make_socket_reuseable(int sock) + { + #ifdef MS_WINDOWS + (void) sock; + #else + int one=1; + + /* REUSEADDR on normal places means you can rebind to the port + * right after somebody else has let it go. But REUSEADDR on win32 + * means you can bind to the port _even when somebody else + * already has it bound_. So, don't do that on Win32. */ + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, + (socklen_t)sizeof(one)); + #endif + } + /** Bind a new non-blocking socket listening to the socket described * by listensockaddr. * @@@ -912,11 -891,7 +931,8 @@@ connection_create_listener(const struc } if (listensockaddr->sa_family == AF_INET) { + tor_addr_t addr; int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); - #ifndef MS_WINDOWS - int one=1; - #endif if (is_tcp) start_reading = 1;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 16 May '11

16 May '11

commit de8e0ef0bd03607f444c967d8c3d74aa8abee4b8 Merge: 4ac8ff9 83fe07d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 22:15:06 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3175 | 7 +++++++ src/common/container.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 16 May '11

16 May '11

commit e423447f53f3a1b3b72cea3e52f345143e847d48 Merge: de8e0ef 919bf6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 11:12:22 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/connection.c changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --cc src/or/connection.c index 17411e0,5054909..50acec3 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1411,7 -1378,9 +1421,9 @@@ connection_connect(connection_t *conn, log_debug(LD_NET, "Connecting to %s:%u.", escaped_safe_str_client(address), port); + make_socket_reuseable(s); + - if (connect(s, dest_addr, dest_addr_len) < 0) { + if (connect(s, dest_addr, (socklen_t)dest_addr_len) < 0) { int e = tor_socket_errno(s); if (!ERRNO_IS_CONN_EINPROGRESS(e)) { /* yuck. kill it. */

1 0

[tor/maint-0.2.2] Set SO_REUSEADDR on all sockets, not just listeners
by nickm＠torproject.org 16 May '11

16 May '11

commit aba7bb705a69697ade1cff24e6693db2cb87236a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 3 22:22:20 2011 -0400 Set SO_REUSEADDR on all sockets, not just listeners See bug 2850 for rationale: it appears that on some busy exits, the OS decides that every single port is now unusable because they have been all used too recently. --- changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/changes/bug2850 b/changes/bug2850 new file mode 100644 index 0000000..77ccbfa --- /dev/null +++ b/changes/bug2850 @@ -0,0 +1,5 @@ + - Minor features + o Set SO_REUSEADDR on all sockets, not just listeners. This should + help busy exit nodes avoid running out of useable ports just because + all the ports have been used in the near past. Resolves issue 2850. + diff --git a/src/or/connection.c b/src/or/connection.c index 6e7bbd5..e90e13f 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -851,6 +851,25 @@ warn_too_many_conns(void) } } +/** Tell the TCP stack that it shouldn't wait for a long time after + * sock has closed before reusing its port. */ +static void +make_socket_reuseable(int sock) +{ +#ifdef MS_WINDOWS + (void) sock; +#else + int one=1; + + /* REUSEADDR on normal places means you can rebind to the port + * right after somebody else has let it go. But REUSEADDR on win32 + * means you can bind to the port _even when somebody else + * already has it bound_. So, don't do that on Win32. */ + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, + (socklen_t)sizeof(one)); +#endif +} + /** Bind a new non-blocking socket listening to the socket described * by listensockaddr. * @@ -873,9 +892,6 @@ connection_create_listener(struct sockaddr *listensockaddr, socklen_t socklen, if (listensockaddr->sa_family == AF_INET) { int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); -#ifndef MS_WINDOWS - int one=1; -#endif if (is_tcp) start_reading = 1; @@ -893,14 +909,7 @@ connection_create_listener(struct sockaddr *listensockaddr, socklen_t socklen, goto err; } -#ifndef MS_WINDOWS - /* REUSEADDR on normal places means you can rebind to the port - * right after somebody else has let it go. But REUSEADDR on win32 - * means you can bind to the port _even when somebody else - * already has it bound_. So, don't do that on Win32. */ - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*) &one, - (socklen_t)sizeof(one)); -#endif + make_socket_reuseable(s); if (bind(s,listensockaddr,socklen) < 0) { const char *helpfulhint = ""; @@ -1088,6 +1097,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) "Connection accepted on socket %d (child of fd %d).", news,conn->s); + make_socket_reuseable(news); set_socket_nonblocking(news); if (options->ConstrainedSockets) @@ -1297,6 +1307,8 @@ connection_connect(connection_t *conn, const char *address, log_debug(LD_NET, "Connecting to %s:%u.", escaped_safe_str_client(address), port); + make_socket_reuseable(s); + if (connect(s, dest_addr, dest_addr_len) < 0) { int e = tor_socket_errno(s); if (!ERRNO_IS_CONN_EINPROGRESS(e)) {

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'public/bug2850' into maint-0.2.2
by nickm＠torproject.org 16 May '11

16 May '11

commit 919bf6ff3cfb1387f3f9ecf9ce97d8e95e330a05 Merge: 83fe07d aba7bb7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 11:10:17 2011 -0400 Merge remote-tracking branch 'public/bug2850' into maint-0.2.2 Fixed a trivial conflict where this and the ControlSocketGroupWritable code both added different functions to the same part of connection.c. Conflicts: src/or/connection.c changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --cc src/or/connection.c index b7d6fe4,e90e13f..5054909 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -853,43 -851,25 +853,62 @@@ warn_too_many_conns(void } } +#ifdef HAVE_SYS_UN_H +/** Check whether we should be willing to open an AF_UNIX socket in + * path. Return 0 if we should go ahead and -1 if we shouldn't. */ +static int +check_location_for_unix_socket(or_options_t *options, const char *path) +{ + int r = -1; + char *p = tor_strdup(path); + cpd_check_t flags = CPD_CHECK_MODE_ONLY; + if (get_parent_directory(p)<0) + goto done; + + if (options->ControlSocketsGroupWritable) + flags |= CPD_GROUP_OK; + + if (check_private_dir(p, flags) < 0) { + char *escpath, *escdir; + escpath = esc_for_log(path); + escdir = esc_for_log(p); + log_warn(LD_GENERAL, "Before Tor can create a control socket in %s, the " + "directory %s needs to exist, and to be accessible only by the " + "user%s account that is running Tor. (On some Unix systems, " + "anybody who can list a socket can conect to it, so Tor is " + "being careful.)", escpath, escdir, + options->ControlSocketsGroupWritable ? " and group" : ""); + tor_free(escpath); + tor_free(escdir); + goto done; + } + + r = 0; + done: + tor_free(p); + return r; +} +#endif + + /** Tell the TCP stack that it shouldn't wait for a long time after + * sock has closed before reusing its port. */ + static void + make_socket_reuseable(int sock) + { + #ifdef MS_WINDOWS + (void) sock; + #else + int one=1; + + /* REUSEADDR on normal places means you can rebind to the port + * right after somebody else has let it go. But REUSEADDR on win32 + * means you can bind to the port _even when somebody else + * already has it bound_. So, don't do that on Win32. */ + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, + (socklen_t)sizeof(one)); + #endif + } + /** Bind a new non-blocking socket listening to the socket described * by listensockaddr. * @@@ -912,11 -891,7 +931,8 @@@ connection_create_listener(const struc } if (listensockaddr->sa_family == AF_INET) { + tor_addr_t addr; int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); - #ifndef MS_WINDOWS - int one=1; - #endif if (is_tcp) start_reading = 1;

1 0

[tor/release-0.2.2] Clean up the 2972 implementation a little
by nickm＠torproject.org 16 May '11

16 May '11

commit 4198261291c8edbd5ba1617b7bfe3563e51edbe7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Apr 23 02:57:53 2011 +0200 Clean up the 2972 implementation a little --- changes/bug2972 | 5 +++++ doc/tor.1.txt | 2 +- src/or/config.c | 14 ++++++++++---- src/or/connection.c | 4 ++-- src/or/or.h | 2 +- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/changes/bug2972 b/changes/bug2972 new file mode 100644 index 0000000..26afcca --- /dev/null +++ b/changes/bug2972 @@ -0,0 +1,5 @@ + o Minor features: + - Allow ControlSockets to be group-writable when the + ControlSocksGroupWritable configuration option is turned on. Patch + by Jérémy Bobbio; implements ticket 2972. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d0d0c2f..1815a8d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -167,7 +167,7 @@ Other options can be specified either on the command-line (--option Like ControlPort, but listens on a Unix domain socket, rather than a TCP socket. (Unix and Unix-like systems only.) -**UnixSocketsGroupWritable** **0**|**1**:: +**ControlSocketsGroupWritable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read and write unix sockets (e.g. ControlSocket). If the option is set to 1, make the control socket readable and writable by the default GID. (Default: 0) diff --git a/src/or/config.c b/src/or/config.c index c81fc9c..614fc48 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -209,7 +209,7 @@ static config_var_t _option_vars[] = { V(ControlPortFileGroupReadable,BOOL, "0"), V(ControlPortWriteToFile, FILENAME, NULL), V(ControlSocket, LINELIST, NULL), - V(UnixSocketsGroupWritable, BOOL, "0"), + V(ControlSocketsGroupWritable, BOOL, "0"), V(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), V(CookieAuthFile, STRING, NULL), @@ -953,9 +953,15 @@ options_act_reversible(or_options_t *old_options, char **msg) } #ifndef HAVE_SYS_UN_H - if (options->ControlSocket || options->UnixSocketsGroupWritable) { - *msg = tor_strdup("Unix domain sockets (ControlSocket) not supported" - " on this OS/with this build."); + if (options->ControlSocket || options->ControlSocketsGroupWritable) { + *msg = tor_strdup("Unix domain sockets (ControlSocket) not supported " + "on this OS/with this build."); + goto rollback; + } +#else + if (options->ControlSocketsGroupWritable && !options->ControlSocket) { + *msg = tor_strdup("Setting ControlSocketGroupWritable without setting" + "a ControlSocket makes no sense."); goto rollback; } #endif diff --git a/src/or/connection.c b/src/or/connection.c index d0898c5..12e00e5 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -966,9 +966,9 @@ connection_create_listener(const struct sockaddr *listensockaddr, tor_socket_strerror(tor_socket_errno(s))); goto err; } - if (get_options()->UnixSocketsGroupWritable) { + if (get_options()->ControlSocketsGroupWritable) { if (chmod(address, 0660) < 0) { - log_warn(LD_FS,"Unable to make %s group-readable.", address); + log_warn(LD_FS,"Unable to make %s group-writable.", address); tor_close_socket(s); goto err; } diff --git a/src/or/or.h b/src/or/or.h index b72693f..b9d8319 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2445,7 +2445,7 @@ typedef struct { int ControlPort; /**< Port to listen on for control connections. */ config_line_t *ControlSocket; /**< List of Unix Domain Sockets to listen on * for control connections. */ - int UnixSocketsGroupWritable; /**< Boolean: Are unix sockets g+rw? */ + int ControlSocketsGroupWritable; /**< Boolean: Are control sockets g+rw? */ int DirPort; /**< Port to listen on for directory connections. */ int DNSPort; /**< Port to listen on for DNS requests. */ int AssumeReachable; /**< Whether to publish our descriptor regardless. */

1 0

[tor/release-0.2.2] Make check_private_dir check for group ownership as appropriate
by nickm＠torproject.org 16 May '11

16 May '11

commit f72e792be5437c9ee11d3f498ed3bb469b46d1bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 13:11:48 2011 -0400 Make check_private_dir check for group ownership as appropriate --- src/common/util.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 0e739f2..1bb116b 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -30,6 +30,7 @@ #else #include <dirent.h> #include <pwd.h> +#include <grp.h> #endif /* math.h needs this on Linux */ @@ -1736,6 +1737,21 @@ check_private_dir(const char *dirname, cpd_check_t check) tor_free(process_ownername); return -1; } + if ((check & CPD_GROUP_OK) && st.st_gid != getgid()) { + struct group *gr; + char *process_groupname = NULL; + gr = getgrgid(getgid()); + process_groupname = gr ? tor_strdup(gr->gr_name) : tor_strdup("<unknown>"); + gr = getgrgid(st.st_gid); + + log_warn(LD_FS, "%s is not owned by this group (%s, %d) but by group " + "%s (%d). Are you running Tor as the wrong user?", + dirname, process_groupname, (int)getgid(), + gr ? gr->gr_name : "<unknown>", (int)st.st_gid); + + tor_free(process_groupname); + return -1; + } if (check & CPD_GROUP_OK) { mask = 0027; } else {

1 0

[tor/release-0.2.2] Merge branch 'bug2972' into maint-0.2.2
by nickm＠torproject.org 16 May '11

16 May '11

commit ede102fd4675af8ac4060767f0348f3c93617e80 Merge: 2b9c5ee f72e792 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:20:36 2011 -0400 Merge branch 'bug2972' into maint-0.2.2 changes/bug2792_checkdir | 8 ++++++ changes/bug2972 | 5 ++++ doc/tor.1.txt | 5 ++++ src/common/compat.c | 39 +++++++++++++++++++++++++++++++ src/common/compat.h | 2 + src/common/util.c | 58 ++++++++++++++++++++++++++++++++++++++-------- src/common/util.h | 7 ++++- src/or/config.c | 13 ++++++++-- src/or/connection.c | 49 ++++++++++++++++++++++++++++++++++++++ src/or/or.h | 1 + src/test/test_util.c | 30 +++++++++++++++++++++++ 11 files changed, 203 insertions(+), 14 deletions(-)

1 0