March 2016 - tor-commits - lists.torproject.org

[webwml/master] Bug 18544: Adding Günes and Nicolas to the mentors list
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit 9a3a84b5d1604e09b8d22db33905e0fbf03a4933 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 14 13:55:55 2016 +0000 Bug 18544: Adding Günes and Nicolas to the mentors list --- getinvolved/en/volunteer.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index be21b59..b243544 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -1115,7 +1115,7 @@ verification issues</a> as part of the application process. <li> Panopticlick - Likely Mentors: Georg (GeKo) + Likely Mentors: Georg (GeKo), Günes Acar, Nicolas (boklm) The <a href="https://panopticlick.eff.org">Panopticlick project by the EFF</a>

1 0

[webwml/master] Add tails project idea
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit 26c390f4f2208c0d886ecb15a582f249a16c8aa5 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 09:09:32 2016 -0700 Add tails project idea Resurrecting a project from commit 186b0b6 anonym and asn would like to mentor this year. --- getinvolved/en/volunteer.wml | 108 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 95 insertions(+), 13 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index f0d2c8d..be21b59 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -48,15 +48,15 @@ <a id="Advocacy"></a> <h2><a class="anchor" href="#Advocacy">Advocacy</a></h2> <ol> - <li>Monitor some of our <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo">public mailing - lists</a>, like <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a>, <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays</a>, <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a>, or <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev">tbb-dev</a>, - and summarize noteworthy exchanges into articles for <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news">Tor + <li>Monitor some of our <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo">public mailing + lists</a>, like <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a>, <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays</a>, <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a>, or <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev">tbb-dev</a>, + and summarize noteworthy exchanges into articles for <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news">Tor Weekly News</a>.</li> <li>Create a presentation that can be used for various user group meetings around the world.</li> @@ -413,8 +413,8 @@ meetings around the world.</li> tracker</a>, <a href="https://www.torproject.org/projects/torbrowser/design/">design doc</a>)</h3> - Tor Browser is an easy-to-use, portable package of Tor, HTTPS-Everywhere, - NoScript, TorLauncher, Torbutton, and a Firefox fork, all preconfigured + Tor Browser is an easy-to-use, portable package of Tor, HTTPS-Everywhere, + NoScript, TorLauncher, Torbutton, and a Firefox fork, all preconfigured to work together out of the box. The modified copy of Firefox aims to resolve the privacy and security issues in mainline version. @@ -463,8 +463,8 @@ meetings around the world.</li> tracker</a>)</h3> - Provides Tor on the Android platform. The project is under active - development, updates to latest Tor releases, and working to stay up to + Provides Tor on the Android platform. The project is under active + development, updates to latest Tor releases, and working to stay up to date with all changes in Android and mobile threats. @@ -1443,6 +1443,88 @@ implementation. well as collect information about the occurrence of these type of attacks. </li> + + <a id="tailsServer"></a> + <li> + Tails server: Self-hosted services behind Tails-powered Tor hidden services + + Likely Mentors: anonym, George (asn) + Let's talk about group collaboration, communication and data sharing + infrastructure, such as chat servers, wikis, or file repositories. + Hosting such data and infrastructure in the cloud generally + implies to trust the service providers not to disclose content, usage or + users location information to third-parties. Hence, there are many threat + models in which cloud hosting is not suitable. + Tor partly answers the users location part; this is great, but + content is left unprotected. + There are two main ways to protect such content: either to encrypt it + client-side (security by design), or to avoid putting it into + untrusted hands in the first place. + Cloud solutions that offer security by design are rare and generally + not mature yet. The Tails server project is about exploring the + other side of the alternative: avoiding to put private data into + untrusted hands in the first place. + This is made possible thanks to Tor hidden services, that allow users + to offer location-hidden services, and make self-hosting possible in + many threat models. Self-hosting has its own lot of problems, however, + particularly in contexts where the physical security of the hosting + place is not assured. Combining Tor hidden services with Tails' + amnesia property and limited support for persistent encrypted data + allows to protect content, to a great degree, even in such contexts. + In short, setting up a new Tails server would be done by: + + <ol style="list-style-type: decimal"> + <li>Alice plugs a USB stick into a running desktop Tails system.</li> + <li>Alice uses a GUI to easily configure the needed services.</li> + <li>Alice unplugs the USB stick, that now contains encrypted services + configuration and data storage space.</li> + <li>Alice plugs that USB stick (and possibly a Tails Live CD) into the + old laptop that was dedicated to run Tails server.</li> + <li>Once booted, Alice enters the encryption passphrase either + directly using the keyboard or through a web interface listening on the + local network.</li> + <li>Then, Bob can use the configured services once he gets a hold on + the hidden service address. (The petname system for Tor hidden + services project would be very complementary to this one, by the + way.)</li> + </ol> + + Tails server should content itself with hardware that is a bit old + (such as a PIII-450 laptop with 256MB of RAM) and/or half broken (e.g. + non-functional hard-disk, screen or keyboard). + The challenges behind this project are: + + <ul> + <li>Design and write the services configuration GUI [keywords: edit + configuration files, upgrade between major Debian versions, + debconf].</li> + <li>How to create the hidden service key? [keywords: Vidalia, control + protocol].</li> + <li>Adapt the Tails boot process to allow switching to "server + mode" when appropriate.</li> + <li>Add support, to the Tails persistence setup process, for asking an + encryption passphrase without X, and possibly with a broken keyboard + and/or screen [keywords: local network, SSL/TLS?, certificate?].</li> + </ul> + + This project can easily grow quite large, so the first task would + probably be to clarify what it would need to get an initial (minimal + but working) implementation ready to be shipped to users. + This project does not require to be an expert in one specific field, + but it requires to be experienced and at ease with a large scope of + software development tools, processes, and operating system knowledge. + Undertaking this project requires in-depth knowledge of Debian-like + systems (self-test: do the "dpkg conffile" and "debconf preseeding" + words sound new to your ear?); the Debian Live persistence system + being written in shell, being at ease with robust shell scripting is + a must; to end with, at least two pieces of software need to be + written from scratch (a GUI and a webapp): the preferred languages for + these tasks would be Python and Perl. Using Behaviour Driven + Development methods to convey expectations and acceptance criteria + would be most welcome. + For more information see https://tails.boum.org/todo/server_edition/ + </li> + <!-- <a id=""></a> <li>

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 6874a7607d167390d2f5c69a6c3917108d9dae6a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 15:15:49 2016 +0000 Update translations for tails-misc --- ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca.po b/ca.po index 8159051..9d5b670 100644 --- a/ca.po +++ b/ca.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-07 18:07+0100\n" -"PO-Revision-Date: 2016-03-15 09:38+0000\n" +"PO-Revision-Date: 2016-03-15 15:12+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 942ece480357cfa3e71e94dd13a522b0140fa84c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 15:15:22 2016 +0000 Update translations for https_everywhere_completed --- ca/https-everywhere.dtd | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/ca/https-everywhere.dtd b/ca/https-everywhere.dtd index 19edd49..bc91115 100644 --- a/ca/https-everywhere.dtd +++ b/ca/https-everywhere.dtd @@ -3,14 +3,18 @@ <!ENTITY https-everywhere.about.ext_description "Xifra la Web! Fes servir automàticament la seguretat HTTPS a molts llocs."> <!ENTITY https-everywhere.about.version "Versió"> <!ENTITY https-everywhere.about.created_by "Creat per"> +<!ENTITY https-everywhere.about.and ", i"> <!ENTITY https-everywhere.about.librarians "Bibliotecaris de normes"> <!ENTITY https-everywhere.about.thanks "Gràcies a"> +<!ENTITY https-everywhere.about.many_contributors "Molts, molts contribuïdors, inclosos: "> +<!ENTITY https-everywhere.about.noscript "A més, parts de HTTPS Everywhere estan basades en codi de NoScript, per Giorgio Maone i altres. Agraïm la seva excel·lent feina!"> <!ENTITY https-everywhere.about.contribute "Si us agrada HTTPS Everywhere, podríeu considerar"> <!ENTITY https-everywhere.about.donate_tor "Fer una donació a Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.or "o"> <!ENTITY https-everywhere.about.donate_eff "Fer una donació a EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donar a EEF"> <!ENTITY https-everywhere.menu.about "Sobre HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Preferències de SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "Activa HTTPS Everywhere"> @@ -34,17 +38,19 @@ <!ENTITY https-everywhere.prefs.reset_default "Tornar a la opció per defecte"> <!ENTITY https-everywhere.prefs.view_xml_source "Veure el codi XML"> -<!ENTITY https-everywhere.source.downloading "Descarregant"> -<!ENTITY https-everywhere.source.filename "Nom d'arxiu"> -<!ENTITY https-everywhere.source.unable_to_download "No es pot descarregar la font."> +<!ENTITY https-everywhere.chrome.stable_rules "Normes estables."> +<!ENTITY https-everywhere.chrome.stable_rules_description "Força connexions encriptades a les següents pàgines web:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Normes experimentals"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Pot causar avisos i problemes. Desactivat per defecte."> +<!ENTITY https-everywhere.chrome.add_rule "Afegir una norma per a aquest lloc"> +<!ENTITY https-everywhere.chrome.add_new_rule "Afegir una nova norma per a aquest lloc"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Utilitza sempre https per a aquest host"> +<!ENTITY https-everywhere.chrome.host "Host:"> +<!ENTITY https-everywhere.chrome.show_advanced "Mostrar avançat"> +<!ENTITY https-everywhere.chrome.hide_advanced "Amagar avançat"> +<!ENTITY https-everywhere.chrome.rule_name "Nom de la norma"> +<!ENTITY https-everywhere.chrome.regex "Trobant regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Re-direccionar a"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel·lar "> -<!ENTITY https-everywhere.popup.title "Notificació de HTTPS Everywhere 4.0development.11"> -<!ENTITY https-everywhere.popup.paragraph1 "Ups, estàveu usant la versió estable de HTTPS Everywhere, però possiblement us hem actualitzat sense voler a la versió de desenvolupadors."> -<!ENTITY https-everywhere.popup.paragraph2 "Voleu tornar a la versió estable?"> -<!ENTITY https-everywhere.popup.paragraph3 "Ens agradaria que continuéssiu usant la versió de desenvolupador per a ajudar-nos a millorar-la. Potser hi trobeu alguns errors, que ens podeu indicar a https-everywhere(a)eff.org. Disculpeu les molèsties, i gràcies per usar HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Vull continuar amb la versió de desenvolupador."> -<!ENTITY https-everywhere.popup.revert "Descarrega l'última versió estable."> -<!ENTITY https-everywhere.ruleset-tests.status_title "Prova de normes d'HTTPS Everywhere"> -<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel·la"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Inicia">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 844777d0f48dcc528edf7c284f7f6b7c363a33e5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 15:15:16 2016 +0000 Update translations for https_everywhere --- ca/https-everywhere.dtd | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ca/https-everywhere.dtd b/ca/https-everywhere.dtd index 6b012d6..bc91115 100644 --- a/ca/https-everywhere.dtd +++ b/ca/https-everywhere.dtd @@ -6,15 +6,15 @@ <!ENTITY https-everywhere.about.and ", i"> <!ENTITY https-everywhere.about.librarians "Bibliotecaris de normes"> <!ENTITY https-everywhere.about.thanks "Gràcies a"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> -<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> +<!ENTITY https-everywhere.about.many_contributors "Molts, molts contribuïdors, inclosos: "> +<!ENTITY https-everywhere.about.noscript "A més, parts de HTTPS Everywhere estan basades en codi de NoScript, per Giorgio Maone i altres. Agraïm la seva excel·lent feina!"> <!ENTITY https-everywhere.about.contribute "Si us agrada HTTPS Everywhere, podríeu considerar"> <!ENTITY https-everywhere.about.donate_tor "Fer una donació a Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.or "o"> <!ENTITY https-everywhere.about.donate_eff "Fer una donació a EFF"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donar a EEF"> <!ENTITY https-everywhere.menu.about "Sobre HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Preferències de SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "Activa HTTPS Everywhere"> @@ -38,19 +38,19 @@ <!ENTITY https-everywhere.prefs.reset_default "Tornar a la opció per defecte"> <!ENTITY https-everywhere.prefs.view_xml_source "Veure el codi XML"> -<!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> +<!ENTITY https-everywhere.chrome.stable_rules "Normes estables."> +<!ENTITY https-everywhere.chrome.stable_rules_description "Força connexions encriptades a les següents pàgines web:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Normes experimentals"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Pot causar avisos i problemes. Desactivat per defecte."> +<!ENTITY https-everywhere.chrome.add_rule "Afegir una norma per a aquest lloc"> +<!ENTITY https-everywhere.chrome.add_new_rule "Afegir una nova norma per a aquest lloc"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Utilitza sempre https per a aquest host"> <!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> -<!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.show_advanced "Mostrar avançat"> +<!ENTITY https-everywhere.chrome.hide_advanced "Amagar avançat"> +<!ENTITY https-everywhere.chrome.rule_name "Nom de la norma"> +<!ENTITY https-everywhere.chrome.regex "Trobant regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Re-direccionar a"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel·lar ">

