June 2011 - tor-commits - lists.torproject.org

[obfsproxy/master] Removed fake sockaddr_in6 definition.
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit c896b0536ae84c9b197a921f4fd650921bec2ce1 Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Jun 20 04:07:09 2011 +0200 Removed fake sockaddr_in6 definition. --- src/socks.c | 35 ++--------------------------------- 1 files changed, 2 insertions(+), 33 deletions(-) diff --git a/src/socks.c b/src/socks.c index 13d5375..7e6f6b2 100644 --- a/src/socks.c +++ b/src/socks.c @@ -5,6 +5,7 @@ #include <sys/types.h> #ifdef _WIN32 #include <Winsock2.h> +#include <Ws2tcpip.h> #else #include <arpa/inet.h> #include <sys/socket.h> @@ -54,38 +55,6 @@ static enum socks_ret socks5_do_negotiation(struct evbuffer *dest, typedef unsigned char uchar; -/* - Necessary definitions for platforms that don't support - sockaddr_in6 and u_int16_t -*/ -#ifdef _WIN32 -typedef uint16_t sa_family_t; - -struct in6_addr -{ - union { - uint8_t u6_addr8[16]; - uint16_t u6_addr16[8]; - uint32_t u6_addr32[4]; - } in6_u; -#define s6_addr in6_u.u6_addr8 -#define s6_addr16 in6_u.u6_addr16 -#define s6_addr32 in6_u.u6_addr32 -}; - -/* Define struct sockaddr_in6 on platforms that do not have it. See notes - * on struct in6_addr. */ -struct sockaddr_in6 { - sa_family_t sin6_family; - uint16_t sin6_port; - // uint32_t sin6_flowinfo; - struct in6_addr sin6_addr; - // uint32_t sin6_scope_id; -}; - -typedef unsigned short u_int16_t; -#endif - socks_state_t * socks_state_new(void) { @@ -166,7 +135,7 @@ socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq) /** XXX: max FQDN size is 255. */ /* #define MAXFQDN */ char destaddr[255+1]; /* Dest address */ - u_int16_t destport; /* Dest port */ + uint16_t destport; /* Dest port */ unsigned int buflength = evbuffer_get_length(source);

1 0

[obfsproxy/master] Trivial bug fix
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 7278977060111b3fe2ce7d1694483f746b13e7fe Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Jun 20 04:13:16 2011 +0200 Trivial bug fix --- src/main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/main.c b/src/main.c index e469b7b..a8347c2 100644 --- a/src/main.c +++ b/src/main.c @@ -306,7 +306,6 @@ main(int argc, const char **argv) #ifdef SIGPIPE signal(SIGPIPE, SIG_IGN); #endif - signal(SIGPIPE, SIG_IGN); sigevent = evsignal_new(base, SIGINT, handle_signal_cb, (void*) base); if (event_add(sigevent,NULL)) {

1 0

[tor/release-0.2.2] bump to 0.2.2.29-beta
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 16e8951c7d523014ccc2ef4d812ea6f8e9eec120 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jun 20 04:03:28 2011 -0400 bump to 0.2.2.29-beta --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 95e90e6..78d0d54 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.2.28-beta) +AM_INIT_AUTOMAKE(tor, 0.2.2.29-beta) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index d4b74f4..eef28d5 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.2.28-beta" +!define VERSION "0.2.2.29-beta" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 36f1fc1..9c4f3d8 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,5 +233,5 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.2.28-beta" +#define VERSION "0.2.2.29-beta"

1 0

