tor-commits August 2014

tor-commits@lists.torproject.org

21 participants
1599 discussions

[tor/release-0.2.5] Restore functionality for CookieAuthFileGroupReadable.
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 0808ed83f9cf312abe229d0956f0b0132a79962d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 15 08:30:44 2014 -0400 Restore functionality for CookieAuthFileGroupReadable. When we merged the cookieauthfile creation logic in 33c3e60a37, we accidentally took out this feature. Fixes bug 12864, bugfix on 0.2.5.1-alpha. Also adds an ExtORPortCookieAuthFileGroupReadable, since there's no reason not to. --- changes/bug12864 | 7 +++++++ doc/tor.1.txt | 7 +++++++ src/or/config.c | 11 ++++++++++- src/or/config.h | 2 +- src/or/control.c | 1 + src/or/ext_orport.c | 1 + src/or/or.h | 2 ++ 7 files changed, 29 insertions(+), 2 deletions(-) diff --git a/changes/bug12864 b/changes/bug12864 new file mode 100644 index 0000000..79e751f --- /dev/null +++ b/changes/bug12864 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - Restore the functionality of CookieAuthFileGroupReadable. Fixes bug + 12864; bugfix on 0.2.5.1-alpha. + + o Minor features: + - Add an ExtORPortCookieAuthFileGroupReadable option to make the + cookie file for the ExtORPort g+r by default. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 93d302e..a85bc34 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -224,6 +224,13 @@ GENERAL OPTIONS for the Extended ORPort's cookie file -- the cookie file is needed for pluggable transports to communicate through the Extended ORPort. +[[ExtORPortCookieAuthFileGroupReadable]] **ExtORPortCookieAuthFileGroupReadable** **0**|**1**:: + If this option is set to 0, don't allow the filesystem group to read the + Extende OR Port cookie file. If the option is set to 1, make the cookie + file readable by the default GID. [Making the file readable by other + groups is not yet implemented; let us know if you need this for some + reason.] (Default: 0) + [[ConnLimit]] **ConnLimit** __NUM__:: The minimum number of file descriptors that must be available to the Tor process before it will start. Tor will ask the OS for as many file diff --git a/src/or/config.c b/src/or/config.c index 2661ce3..20fde3b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -238,6 +238,7 @@ static config_var_t option_vars_[] = { V(ExtendAllowPrivateAddresses, BOOL, "0"), VPORT(ExtORPort, LINELIST, NULL), V(ExtORPortCookieAuthFile, STRING, NULL), + V(ExtORPortCookieAuthFileGroupReadable, BOOL, "0"), V(ExtraInfoStatistics, BOOL, "1"), V(FallbackDir, LINELIST, NULL), @@ -6828,7 +6829,7 @@ config_maybe_load_geoip_files_(const or_options_t *options, * cookie_is_set_out to True. */ int init_cookie_authentication(const char *fname, const char *header, - int cookie_len, + int cookie_len, int group_readable, uint8_t **cookie_out, int *cookie_is_set_out) { char cookie_file_str_len = strlen(header) + cookie_len; @@ -6861,6 +6862,14 @@ init_cookie_authentication(const char *fname, const char *header, goto done; } +#ifndef _WIN32 + if (group_readable) { + if (chmod(fname, 0640)) { + log_warn(LD_FS,"Unable to make %s group-readable.", escaped(fname)); + } + } +#endif + /* Success! */ log_info(LD_GENERAL, "Generated auth cookie file in '%s'.", escaped(fname)); *cookie_is_set_out = 1; diff --git a/src/or/config.h b/src/or/config.h index bf38613..8a1919c 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -97,7 +97,7 @@ uint32_t get_effective_bwburst(const or_options_t *options); char *get_transport_bindaddr_from_config(const char *transport); int init_cookie_authentication(const char *fname, const char *header, - int cookie_len, + int cookie_len, int group_readable, uint8_t **cookie_out, int *cookie_is_set_out); or_options_t *options_new(void); diff --git a/src/or/control.c b/src/or/control.c index 9285fc5..ec63506 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4666,6 +4666,7 @@ init_control_cookie_authentication(int enabled) fname = get_controller_cookie_file_name(); retval = init_cookie_authentication(fname, "", /* no header */ AUTHENTICATION_COOKIE_LEN, + get_options()->CookieAuthFileGroupReadable, &authentication_cookie, &authentication_cookie_is_set); tor_free(fname); diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index 0d28a91..9b550ee 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -143,6 +143,7 @@ init_ext_or_cookie_authentication(int is_enabled) fname = get_ext_or_auth_cookie_file_name(); retval = init_cookie_authentication(fname, EXT_OR_PORT_AUTH_COOKIE_HEADER, EXT_OR_PORT_AUTH_COOKIE_HEADER_LEN, + get_options()->ExtORPortCookieAuthFileGroupReadable, &ext_or_auth_cookie, &ext_or_auth_cookie_is_set); tor_free(fname); diff --git a/src/or/or.h b/src/or/or.h index 131bce3..0f1457f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3801,6 +3801,8 @@ typedef struct { char *ExtORPortCookieAuthFile; /**< Filesystem location of Extended * ORPort authentication cookie. */ int CookieAuthFileGroupReadable; /**< Boolean: Is the CookieAuthFile g+r? */ + int ExtORPortCookieAuthFileGroupReadable; /**< Boolean: Is the + * ExtORPortCookieAuthFile g+r? */ int LeaveStreamsUnattached; /**< Boolean: Does Tor attach new streams to * circuits itself (0), or does it expect a controller * to cope? (1) */

