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

[webwml/master] remove dead link in torbrowser design doc
by sebastian＠torproject.org 11 Jan '15

11 Jan '15

commit 7b30c8b541a2a156822e664a13023b1044d5e37c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Jan 11 20:37:12 2015 +0100 remove dead link in torbrowser design doc --- projects/en/torbrowser.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 337c0e1..4055009 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -289,7 +289,7 @@ <p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>, which allows you to make sure you've downloaded the file we intended you to get. Also, note that the Firefox ESR in our bundles is - <a href="https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/confi…">modified</a> from the <a + modified from the <a href="https://www.mozilla.org/en-US/firefox/organizations/">default Firefox ESR</a></p>

1 0

[tor/master] changes file for bug13805
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit 3f39daa663b34bc62d36d76d6d7d3de9bf5b8ecd Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 11 11:27:33 2015 -0500 changes file for bug13805 --- changes/bug13805 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug13805 b/changes/bug13805 new file mode 100644 index 0000000..321cd58 --- /dev/null +++ b/changes/bug13805 @@ -0,0 +1,3 @@ + o Minor features (systemd): + - Various improvements and modernizations in systemd hardening support. + Closes ticket 13805. Patch from Craig Andrews.

1 0

[tor/master] Prefix ReadWriteDirectories with a "-" so if they don't exist it's not an error
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit 0c73bcd3ba7f5fb724a4ecb9f2057a40dd1a2582 Author: Craig Andrews <candrews(a)integralblue.com> Date: Fri Nov 28 12:38:40 2014 -0500 Prefix ReadWriteDirectories with a "-" so if they don't exist it's not an error See 13805 --- contrib/dist/tor.service.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 0e1e6cc..5cd460e 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -19,9 +19,9 @@ PrivateTmp = yes PrivateDevices = yes ProtectHome = yes ReadOnlyDirectories = / -ReadWriteDirectories = @LOCALSTATEDIR@/lib/tor -ReadWriteDirectories = @LOCALSTATEDIR@/log/tor -ReadWriteDirectories = @LOCALSTATEDIR@/run/tor +ReadWriteDirectories = -@LOCALSTATEDIR@/lib/tor +ReadWriteDirectories = -@LOCALSTATEDIR@/log/tor +ReadWriteDirectories = -@LOCALSTATEDIR@/run/tor NoNewPrivileges = yes [Install]

1 0

[tor/master] Use ProtectHome instead of InaccessibleDirectories
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit 9c933b3635d9d7e30ff43494aa4efac65ab99b16 Author: Craig Andrews <candrews(a)integralblue.com> Date: Fri Nov 28 12:36:56 2014 -0500 Use ProtectHome instead of InaccessibleDirectories See 13805 --- contrib/dist/tor.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 6362855..0e1e6cc 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -17,7 +17,7 @@ LimitNOFILE = 32768 # Hardening PrivateTmp = yes PrivateDevices = yes -InaccessibleDirectories = /home +ProtectHome = yes ReadOnlyDirectories = / ReadWriteDirectories = @LOCALSTATEDIR@/lib/tor ReadWriteDirectories = @LOCALSTATEDIR@/log/tor

1 0

[tor/master] Use PrivateDevices instead of DeviceAllow
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit 1ac3b74405098d6cace271e0c5c6b0cf33ba0154 Author: Craig Andrews <candrews(a)integralblue.com> Date: Fri Nov 28 12:36:17 2014 -0500 Use PrivateDevices instead of DeviceAllow See 13805 --- contrib/dist/tor.service.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 57409a7..6362855 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -16,8 +16,7 @@ LimitNOFILE = 32768 # Hardening PrivateTmp = yes -DeviceAllow = /dev/null rw -DeviceAllow = /dev/urandom r +PrivateDevices = yes InaccessibleDirectories = /home ReadOnlyDirectories = / ReadWriteDirectories = @LOCALSTATEDIR@/lib/tor

1 0

[tor/master] Add ProtectSystem = full
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit 5bdf12ca8aa13cd98c6a4b7457b37df2b519e8a7 Author: Craig Andrews <candrews(a)integralblue.com> Date: Fri Nov 28 12:41:23 2014 -0500 Add ProtectSystem = full See 13805 --- contrib/dist/tor.service.in | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 5cd460e..b052405 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -18,6 +18,7 @@ LimitNOFILE = 32768 PrivateTmp = yes PrivateDevices = yes ProtectHome = yes +ProtectSystem = full ReadOnlyDirectories = / ReadWriteDirectories = -@LOCALSTATEDIR@/lib/tor ReadWriteDirectories = -@LOCALSTATEDIR@/log/tor

