tor-commits September 2017

tor-commits@lists.torproject.org

16 participants
2950 discussions

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit b14bbb5117c390c4f51e3080d600016f9c26951d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 20:16:39 2017 +0000 Update translations for tails-misc --- uz.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uz.po b/uz.po index d9a1809d0..d9aac894c 100644 --- a/uz.po +++ b/uz.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-05 11:57+0200\n" -"PO-Revision-Date: 2017-05-26 14:47+0000\n" +"PO-Revision-Date: 2017-09-12 19:57+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit f680e172b5a2135ccd0fd02261c755211c82d654 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 20:16:09 2017 +0000 Update translations for mat-gui --- uz.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uz.po b/uz.po index 6d4110887..5d20cafa8 100644 --- a/uz.po +++ b/uz.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-03-21 16:34+0000\n" +"PO-Revision-Date: 2017-09-12 19:53+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n" "MIME-Version: 1.0\n" @@ -148,7 +148,7 @@ msgstr "" #: data/mat.glade:187 msgid "Add" -msgstr "" +msgstr "Qo‘shish" #: data/mat.glade:256 msgid "State"

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit b15eee8e16952e5cf4ea6408a3aae72218538e4e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 20:15:59 2017 +0000 Update translations for torbirdy --- uz/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uz/torbirdy.dtd b/uz/torbirdy.dtd index c4e540f78..b2893663e 100644 --- a/uz/torbirdy.dtd +++ b/uz/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra2.key "d"> <!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> <!ENTITY torbirdy.prefs.testproxy.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.proxy.label "Proksi-server"> <!ENTITY torbirdy.prefs.privacy.label "Privacy"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> <!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 12 Sep '17

12 Sep '17

commit 31e0befd8a8311f9a71c72d88c30795302e54057 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 12 20:15:50 2017 +0000 Update translations for tails-persistence-setup --- uz/uz.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uz/uz.po b/uz/uz.po index 3cf62cc97..c9ddbd87c 100644 --- a/uz/uz.po +++ b/uz/uz.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-05-17 03:09+0000\n" +"PO-Revision-Date: 2017-09-12 19:57+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n" "MIME-Version: 1.0\n" @@ -312,7 +312,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" -msgstr "" +msgstr "O‘chirish" #: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..."

1 0

[policies/master] Membership policy vote
by atagar＠torproject.org 12 Sep '17

12 Sep '17