1 0

[tor/release-0.2.5] Some documentation fixes for #12864.
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 112c984f9242699d273f3096d669eb1024d7f64b Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Aug 15 23:12:06 2014 +0300 Some documentation fixes for #12864. --- doc/tor.1.txt | 2 +- src/or/config.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 900e588..04d13fb 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -226,7 +226,7 @@ GENERAL OPTIONS [[ExtORPortCookieAuthFileGroupReadable]] **ExtORPortCookieAuthFileGroupReadable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read the - Extende OR Port cookie file. If the option is set to 1, make the cookie + Extended OR Port cookie file. If the option is set to 1, make the cookie file readable by the default GID. [Making the file readable by other groups is not yet implemented; let us know if you need this for some reason.] (Default: 0) diff --git a/src/or/config.c b/src/or/config.c index 20fde3b..f53186a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6825,6 +6825,9 @@ config_maybe_load_geoip_files_(const or_options_t *options, * in cookie_out. * Then write it down to fname and prepend it with header. * + * If group_readable is set, set fname to be readable + * by the default GID. + * * If the whole procedure was successful, set * cookie_is_set_out to True. */ int

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'public/bug12848_024' into maint-0.2.5
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit d443658fade3b4090d0b93903b4aec857cab03ea Merge: 789c8d8 0044d74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 13 23:14:28 2014 -0400 Merge remote-tracking branch 'public/bug12848_024' into maint-0.2.5 Conflicts: src/or/circuitbuild.c changes/bug12848 | 4 ++++ src/or/channel.c | 8 ++++++++ src/or/circuitbuild.c | 12 ++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --cc src/or/channel.c index 3072eff,cd55bd0..ffd6849 --- a/src/or/channel.c +++ b/src/or/channel.c @@@ -2681,7 -2622,17 +2681,15 @@@ is_destroy_cell(channel_t *chan int channel_send_destroy(circid_t circ_id, channel_t *chan, int reason) { - cell_t cell; - tor_assert(chan); + if (circ_id == 0) { + log_warn(LD_BUG, "Attempted to send a destroy cell for circID 0 " + "on a channel " U64_FORMAT " at %p in state %s (%d)", + U64_PRINTF_ARG(chan->global_identifier), + chan, channel_state_to_string(chan->state), + chan->state); + return 0; + } /* Check to make sure we can send on this channel first */ if (!(chan->state == CHANNEL_STATE_CLOSING || diff --cc src/or/circuitbuild.c index 283afee,5325eff..897f90f --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@@ -657,13 -584,9 +658,11 @@@ circuit_deliver_create_cell(circuit_t * id = get_unique_circ_id_by_chan(circ->n_chan); if (!id) { - log_warn(LD_CIRC,"failed to get unique circID."); + static ratelim_t circid_warning_limit = RATELIM_INIT(9600); + log_fn_ratelim(&circid_warning_limit, LOG_WARN, LD_CIRC, + "failed to get unique circID."); - return -1; + goto error; } - log_debug(LD_CIRC,"Chosen circID %u.", (unsigned)id); - circuit_set_n_circid_chan(circ, id, circ->n_chan); memset(&cell, 0, sizeof(cell_t)); r = relayed ? create_cell_format_relayed(&cell, create_cell)

1 0

[tor/release-0.2.5] Remove stale printfs from buffer/zlib_fin_at_chunk_end test
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 0cb028b7c0d040e49fa7c8569f71a3e44cdd7d1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 15 09:34:10 2014 -0400 Remove stale printfs from buffer/zlib_fin_at_chunk_end test These got committed by mistake. --- src/test/test_buffers.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 61ac5bc..f24b80f 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -684,14 +684,11 @@ test_buffers_zlib_fin_at_chunk_end(void *arg) headerjunk = buf->head->memlen - 7; write_to_buf(msg, headerjunk-1, buf); tt_uint_op(buf->head->datalen, ==, headerjunk); - printf("<%u>\n", (unsigned)buf_datalen(buf)); tt_uint_op(buf_datalen(buf), ==, headerjunk); /* Write an empty string, with finalization on. */ zlib_state = tor_zlib_new(1, ZLIB_METHOD); tt_int_op(write_to_buf_zlib(buf, zlib_state, "", 0, 1), ==, 0); - printf("<%u>\n", (unsigned)buf_datalen(buf)); - in_len = buf_datalen(buf); contents = tor_malloc(in_len);

1 0

[tor/release-0.2.5] Documentation fix on arguments to CookieAuthFileGroupReadable
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 0ee1be0c698fa330a2ee2e4f2818e2118f459517 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 15 08:32:54 2014 -0400 Documentation fix on arguments to CookieAuthFileGroupReadable We don't actually allow a group name, but the documentation implied that we did. --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a85bc34..900e588 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -319,7 +319,7 @@ GENERAL OPTIONS If set, this option overrides the default location and file name for Tor's cookie file. (See CookieAuthentication above.) -[[CookieAuthFileGroupReadable]] **CookieAuthFileGroupReadable** **0**|**1**|__Groupname__:: +[[CookieAuthFileGroupReadable]] **CookieAuthFileGroupReadable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read the cookie file. If the option is set to 1, make the cookie file readable by the default GID. [Making the file readable by other groups is not yet

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 18 Aug '14

18 Aug '14

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 967b4e7c54b53391e1a0b67e0a5bf70bc2e6a896 Merge: 0cb028b 112c984 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 15 17:40:13 2014 -0400 Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5 changes/bug12864 | 7 +++++++ doc/tor.1.txt | 9 ++++++++- src/or/config.c | 14 +++++++++++++- src/or/config.h | 2 +- src/or/control.c | 1 + src/or/ext_orport.c | 1 + src/or/or.h | 2 ++ 7 files changed, 33 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.5] Verify configuration file via ExecStartPre in the systemd unit file (#12730).
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 0a705797840f893a94bd5b8b2cbb86e58a3a3fc7 Author: intrigeri <intrigeri(a)boum.org> Date: Tue Jul 29 12:13:01 2014 +0000 Verify configuration file via ExecStartPre in the systemd unit file (#12730). --- changes/bug12730-systemd-verify-config | 3 +++ contrib/dist/tor.service.in | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug12730-systemd-verify-config b/changes/bug12730-systemd-verify-config new file mode 100644 index 0000000..221633c --- /dev/null +++ b/changes/bug12730-systemd-verify-config @@ -0,0 +1,3 @@ + o Distribution: + - Verify configuration file via ExecStartPre in the systemd unit file. + Patch from intrigeri; resolves ticket 12730. diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 5d76702..9914a78 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -4,6 +4,7 @@ After = syslog.target network.target nss-lookup.target [Service] Type = simple +ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT

1 0

[tor/release-0.2.5] fix three typos in comments
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 0c869af7f8626cc74a7b82d0c0d6192cbb796d02 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Aug 6 02:20:51 2014 -0400 fix three typos in comments --- src/or/directory.c | 2 +- src/or/routerlist.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 22ba056..51ea312 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -349,7 +349,7 @@ should_use_directory_guards(const or_options_t *options) return 1; } -/** Pick an unconsetrained directory server from among our guards, the latest +/** Pick an unconstrained directory server from among our guards, the latest * networkstatus, or the fallback dirservers, for use in downloading * information of type type, and return its routerstatus. */ static const routerstatus_t * diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 8f3477a..b5e9245 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1365,7 +1365,7 @@ router_pick_trusteddirserver(dirinfo_type_t type, int flags) return router_pick_dirserver_generic(trusted_dir_servers, type, flags); } -/** Try to find a running fallback directory Flags are as for +/** Try to find a running fallback directory. Flags are as for * router_pick_directory_server. */ const routerstatus_t * @@ -1374,7 +1374,7 @@ router_pick_fallback_dirserver(dirinfo_type_t type, int flags) return router_pick_dirserver_generic(fallback_dir_servers, type, flags); } -/** Try to find a running fallback directory Flags are as for +/** Try to find a running fallback directory. Flags are as for * router_pick_directory_server. */ static const routerstatus_t *

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 88590ed3a66423fd4de3ad10dc67f1c9b18bf047 Merge: 7760916 0a70579 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 30 13:59:39 2014 -0400 Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5 changes/bug12730-systemd-verify-config | 3 +++ contrib/dist/tor.service.in | 1 + 2 files changed, 4 insertions(+)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2014