1 0

[tor/master] systemd changes for 13805 as recommened by Tomasz on that ticket.
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit 96a407a2435213a1b9a7e1f6373955fdce743d60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 11 11:26:08 2015 -0500 systemd changes for 13805 as recommened by Tomasz on that ticket. --- contrib/dist/tor.service.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index d7bf611..93be702 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -6,7 +6,7 @@ After = syslog.target network.target nss-lookup.target Type = notify NotifyAccess = all ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config -ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc +ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT TimeoutSec = 30 @@ -22,8 +22,9 @@ ProtectSystem = full ReadOnlyDirectories = / ReadWriteDirectories = -@LOCALSTATEDIR@/lib/tor ReadWriteDirectories = -@LOCALSTATEDIR@/log/tor -ReadWriteDirectories = -@LOCALSTATEDIR@/run/tor NoNewPrivileges = yes +ReadWriteDirectories = -@LOCALSTATEDIR@/run/tor +CapabilityBoundingSet = CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE [Install] WantedBy = multi-user.target

1 0

[tor/master] Merge remote-tracking branch 'candrews/issue13805'
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit c98e075ebc17d7e5b4548cc58f58088cff83d0ca Merge: e009c2d 5bdf12c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 11 11:24:48 2015 -0500 Merge remote-tracking branch 'candrews/issue13805' contrib/dist/tor.service.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[tor/master] send PID of the main daemon to supervisor
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit b17918726d2ec221556d707f06bb92cfa3830183 Author: Tomasz Torcz <tomek(a)pipebreaker.pl> Date: Fri Jan 9 22:17:50 2015 +0100 send PID of the main daemon to supervisor If running under systemd, notify the supervisor about current PID of Tor daemon. This makes systemd unit simpler and more robust: it will do the right thing regardless of RunAsDaemon settings. --- contrib/dist/tor.service.in | 7 +++---- src/or/config.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 57409a7..607615a 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -3,11 +3,10 @@ Description = Anonymizing overlay network for TCP After = syslog.target network.target nss-lookup.target [Service] -Type = simple +Type = notify +NotifyAccess = all ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config -# A torrc that has "RunAsDaemon 1" won't work with the "simple" service type; -# let's explicitly override it. -ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0 +ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT TimeoutSec = 30 diff --git a/src/or/config.c b/src/or/config.c index a1347b9..781f15a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -55,6 +55,16 @@ #include "procmon.h" +#ifdef HAVE_SYSTEMD +# if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) +/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse + * Coverity. Here's a kludge to unconfuse it. + */ +# define __INCLUDE_LEVEL__ 2 +# endif +#include <systemd/sd-daemon.h> +#endif + /* From main.c */ extern int quiet_level; @@ -1018,6 +1028,11 @@ options_act_reversible(const or_options_t *old_options, char **msg) start_daemon(); } +#ifdef HAVE_SYSTEMD + /* Our PID may have changed, inform supervisor */ + sd_notifyf(0, "MAINPID=%ld\n", (long int)getpid()); +#endif + #ifndef HAVE_SYS_UN_H if (options->ControlSocket || options->ControlSocketsGroupWritable) { *msg = tor_strdup("Unix domain sockets (ControlSocket) not supported "

1 0

[tor/master] send more details about daemon status to supervisor
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit 2aa2d0a1c559bcc2f2198ab7df37ab0a33605904 Author: Tomasz Torcz <tomek(a)pipebreaker.pl> Date: Fri Jan 9 22:44:00 2015 +0100 send more details about daemon status to supervisor If running under systemd, send back information when reloading configuration and gracefully shutting down. This gives administator more information about current Tor daemon state. --- src/or/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 9e5a916..1b43904 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2169,6 +2169,9 @@ process_signal(uintptr_t sig) tor_cleanup(); exit(0); } +#ifdef HAVE_SYSTEMD + sd_notify(0, "STOPPING=1"); +#endif hibernate_begin_shutdown(); break; #ifdef SIGPIPE @@ -2188,11 +2191,17 @@ process_signal(uintptr_t sig) control_event_signal(sig); break; case SIGHUP: +#ifdef HAVE_SYSTEMD + sd_notify(0, "RELOADING=1"); +#endif if (do_hup() < 0) { log_warn(LD_CONFIG,"Restart failed (config error?). Exiting."); tor_cleanup(); exit(1); } +#ifdef HAVE_SYSTEMD + sd_notify(0, "READY=1"); +#endif control_event_signal(sig); break; #ifdef SIGCHLD

1 0