commit 35594fd77f83007211fcb037c4f27d9cda0a1df0 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 12 13:11:32 2017 -0700 Membership policy vote --- membership.txt | 191 +++++++++++++++++++++++++++++++++ votes/17-09-12_membership/proposal.txt | 144 +++++++++++++++++++++++++ votes/17-09-12_membership/summary.txt | 118 ++++++++++++++++++++ 3 files changed, 453 insertions(+) diff --git a/membership.txt b/membership.txt new file mode 100644 index 0000000..524d8a8 --- /dev/null +++ b/membership.txt @@ -0,0 +1,191 @@ +===================================================================== +Membership Policy +===================================================================== + +These guidelines are intended to define Core Contributor roles and +responsibilities. Anyone who uses, supports, or contributes to Tor can be a +member of the Tor community, but being a Core Contributor is a recognition of +demonstrated, continuous work on Tor plus interactions with other Core +Contributors. Core Contributors get special access to Tor resources, are +involved with the day-to-day work of building Tor, and are considered +ambassadors of Tor in the broader community. We hope that these guidelines will +clarify the privileges and responsibilities of being a Core Contributor so that +we may all focus our time on working well together and contributing positively +to Tor. + +This membership concept is distinct from whether people are employees or +contractors for the non-profit organization "The Tor Project Inc": Tor the +non-profit organization is different from Tor Core Contributors. The Tor +Project Inc and the Core Contributors support the same goals with an +overlapping, but not necessarily identical, set of responsibilities. + +This document describes rules and procedures. We as a community frown on gaming +these rules and procedures by following them to the letter while subverting +their intent. Please don't do that. + +===================================================================== +What is a "Core Contributor"? +===================================================================== + +We call a community member a Core Contributor when they... + + * Have worked continuously on Tor for at least the last six months. + * Enjoy the respect and support of other Tor Core Contributors. + * Have gone through the process outlined in this document. + +The phrase "work on Tor" includes but is not limited to: advocacy, support, +design, code, community building, project management, bug triaging, +documentation, etc. + +The Tor Community is made up of all kinds of people -- researchers, relay +operators, advocates, developers, and users. Some of those people work on Tor +as part of their day job, while others contribute a few lines of code or a bug +report here and there. All contributions -- big and small -- are what make Tor +possible, and we're grateful for such a vibrant and dedicated community. + +===================================================================== +How can I become a Core Contributor? +===================================================================== + +Members of the wider Tor community may become a Core Contributor by doing the +following... + + 1. Find an Advocate who is an existing Core Contributor. + 2. You and your Advocate collaborate to answer the following: + + * What name or alias would you like to be called? + * How have you been involved in Tor these last six months? + * What is your OpenPGP key? + * What email should be subscribed to our internal lists? + + 3. Your Advocate initiates an internal discussion with the other Core + Contributors. Two weeks of discussion and consensus-building will then take + place. Any Core Contributor has the ability to "block" if they have very + serious concerns about a potential new contributor. A "block" is not a veto + in the traditional sense; it means that the concerns are so serious that + they would sooner leave the project than allow for the new contributor to + join. Since blocking is a very serious measure, we hope that the + overwhelming majority of decisions about whether or not to invite someone + to become a Core Contributor will be decided by consensus-building alone. + +If consensus is reached after two weeks, you become a Core Contributor. If +consensus fails, that result will be shared with you and it is suggested you +wait at least six months before trying again, and work with your Advocate to +understand why your membership was rejected. If your application is blocked, +you may be prohibited from reapplying. + +===================================================================== +What are the benefits of being a Core Contributor? +===================================================================== + +Core Contributorship has the following privileges... + + * One vote, whenever voting takes place. [2] + * Subscription to the tor-internal@ and related mailing lists. + * Access to the #tor-internal and related IRC channels. + * Standing invitation to the periodic Tor Meetings. + * Listing on the "core people" webpage. [1] + * An @torproject.org forwarding address. + * Technical and computing resources as required and available. Note + that access to authenticated resources requires your OpenPGP key to + be signed by at least one other Core Contributor. + +===================================================================== +What responsibilities are there to being a Core Contributor? +===================================================================== + +Core Contributors are expected to... + + * Agree and abide by the Tor Social Contract. [3] + * Bring conflicts or concerns with other Core Contributors to the + Community Council. [4] + * Continue actively working on Tor and interacting with other Core + Contributors. + +We emphasize the *community* nature of being a Core Contributor: it is not +enough to just advance Tor's goals; you also have to participate in the +community. Building trust by interacting as human beings, in person when +possible, is the best way to maintain a strong and robust Tor Project. + +===================================================================== +How can my status as a Core Contributor end? +===================================================================== + +There are three methods... + + 1. Voluntary + + Core Contributors are free to step out of the project at any + time. We kindly ask that it's done carefully, transitioning any + responsibilities. To retire, please send an email either publicly + on tor-project@ or privately on tor-internal@. + + 2. Inactivity + + Volunteers naturally both come and go, and this is fine. If you + haven't been actively involved with Tor in the preceding six months + the Account Manager will contact you to ask if you'd like to start + actively contributing again. If not, your membership as a Core + Contributor may be suspended. + + If there is disagreement about whether a level of involvement meets + this criteria or not, the Community Council will be asked to decide. + + Contributors who have their status discontinued for this reason are of + course welcome and encouraged to remain in the wider Tor community, + and they may go through the process of becoming a Core Contributor + again if they wish. Returning contributors don't necessarily need + to accumulate a fresh six months of work on Tor before reapplying; + other Core Contributors can opt to waive that requirement during the + application period. + + 3. Involuntary + + Unfortunately in some circumstances it might become necessary to + "banish" someone from being a Core Contributor. This can only + happen with a decision from the Community Council. We consider + this a last resort and would rather resolve any issues through e.g. + community-based approaches. + + When there is a serious question about whether someone's Core + Contributor status should be revoked, they will temporarily lose + access to the internal mailing list(s) where their membership status + is being discussed. If this happens, the Account Manager will... + + * inform the person of the matter + * remove the person from the lists while things are under discussion + * give the person a clear way to relay matters to the list during + their not-being-on-the-list + + Involuntary termination will result in revocation of the privileges + listed above. Mail forwarding for involuntarily terminations will + be determined on a case-by-case basis. + +===================================================================== +Who is the Tor Project Account Manager? +===================================================================== + +The Tor Project Account Manager, aka Membership Secretary, helps set up and +maintain Tor accounts. Their tasks are to ensure that the processes that we +agreed upon are being respected and to follow the advice of the Community +Council about closing any account. The Account Manager acts in consultation +with longstanding members of the Tor community. Every quarter the Account +Manager, with the help of longstanding community members, should review the +list of Core Contributors and look for Contributors without any visible +activity since the last review. + +The Account Manager is an elected position that follows the same procedure as +the Vote Secretary. [2] + +===================================================================== +Are the privileges like email forwarding addresses restricted to Tor Core Contributors? +===================================================================== + +No, some of those things are necessary for other work, for example, employees +need an @torproject.org address as soon as they are hired, and many members of +our community get invited to the Tor Meeting. + +[1] https://www.torproject.org/about/corepeople +[2] https://gitweb.torproject.org/community/policies.git/tree/voting.txt +[3] https://gitweb.torproject.org/community/policies.git/tree/social_contract.t… +[4] https://gitweb.torproject.org/community/policies.git/tree community_council.txt diff --git a/votes/17-09-12_membership/proposal.txt b/votes/17-09-12_membership/proposal.txt new file mode 100644 index 0000000..a8678e1 --- /dev/null +++ b/votes/17-09-12_membership/proposal.txt @@ -0,0 +1,144 @@ +===================================================================== +Membership Policy +===================================================================== + +These guidelines are intended to define Core Contributor roles and responsibilities. Anyone who uses, supports, or contributes to Tor can be a member of the Tor community, but being a Core Contributor is a recognition of demonstrated, continuous work on Tor plus interactions with other Core Contributors. Core Contributors get special access to Tor resources, are involved with the day-to-day work of building Tor, and are considered ambassadors of Tor in the broader community. We hope that these guidelines will clarify the privileges and responsibilities of being a Core Contributor so that we may all focus our time on working well together and contributing positively to Tor. + +This membership concept is distinct from whether people are employees or contractors for the non-profit organization "The Tor Project Inc": Tor the non-profit organization is different from Tor Core Contributors. The Tor Project Inc and the Core Contributors support the same goals with an overlapping, but not necessarily identical, set of responsibilities. + +This document describes rules and procedures. We as a community frown on gaming these rules and procedures by following them to the letter while subverting their intent. Please don't do that. + +===================================================================== +What is a "Core Contributor"? +===================================================================== + +We call a community member a Core Contributor when they... + + * Have worked continuously on Tor for at least the last six months. + * Enjoy the respect and support of other Tor Core Contributors. + * Have gone through the process outlined in this document. + +The phrase "work on Tor" includes but is not limited to: advocacy, support, design, code, community building, project management, bug triaging, documentation, etc. + +The Tor Community is made up of all kinds of people -- researchers, relay operators, advocates, developers, and users. Some of those people work on Tor as part of their day job, while others contribute a few lines of code or a bug report here and there. All contributions -- big and small -- are what make Tor possible, and we're grateful for such a vibrant and dedicated community. + +===================================================================== +How can I become a Core Contributor? +===================================================================== + +Members of the wider Tor community may become a Core Contributor by doing the following... + + 1. Find an Advocate who is an existing Core Contributor. + 2. You and your Advocate collaborate to answer the following: + + * What name or alias would you like to be called? + * How have you been involved in Tor these last six months? + * What is your OpenPGP key? + * What email should be subscribed to our internal lists? + + 3. Your Advocate initiates an internal discussion with the other Core Contributors. Two weeks of discussion and consensus-building will then take place. Any Core Contributor has the ability to "block" if they have very serious concerns about a potential new contributor. A "block" is not a veto in the traditional sense; it means that the concerns are so serious that they would sooner leave the project than allow for the new contributor to join. Since blocking is a very serious measure, we hope that the overwhelming majority of decisions about whether or not to invite someone to become a Core Contributor will be decided by consensus-building alone. + +If consensus is reached after two weeks, you become a Core Contributor. If consensus fails, that result will be shared with you and it is suggested you wait at least six months before trying again, and work with your Advocate to understand why your membership was rejected. If your application is blocked, you may be prohibited from reapplying. + +===================================================================== +What are the benefits of being a Core Contributor? +===================================================================== + +Core Contributorship has the following privileges... + + * One vote, whenever voting takes place. [2] + * Subscription to the tor-internal@ and related mailing lists. + * Access to the #tor-internal and related IRC channels. + * Standing invitation to the periodic Tor Meetings. + * Listing on the "core people" webpage. [1] + * An @torproject.org forwarding address. + * Technical and computing resources as required and available. Note + that access to authenticated resources requires your OpenPGP key to + be signed by at least one other Core Contributor. + +===================================================================== +What responsibilities are there to being a Core Contributor? +===================================================================== + +Core Contributors are expected to... + + * Agree and abide by the Tor Social Contract. [3] + * Bring conflicts or concerns with other Core Contributors to the + Community Council. [4] + * Continue actively working on Tor and interacting with other Core + Contributors. + +We emphasize the *community* nature of being a Core Contributor: it is not enough to just advance Tor's goals; you also have to participate in the community. Building trust by interacting as human beings, in person when possible, is the best way to maintain a strong and robust Tor Project. + +===================================================================== +How can my status as a Core Contributor end? +===================================================================== + +There are three methods... + + 1. Voluntary + + Core Contributors are free to step out of the project at any + time. We kindly ask that it's done carefully, transitioning any + responsibilities. To retire, please send an email either publicly + on tor-project@ or privately on tor-internal@. + + 2. Inactivity + + Volunteers naturally both come and go, and this is fine. If you + haven't been actively involved with Tor in the preceding six months + the Account Manager will contact you to ask if you'd like to start + actively contributing again. If not, your membership as a Core + Contributor may be suspended. + + If there is disagreement about whether a level of involvement meets + this criteria or not, the Community Council will be asked to decide. + + Contributors who have their status discontinued for this reason are of + course welcome and encouraged to remain in the wider Tor community, + and they may go through the process of becoming a Core Contributor + again if they wish. Returning contributors don't necessarily need + to accumulate a fresh six months of work on Tor before reapplying; + other Core Contributors can opt to that waive that requirement during + the application period. + + 3. Involuntary + + Unfortunately in some circumstances it might become necessary to + "banish" someone from being a Core Contributor. This can only + happen with a decision from the Community Council. We consider + this a last resort and would rather resolve any issues through e.g. + community-based approaches. + + When there is a serious question about whether someone's Core + Contributor status should be revoked, they will temporarily lose + access to the internal mailing list(s) where their membership status + is being discussed. If this happens, the Account Manager will... + + * inform the person of the matter + * remove the person from the lists while things are under discussion + * give the person a clear way to relay matters to the list during + their not-being-on-the-list + + Involuntary termination will result in revocation of the privileges + listed above. Mail forwarding for involuntarily terminations will + be determined on a case-by-case basis. + +===================================================================== +Who is the Tor Project Account Manager? +===================================================================== + +The Tor Project Account Manager, aka Membership Secretary, helps set up and maintain Tor accounts. Their tasks are to ensure that the processes that we agreed upon are being respected and to follow the advice of the Community Council about closing any account. The Account Manager acts in consultation with longstanding members of the Tor community. Every quarter the Account Manager, with the help of longstanding community members, should review the list of Core Contributors and look for Contributors without any visible activity since the last review. + +The Account Manager is an elected position that follows the same procedure as the Vote Secretary. [2] + +===================================================================== +Are the privileges like email forwarding addresses restricted to Tor Core Contributors? +===================================================================== + +No, some of those things are necessary for other work, for example, employees need an @torproject.org address as soon as they are hired, and many members of our community get invited to the Tor Meeting. + +[1] https://www.torproject.org/about/corepeople +[2] https://gitweb.torproject.org/community/policies.git/tree/voting.txt +[3] https://gitweb.torproject.org/community/policies.git/tree/social_contract.t… +[4] https://gitweb.torproject.org/community/policies.git/tree community_council.txt diff --git a/votes/17-09-12_membership/summary.txt b/votes/17-09-12_membership/summary.txt new file mode 100644 index 0000000..34cdf9a --- /dev/null +++ b/votes/17-09-12_membership/summary.txt @@ -0,0 +1,118 @@ +===================================================================== +Summary +===================================================================== + +Topic: Membership +Date taken: 17/8/29 - 17/9/12 +Vote count: 36 (of 92 eligible voters, 39%) + +Secretary: Karsten Loesing +Proposer: Alison Macrina + +Topic put to a vote were... + + Question 1: Social Contract Proposal + + There are no alternate proposals for these guidelines, so please choose + A or B. + + A. I approve of the attached proposal. + B. I reject the attached proposal. + +Results were... + + * Proposal passes. 89% approved of its adoption. We'll institute + this as our membership policy. + +===================================================================== +Votes +===================================================================== + +Adam Shostack +Alison Macrina +Allen Gunn +Chelsea +Colin Childs +Damian Johnson +David Goulet +Donncha O'Cearbhaill +Georg Koppen +Hiro +Ian Goldberg +Isabela +Isis +Jens Kubieziel +Julius Mittenzwei +Juris +Kat +Linda Lee +Linus Nordberg +Maria Xynou +Mark Smith +Matt Traudt +Matthew Finkel +Moritz Bartl +Nick Mathewson +Nicolas Vigier +Paul Syverson +Rob Jansen +Roger Dingledine +Steven Murdoch +Sukhbir Singh +Taylor Yu +teor +Tom Ritter +Tommy Collison +Yawning Angel + +1341;A +2775;A +4133;A +4355;A +5502;A +6670;A +8323;A +8449;A +8809;A +10307;B +15300;A +15896;A +15923;A +15932;A +17425;A +17641;A +17650;A +17888;A +18477;A +18821;A +21619;B +21700;A +22451;B +23338;A +23340;A +23945;A +24310;A +24434;A +26703;A +27547;A +28495;A +29610;A +30884;B +31500;A +32392;A +32594;A + +===================================================================== +Question 1: Membership Proposal +===================================================================== + +Approve: 32 (89%) +Reject: 4 (11%) + +--------------------------------------------------------------------- +Result: +--------------------------------------------------------------------- + +Proposal passes. 89% approved of its adoption. We'll institute +this as our membership policy. +