[tor/release-0.2.2] fold in the changes files
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit bfaf3e361a10924a8a33b8ce2f481a1be86d8086 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jun 20 03:58:08 2011 -0400 fold in the changes files --- ChangeLog | 56 ++++++++++++++++++++++++++++++++++ changes/abandon-rend-circs-on-newnym | 8 ----- changes/bug2355_revert | 7 ---- changes/bug3306 | 9 ----- changes/bug3369 | 4 -- changes/bug3393 | 5 --- changes/coverity_maint | 9 ----- changes/fix-connection_printf_to_buf | 15 --------- changes/geoip-june2011 | 3 -- 9 files changed, 56 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d229d0..1b9e43a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,59 @@ +Changes in version 0.2.2.29-beta - 2011-06-20 + o Major bugfixes: + - Revert the UseBridges option to its behavior before 0.2.2.28-beta. + When we changed the default behavior to "use bridges if any + are listed in the torrc", we surprised users who had bridges + in their torrc files but who didn't actually want to use them. + Partial resolution for bug 3354. + + o Privacy fixes: + - Don't attach new streams to old rendezvous circuits after SIGNAL + NEWNYM. Previously, we would keep using an existing rendezvous + circuit if it remained open (i.e. if it were kept open by a + long-lived stream, or if a new stream were attached to it before + Tor could notice that it was old and no longer in use). Bugfix on + 0.1.1.15-rc; fixes bug 3375. + + o Minor bugfixes: + - Fix a bug when using ControlSocketsGroupWritable with User. The + directory's group would be checked against the current group, not + the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix + on Tor 0.2.2.26-beta. + - Make connection_printf_to_buf()'s behaviour sane. Its callers + expect it to emit a CRLF iff the format string ends with CRLF; + it actually emitted a CRLF iff (a) the format string ended with + CRLF or (b) the resulting string was over 1023 characters long or + (c) the format string did not end with CRLF ''and'' the resulting + string was 1021 characters long or longer. Bugfix on 0.1.1.9-alpha; + fixes part of bug 3407. + - Make send_control_event_impl()'s behaviour sane. Its callers + expect it to always emit a CRLF at the end of the string; it + might have emitted extra control characters as well. Bugfix on + 0.1.1.9-alpha; fixes another part of bug 3407. + - Make crypto_rand_int() check the value of its input correctly. + Previously, it accepted values up to UINT_MAX, but could return a + negative number if given a value above INT_MAX+1. Found by George + Kadianakis. Fixes bug 3306; bugfix on 0.2.2pre14. + - Avoid a segfault when reading a malformed circuit build state + with more than INT_MAX entries. Found by wanoskarnet. Bugfix on + 0.2.2.4-alpha. + - When asked about a DNS record type we don't support via a + client DNSPort, reply with NOTIMPL rather than an empty + reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha. + - Fix a rare memory leak during stats writing. Found by coverity. + + o Minor features: + - Update to the June 1 2011 Maxmind GeoLite Country database. + + o Code simplifications and refactoring: + - Remove some dead code as indicated by coverity. + - Remove a few dead assignments during router parsing. Found by + coverity. + - Add some forgotten return value checks during unit tests. Found + by coverity. + - Don't use 1-bit wide signed bit fields. Found by coverity. + + Changes in version 0.2.2.28-beta - 2011-06-04 Tor 0.2.2.28-beta makes great progress towards a new stable release: we fixed a big bug in whether relays stay in the consensus consistently, diff --git a/changes/abandon-rend-circs-on-newnym b/changes/abandon-rend-circs-on-newnym deleted file mode 100644 index 67cb2dc..0000000 --- a/changes/abandon-rend-circs-on-newnym +++ /dev/null @@ -1,8 +0,0 @@ - o Security fixes: - - Don't attach new streams to old rendezvous circuits after SIGNAL - NEWNYM. Previously, we would keep using an existing rendezvous - circuit if it remained open (i.e. if it were kept open by a - long-lived stream or if a new stream were attached to it before - Tor could notice that it was old and no longer in use and close - it). Bugfix on 0.1.1.15-rc; fixes bug 3375. - diff --git a/changes/bug2355_revert b/changes/bug2355_revert deleted file mode 100644 index 2ded40a..0000000 --- a/changes/bug2355_revert +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes: - - Revert the UseBridges option to its behavior before 0.2.2.28-beta. - When we changed the default behavior to "use bridges if any are - listed in the torrc", we broke a number of users who had bridges - in their torrc files but who didn't actually want to use them. - Partial resolution for bug 3354. - diff --git a/changes/bug3306 b/changes/bug3306 deleted file mode 100644 index f868a24..0000000 --- a/changes/bug3306 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - Make our crypto_rand_int() function check the value of its input - correctly. Previously, it accepted values up to UINT_MAX, but - could return a negative number if given a value above INT_MAX+1. - Found by George Kadianakis. Fixes bug 3306; bugfix on 0.2.2pre14. - - - Avoid a segfault when reading a malformed circuit build state - with more than INT_MAX entries. Found by wanoskarnet. Bugfix on - 0.2.2.4-alpha. diff --git a/changes/bug3369 b/changes/bug3369 deleted file mode 100644 index 9c0d0e6..0000000 --- a/changes/bug3369 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - When asked about a DNS record type we don't support via a - client DNSPort, reply with NOTIMPL rather than an empty - reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha. diff --git a/changes/bug3393 b/changes/bug3393 deleted file mode 100644 index 677bcb7..0000000 --- a/changes/bug3393 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix a bug when using ControlSocketsGroupWritable with User. The - directory's group would be checked against the current group, not - the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix - on Tor 0.2.2.26-beta. \ No newline at end of file diff --git a/changes/coverity_maint b/changes/coverity_maint deleted file mode 100644 index e7be90a..0000000 --- a/changes/coverity_maint +++ /dev/null @@ -1,9 +0,0 @@ - o Code simplifications and refactoring: - - Remove some dead code as indicated by coverity. - - Remove a few dead assignments during router parsing. Found by coverity. - o Minor bugfixes: - - Add some forgotten return value checks during unit tests. Found - by coverity. - - Don't use 1-bit wide signed bit fields. Found by coverity. - - Fix a rare memory leak during stats writing. Found by coverity. - diff --git a/changes/fix-connection_printf_to_buf b/changes/fix-connection_printf_to_buf deleted file mode 100644 index e191eac..0000000 --- a/changes/fix-connection_printf_to_buf +++ /dev/null @@ -1,15 +0,0 @@ - * Code simplifications and refactoring: - - - Make connection_printf_to_buf's behaviour sane. Its callers - expect it to emit a CRLF iff the format string ends with CRLF; - it actually emits a CRLF iff (a) the format string ends with - CRLF or (b) the resulting string is over 1023 characters long or - (c) the format string does not end with CRLF ''and'' the - resulting string is 1021 characters long or longer. Bugfix on - 0.1.1.9-alpha; fixes part of bug 3407. - - - Make send_control_event_impl's behaviour sane. Its callers - expect it to always emit a CRLF at the end of the string; it - might emit extra control characters as well. Bugfix on - 0.1.1.9-alpha; fixes another part of bug 3407. - diff --git a/changes/geoip-june2011 b/changes/geoip-june2011 deleted file mode 100644 index 8cf011b..0000000 --- a/changes/geoip-june2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the June 1 2011 Maxmind GeoLite Country database. -

