- tor-commits - lists.torproject.org

r24751: {projects} updated strings files with version number (in projects/android/trunk/Orbot/res: layout values values-ar values-ca values-de values-es values-fa values-mk values-nb values-nl values-pl values-pt values-ru values-sv values-zh xml)
by Nathan Freitas 16 May '11

16 May '11

Author: n8fr8 Date: 2011-05-16 03:49:36 +0000 (Mon, 16 May 2011) New Revision: 24751 Modified: projects/android/trunk/Orbot/res/layout/layout_about.xml projects/android/trunk/Orbot/res/layout/layout_main.xml projects/android/trunk/Orbot/res/values-ar/strings.xml projects/android/trunk/Orbot/res/values-ca/strings.xml projects/android/trunk/Orbot/res/values-de/strings.xml projects/android/trunk/Orbot/res/values-es/strings.xml projects/android/trunk/Orbot/res/values-fa/strings.xml projects/android/trunk/Orbot/res/values-mk/strings.xml projects/android/trunk/Orbot/res/values-nb/strings.xml projects/android/trunk/Orbot/res/values-nl/strings.xml projects/android/trunk/Orbot/res/values-pl/strings.xml projects/android/trunk/Orbot/res/values-pt/strings.xml projects/android/trunk/Orbot/res/values-ru/strings.xml projects/android/trunk/Orbot/res/values-sv/strings.xml projects/android/trunk/Orbot/res/values-zh/strings.xml projects/android/trunk/Orbot/res/values/strings.xml projects/android/trunk/Orbot/res/xml/preferences.xml Log: updated strings files with version number Modified: projects/android/trunk/Orbot/res/layout/layout_about.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_about.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/layout/layout_about.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -80,7 +80,7 @@ android:paddingLeft="15px" android:textStyle="bold" android:textColor="#00ff00" /> - <TextView android:text="Tor v0.2.2.14: https://www.torproject.org" + <TextView android:text="Tor v0.2.2.25: https://www.torproject.org" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -15,8 +15,8 @@ <ImageView android:id="@+id/radioModeImage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="0px" - android:layout_marginRight="3px" + android:layout_marginTop="3dip" + android:layout_marginRight="3dip" android:gravity="right" android:layout_toRightOf="@+id/radioModeLabel" android:layout_alignParentRight="true" @@ -34,10 +34,6 @@ android:textColor="#333333" /> </RelativeLayout> - <ScrollView android:id="@+id/mainview" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> <TableLayout android:id="@+id/mainLayout" android:layout_gravity="center" android:layout_height="wrap_content" @@ -50,6 +46,7 @@ <TableRow> <ImageView android:id="@+id/imgStatus" + android:layout_marginTop="30dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/toroff"/> @@ -60,8 +57,8 @@ android:layout_gravity="center_horizontal" android:gravity="center_horizontal" android:textStyle="bold" - android:width="330px" - android:height="75px" + android:layout_width="fill_parent" + android:layout_height="75px" android:textColor="#ffffff" /> </TableRow> @@ -69,7 +66,6 @@ </TableRow> </TableLayout> - </ScrollView> Modified: projects/android/trunk/Orbot/res/values/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> - + <string name="app_version">1.0.5</string> + <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">اوربوت (Orbot)</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-ca/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-de/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-de/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-de/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-es/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-es/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-es/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-fa/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">اوربات</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-mk/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Орбот</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-nb/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-nb/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-nb/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-nl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-pl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-pt/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-pt/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-pt/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-ru/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-sv/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-sv/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-sv/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-zh/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5-dev</string> + <string name="app_version">1.0.5</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/xml/preferences.xml =================================================================== --- projects/android/trunk/Orbot/res/xml/preferences.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/xml/preferences.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -42,7 +42,19 @@ </PreferenceCategory> - +<PreferenceCategory android:title="Exit Nodes"> + +<EditTextPreference android:key="pref_exit_nodes" +android:title="Exit Nodes" +android:summary="Fingerprints, nicknames, country codes and address patterns for the last hop" +android:dialogTitle="Enter Exit Nodes" +/> + +<CheckBoxPreference android:defaultValue="false" +android:title="Strict Exit Nodes" android:key="pref_strict_exit_nodes" +android:summary="Use only these specific exit nodes"/> + +</PreferenceCategory> <PreferenceCategory android:title="Bridges"> <CheckBoxPreference android:defaultValue="false"

