October 2018 - tor-commits - lists.torproject.org

[tor/master] hs-v3: Add changes file for 28026
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 6c9d678ff66d012b4c8009c6ad44409c7368ed69 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 30 11:28:53 2018 -0400 hs-v3: Add changes file for 28026 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket28026 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket28026 b/changes/ticket28026 new file mode 100644 index 000000000..a6911c2ca --- /dev/null +++ b/changes/ticket28026 @@ -0,0 +1,3 @@ + o Documentation (hidden service manpage): + - Improve HSv3 client authorization by making some options more explicit + and detailed. Closes ticket 28026. Patch by "mtigas".

1 0

[tor/master] tweak manpage bits about v3 onion svc client auth
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit d023de945a7037bb4ec66f81aa83588d53184099 Author: Mike Tigas <mike.tigas(a)gmail.com> Date: Fri Oct 12 17:15:11 2018 -0400 tweak manpage bits about v3 onion svc client auth make a couple things more explicit, like not needing to set "HiddenServiceAuthorizeClient" & etc --- doc/tor.1.txt | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 406372433..2d5237c84 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1090,14 +1090,16 @@ The following options are useful only for clients (that is, if **HiddenServiceAuthorizeClient** option. [[ClientOnionAuthDir]] **ClientOnionAuthDir** __path__:: - Path to the directory containing the hidden service authorization file. The - files MUST have the suffix ".auth_private". Each file is for a single - onion address and their format is: + Path to the directory containing v3 hidden service authorization files. + Each file is for a single onion address, and the files MUST have the suffix + ".auth_private" (i.e. "bob_onion.auth_private"). The content format MUST be: + <onion-address>:descriptor:x25519:<base32-encoded-privkey> + - The <onion-address> MUST NOT have the ".onion" suffix. See the - rend-spec-v3.txt Appendix G for more information. + The <onion-address> MUST NOT have the ".onion" suffix. The + <base32-encoded-privkey> is the base32 representation of the raw key bytes + only (32 bytes for x25519). See Appendix G in the rend-spec-v3.txt file of + https://spec.torproject.org/[torspec] for more information. [[LongLivedPorts]] **LongLivedPorts** __PORTS__:: A list of ports for services that tend to have long-running connections @@ -2839,7 +2841,8 @@ The following options are used to configure a hidden service. clients without authorization any more. Generated authorization data can be found in the hostname file. Clients need to put this authorization data in their configuration file using **HidServAuth**. This option is only for v2 - services. + services; v3 services configure client authentication in a subdirectory of + HiddenServiceDir instead (see the **Client Authorization** section). [[HiddenServiceAllowUnknownPorts]] **HiddenServiceAllowUnknownPorts** **0**|**1**:: If set to 1, then connections to unrecognized ports do not cause the @@ -2941,19 +2944,26 @@ Client Authorization (Version 3 only) To configure client authorization on the service side, the -"<HiddenServiceDir>/authorized_clients/" needs to exists. Each file in that -directory should be suffixed with ".auth" (the file name is irrelevant) and -its content format MUST be: +"<HiddenServiceDir>/authorized_clients/" directory needs to exist. Each file +in that directory should be suffixed with ".auth" (i.e. "alice.auth"; the +file name is irrelevant) and its content format MUST be: <auth-type>:<key-type>:<base32-encoded-public-key> The supported <auth-type> are: "descriptor". The supported <key-type> are: -"x25519". Each file MUST contain one line only. Any malformed file will be -ignored. +"x25519". The <base32-encoded-privkey> is the base32 representation of the raw +key bytes only (32 bytes for x25519). + +Each file MUST contain one line only. Any malformed file will be +ignored. Client authorization will only be enabled for the service if tor +successfully loads at least one authorization file. Note that once you've configured client authorization, anyone else with the address won't be able to access it from this point on. If no authorization is -configured, the service will be accessible to all. +configured, the service will be accessible to anyone with the onion address. + +See the Appendix G in the rend-spec-v3.txt file of +https://spec.torproject.org/[torspec] for more information. TESTING NETWORK OPTIONS -----------------------

1 0

[tor/master] Merge branch 'maint-0.3.5'
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 1c5c3f353a0324bbc8b5df235999e04d2478c650 Merge: cdb065d6b 6c9d678ff Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 30 11:29:30 2018 -0400 Merge branch 'maint-0.3.5' changes/ticket28026 | 3 +++ doc/tor.1.txt | 34 ++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 12 deletions(-)

1 0

[tor/release-0.3.5] tweak manpage bits about v3 onion svc client auth
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit d023de945a7037bb4ec66f81aa83588d53184099 Author: Mike Tigas <mike.tigas(a)gmail.com> Date: Fri Oct 12 17:15:11 2018 -0400 tweak manpage bits about v3 onion svc client auth make a couple things more explicit, like not needing to set "HiddenServiceAuthorizeClient" & etc --- doc/tor.1.txt | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 406372433..2d5237c84 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1090,14 +1090,16 @@ The following options are useful only for clients (that is, if **HiddenServiceAuthorizeClient** option. [[ClientOnionAuthDir]] **ClientOnionAuthDir** __path__:: - Path to the directory containing the hidden service authorization file. The - files MUST have the suffix ".auth_private". Each file is for a single - onion address and their format is: + Path to the directory containing v3 hidden service authorization files. + Each file is for a single onion address, and the files MUST have the suffix + ".auth_private" (i.e. "bob_onion.auth_private"). The content format MUST be: + <onion-address>:descriptor:x25519:<base32-encoded-privkey> + - The <onion-address> MUST NOT have the ".onion" suffix. See the - rend-spec-v3.txt Appendix G for more information. + The <onion-address> MUST NOT have the ".onion" suffix. The + <base32-encoded-privkey> is the base32 representation of the raw key bytes + only (32 bytes for x25519). See Appendix G in the rend-spec-v3.txt file of + https://spec.torproject.org/[torspec] for more information. [[LongLivedPorts]] **LongLivedPorts** __PORTS__:: A list of ports for services that tend to have long-running connections @@ -2839,7 +2841,8 @@ The following options are used to configure a hidden service. clients without authorization any more. Generated authorization data can be found in the hostname file. Clients need to put this authorization data in their configuration file using **HidServAuth**. This option is only for v2 - services. + services; v3 services configure client authentication in a subdirectory of + HiddenServiceDir instead (see the **Client Authorization** section). [[HiddenServiceAllowUnknownPorts]] **HiddenServiceAllowUnknownPorts** **0**|**1**:: If set to 1, then connections to unrecognized ports do not cause the @@ -2941,19 +2944,26 @@ Client Authorization (Version 3 only) To configure client authorization on the service side, the -"<HiddenServiceDir>/authorized_clients/" needs to exists. Each file in that -directory should be suffixed with ".auth" (the file name is irrelevant) and -its content format MUST be: +"<HiddenServiceDir>/authorized_clients/" directory needs to exist. Each file +in that directory should be suffixed with ".auth" (i.e. "alice.auth"; the +file name is irrelevant) and its content format MUST be: <auth-type>:<key-type>:<base32-encoded-public-key> The supported <auth-type> are: "descriptor". The supported <key-type> are: -"x25519". Each file MUST contain one line only. Any malformed file will be -ignored. +"x25519". The <base32-encoded-privkey> is the base32 representation of the raw +key bytes only (32 bytes for x25519). + +Each file MUST contain one line only. Any malformed file will be +ignored. Client authorization will only be enabled for the service if tor +successfully loads at least one authorization file. Note that once you've configured client authorization, anyone else with the address won't be able to access it from this point on. If no authorization is -configured, the service will be accessible to all. +configured, the service will be accessible to anyone with the onion address. + +See the Appendix G in the rend-spec-v3.txt file of +https://spec.torproject.org/[torspec] for more information. TESTING NETWORK OPTIONS -----------------------

1 0

[tor/release-0.3.5] hs-v3: Add changes file for 28026
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 6c9d678ff66d012b4c8009c6ad44409c7368ed69 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 30 11:28:53 2018 -0400 hs-v3: Add changes file for 28026 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket28026 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket28026 b/changes/ticket28026 new file mode 100644 index 000000000..a6911c2ca --- /dev/null +++ b/changes/ticket28026 @@ -0,0 +1,3 @@ + o Documentation (hidden service manpage): + - Improve HSv3 client authorization by making some options more explicit + and detailed. Closes ticket 28026. Patch by "mtigas".

1 0

[torspec/master] Specify the ED25519-V3 private key format, and explain why it is so.
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 3c34000c9c28b6a55e2c4333a5ad0ccf99bd4026 Author: Taylor R Campbell <campbell+tor(a)mumble.net> Date: Fri Oct 19 17:43:17 2018 +0000 Specify the ED25519-V3 private key format, and explain why it is so. --- control-spec.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 6f0a543..6a04b65 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1671,8 +1671,18 @@ (The KeyBlob format is left intentionally opaque, however for "RSA1024" keys it is currently the Base64 encoded DER representation of a PKCS#1 - RSAPrivateKey, with all newlines removed. For a "ED25519-V3" key is a Base64 - encoded ed25519 private key.) + RSAPrivateKey, with all newlines removed. For a "ED25519-V3" key is + the Base64 encoding of the concatenation of the 32-byte ed25519 secret + scalar in little-endian and the 32-byte ed25519 PRF secret.) + + [Note: The ED25519-V3 format is not the same as, e.g., SUPERCOP + ed25519/ref, which stores the concatenation of the 32-byte ed25519 + hash seed concatenated with the 32-byte public key, and which derives + the secret scalar and PRF secret by expanding the hash seed with + SHA-512. Our key blinding scheme is incompatible with storing + private keys as seeds, so we store the secret scalar alongside the + PRF secret, and just pay the cost of recomputing the public key when + importing an ED25519-V3 key.] (The "NEW:BEST" option obeys the HiddenServiceVersion torrc option default value. Currently it is 2.)

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 30 Oct '18

30 Oct '18

commit 509da29317440c20708fe2214d00d5c0f47a5d4b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 15:15:31 2018 +0000 Update translations for donatepages-messagespot_completed --- locale/es_AR/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 890f7e1a1..f5ead19f8 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -622,7 +622,7 @@ msgid "" "to integrate Tor into their applications." msgstr "" "Gracias por apoyar a Tor a Potenciar la Resistencia Digital. Debería " -"llegarte un recibo por correo electrónico a corto plazo. Con tu soporte, " +"llegarte un recibo por correo electrónico a prontamente. Con tu apoyo, " "seremos capaces de encarar proyectos ambiciosos, tal como desarrollar un " "navegador más seguro, con privacidad ampliada para dispositivos móviles, y " "hacer más fácil que desarrolladores de aplicaciones de terceros integren "

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 30 Oct '18

30 Oct '18

commit adf0df1efc8d61a535bef9f71077e5f74b66ccc9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 15:15:25 2018 +0000 Update translations for donatepages-messagespot --- locale/el/LC_MESSAGES/messages.po | 23 +++++++++++++++++++++++ locale/es_AR/LC_MESSAGES/messages.po | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/locale/el/LC_MESSAGES/messages.po b/locale/el/LC_MESSAGES/messages.po index 4b3102808..e241537a3 100644 --- a/locale/el/LC_MESSAGES/messages.po +++ b/locale/el/LC_MESSAGES/messages.po @@ -1162,6 +1162,13 @@ msgid "" " Phone number: 206-420-3136 \n" " Contact person: Shari Steele, Executive Director " msgstr "" +"Αριθμός Φορολογικού Μητρώου (ΑΦΜ) του Tor Project:20-8096820 \n" +"Διεύθυνση: \n" +"Tor Project, Inc. \n" +"217 First Avenue South #4903 \n" +"Seattle, WA 98194 \n" +"Αριθμός τηλεφώνου: 206-420-3136 \n" +"Υπεύθυνος επικοινωνίας:Shari Steele, Executive Director " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:263 msgid "If I am not in the United States, can I still donate?" @@ -1176,6 +1183,8 @@ msgid "" "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. " "income) but we would very much appreciate your support." msgstr "" +"Η δωρεά σας πιθανότατα δεν εκπίπτει από το φόρο (εκτός αν πληρώνετε φόρο " +"εισοδήματος των ΗΠΑ), αλλά θα εκτιμούσαμε πολύ την υποστήριξή σας." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:275 msgid "" @@ -1196,12 +1205,17 @@ msgid "" "used, we're required by the IRS to track and report separately on that " "money." msgstr "" +"Αν δεχτούμε δωρεά από κάποιον που έχει διευκρινίσει πώς θέλει να " +"χρησιμοποιηθεί το ποσό, απαιτείται από το IRS να παρακολουθήσουμε και να " +"αναφέρουμε χωριστά τα χρήματα αυτά." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:283 msgid "" "That would be a big administrative burden for a small organization, and we " "don't think it's a good idea for us." msgstr "" +"Αυτό θα ήταν ένα μεγάλο διοικητικό βάρος για μια μικρή οργάνωση και δεν " +"πιστεύουμε ότι είναι καλή ιδέα για εμάς." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:285 msgid "" @@ -1215,6 +1229,8 @@ msgid "" "If you're donating using a mechanism that allows for comments, feel free to " "send your thoughts that way." msgstr "" +"Αν κάνετε δωρεά χρησιμοποιώντας έναν μηχανισμό που επιτρέπει σχόλια, μη " +"διστάσετε να στείλετε τις σκέψεις σας με αυτόν τον τρόπο." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:293 msgid "Can I donate while using Tor Browser?" @@ -1266,6 +1282,10 @@ msgid "" "Discover or American Express) or via PayPal, please visit our <a " "href=\"https://donate.torproject.org\">donate page</a>." msgstr "" +"Για να κάνετε δωρεά χρησιμοποιώντας μια πιστωτική κάρτα ή μια χρεωστική " +"κάρτα (VISA, MasterCard, Discover ή American Express) ή μέσω PayPal, " +"επισκεφθείτε τη <a href=\"https://donate.torproject.org\">σελίδα δωρεών</a> " +"μας." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:323 msgid "Why do you ask for my address and similar information?" @@ -1286,6 +1306,9 @@ msgid "" "This allows our payment processor to verify your identity, process your " "payment, and prevent fraudulent charges to your credit card." msgstr "" +"Αυτό επιτρέπει στον επεξεργαστή πληρωμών μας να επαληθεύσει την ταυτότητά " +"σας, να επεξεργαστεί την πληρωμή σας και να αποτρέψει παράνομες χρεώσεις " +"στην πιστωτική σας κάρτα." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:331 msgid "" diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 890f7e1a1..f5ead19f8 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -622,7 +622,7 @@ msgid "" "to integrate Tor into their applications." msgstr "" "Gracias por apoyar a Tor a Potenciar la Resistencia Digital. Debería " -"llegarte un recibo por correo electrónico a corto plazo. Con tu soporte, " +"llegarte un recibo por correo electrónico a prontamente. Con tu apoyo, " "seremos capaces de encarar proyectos ambiciosos, tal como desarrollar un " "navegador más seguro, con privacidad ampliada para dispositivos móviles, y " "hacer más fácil que desarrolladores de aplicaciones de terceros integren "

1 0

[tor/maint-0.3.5] Detect the onion service version and then check for invalid options unless we have set HiddenServiceVersion
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 82b3a023024755971003f53950d9b6dfbe90f969 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 24 12:19:42 2018 -0400 Detect the onion service version and then check for invalid options unless we have set HiddenServiceVersion --- src/feature/hs/hs_config.c | 30 +++++++++++++++++++----------- src/feature/hs/hs_service.h | 3 +++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 93d7403df..497e31fbb 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -419,7 +419,7 @@ config_generic_service(const config_line_t *line_, dup_opt_seen = line->key; goto err; } - have_version = 1; + have_version = service->config.hs_version_explicitly_set = 1; continue; } /* Virtual port. */ @@ -534,18 +534,15 @@ config_service(const config_line_t *line, const or_options_t *options, /* We have a new hidden service. */ service = hs_service_new(options); + /* We'll configure that service as a generic one and then pass it to a * specific function according to the configured version number. */ if (config_generic_service(line, options, service) < 0) { goto err; } + tor_assert(service->config.version <= HS_VERSION_MAX); - /* Before we configure the service on a per-version basis, we'll make - * sure that this set of options for a service are valid that is for - * instance an option only for v2 is not used for v3. */ - if (config_has_invalid_options(line->next, service)) { - goto err; - } + /* Check permission on service directory that was just parsed. And this must * be done regardless of the service version. Do not ask for the directory * to be created, this is done when the keys are loaded because we could be @@ -556,11 +553,19 @@ config_service(const config_line_t *line, const or_options_t *options, 0) < 0) { goto err; } + /* We'll try to learn the service version here by loading the key(s) if - * present. Depending on the key format, we can figure out the service - * version. If we can't find a key, the configuration version will be used - * which has been set previously. */ - service->config.version = config_learn_service_version(service); + * present and we did not set HiddenServiceVersion. Depending on the key + * format, we can figure out the service version. */ + if (!service->config.hs_version_explicitly_set) { + service->config.version = config_learn_service_version(service); + } + + /* We make sure that this set of options for a service are valid that is for + * instance an option only for v2 is not used for v3. */ + if (config_has_invalid_options(line->next, service)) { + goto err; + } /* Different functions are in charge of specific options for a version. We * start just after the service directory line so once we hit another @@ -580,13 +585,16 @@ config_service(const config_line_t *line, const or_options_t *options, if (ret < 0) { goto err; } + /* We'll check if this service can be kept depending on the others * configured previously. */ if (service_is_duplicate_in_list(service_list, service)) { goto err; } + /* Passes, add it to the given list. */ smartlist_add(service_list, service); + return 0; err: diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index 6fb15b9d3..cc0006f1d 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -178,6 +178,9 @@ typedef struct hs_service_config_t { * option. */ uint32_t version; + /* Have we explicitly set HiddenServiceVersion? */ + unsigned int hs_version_explicitly_set : 1; + /* List of rend_service_port_config_t */ smartlist_t *ports;

1 0

[tor/maint-0.3.5] Add test for HiddenServiceAuthorizeClient and v3 onion services
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit cd9914d9f91a2fd1f56e1c0f89bee57b9a49bbc6 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 24 12:20:10 2018 -0400 Add test for HiddenServiceAuthorizeClient and v3 onion services --- src/test/test_hs_config.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/test_hs_config.c b/src/test/test_hs_config.c index 553b96758..b6ab0c21f 100644 --- a/src/test/test_hs_config.c +++ b/src/test/test_hs_config.c @@ -366,6 +366,22 @@ test_invalid_service_v3(void *arg) teardown_capture_of_logs(); } + /* v2-specific HiddenServiceAuthorizeClient set. */ + { + const char *conf = + "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n" + "HiddenServiceVersion 3\n" + "HiddenServiceAuthorizeClient stealth client1\n"; + setup_full_capture_of_logs(LOG_WARN); + ret = helper_config_service(conf, validate_only); + tt_int_op(ret, OP_EQ, -1); + expect_log_msg_containing("Hidden service option " + "HiddenServiceAuthorizeClient is incompatible " + "with version 3 of service in " + "/tmp/tor-test-hs-RANDOM/hs1"); + teardown_capture_of_logs(); + } + done: ; }

1 0