December 2014 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'meejah/ticket-13941-b'
by nickm＠torproject.org 12 Dec '14

12 Dec '14

commit 915c9a517ea27a589c50e2768dda3ec41b2f94b9 Merge: 7c5d888 76753ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 12 08:53:14 2014 -0500 Merge remote-tracking branch 'meejah/ticket-13941-b' changes/bug13941 | 4 ++++ src/or/rendservice.c | 2 +- src/or/router.c | 18 +++++++++++------- src/or/router.h | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-)

1 0

[tor/master] Pre-check hidden-service-dir permissions/ownership
by nickm＠torproject.org 12 Dec '14

12 Dec '14

commit 85bfad1875994dee84eab8fff49189ba2be0b532 Author: meejah <meejah(a)meejah.ca> Date: Wed Dec 10 22:15:04 2014 -0700 Pre-check hidden-service-dir permissions/ownership See ticket #13942 where Tor dies if you feed it a hidden service directory with the wrong owner via SETCONF. --- changes/bug13942 | 5 +++++ src/or/rendservice.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/bug13942 b/changes/bug13942 new file mode 100644 index 0000000..c1247b6 --- /dev/null +++ b/changes/bug13942 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden services): + - Pre-check directory permissions for new hidden-services to avoid + at least one case of "Bug: Acting on config options left us in a + broken state. Dying." + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 26e5659..a354d90 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -531,6 +531,16 @@ rend_config_services(const or_options_t *options, int validate_only) } } if (service) { + cpd_check_t check_opts = CPD_CHECK_MODE_ONLY; + if (service->dir_group_readable) { + check_opts |= CPD_GROUP_READ; + } + + if (check_private_dir(service->directory, check_opts, options->User) < 0) { + rend_service_free(service); + return -1; + } + if (validate_only) { rend_service_free(service); } else {

1 0

[tor/master] fix a long line
by nickm＠torproject.org 12 Dec '14

12 Dec '14