1 0

[tor/master] remove a redundant changes file for 22750
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit d165812416246f3b34d80904d6b253bd7eb1f4fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 15:39:06 2017 -0400 remove a redundant changes file for 22750 --- changes/ticket22750 | 3 --- 1 file changed, 3 deletions(-) diff --git a/changes/ticket22750 b/changes/ticket22750 deleted file mode 100644 index 6bc1fb263..000000000 --- a/changes/ticket22750 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (logging, sandbox): - - Use the correct system call in sandbox error messages. Fixes bug - 22750; bugfix on 0.2.5.1-alpha.

1 0

[tor/master] hs-v3: Stall SOCKS connection when no live consensus available
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 6b4eace248272f4defae0f6cc9933588b1b498b3 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Sep 12 12:24:26 2017 -0400 hs-v3: Stall SOCKS connection when no live consensus available Fixes #23481 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/connection_edge.c | 26 +++++++++++++++++++++++--- src/or/hs_client.c | 31 +++++++++++++++++++++++-------- src/or/hs_client.h | 16 ++++++++++++++++ src/test/test_entryconn.c | 2 +- 4 files changed, 63 insertions(+), 12 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index dfa89bc2c..d1b8abda8 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -80,6 +80,7 @@ #include "hs_client.h" #include "hs_circuit.h" #include "main.h" +#include "networkstatus.h" #include "nodelist.h" #include "policies.h" #include "proto_http.h" @@ -1561,18 +1562,37 @@ connection_ap_handle_onion(entry_connection_t *conn, if (addresstype == ONION_V2_HOSTNAME) { tor_assert(edge_conn->rend_data); rend_client_refetch_v2_renddesc(edge_conn->rend_data); + /* Whatever the result of the refetch, we don't go further. */ + return 0; } else { tor_assert(addresstype == ONION_V3_HOSTNAME); tor_assert(edge_conn->hs_ident); - hs_client_refetch_hsdesc(&edge_conn->hs_ident->identity_pk); + /* Attempt to fetch the hsv3 descriptor. Check the retval to see how it + * went and act accordingly. */ + int ret = hs_client_refetch_hsdesc(&edge_conn->hs_ident->identity_pk); + switch (ret) { + case HS_CLIENT_FETCH_MISSING_INFO: + /* By going to the end, the connection is put in waiting for a circuit + * state which means that it will be retried and consider as a pending + * connection. */ + goto end; + case HS_CLIENT_FETCH_LAUNCHED: + case HS_CLIENT_FETCH_HAVE_DESC: + return 0; + case HS_CLIENT_FETCH_ERROR: + case HS_CLIENT_FETCH_NO_HSDIRS: + case HS_CLIENT_FETCH_NOT_ALLOWED: + /* Can't proceed further and better close the SOCKS request. */ + return -1; + } } - return 0; } /* We have the descriptor! So launch a connection to the HS. */ - base_conn->state = AP_CONN_STATE_CIRCUIT_WAIT; log_info(LD_REND, "Descriptor is here. Great."); + end: + base_conn->state = AP_CONN_STATE_CIRCUIT_WAIT; /* We'll try to attach it at the next event loop, or whenever * we call connection_ap_attach_pending() */ connection_ap_mark_as_pending_circuit(conn); diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 620ef3a10..be5ece068 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -152,7 +152,7 @@ directory_launch_v3_desc_fetch(const ed25519_public_key_t *onion_identity_pk, /* ...and base64 it. */ retval = ed25519_public_to_base64(base64_blinded_pubkey, &blinded_pubkey); if (BUG(retval < 0)) { - return -1; + return HS_CLIENT_FETCH_ERROR; } /* Copy onion pk to a dir_ident so that we attach it to the dir conn */ @@ -180,7 +180,7 @@ directory_launch_v3_desc_fetch(const ed25519_public_key_t *onion_identity_pk, memwipe(base64_blinded_pubkey, 0, sizeof(base64_blinded_pubkey)); memwipe(&hs_conn_dir_ident, 0, sizeof(hs_conn_dir_ident)); - return 1; + return HS_CLIENT_FETCH_LAUNCHED; } /** Return the HSDir we should use to fetch the descriptor of the hidden @@ -236,7 +236,7 @@ fetch_v3_desc(const ed25519_public_key_t *onion_identity_pk) hsdir_rs = pick_hsdir_v3(onion_identity_pk); if (!hsdir_rs) { log_info(LD_REND, "Couldn't pick a v3 hsdir."); - return 0; + return HS_CLIENT_FETCH_NO_HSDIRS; } return directory_launch_v3_desc_fetch(onion_identity_pk, hsdir_rs); @@ -998,8 +998,7 @@ hs_client_any_intro_points_usable(const ed25519_public_key_t *service_pk, /** Launch a connection to a hidden service directory to fetch a hidden * service descriptor using <b>identity_pk</b> to get the necessary keys. * - * On success, 1 is returned. If no hidden service is left to ask, return 0. - * On error, -1 is returned. (retval is only used by unittests right now) */ + * A hs_client_fetch_status_t code is returned. */ int hs_client_refetch_hsdesc(const ed25519_public_key_t *identity_pk) { @@ -1009,7 +1008,23 @@ hs_client_refetch_hsdesc(const ed25519_public_key_t *identity_pk) if (!get_options()->FetchHidServDescriptors) { log_warn(LD_REND, "We received an onion address for a hidden service " "descriptor but we are configured to not fetch."); - return 0; + return HS_CLIENT_FETCH_NOT_ALLOWED; + } + + /* Without a live consensus we can't do any client actions. It is needed to + * compute the hashring for a service. */ + if (!networkstatus_get_live_consensus(approx_time())) { + log_info(LD_REND, "Can't fetch descriptor for service %s because we " + "are missing a live consensus. Stalling connection.", + safe_str_client(ed25519_fmt(identity_pk))); + return HS_CLIENT_FETCH_MISSING_INFO; + } + + if (!router_have_minimum_dir_info()) { + log_info(LD_REND, "Can't fetch descriptor for service %s because we " + "dont have enough descriptors. Stalling connection.", + safe_str_client(ed25519_fmt(identity_pk))); + return HS_CLIENT_FETCH_MISSING_INFO; } /* Check if fetching a desc for this HS is useful to us right now */ @@ -1019,8 +1034,8 @@ hs_client_refetch_hsdesc(const ed25519_public_key_t *identity_pk) if (cached_desc && hs_client_any_intro_points_usable(identity_pk, cached_desc)) { log_info(LD_GENERAL, "We would fetch a v3 hidden service descriptor " - "but we already have a usable descriptor."); - return 0; + "but we already have a usable descriptor."); + return HS_CLIENT_FETCH_HAVE_DESC; } } diff --git a/src/or/hs_client.h b/src/or/hs_client.h index 522770450..3ea2b8cdf 100644 --- a/src/or/hs_client.h +++ b/src/or/hs_client.h @@ -13,6 +13,22 @@ #include "hs_descriptor.h" #include "hs_ident.h" +/* Status code of a descriptor fetch request. */ +typedef enum { + /* Something internally went wrong. */ + HS_CLIENT_FETCH_ERROR = -1, + /* The fetch request has been launched successfully. */ + HS_CLIENT_FETCH_LAUNCHED = 0, + /* We already have a usable descriptor. No fetch. */ + HS_CLIENT_FETCH_HAVE_DESC = 1, + /* No more HSDir available to query. */ + HS_CLIENT_FETCH_NO_HSDIRS = 2, + /* The fetch request is not allowed. */ + HS_CLIENT_FETCH_NOT_ALLOWED = 3, + /* We are missing information to be able to launch a request. */ + HS_CLIENT_FETCH_MISSING_INFO = 4, +} hs_client_fetch_status_t; + void hs_client_note_connection_attempt_succeeded( const edge_connection_t *conn); diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c index 9fe3db26f..2d28f1d42 100644 --- a/src/test/test_entryconn.c +++ b/src/test/test_entryconn.c @@ -815,7 +815,7 @@ test_entryconn_rewrite_onion_v3(void *arg) tt_int_op(retval, OP_EQ, 0); /* Check connection state after rewrite */ - tt_int_op(ENTRY_TO_CONN(conn)->state, OP_EQ, AP_CONN_STATE_RENDDESC_WAIT); + tt_int_op(ENTRY_TO_CONN(conn)->state, OP_EQ, AP_CONN_STATE_CIRCUIT_WAIT); /* check that the address got rewritten */ tt_str_op(conn->socks_request->address, OP_EQ, "p3xnclpu4mu22dwaurjtsybyqk4xfjmcfz6z62yl24uwmhjatiwnlnad");