1 0

[tor/master] Fix whitespace.
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit b48f8a8114575793046a8e9d3544d6b2d0a17f82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 09:21:29 2016 -0400 Fix whitespace. --- src/common/util.c | 6 ++++-- src/or/circuitbuild.c | 4 +++- src/or/config.c | 6 ++++-- src/or/main.c | 3 ++- src/or/rendcommon.c | 1 + src/or/rendcommon.h | 2 +- src/or/routerlist.c | 1 + 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 52b87f8..39d6502 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2074,7 +2074,8 @@ check_private_dir(const char *dirname, cpd_check_t check, * the file between stat() and chmod(), a potential race exists. * * Several suggestions taken from: - * https://developer.apple.com/library/mac/documentation/Security/Conceptual/S… + * https://developer.apple.com/library/mac/documentation/ + * Security/Conceptual/SecureCodingGuide/Articles/RaceConditions.html */ /* Open directory. @@ -2985,7 +2986,8 @@ expand_filename(const char *filename) tor_assert(filename); #ifdef _WIN32 /* Might consider using GetFullPathName() as described here: - * http://etutorials.org/Programming/secure+programming/Chapter+3.+Input+Valid… + * http://etutorials.org/Programming/secure+programming/ + * Chapter+3.+Input+Validation/3.7+Validating+Filenames+and+Paths/ */ return tor_strdup(filename); #else diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a15f4c2..237b61a 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2420,7 +2420,8 @@ build_state_get_exit_nickname(cpath_build_state_t *state) } /** Return true iff the given address can be used to extend to. */ -int extend_info_addr_is_allowed(const tor_addr_t *addr) +int +extend_info_addr_is_allowed(const tor_addr_t *addr) { tor_assert(addr); @@ -2434,3 +2435,4 @@ int extend_info_addr_is_allowed(const tor_addr_t *addr) disallow: return 0; } + diff --git a/src/or/config.c b/src/or/config.c index 8f3c28c..0e15f9b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6325,7 +6325,8 @@ parse_port_config(smartlist_t *out, ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, cache_ipv4 = 1, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, - prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0, + prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, + relax_dirmode_check = 0, has_used_unix_socket_only_option = 0; smartlist_split_string(elts, ports->value, NULL, @@ -6577,7 +6578,8 @@ parse_port_config(smartlist_t *out, if ( has_used_unix_socket_only_option && ! unix_socket_path) { log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, " - "WorldWritable, or RelaxDirModeCheck, but it is not a unix socket.", portname); + "WorldWritable, or RelaxDirModeCheck, but it is not a " + "unix socket.", portname); goto err; } diff --git a/src/or/main.c b/src/or/main.c index cfd1169..713816d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -572,7 +572,8 @@ connection_check_event(connection_t *conn, struct event *ev) conn_type_to_string(conn->type), conn_state_to_string(conn->type, conn->state), (int)conn->s, (int)conn->linked, - (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request), + (conn->type == CONN_TYPE_AP && + TO_EDGE_CONN(conn)->is_dns_request), conn->marked_for_close_file ? conn->marked_for_close_file : "-", conn->marked_for_close ); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 79509cb..603e4f0 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1009,3 +1009,4 @@ MOCK_IMPL(int, hid_serv_responsible_for_desc_id, smartlist_free(responsible); return result; } + diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index fe45299..7d81976 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -58,7 +58,7 @@ void rend_get_descriptor_id_bytes(char *descriptor_id_out, const char *service_id, const char *secret_id_part); int hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, - const char *id); + const char *id); int hid_serv_acting_as_directory(void); MOCK_DECL(int, hid_serv_responsible_for_desc_id, (const char *id)); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 7f20aa9..bc5e2e9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5395,3 +5395,4 @@ refresh_all_country_info(void) nodelist_refresh_countries(); } +

1 0

[tor/master] Merge remote-tracking branch 'weasel/bug18458'
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit c9899ee64008b63cb9867115ac684590dd50f902 Merge: 4b02af4 d8626d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 09:18:24 2016 -0400 Merge remote-tracking branch 'weasel/bug18458' changes/bug18458 | 9 +++++++++ doc/tor.1.txt | 3 +++ src/common/util.c | 8 ++++++-- src/common/util.h | 13 +++++++------ src/or/config.c | 16 ++++++++++++---- src/or/connection.c | 4 ++++ src/or/or.h | 1 + src/test/test_config.c | 7 +++++++ 8 files changed, 49 insertions(+), 12 deletions(-)

1 0

[tor/master] Fix log message: say RelaxDirModeCheck instead of StrictDirModes
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit d8626d34e59ceb1a71b23646b9c1c1f4fec88638 Author: Peter Palfrader <peter(a)palfrader.org> Date: Mon Mar 14 20:27:53 2016 +0100 Fix log message: say RelaxDirModeCheck instead of StrictDirModes --- src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 556d285..ea41ca8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6577,7 +6577,7 @@ parse_port_config(smartlist_t *out, if ( has_used_unix_socket_only_option && ! unix_socket_path) { log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, " - "WorldWritable, or StrictDirModes, but it is not a unix socket.", portname); + "WorldWritable, or RelaxDirModeCheck, but it is not a unix socket.", portname); goto err; }

1 0

[tor/master] Add a changes file for #18458
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit 35644433511d210845ae9e101034059bbf839167 Author: Peter Palfrader <peter(a)palfrader.org> Date: Tue Mar 1 18:48:57 2016 +0100 Add a changes file for #18458 --- changes/bug18458 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changes/bug18458 b/changes/bug18458 new file mode 100644 index 0000000..59646ef --- /dev/null +++ b/changes/bug18458 @@ -0,0 +1,9 @@ + o Minor features: + - Since some operating systems do not consider the actual modes on a + UNIX domain socket itself, tor does not allow creating such a + socket in a directory that is group or world accessible if it is + supposed to be private. Likewise, it will not allow only group + accessible sockets in a world accessible directory. + However, on some operating systems this is unnecessary, so + add a per-socket option called RelaxDirModeCheck. + Fixes bug 18458. Patch by weasel.

1 0

[tor/master] First RelaxDirModeCheck implementation
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit 1ef7df551d8efc0a74536006c17bdaa3cbb0931d Author: Peter Palfrader <peter(a)palfrader.org> Date: Tue Mar 1 17:08:14 2016 +0100 First RelaxDirModeCheck implementation --- doc/tor.1.txt | 3 +++ src/common/util.c | 8 ++++++-- src/common/util.h | 13 +++++++------ src/or/config.c | 16 ++++++++++++---- src/or/connection.c | 4 ++++ src/or/or.h | 1 + src/test/test_config.c | 7 +++++++ 7 files changed, 40 insertions(+), 12 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d6a6852..a71b04f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -321,6 +321,9 @@ GENERAL OPTIONS **WorldWritable**;; Unix domain sockets only: makes the socket get created as world-writable. + **RelaxDirModeCheck**;; + Unix domain sockets only: Do not insist that the directory + that holds the socket be read-restricted. [[ControlListenAddress]] **ControlListenAddress** __IP__[:__PORT__]:: Bind the controller listener to this address. If you specify a port, bind diff --git a/src/common/util.c b/src/common/util.c index b435511..ce15d52 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2063,7 +2063,6 @@ check_private_dir(const char *dirname, cpd_check_t check, #ifndef _WIN32 int fd; - unsigned unwanted_bits = 0; const struct passwd *pw = NULL; uid_t running_uid; gid_t running_gid; @@ -2197,12 +2196,17 @@ check_private_dir(const char *dirname, cpd_check_t check, close(fd); return -1; } + unsigned unwanted_bits = 0; if (check & (CPD_GROUP_OK|CPD_GROUP_READ)) { unwanted_bits = 0027; } else { unwanted_bits = 0077; } - if ((st.st_mode & unwanted_bits) != 0) { + unsigned check_bits_filter = ~0; + if (check & CPD_RELAX_DIRMODE_CHECK) { + check_bits_filter = 0022; + } + if ((st.st_mode & unwanted_bits & check_bits_filter) != 0) { unsigned new_mode; if (check & CPD_CHECK_MODE_ONLY) { log_warn(LD_FS, "Permissions on directory %s are too permissive.", diff --git a/src/common/util.h b/src/common/util.h index 9657003..ebcf88b 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -357,12 +357,13 @@ 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 unsigned int cpd_check_t; -#define CPD_NONE 0 -#define CPD_CREATE 1 -#define CPD_CHECK 2 -#define CPD_GROUP_OK 4 -#define CPD_GROUP_READ 8 -#define CPD_CHECK_MODE_ONLY 16 +#define CPD_NONE 0 +#define CPD_CREATE (1u << 0) +#define CPD_CHECK (1u << 1) +#define CPD_GROUP_OK (1u << 2) +#define CPD_GROUP_READ (1u << 3) +#define CPD_CHECK_MODE_ONLY (1u << 4) +#define CPD_RELAX_DIRMODE_CHECK (1u << 5) int check_private_dir(const char *dirname, cpd_check_t check, const char *effective_user); diff --git a/src/or/config.c b/src/or/config.c index 544b032..556d285 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6325,7 +6325,8 @@ parse_port_config(smartlist_t *out, ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, cache_ipv4 = 1, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, - prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0; + prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0, + has_used_unix_socket_only_option = 0; smartlist_split_string(elts, ports->value, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); @@ -6478,9 +6479,15 @@ parse_port_config(smartlist_t *out, if (!strcasecmp(elt, "GroupWritable")) { group_writable = !no; + has_used_unix_socket_only_option = 1; continue; } else if (!strcasecmp(elt, "WorldWritable")) { world_writable = !no; + has_used_unix_socket_only_option = 1; + continue; + } else if (!strcasecmp(elt, "RelaxDirModeCheck")) { + relax_dirmode_check = !no; + has_used_unix_socket_only_option = 1; continue; } @@ -6568,9 +6575,9 @@ parse_port_config(smartlist_t *out, goto err; } - if ( (world_writable || group_writable) && ! unix_socket_path) { - log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable " - "or WorldWritable set, but it is not a unix socket.", portname); + if ( has_used_unix_socket_only_option && ! unix_socket_path) { + log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, " + "WorldWritable, or StrictDirModes, but it is not a unix socket.", portname); goto err; } @@ -6596,6 +6603,7 @@ parse_port_config(smartlist_t *out, cfg->type = listener_type; cfg->is_world_writable = world_writable; cfg->is_group_writable = group_writable; + cfg->relax_dirmode_check = relax_dirmode_check; cfg->entry_cfg.isolation_flags = isolation; cfg->entry_cfg.session_group = sessiongroup; cfg->server_cfg.no_advertise = no_advertise; diff --git a/src/or/connection.c b/src/or/connection.c index 2e1c508..4e915f1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1014,6 +1014,10 @@ check_location_for_unix_socket(const or_options_t *options, const char *path, flags |= CPD_GROUP_OK; } + if (port->relax_dirmode_check) { + flags |= CPD_RELAX_DIRMODE_CHECK; + } + if (check_private_dir(p, flags, options->User) < 0) { char *escpath, *escdir; escpath = esc_for_log(path); diff --git a/src/or/or.h b/src/or/or.h index 4d145e4..4c295ab 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3456,6 +3456,7 @@ typedef struct port_cfg_t { unsigned is_group_writable : 1; unsigned is_world_writable : 1; + unsigned relax_dirmode_check : 1; entry_port_cfg_t entry_cfg; diff --git a/src/test/test_config.c b/src/test/test_config.c index b118481..6d9b491 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4038,6 +4038,13 @@ test_config_parse_port_config__ports__ports_given(void *data) "127.0.0.3", 0, 0); tt_int_op(ret, OP_EQ, -1); + // Test failure if we specify group writable for an IP Port + config_free_lines(config_port_invalid); config_port_invalid = NULL; + config_port_invalid = mock_config_line("DNSPort", "42 RelaxDirModeCheck"); + ret = parse_port_config(NULL, config_port_invalid, NULL, "DNS", 0, + "127.0.0.3", 0, 0); + tt_int_op(ret, OP_EQ, -1); + // Test success with only a port (this will fail without a default address) config_free_lines(config_port_valid); config_port_valid = NULL; config_port_valid = mock_config_line("DNSPort", "42");

1 0