commit f7e8bc2b4bc0d6072a337d9420cd5cd395c9f9d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 12 08:54:07 2014 -0500 fix a long line --- src/or/rendservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index cffaf4a..196145e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -400,7 +400,7 @@ rend_config_services(const or_options_t *options, int validate_only) } else if (!strcasecmp(line->key, "HiddenServiceDirGroupReadable")) { service->dir_group_readable = (int)tor_parse_long(line->value, - 10, 0, 1, &ok, NULL); + 10, 0, 1, &ok, NULL); if (!ok) { log_warn(LD_CONFIG, "HiddenServiceDirGroupReadable should be 0 or 1, not %s",

1 0

[webwml/staging] linking to git from tags works again.
by sebastian＠torproject.org 12 Dec '14

12 Dec '14

commit 34e59f00bd44508fa19e873d894db0470b66cfa8 Author: Matt Pagan <matt(a)pagan.io> Date: Fri Dec 12 01:29:59 2014 -0600 linking to git from tags works again. --- download/en/download-unix.wml | 2 +- download/en/download.wml | 2 +- include/links.wmi | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/download/en/download-unix.wml b/download/en/download-unix.wml index a4e6ac9..fc9efea 100644 --- a/download/en/download-unix.wml +++ b/download/en/download-unix.wml @@ -151,7 +151,7 @@ href="<page getinvolved/mirrors>">list of sites mirroring the Tor site</a>. <a id="Testing"></a> <p> For a list of what has changed in each stable Tor release, see the -<a href="<gitblobstable>ReleaseNotes">ReleaseNotes</a>. For a list of +<a href="<gitblob>ReleaseNotes<cgitstable>">ReleaseNotes</a>. For a list of changes in both stable and development versions, see the <a href="<gitblob>ChangeLog">ChangeLog</a>. </p> diff --git a/download/en/download.wml b/download/en/download.wml index 9382512..c1de0bc 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -244,7 +244,7 @@ custom configurations. All an apt-get or yum install away.</p> <h2>Source Tarball</h2> <p> Configure with: <code style="color: #666666;">./configure && make && src/or/tor</code></p> - <p>The current stable version of Tor is <version-stable>. Its <a href="<gitblobstable>ReleaseNotes">release notes</a> are available.</p> + <p>The current stable version of Tor is <version-stable>. Its <a href="<gitblob>ReleaseNotes<cgitstable>">release notes</a> are available.</p> <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="<gitblob>ChangeLog">Changelog</a> is available.</p> </div> </div> diff --git a/include/links.wmi b/include/links.wmi index 838984d..31d3032 100644 --- a/include/links.wmi +++ b/include/links.wmi @@ -1,7 +1,7 @@ #!wml -<define-tag gitblob whitespace=delete>https://gitweb.torproject.org/tor.git?a=blob_plain;hb=HEAD;f=</define-tag> -<define-tag gitblobstable whitespace=delete>https://gitweb.torproject.org/tor.git?a=blob_plain;hb=release-0.2.5;f=</define-tag> +<define-tag gitblob whitespace=delete>https://gitweb.torproject.org/tor.git/plain/</define-tag> +<define-tag cgitstable whitespace=delete>?id=tor-0.2.5.10</define-tag> <define-tag gittree whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD;f=</define-tag> <define-tag gitrepo whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD</define-tag> <define-tag svnwebsite whitespace=delete>https://svn.torproject.org/svn/website/trunk/</define-tag>

1 0

[torbutton/master] Bug 11449: Avoid new identity error when NoScript disabled.
by brade＠torproject.org 11 Dec '14

11 Dec '14

commit 88dfaaaf325f5b86aba3d449b87320d0d962681d Author: Loic Bistuer <loic.bistuer(a)gmail.com> Date: Tue Oct 21 02:30:20 2014 +0700 Bug 11449: Avoid new identity error when NoScript disabled. --- src/chrome/content/torbutton.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2ba4159..5aed682 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1646,8 +1646,10 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Clearing NoScript Temporary Permissions"); try { - var nsSvc = Components.classes["@maone.net/noscript-service;1"].getService().wrappedJSObject - nsSvc.eraseTemp(); + if ("@maone.net/noscript-service;1" in Components.classes) { + var nsSvc = Components.classes["@maone.net/noscript-service;1"].getService().wrappedJSObject + nsSvc.eraseTemp(); + } } catch(e) { torbutton_log(5, "New Identity: Error clearing NoScript Temporary Permissions: "+e); window.alert("Torbutton: Error clearing NoScript Temporary Permissions: "+e);

1 0

[stem/master] Unit test failure for system_resolvers() on Gentoo
by atagar＠torproject.org 11 Dec '14

11 Dec '14

commit a63e4eeba44be24f258547c93be23263b8c95ddd Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 11 08:28:00 2014 -0800 Unit test failure for system_resolvers() on Gentoo Oops, mistake in how platform detection is done. Making our Gentoo hacks play well with the unit tests. --- stem/util/connection.py | 9 ++++++--- test/unit/util/connection.py | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index 1ee0ffb..ac4bf27 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -249,13 +249,16 @@ def system_resolvers(system = None): """ if system is None: - system = platform.system() + if stem.util.system.is_gentoo(): + system = 'Gentoo' + else: + system = platform.system() if system == 'Windows': resolvers = [] elif system in ('Darwin', 'OpenBSD'): resolvers = [Resolver.LSOF] - elif stem.util.system.is_gentoo(): + elif system == 'Gentoo': resolvers = [] elif system == 'FreeBSD': # Netstat is available, but lacks a '-p' equivilant so we can't associate @@ -274,7 +277,7 @@ def system_resolvers(system = None): # proc resolution, by far, outperforms the others so defaults to this is able - if stem.util.proc.is_available() and os.access('/proc/net/tcp', os.R_OK) and os.access('/proc/net/udp', os.R_OK) and not stem.util.system.is_gentoo(): + if stem.util.proc.is_available() and os.access('/proc/net/tcp', os.R_OK) and os.access('/proc/net/udp', os.R_OK) and system != 'Gentoo': resolvers = [Resolver.PROC] + resolvers return resolvers diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index f0359eb..179ebdf 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -117,6 +117,7 @@ class TestConnection(unittest.TestCase): self.assertEqual([], stem.util.connection.system_resolvers('Windows')) self.assertEqual([Resolver.LSOF], stem.util.connection.system_resolvers('Darwin')) + self.assertEqual([], stem.util.connection.system_resolvers('Gentoo')) self.assertEqual([Resolver.LSOF], stem.util.connection.system_resolvers('OpenBSD')) self.assertEqual([Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF], stem.util.connection.system_resolvers('FreeBSD')) self.assertEqual([Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS], stem.util.connection.system_resolvers('Linux'))

1 0

[stem/master] Gentoo lies about proc permisssions
by atagar＠torproject.org 11 Dec '14

11 Dec '14

commit 061db1fd6ee04136f627110a06aba9f2f1bd4346 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 11 07:34:50 2014 -0800 Gentoo lies about proc permisssions Gentoo says we have read permissions. Great! Only one minor hiccup, we get permission denied if we read it... https://trac.torproject.org/projects/tor/ticket/13904#comment:19 --- stem/util/connection.py | 2 +- test/integ/util/proc.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index feb1b34..1ee0ffb 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -274,7 +274,7 @@ def system_resolvers(system = None): # proc resolution, by far, outperforms the others so defaults to this is able - if stem.util.proc.is_available() and os.access('/proc/net/tcp', os.R_OK) and os.access('/proc/net/udp', os.R_OK): + if stem.util.proc.is_available() and os.access('/proc/net/tcp', os.R_OK) and os.access('/proc/net/udp', os.R_OK) and not stem.util.system.is_gentoo(): resolvers = [Resolver.PROC] + resolvers return resolvers diff --git a/test/integ/util/proc.py b/test/integ/util/proc.py index 1047912..3fac9eb 100644 --- a/test/integ/util/proc.py +++ b/test/integ/util/proc.py @@ -8,7 +8,7 @@ import unittest import test.runner -from stem.util import proc +from stem.util import proc, system class TestProc(unittest.TestCase): @@ -90,7 +90,7 @@ class TestProc(unittest.TestCase): elif not test.runner.get_runner().is_ptraceable(): test.runner.skip(self, '(DisableDebuggerAttachment is set)') return - elif not os.access('/proc/net/tcp', os.R_OK) or not os.access('/proc/net/udp', os.R_OK): + elif not os.access('/proc/net/tcp', os.R_OK) or not os.access('/proc/net/udp', os.R_OK) or system.is_gentoo(): test.runner.skip(self, '(proc lacks read permissions)') return

1 0

[webwml/master] fix zilog mirror per operator request.
by andrew＠torproject.org 11 Dec '14

11 Dec '14

commit c8815b628e35a1972699ebdf73de9afb4d3905e0 Author: Andrew Lewman <andrew(a)torproject.is> Date: Thu Dec 11 10:22:32 2014 -0500 fix zilog mirror per operator request. --- include/tor-mirrors.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv index a3d9264..4f86256 100644 --- a/include/tor-mirrors.csv +++ b/include/tor-mirrors.csv @@ -27,7 +27,7 @@ Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://tor.hoi-polloi.o kevinmg(a)pressfreedomfoundation.org, Freedom of the Press Foundation, US, United States, US, True, False, No, http://tor.pressfreedomfoundation.org, https://tor.pressfreedomfoundation.org, , , http://tor.pressfreedomfoundation.org/dist/, https://tor.pressfreedomfoundation.org/dist/, , , Tue Dec 9 18:03:30 2014 tor(a)fodt.it // FoDT.it Webteam, FoDT.it, AT, Austria, Europe, TRUE, FALSE, No, http://tor.fodt.it, https://tor.fodt.it, , ftp://ftp.fodt.it/pub/mirrors/torproject.org/, http://tor.fodt.it/dist/, https://tor.fodt.it/dist/, , , Mon Aug 25 16:19:07 2014 http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Wed Dec 10 04:51:47 2014 -haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Wed Dec 10 04:51:47 2014 +haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, TRUE, No, http://tor.zilog.es/, https://tor.zilog.es/,,, http://tor.zilog.es/dist/, https://tor.zilog.es/dist/ ,,, Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Wed Dec 10 04:22:22 2014 margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Wed Dec 10 03:55:27 2014 Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Sat Dec 6 23:07:16 2014

1 0

[webwml/master] fix tb-itf mirror per operator request
by andrew＠torproject.org 11 Dec '14

11 Dec '14

commit a282eadfb874def8d935dc60e7ca1832e7e3edf0 Author: Andrew Lewman <andrew(a)torproject.is> Date: Thu Dec 11 10:21:11 2014 -0500 fix tb-itf mirror per operator request --- include/tor-mirrors.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv index 681793a..a3d9264 100644 --- a/include/tor-mirrors.csv +++ b/include/tor-mirrors.csv @@ -16,7 +16,7 @@ Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, NO, http://tor.externenpr mirror-service(a)netcologne.de, NetCologne GmbH, DE, NRW, TRUE, TRUE, No, http://mirror.netcologne.de/torproject.org, , rsync://mirror.netcologne.de/torproject.org, ftp://mirror.netcologne.de/torproject.org/, http://mirror.netcologne.de/torproject.org/dist, , rsync://mirror.netcologne.de/torproject.org/dist, , , admin AT netgull DOT com, NetGull, US, United States, North America, TRUE, TRUE, No, , , , , http://www.netgull.com/torproject/, , , , mirrors[at]ip-connect[dot]vn[dot]ua, IP-Connect LLC, UA, VN, TRUE, TRUE, Yes, http://torproject.ip-connect.vn.ua, , rsync://torproject.ip-connect.vn.ua/torproject, ftp://torproject.ip-connect.vn.ua/mirror/torproject/, http://torproject.ip-connect.vn.ua/dist, , rsync://torproject.ip-connect.vn.ua/torproject/dist, , , -torsupport AT tb-itf DOT de, TB-ITF, DE, Germany, Europe, TRUE, TRUE, No, http://tormirror.tb-itf-tor.de, https://tormirror.tb-itf-tor.de, , , , http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , Tue Dec 9 18:03:30 2014 +torsupport AT tb-itf DOT de,TB-ITF,DE,Germany,Europe,TRUE,TRUE,No,http://tormirror.tb-itf-tor.de,https://tormirror.tb-itf-tor.de,,,http://tormirror.tb-itf-tor.de/dist/,https://tormirror.tb-itf-tor.de/dist/,,, admin at koreswatanabe dottnet, Tor Supporter, RO, Romania, RO, TRUE, TRUE, No, http://tor-relay.koreswatanabe.net, , , , http://tor-relay.koreswatanabe.net/dist/, , , , calebcenter(a)live.com, calebxu.tk, US, United States, US, TRUE, FALSE, NO, http://tor.calebxu.tk, , rsync://calebxu.tk/tor, ftp://ftp.calebxu.tk, http://tor.calebxu.tk/dist, , , , maki(a)maki-chan.de, Maki Hoshisawa, DE, Germany, DE, TRUE, FALSE, NO, http://tor.mirrors.maki-chan.de/, , , , http://tor.mirrors.maki-chan.de/dist/, , , , Sat Aug 23 14:09:07 2014

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 11 Dec '14

11 Dec '14

commit ae757c920eb6ebf354332b62acd3afd9e9e3641f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 11 15:16:16 2014 +0000 Update translations for tails-iuk_completed --- tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tr.po b/tr.po index d8fd214..a24ebc5 100644 --- a/tr.po +++ b/tr.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-10-08 21:09+0200\n" -"PO-Revision-Date: 2014-10-29 01:50+0000\n" +"POT-Creation-Date: 2014-12-02 09:42+0100\n" +"PO-Revision-Date: 2014-12-11 15:11+0000\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -149,7 +149,7 @@ msgstr "Güncelleme indiriliyor" #: ../lib/Tails/IUK/Frontend.pm:471 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "Yükselteme indiriliyor. %{name} %{version}" +msgstr "%{name} %{version} için yükseltme indiriliyor..." #: ../lib/Tails/IUK/Frontend.pm:512 msgid ""

1 0