1 0

[nyx/master] Set environment variables inline
by atagar＠torproject.org 12 Sep '17

12 Sep '17

commit 2a621aeb8838117b7c65ad1932dc37bc223caf43 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 10 03:42:56 2017 -0700 Set environment variables inline Shortening the starter a bit by dropping a couple helpers. No need to be quite so verbose. --- nyx/starter.py | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/nyx/starter.py b/nyx/starter.py index 90aa947..40cfc6b 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -78,11 +78,12 @@ def main(config): _warn_if_root(controller) _warn_if_unable_to_get_pid(controller) _warn_about_unused_config_keys() - _use_english_subcommands() - _use_no_esc_delay() _use_unicode() _set_process_name() + os.putenv('LANG', 'C') # make subcommands (ps, netstat, etc) provide english results + os.putenv('ESCDELAY', '0') # make 'esc' take effect right away + try: nyx.curses.start(nyx.draw_loop, acs_support = config.get('acs_support', True), transparent_background = True, cursor = False) except KeyboardInterrupt: @@ -182,25 +183,6 @@ def _warn_about_unused_config_keys(config): stem.util.log.notice('Unused configuration entry: %s' % key) -def _use_english_subcommands(): - """ - Make subcommands we run (ps, netstat, etc) provide us with English results. - This is important so we can parse the output. - """ - - os.putenv('LANG', 'C') - - -def _use_no_esc_delay(): - """ - Make it so pressing 'esc' takes effect right away... - - https://stackoverflow.com/questions/27372068/why-does-the-escape-key-have-a… - """ - - os.putenv('ESCDELAY', '0') - - @uses_settings def _use_unicode(config): """