1 0

[tor/maint-0.2.2] 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 'origin/maint-0.2.2'
by nickm＠torproject.org 16 May '11

16 May '11

commit 4ac8ff9c9f182b6202200480f8fc4689da659331 Merge: f2c1702 ede102f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:22:44 2011 -0400 Merge remote-tracking branch 'origin/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

[tor/master] 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/master] 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

[tor/master] 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/master] Add a new flag to check_private_dir to make it _not_ change permissions
by nickm＠torproject.org 16 May '11

16 May '11

commit 5d147d8527da3c8cff7f5ab5f0d0185d51fff79b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 13 15:40:03 2011 -0400 Add a new flag to check_private_dir to make it _not_ change permissions We'll need this for checking permissions on the directories that hold control sockets: if somebody says "ControlSocket ~/foo", it would be pretty rude to do a chmod 700 on their homedir. --- src/common/util.c | 7 +++++++ src/common/util.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 3f81874..d84ed9c 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1670,6 +1670,8 @@ file_status(const char *fname) * check&CPD_CHECK, and we think we can create it, return 0. Else * return -1. If CPD_GROUP_OK is set, then it's okay if the directory * 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. */ int check_private_dir(const char *dirname, cpd_check_t check) @@ -1741,6 +1743,11 @@ check_private_dir(const char *dirname, cpd_check_t check) } if (st.st_mode & mask) { unsigned new_mode; + if (check & CPD_CHECK_MODE_ONLY) { + log_warn(LD_FS, "Permissions on directory %s are too permissive.", + dirname); + return -1; + } log_warn(LD_FS, "Fixing permissions on directory %s", dirname); new_mode = st.st_mode; new_mode |= 0700; /* Owner should have rwx */ diff --git a/src/common/util.h b/src/common/util.h index f759532..f32709a 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -291,6 +291,7 @@ typedef unsigned int cpd_check_t; #define CPD_CREATE 1 #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); #define OPEN_FLAGS_REPLACE (O_WRONLY|O_CREAT|O_TRUNC) #define OPEN_FLAGS_APPEND (O_WRONLY|O_CREAT|O_APPEND)

1 0

[tor/master] Make check_private_dir accept g+rx dirs if told to do so.
by nickm＠torproject.org 16 May '11

16 May '11

commit b147c01295deb8c09807fda3b5e4945edcfaf81a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 13 14:55:40 2011 -0400 Make check_private_dir accept g+rx dirs if told to do so. --- src/common/util.c | 33 ++++++++++++++++++++++++--------- src/common/util.h | 6 +++++- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 86f4141..3f81874 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1665,16 +1665,22 @@ file_status(const char *fname) } /** Check whether dirname exists and is private. If yes return 0. If - * it does not exist, and check==CPD_CREATE is set, try to create it + * it does not exist, and check&CPD_CREATE is set, try to create it * and return 0 on success. If it does not exist, and - * check==CPD_CHECK, and we think we can create it, return 0. Else - * return -1. */ + * check&CPD_CHECK, and we think we can create it, return 0. Else + * return -1. If CPD_GROUP_OK is set, then it's okay if the directory + * is group-readable, but in all cases we create the directory mode 0700. + */ int check_private_dir(const char *dirname, cpd_check_t check) { int r; struct stat st; char *f; +#ifndef MS_WINDOWS + int mask; +#endif + tor_assert(dirname); f = tor_strdup(dirname); clean_name_for_stat(f); @@ -1686,10 +1692,7 @@ check_private_dir(const char *dirname, cpd_check_t check) strerror(errno)); return -1; } - if (check == CPD_NONE) { - log_warn(LD_FS, "Directory %s does not exist.", dirname); - return -1; - } else if (check == CPD_CREATE) { + if (check & CPD_CREATE) { log_info(LD_GENERAL, "Creating directory %s", dirname); #if defined (MS_WINDOWS) && !defined (WINCE) r = mkdir(dirname); @@ -1701,6 +1704,9 @@ check_private_dir(const char *dirname, cpd_check_t check) strerror(errno)); return -1; } + } else if (!(check & CPD_CHECK)) { + log_warn(LD_FS, "Directory %s does not exist.", dirname); + return -1; } /* XXXX In the case where check==CPD_CHECK, we should look at the * parent directory a little harder. */ @@ -1728,9 +1734,18 @@ check_private_dir(const char *dirname, cpd_check_t check) tor_free(process_ownername); return -1; } - if (st.st_mode & 0077) { + if (check & CPD_GROUP_OK) { + mask = 0027; + } else { + mask = 0077; + } + if (st.st_mode & mask) { + unsigned new_mode; log_warn(LD_FS, "Fixing permissions on directory %s", dirname); - if (chmod(dirname, 0700)) { + new_mode = st.st_mode; + new_mode |= 0700; /* Owner should have rwx */ + new_mode &= ~mask; /* Clear the other bits that we didn't want set...*/ + if (chmod(dirname, new_mode)) { log_warn(LD_FS, "Could not chmod directory %s: %s", dirname, strerror(errno)); return -1; diff --git a/src/common/util.h b/src/common/util.h index 961b587..f759532 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -286,7 +286,11 @@ file_status_t file_status(const char *filename); /** Possible behaviors for check_private_dir() on encountering a nonexistent * directory; see that function's documentation for details. */ -typedef enum { CPD_NONE, CPD_CREATE, CPD_CHECK } cpd_check_t; +typedef unsigned int cpd_check_t; +#define CPD_NONE 0 +#define CPD_CREATE 1 +#define CPD_CHECK 2 +#define CPD_GROUP_OK 4 int check_private_dir(const char *dirname, cpd_check_t check); #define OPEN_FLAGS_REPLACE (O_WRONLY|O_CREAT|O_TRUNC) #define OPEN_FLAGS_APPEND (O_WRONLY|O_CREAT|O_APPEND)

1 0

[tor/master] Add UnixSocketsGroupWritable config flag
by nickm＠torproject.org 16 May '11

16 May '11

commit d41ac64ad68811d8575db6e456fba470b0c3fde7 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Sat Apr 23 02:35:02 2011 +0200 Add UnixSocketsGroupWritable config flag When running a system-wide instance of Tor on Unix-like systems, having a ControlSocket is a quite handy mechanism to access Tor control channel. But it would be easier if access to the Unix domain socket can be granted by making control users members of the group running the Tor process. This change introduces a UnixSocketsGroupWritable option, which will create Unix domain sockets (and thus ControlSocket) 'g+rw'. This allows ControlSocket to offer same access control measures than ControlPort+CookieAuthFileGroupReadable. See <http://bugs.debian.org/552556> for more details. --- doc/tor.1.txt | 5 +++++ src/or/config.c | 3 ++- src/or/connection.c | 7 +++++++ src/or/or.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d95d764..d0d0c2f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -167,6 +167,11 @@ 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**:: + 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) + **HashedControlPassword** __hashed_password__:: Don't allow any connections on the control port except when the other process knows the password whose one-way hash is __hashed_password__. You diff --git a/src/or/config.c b/src/or/config.c index 6a2742d..c81fc9c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -209,6 +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(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), V(CookieAuthFile, STRING, NULL), @@ -952,7 +953,7 @@ options_act_reversible(or_options_t *old_options, char **msg) } #ifndef HAVE_SYS_UN_H - if (options->ControlSocket) { + if (options->ControlSocket || options->UnixSocketsGroupWritable) { *msg = tor_strdup("Unix domain sockets (ControlSocket) not supported" " on this OS/with this build."); goto rollback; diff --git a/src/or/connection.c b/src/or/connection.c index 01b533d..d0898c5 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -966,6 +966,13 @@ connection_create_listener(const struct sockaddr *listensockaddr, tor_socket_strerror(tor_socket_errno(s))); goto err; } + if (get_options()->UnixSocketsGroupWritable) { + if (chmod(address, 0660) < 0) { + log_warn(LD_FS,"Unable to make %s group-readable.", address); + tor_close_socket(s); + goto err; + } + } if (listen(s,SOMAXCONN) < 0) { log_warn(LD_NET, "Could not listen on %s: %s", address, diff --git a/src/or/or.h b/src/or/or.h index 5647691..b72693f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2445,6 +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 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/master] Add a function to pull off the final component of a path
by nickm＠torproject.org 16 May '11

16 May '11

commit 3b6cbf253494303f612eeb09a6fbb30a7c15c7fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 13 15:15:41 2011 -0400 Add a function to pull off the final component of a path --- src/common/compat.c | 34 ++++++++++++++++++++++++++++++++++ src/common/compat.h | 2 ++ src/or/connection.c | 2 ++ src/test/test_util.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 0 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index ea7f9d7..3c5e938 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1467,6 +1467,40 @@ get_user_homedir(const char *username) } #endif +/** Modify <b>fname</b> to contain the name of the directory */ +int +get_parent_directory(char *fname) +{ + char *cp; + int at_end = 1; + tor_assert(fname); +#ifdef MS_WINDOWS + /* If we start with, say, c:, then don't consider that the start of the path + */ + if (fname[0] && fname[1] == ':') { + fname += 2; + } +#endif + /* Now we want to remove the final character that */ + cp = fname + strlen(fname); + at_end = 1; + while (--cp > fname) { + int is_sep = (*cp == '/' +#ifdef MS_WINDOWS + || *cp == '\\' +#endif + ); + if (is_sep) { + *cp = '\0'; + if (! at_end) + return 0; + } else { + at_end = 0; + } + } + return -1; +} + /** Set *addr to the IP address (in dotted-quad notation) stored in c. * Return 1 on success, 0 if c is badly formatted. (Like inet_aton(c,addr), * but works on Windows and Solaris.) diff --git a/src/common/compat.h b/src/common/compat.h index af795ff..eff51ab 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -552,6 +552,8 @@ int switch_id(const char *user); char *get_user_homedir(const char *username); #endif +int get_parent_directory(char *fname); + int spawn_func(void (*func)(void *), void *data); void spawn_exit(void) ATTR_NORETURN; diff --git a/src/or/connection.c b/src/or/connection.c index 12e00e5..ab265df 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -967,6 +967,8 @@ connection_create_listener(const struct sockaddr *listensockaddr, goto err; } if (get_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); tor_close_socket(s); diff --git a/src/test/test_util.c b/src/test/test_util.c index 0da45df..23cd059 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1195,6 +1195,35 @@ test_util_listdir(void *ptr) } } +static void +test_util_parent_dir(void *ptr) +{ + char *cp; + (void)ptr; + +#define T(input,expect_ok,output) \ + do { \ + int ok; \ + cp = tor_strdup(input); \ + ok = get_parent_directory(cp); \ + tt_int_op(ok, ==, expect_ok); \ + if (ok==0) \ + tt_str_op(cp, ==, output); \ + tor_free(cp); \ + } while (0); + + T("/home/wombat/knish", 0, "/home/wombat"); + T("/home/wombat/knish/", 0, "/home/wombat"); + T("./home/wombat/knish/", 0, "./home/wombat"); + T("./wombat", 0, "."); + T("", -1, ""); + T("/", -1, ""); + T("////", -1, ""); + + done: + tor_free(cp); +} + #ifdef MS_WINDOWS static void test_util_load_win_lib(void *ptr) @@ -1286,6 +1315,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(find_str_at_start_of_line, 0), UTIL_TEST(asprintf, 0), UTIL_TEST(listdir, 0), + UTIL_TEST(parent_dir, 0), #ifdef MS_WINDOWS UTIL_TEST(load_win_lib, 0), #endif

1 0