1 0

[tor/release-0.2.2] Add changes file for bug2355 revert
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 1811bef666680222fe9421bbe282b49b00df6683 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 16:54:31 2011 -0400 Add changes file for bug2355 revert --- changes/bug2355_revert | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug2355_revert b/changes/bug2355_revert new file mode 100644 index 0000000..0d2822a --- /dev/null +++ b/changes/bug2355_revert @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Revert the UseBridges option to its behavior before 0.2.2.28-beta. + When we changed the default behavior to "use bridges if any are + listed in the torrc", we broke a number of Vidalia users. + Partial resolution for bug 3354. +

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 20 Jun '11

20 Jun '11

1 0

[tor/release-0.2.2] Tweak bug2355_revert at suggestion from Roger
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 8e5dfe42a0230722bff07ba6ededcc0d2dbd53e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 19 20:58:46 2011 -0400 Tweak bug2355_revert at suggestion from Roger --- changes/bug2355_revert | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug2355_revert b/changes/bug2355_revert index 0d2822a..2ded40a 100644 --- a/changes/bug2355_revert +++ b/changes/bug2355_revert @@ -1,6 +1,7 @@ o Minor bugfixes: - Revert the UseBridges option to its behavior before 0.2.2.28-beta. When we changed the default behavior to "use bridges if any are - listed in the torrc", we broke a number of Vidalia users. + listed in the torrc", we broke a number of users who had bridges + in their torrc files but who didn't actually want to use them. Partial resolution for bug 3354.

1 0