1 0

[nyx/master] Move _load_user_nyxrc() helper into main
by atagar＠torproject.org 12 Sep '17

12 Sep '17

commit 4fe97b17de9b0999ea87c9c13978eb3f7d80a06a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 10 03:50:04 2017 -0700 Move _load_user_nyxrc() helper into main This helper stands out from the rest in that it's invoked before established a controller connection. Think I like it a bit better above, like the debug handling. --- nyx/starter.py | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/nyx/starter.py b/nyx/starter.py index 40cfc6b..789e67c 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -63,7 +63,13 @@ def main(config): print('Unable to write to our debug log file (%s): %s' % (args.debug_path, exc.strerror)) sys.exit(1) - _load_user_nyxrc(args.config) + if os.path.exists(args.config): + try: + config.load(args.config) + except IOError as exc: + stem.util.log.warn('Failed to load configuration (using defaults): "%s"' % exc.strerror) + else: + stem.util.log.notice('No nyxrc loaded, using defaults. You can customize nyx by placing a configuration file at %s (see https://nyx.torproject.org/nyxrc.sample for its options).' % args.config) controller = init_controller( control_port = args.control_port, @@ -134,21 +140,6 @@ def _setup_debug_logging(args): )) -@uses_settings -def _load_user_nyxrc(path, config): - """ - Loads user's personal nyxrc if it's available. - """ - - if os.path.exists(path): - try: - config.load(path) - except IOError as exc: - stem.util.log.warn('Failed to load configuration (using defaults): "%s"' % exc.strerror) - else: - stem.util.log.notice('No nyxrc loaded, using defaults. You can customize nyx by placing a configuration file at %s (see https://nyx.torproject.org/nyxrc.sample for its options).' % path) - - def _warn_if_root(controller): """ Give a notice if tor or nyx are running with root. @@ -191,13 +182,11 @@ def _use_unicode(config): initializing curses. """ - if not config.get('unicode_support', True): - return - - is_lang_unicode = 'utf-' in os.getenv('LANG', '').lower() + if config.get('unicode_support', True): + is_lang_unicode = 'utf-' in os.getenv('LANG', '').lower() - if is_lang_unicode and nyx.curses.is_wide_characters_supported(): - locale.setlocale(locale.LC_ALL, '') + if is_lang_unicode and nyx.curses.is_wide_characters_supported(): + locale.setlocale(locale.LC_ALL, '') def _set_process_name():

1 0

[nyx/master] Couple minor argument tests
by atagar＠torproject.org 12 Sep '17

12 Sep '17

commit c2bb902f58e7060a58fabe4c0ce6f9e94fe3acf5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 10 08:29:17 2017 -0700 Couple minor argument tests Just adding some basic coverage for the rest of the argument module. --- test/arguments.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/arguments.py b/test/arguments.py index 454c3ca..da55127 100644 --- a/test/arguments.py +++ b/test/arguments.py @@ -4,7 +4,7 @@ Unit tests for nyx.arguments. import unittest -from nyx.arguments import DEFAULT_ARGS, parse +from nyx.arguments import DEFAULT_ARGS, parse, get_help, get_version class TestArgumentParsing(unittest.TestCase): @@ -48,7 +48,7 @@ class TestArgumentParsing(unittest.TestCase): def test_that_we_reject_unrecognized_arguments(self): self.assertRaises(ValueError, parse, ['--blarg', 'stuff']) - def test_that_port_and_socket_unset_other(self): + def test_port_and_socket_unset_other(self): args = parse([]) self.assertEqual(DEFAULT_ARGS['control_port'], args.control_port) self.assertEqual(DEFAULT_ARGS['control_socket'], args.control_socket) @@ -80,3 +80,10 @@ class TestArgumentParsing(unittest.TestCase): for invalid_input in invalid_inputs: self.assertRaises(ValueError, parse, ['--interface', invalid_input]) + + def test_help(self): + self.assertTrue(get_help().startswith('Usage nyx [OPTION]')) + self.assertTrue('change control interface from 127.0.0.1:9051' in get_help()) + + def test_version(self): + self.assertTrue(get_version().startswith('nyx version'))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2017