[tor/release-0.2.2] client-side DNS proxy server: reply NOTIMPL to unsupported queries
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 910472c5146ad3e436f1b5238570a2802662319b Author: intrigeri <intrigeri(a)boum.org> Date: Sun Jun 12 11:57:31 2011 +0200 client-side DNS proxy server: reply NOTIMPL to unsupported queries Fix for bug 3369. --- src/or/dnsserv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 009ab5f..f2c473d 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -95,8 +95,8 @@ evdns_server_callback(struct evdns_server_request *req, void *_data) } if (!q) { log_info(LD_APP, "None of the questions we got were ones we're willing " - "to support. Sending NODATA."); - evdns_server_request_respond(req, DNS_ERR_NONE); + "to support. Sending NOTIMPL."); + evdns_server_request_respond(req, DNS_ERR_NOTIMPL); return; } if (q->type != EVDNS_TYPE_A) {

1 0

[tor/release-0.2.2] changelog entry for bug3369
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit e470f6a8866105c9f6b113aa8eafec5ee202c992 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 13 13:42:00 2011 -0400 changelog entry for bug3369 --- changes/bug3369 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug3369 b/changes/bug3369 new file mode 100644 index 0000000..9c0d0e6 --- /dev/null +++ b/changes/bug3369 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When asked about a DNS record type we don't support via a + client DNSPort, reply with NOTIMPL rather than an empty + reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha.

1 0

[tor/release-0.2.2] Make ControlSocketsGroupWritable work with User.
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 54d7d31cba84232b50fef4287951b2c4bfa746c2 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Tue Jun 14 12:18:32 2011 -0400 Make ControlSocketsGroupWritable work with User. Original message from bug3393: check_private_dir() to ensure that ControlSocketsGroupWritable is safe to use. Unfortunately, check_private_dir() only checks against the currently running user… which can be root until privileges are dropped to the user and group configured by the User config option. The attached patch fixes the issue by adding a new effective_user argument to check_private_dir() and updating the callers. It might not be the best way to fix the issue, but it did in my tests. (Code by lunar; changelog by nickm) --- src/common/util.c | 33 ++++++++++++++++++++++++++------- src/common/util.h | 3 ++- src/or/config.c | 6 ++++-- src/or/connection.c | 2 +- src/or/geoip.c | 6 +++--- src/or/rendservice.c | 2 +- src/or/rephist.c | 4 ++-- src/or/router.c | 4 ++-- 8 files changed, 41 insertions(+), 19 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 6f323dd..36aa9cc 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1677,15 +1677,20 @@ file_status(const char *fname) * is group-readable, but in all cases we create the directory mode 0700. * If CPD_CHECK_MODE_ONLY is set, then we don't alter the directory permissions * if they are too permissive: we just return -1. + * When effective_user is not NULL, check permissions against the given user and + * its primary group. */ int -check_private_dir(const char *dirname, cpd_check_t check) +check_private_dir(const char *dirname, cpd_check_t check, const char *effective_user) { int r; struct stat st; char *f; #ifndef MS_WINDOWS int mask; + struct passwd *pw = NULL; + uid_t running_uid; + gid_t running_gid; #endif tor_assert(dirname); @@ -1724,33 +1729,47 @@ check_private_dir(const char *dirname, cpd_check_t check) return -1; } #ifndef MS_WINDOWS - if (st.st_uid != getuid()) { + if (effective_user) { + /* Lookup the user and group information, if we have a problem, bail out. */ + pw = getpwnam(effective_user); + if (pw == NULL) { + log_warn(LD_CONFIG, "Error setting configured user: %s not found", effective_user); + return -1; + } + running_uid = pw->pw_uid; + running_gid = pw->pw_gid; + } else { + running_uid = getuid(); + running_gid = getgid(); + } + + if (st.st_uid != running_uid) { struct passwd *pw = NULL; char *process_ownername = NULL; - pw = getpwuid(getuid()); + pw = getpwuid(running_uid); process_ownername = pw ? tor_strdup(pw->pw_name) : tor_strdup("<unknown>"); pw = getpwuid(st.st_uid); log_warn(LD_FS, "%s is not owned by this user (%s, %d) but by " "%s (%d). Perhaps you are running Tor as the wrong user?", - dirname, process_ownername, (int)getuid(), + dirname, process_ownername, (int)running_uid, pw ? pw->pw_name : "<unknown>", (int)st.st_uid); tor_free(process_ownername); return -1; } - if ((check & CPD_GROUP_OK) && st.st_gid != getgid()) { + if ((check & CPD_GROUP_OK) && st.st_gid != running_gid) { struct group *gr; char *process_groupname = NULL; - gr = getgrgid(getgid()); + gr = getgrgid(running_gid); 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(), + dirname, process_groupname, (int)running_gid, gr ? gr->gr_name : "<unknown>", (int)st.st_gid); tor_free(process_groupname); diff --git a/src/common/util.h b/src/common/util.h index d657db6..b9db25c 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -292,7 +292,8 @@ typedef unsigned int cpd_check_t; #define CPD_CHECK 2 #define CPD_GROUP_OK 4 #define CPD_CHECK_MODE_ONLY 8 -int check_private_dir(const char *dirname, cpd_check_t check); +int check_private_dir(const char *dirname, cpd_check_t check, + const char *effective_user); #define OPEN_FLAGS_REPLACE (O_WRONLY|O_CREAT|O_TRUNC) #define OPEN_FLAGS_APPEND (O_WRONLY|O_CREAT|O_APPEND) typedef struct open_file_t open_file_t; diff --git a/src/or/config.c b/src/or/config.c index 44cecf3..8ab23a3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1025,7 +1025,8 @@ options_act_reversible(or_options_t *old_options, char **msg) /* Ensure data directory is private; create if possible. */ if (check_private_dir(options->DataDirectory, - running_tor ? CPD_CREATE : CPD_CHECK)<0) { + running_tor ? CPD_CREATE : CPD_CHECK, + options->User)<0) { tor_asprintf(msg, "Couldn't access/create private data directory \"%s\"", options->DataDirectory); @@ -1038,7 +1039,8 @@ options_act_reversible(or_options_t *old_options, char **msg) char *fn = tor_malloc(len); tor_snprintf(fn, len, "%s"PATH_SEPARATOR"cached-status", options->DataDirectory); - if (check_private_dir(fn, running_tor ? CPD_CREATE : CPD_CHECK) < 0) { + if (check_private_dir(fn, running_tor ? CPD_CREATE : CPD_CHECK, + options->User) < 0) { tor_asprintf(msg, "Couldn't access/create private data directory \"%s\"", fn); tor_free(fn); diff --git a/src/or/connection.c b/src/or/connection.c index 3f4ca1d..a9e3a74 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -867,7 +867,7 @@ check_location_for_unix_socket(or_options_t *options, const char *path) if (options->ControlSocketsGroupWritable) flags |= CPD_GROUP_OK; - if (check_private_dir(p, flags) < 0) { + if (check_private_dir(p, flags, options->User) < 0) { char *escpath, *escdir; escpath = esc_for_log(path); escdir = esc_for_log(p); diff --git a/src/or/geoip.c b/src/or/geoip.c index 5bb2410..c621ea8 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -970,7 +970,7 @@ geoip_dirreq_stats_write(time_t now) geoip_remove_old_clients(start_of_dirreq_stats_interval); statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE) < 0) + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) goto done; filename = get_datadir_fname2("stats", "dirreq-stats"); data_v2 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); @@ -1209,7 +1209,7 @@ geoip_bridge_stats_write(time_t now) /* Write it to disk. */ statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE) < 0) + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) goto done; filename = get_datadir_fname2("stats", "bridge-stats"); @@ -1304,7 +1304,7 @@ geoip_entry_stats_write(time_t now) geoip_remove_old_clients(start_of_entry_stats_interval); statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE) < 0) + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) goto done; filename = get_datadir_fname2("stats", "entry-stats"); data = geoip_get_client_history(GEOIP_CLIENT_CONNECT); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index a10e43f..d9a9364 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -569,7 +569,7 @@ rend_service_load_keys(void) s->directory); /* Check/create directory */ - if (check_private_dir(s->directory, CPD_CREATE) < 0) + if (check_private_dir(s->directory, CPD_CREATE, get_options()->User) < 0) return -1; /* Load key */ diff --git a/src/or/rephist.c b/src/or/rephist.c index 54593a0..b7341f3 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2307,7 +2307,7 @@ rep_hist_exit_stats_write(time_t now) /* Try to write to disk. */ statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE) < 0) { + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { log_warn(LD_HIST, "Unable to create stats/ directory!"); goto done; } @@ -2497,7 +2497,7 @@ rep_hist_buffer_stats_write(time_t now) smartlist_clear(circuits_for_buffer_stats); /* write to file */ statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE) < 0) + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) goto done; filename = get_datadir_fname2("stats", "buffer-stats"); out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND, diff --git a/src/or/router.c b/src/or/router.c index 68e29bb..2165e6e 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -533,12 +533,12 @@ init_keys(void) return 0; } /* Make sure DataDirectory exists, and is private. */ - if (check_private_dir(options->DataDirectory, CPD_CREATE)) { + if (check_private_dir(options->DataDirectory, CPD_CREATE, options->User)) { return -1; } /* Check the key directory. */ keydir = get_datadir_fname("keys"); - if (check_private_dir(keydir, CPD_CREATE)) { + if (check_private_dir(keydir, CPD_CREATE, options->User)) { tor_free(keydir); return -1; }

1 0