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

[webwml/master] Add Executive Admin posting
by nickm＠torproject.org 14 May '15

14 May '15

commit 005a13eccaed89b95456bcc5b4ee84f97781f2fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 11:47:05 2015 -0400 Add Executive Admin posting --- about/en/jobs-execadmin.wml | 113 +++++++++++++++++++++++++++++++++++++++++++ about/en/jobs.wml | 13 +++-- 2 files changed, 121 insertions(+), 5 deletions(-) diff --git a/about/en/jobs-execadmin.wml b/about/en/jobs-execadmin.wml new file mode 100644 index 0000000..db2377e --- /dev/null +++ b/about/en/jobs-execadmin.wml @@ -0,0 +1,113 @@ +## translation metadata +# Revision: $Revision: 25666 $ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Jobs (executive administrator)" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page about/overview>">About » </a> + <a href="<page about/jobs>">Jobs</a> + </div> + <div id="maincol"> + + +<h2>Executive Administrator (contract; 20 hours per week, to start)</h2> + +<p>The Tor Project, Inc. ("Tor") is accepting applications for an Executive Administrator! This +new role is designed to improve processes and drive execution as the hub +of our diverse and driven global community. Tor has dramatically +expanded the software products and services that it provides since it +became a non-profit organization in 2006, and the executive team needs +help in coordinating efforts to efficiently support and scale its +operations.</p> + +<p>Reporting to a small executive management team, the Executive Administrator's primary focus is to promote organizational effectiveness by improving core administrative and managerial processes, systems and functions. We seek an intuitive problem solver who is able to tailor organizational responses to the diverse needs of our global community. We seek a problem solver who will improve the flow of information within the leadership team and among those it serves, including end users, volunteers, contractors, employees, the Board of Directors, funders and the greater community.</p> + +<p>Responsibilities include performing a wide variety of complex and confidential tasks, including:</p> + +<ul> +<li>Perform day-to-day administrative tasks as directed by the executive team. + +<li>Maintain calendar, schedule meetings and appointments, and make necessary travel arrangements; manage the business calendar for the Executive Director and 5-6 team members. + +<li>Establish and maintain office files and company documents, both physically and virtually; make recommendations for better information management practices and tools in a free and open source software environment. + +<li>Assist the Executive Director in managing, re-directing, prioritizing and responding to large volumes of email and other correspondence. + +<li>Screen and respond to a variety of routine inquiries by developing knowledge and understanding of the organization, projects and procedures related to the work of the Executive Director and Tor. Coordinate future responses to recurring issues/requests. + +<li>Prepare meeting materials, formalize agendas, and record and share minutes to promote exchange of actionable information and timely decision-making. + +<li>Translate executive level direction into working level operations, ensuring roadmap and plans are successfully implemented. + +<li>Establish and build relationships with key stakeholders inside and outside the community. + +<li>Serve as liaison with finance and accounting on diverse issues, including contract management, project planning and budgeting, report writing, expense management, external funding, event planning and human resources paperwork. + +<li>Coordinate with Tor's Project Manager and team leaders in supporting needs and objectives of diverse developers and teams. + +<li>Identify and articulate a daily and weekly leadership agenda of macro tasks, clearly defining milestones and deliverables with deadlines. Continuously seek out a mutual understanding from executive management regarding how to resolve. + +<li>Other tasks as mutually identified, and as assigned. +</ul> + +<h3>Qualifications<h3> + +<ul> +<li>Shares the non-profit, free and open software culture, as well as Tor's privacy values within a security environment. +<li>Strong project management skills plus ability to broadly support managers, including experience with facilitating communications, scheduling, information management, human resources and accounting. +<li>Accessible and engaging with diverse global community. Capable of moderating among diverse communication styles, from less formal developers to more formal Board and funder communications. +<li>Knowledge of office and communication practices and procedures, especially within the non-profit and/or open source community. Comfort level with common open source and encrypted communication technology strongly preferred. +<li>Experience with the advanced features of email and chat clients, spreadsheets, calendars, shared documents, etc., especially in a security-focused, open source environment. +<li>Ability to act on own initiative to identify needs and to enhance Tor's overall administrative/management functioning. +<li>Exceptional communication skills, sophisticated understanding of professional standards, practices and relations. Knowledge of correct English usage, knowledge of other language(s) prevalent within the community is preferred. +<li>Willingness to learn how to interact with journalists interested in covering Tor and its work. +<li>Experience within non-profit organizations preferred, as is experience within free and open source software communities. +<li>High levels of integrity, autonomy, self-motivation, diplomacy, humor, common sense and attention to detail. +<li>Ability to work in a fast-paced, fluid and often ambiguous environment. +<li>Background check required. +</ul> + + +<h3>About the role:</h3> +<p> +This position will be based in Tor's offices in Cambridge, MA. Initially, we anticipate the need for 20-24 hours per week during flex business hours in Cambridge, with the potential for increasing the number of hours, some of which may be off-site. We coordinate our global community via IRC, instant messaging, email, phone and video chats, and TRAC, as well as bi-annual meetings. +<p>We only write free and open source software, and we don't believe in software patents. + + +<h3>How to apply:</h3> +<ul> +<li>Provide a CV explaining your background, experience, skills, and other relevant qualifications. +<li>Include a cover letter that describes how your skills and background qualify you to meet the challenges of this role for this unique organization. Please supply a writing sample (blog post, article, etc.). +<li>Provide at least three references who can tell us more about you. +<li>Email the above to jobs @ torproject.org, specifying the "Executive Administrator" position. +</ul> + + + +<h4>About the company:</h4> + The Tor Project is a US 501(c)(3) non-profit dedicated to research, + development, and education about online anonymity and privacy. The Tor + network's 6000 volunteer relays carry 48 Gbps for several + million daily users, including ordinary citizens who want protection + from identity theft and prying corporations, corporations who want + to look at a competitor's website in private, people around the world + whose Internet connections are censored, and even governments and law + enforcement. Tor has a staff of 30 paid developers, researchers, and + advocates, plus many dozen volunteers who help out on a daily basis. Tor + is funded in part by government research and development grants, and + in part by individual and corporate donations. +</p> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> + diff --git a/about/en/jobs.wml b/about/en/jobs.wml index 5ffc56b..42761c9 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,12 +12,15 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> -<p>At the moment, we don't have any official open positions. Please check back -soon, though! In the meantime, you may want to glance at our -<a href="<page getinvolved/volunteer>">volunteers</a> page. +#<p>At the moment, we don't have any official open positions. Please check back +#soon, though! In the meantime, you may want to glance at our +#<a href="<page getinvolved/volunteer>">volunteers</a> page. -#<p>Specifically, we're looking for the following people currently: -#</p> +<p>Specifically, we're looking for the following people currently: +</p> +<ul> +<a href="<a href="<page about/jobs-execadmin>">Executive Administrator</a></li>" +</li> <p>In the past, we looked for the following people:</p>

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 14 May '15

14 May '15

commit 6d85f6b39f5be56b05a2bfcae9cdc3e72a8dc19c Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 14 15:46:06 2015 +0000 Update translations for tor_animation --- fr_CA.srt | 78 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/fr_CA.srt b/fr_CA.srt index 732cb28..c707e1a 100644 --- a/fr_CA.srt +++ b/fr_CA.srt @@ -9,108 +9,108 @@ sur nous et nos vies privées : 3 00:00:08,000 --> 00:00:09,960 -food we eat, people we meet, +ce que nous mangeons, les gens que nous rencontrons, 4 00:00:10,180 --> 00:00:12,480 -places we go, and the stuff we read. +les lieux où nous allons et ce que nous lisons. 5 00:00:13,280 --> 00:00:14,640 -Let me explain it better. +Laissez-moi l'expliquer un peu mieux. 6 00:00:14,920 --> 00:00:17,740 -Right at this moment, -if someone attempts to look you up, +En ce moment précis, +si quelqu'un essaie de vous trouvez, 7 00:00:18,060 --> 00:00:22,480 -they'll see your real identity, -precise location, operating system, +cette personne verra votre véritable identité, +votre emplacement précis, votre système d'exploitation, 8 00:00:22,800 --> 00:00:26,500 -all the sites you've visited, -the browser you use to surf the web, +tous les sites que vous avez visités, +le navigateur que vous utilisez pour naviguer sur la toile, 9 00:00:26,700 --> 00:00:29,140 -and so much more information -about you and your life +et tellement plus d'informations +sur vous et votre vie 10 00:00:29,200 --> 00:00:31,500 -which you probably didn't mean -to share with unknown strangers, +que vous ne vouliez certainement +pas partager avec des étrangers 11 00:00:31,700 --> 00:00:34,000 -who could easily use this data -to exploit you. +qui pourraient facilement utiliser +ces données pour vous exploiter. 12 00:00:34,500 --> 00:00:37,000 -But not if you're using Tor! +Mais pas si vous utilisez Tor! 13 00:00:37,140 --> 00:00:40,840 -Tor Browser protects our privacy -and identity on the Internet. +Le navigateur Tor protège nos renseignements +personnels et notre identité en ligne. 14 00:00:41,560 --> 00:00:44,760 -Tor secures your connection -with three layers of encryption +Tor sécurise votre connexion +avec trois couches de chiffrement 15 00:00:44,940 --> 00:00:49,760 -and passes it through three voluntarily -operated servers around the world, +et l'achemine par trois serveurs mondiaux +exploités volontairement, 16 00:00:50,280 --> 00:00:53,520 -which enables us to communicate -anonymously over the Internet. +ce qui nous permet de communiquer +sur anonymement sur Internet. 17 00:00:56,560 --> 00:00:58,280 -Tor also protects our data +Tor protège aussi nos données 18 00:00:58,400 --> 00:01:01,900 -against corporate or government targeted -and mass surveillance. +contre la surveillance ciblée et de masse +par les entreprises et les gouvernements. 19 00:01:02,880 --> 00:01:07,340 -Perhaps you live in a repressive country -which tries to control and surveil the Internet. +Vous habitez peut-être dans un pays répressif +qui tente de contrôler et de surveiller Internet. 20 00:01:07,900 --> 00:01:11,800 -Or perhaps you don't want big corporations -taking advantage of your personal information. +Ou peut-être que vous ne voulez pas que les grandes +entreprises abusent de vos renseignements personnels. 21 00:01:12,880 --> 00:01:15,640 -Tor makes all of its users -to look the same +Tor s'assure que tous ses utilisateurs +se ressenblent 22 00:01:15,920 --> 00:01:18,800 -which confuses the observer -and makes you anonymous. +ce qui embrouillent l'observateur +et vous rend anonyme. 23 00:01:19,500 --> 00:01:22,980 -So, the more people use the Tor network, -the stronger it gets +Et ainsi, plus de personnes utilisent le +réseau Tor, plus fort il devient, 24 00:01:23,140 --> 00:01:27,800 -as it's easier to hide in a crowd -of people who look exactly the same. +car il est plus facile de se cacher dans unes foule +de personnes qui se ressemblent toutes. 25 00:01:28,700 --> 00:01:31,240

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 14 May '15

14 May '15

commit d43e60a517ce154f2da80023f0a8387741e7968d Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 14 15:16:24 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- fr_CA/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/fr_CA/aboutdialog.dtd b/fr_CA/aboutdialog.dtd new file mode 100644 index 0000000..4491a3b --- /dev/null +++ b/fr_CA/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; est développé par"> + +<!ENTITY project.tpoLink "le &vendorShortName;"> +<!ENTITY project.end ", une organisation sans but lucratif travaillant à la protection de vos renseignements personnels et de votre liberté en ligne."> + +<!ENTITY help.start "Vous voulez aider?"> + +<!ENTITY help.donateLink "Faites un don"> +<!ENTITY help.or "ou"> + +<!ENTITY help.getInvolvedLink "impliquez-vous"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Des questions?"> + +<!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor!"> + +<!ENTITY bottomLinks.license "Informations de licence"> +<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques déposées de Tor Project, Inc. ">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 14 May '15

14 May '15

commit 1f42bd7d5945770a73e12dae57e5ab56fe102368 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 14 15:16:20 2015 +0000 Update translations for torbutton-aboutdialogdtd --- fr_CA/aboutdialog.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fr_CA/aboutdialog.dtd b/fr_CA/aboutdialog.dtd index 93b96f4..4491a3b 100644 --- a/fr_CA/aboutdialog.dtd +++ b/fr_CA/aboutdialog.dtd @@ -1,7 +1,7 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; est développé par">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "le &vendorShortName;"> +<!ENTITY project.end ", une organisation sans but lucratif travaillant à la protection de vos renseignements personnels et de votre liberté en ligne."> <!ENTITY help.start "Vous voulez aider?">  @@ -11,9 +11,9 @@ <!ENTITY help.getInvolvedLink "impliquez-vous"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "Des questions?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor!">  -<!ENTITY bottomLinks.license "Licensing Information"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY bottomLinks.license "Informations de licence"> +<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques déposées de Tor Project, Inc. ">

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 14 May '15

14 May '15

commit 3595395730dafbbb575cfc4bd3cf06d37734e203 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 14 15:16:15 2015 +0000 Update translations for tor_animation --- fr_CA.srt | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/fr_CA.srt b/fr_CA.srt index 78c998d..732cb28 100644 --- a/fr_CA.srt +++ b/fr_CA.srt @@ -1,11 +1,11 @@ 1 00:00:00,660 --> 00:00:02,780 -We've gotten very used to the Internet. +Nous nous sommes vraiment habitués à Internet. 2 00:00:03,120 --> 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +Nous partageons constamment des informations, +sur nous et nos vies privées : 3 00:00:08,000 --> 00:00:09,960 @@ -40,126 +40,126 @@ and so much more information about you and your life 10 -00:00:29,620 --> 00:00:32,460 +00:00:29,200 --> 00:00:31,500 which you probably didn't mean to share with unknown strangers, 11 -00:00:32,920 --> 00:00:35,840 +00:00:31,700 --> 00:00:34,000 who could easily use this data to exploit you. 12 -00:00:36,220 --> 00:00:38,120 +00:00:34,500 --> 00:00:37,000 But not if you're using Tor! 13 -00:00:39,140 --> 00:00:42,840 +00:00:37,140 --> 00:00:40,840 Tor Browser protects our privacy and identity on the Internet. 14 -00:00:43,560 --> 00:00:46,760 +00:00:41,560 --> 00:00:44,760 Tor secures your connection with three layers of encryption 15 -00:00:46,940 --> 00:00:51,760 +00:00:44,940 --> 00:00:49,760 and passes it through three voluntarily operated servers around the world, 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 which enables us to communicate anonymously over the Internet. 17 -00:00:58,560 --> 00:01:00,280 +00:00:56,560 --> 00:00:58,280 Tor also protects our data 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 against corporate or government targeted and mass surveillance. 19 -00:01:04,880 --> 00:01:09,340 +00:01:02,880 --> 00:01:07,340 Perhaps you live in a repressive country which tries to control and surveil the Internet. 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 Or perhaps you don't want big corporations taking advantage of your personal information. 21 -00:01:14,880 --> 00:01:17,640 +00:01:12,880 --> 00:01:15,640 Tor makes all of its users to look the same 22 -00:01:17,920 --> 00:01:20,800 +00:01:15,920 --> 00:01:18,800 which confuses the observer and makes you anonymous. 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 So, the more people use the Tor network, the stronger it gets 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 as it's easier to hide in a crowd of people who look exactly the same. 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 You can bypass the censorship without being worried about 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 the censor knowing what you do on the Internet. 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 The ads won't follow you everywhere for months, 28 -00:01:41,640 --> 00:01:43,300 +00:01:39,640 --> 00:01:41,300 starting when you first clicked on a product. 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 By using Tor, the sites you visit won't even know who you are, 30 -00:01:49,540 --> 00:01:51,760 +00:01:47,540 --> 00:01:49,760 from what part of the world you're visiting them, 31 -00:01:51,920 --> 00:01:53,920 +00:01:49,920 --> 00:01:51,920 unless you login and tell them so. 32 -00:01:56,200 --> 00:01:57,840 +00:01:54,200 --> 00:01:55,840 By downloading and using Tor, 33 -00:01:58,200 --> 00:02:00,560 +00:01:56,200 --> 00:01:58,560 you can protect the people who need anonymity, 34 -00:02:00,880 --> 00:02:03,640 +00:01:58,880 --> 00:02:01,640 like activists, journalists and bloggers. 35 -00:02:04,000 --> 00:02:09,000 +00:02:02,000 --> 00:02:07,000 Download and use Tor! Or run a relay!

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 14 May '15

14 May '15

commit 561d8e03c873dcb9c8ae81a6630fc4cf553dc7e2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 14 15:15:49 2015 +0000 Update translations for tails-misc_completed --- fr_CA.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr_CA.po b/fr_CA.po index ed08ed2..b64ab4e 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-05-14 14:43+0000\n" +"PO-Revision-Date: 2015-05-14 14:52+0000\n" "Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n"

1 0

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

14 May '15

commit 22847a57a796d811296bab03435e3510f8011352 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 14 15:15:44 2015 +0000 Update translations for tails-misc --- fr_CA.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr_CA.po b/fr_CA.po index ed08ed2..b64ab4e 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-05-14 14:43+0000\n" +"PO-Revision-Date: 2015-05-14 14:52+0000\n" "Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Fix: init HSDirs list in rend_data_service_create
by nickm＠torproject.org 14 May '15

14 May '15

commit 2aaaf7b145e818835e4e0d17e9aed14213b8b0ee Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu May 14 10:56:14 2015 -0400 Fix: init HSDirs list in rend_data_service_create Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index f06a5ff..ec4353c 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1464,6 +1464,9 @@ rend_data_service_create(const char *onion_address, const char *pk_digest, strlcpy(rend_data->onion_address, onion_address, sizeof(rend_data->onion_address)); rend_data->auth_type = auth_type; + /* Won't be used but still need to initialize it for rend_data dup and + * free. */ + rend_data->hsdirs_fp = smartlist_new(); return rend_data; }

1 0

[tor/master] Test: fix HS_DESC to expect descriptor ID
by nickm＠torproject.org 14 May '15

14 May '15

commit acfa374048cfbf7f632ecaba8355826366e4ed1f Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue May 12 16:45:56 2015 -0400 Test: fix HS_DESC to expect descriptor ID With #15881 implemented, this adds the missing descriptor ID at the end of the expected control message. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/test/test_hs.c | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 89438f2..49681b4 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -13,6 +13,7 @@ #include "test.h" #include "control.h" #include "config.h" +#include "rendcommon.h" #include "routerset.h" #include "circuitbuild.h" #include "test_helpers.h" @@ -131,11 +132,13 @@ static void test_hs_desc_event(void *arg) { #define STR_HS_ADDR "ajhb7kljbiru65qo" - #define STR_HS_ID "b3oeducbhjmbqmgw2i3jtz4fekkrinwj" - #define STR_DESC_ID "g5ojobzupf275beh5ra72uyhb3dkpxwg" + #define STR_HS_CONTENT_DESC_ID "g5ojobzupf275beh5ra72uyhb3dkpxwg" + #define STR_DESC_ID_BASE32 "hba3gmcgpfivzfhx5rtfqkfdhv65yrj3" + int ret; rend_data_t rend_query; const char *expected_msg; + char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; (void) arg; MOCK(send_control_event_string, @@ -144,31 +147,46 @@ test_hs_desc_event(void *arg) node_describe_longname_by_id_replacement); /* setup rend_query struct */ + memset(&rend_query, 0, sizeof(rend_query)); strncpy(rend_query.onion_address, STR_HS_ADDR, REND_SERVICE_ID_LEN_BASE32+1); - rend_query.auth_type = 0; + rend_query.auth_type = REND_NO_AUTH; + rend_query.hsdirs_fp = smartlist_new(); + smartlist_add(rend_query.hsdirs_fp, tor_memdup(HSDIR_EXIST_ID, + DIGEST_LEN)); + + /* Compute descriptor ID for replica 0, should be STR_DESC_ID_BASE32. */ + ret = rend_compute_v2_desc_id(rend_query.descriptor_id[0], + rend_query.onion_address, + NULL, 0, 0); + tt_int_op(ret, ==, 0); + base32_encode(desc_id_base32, sizeof(desc_id_base32), + rend_query.descriptor_id[0], DIGEST_LEN); + /* Make sure rend_compute_v2_desc_id works properly. */ + tt_mem_op(desc_id_base32, OP_EQ, STR_DESC_ID_BASE32, + sizeof(desc_id_base32)); /* test request event */ control_event_hs_descriptor_requested(&rend_query, HSDIR_EXIST_ID, - STR_HS_ID); + STR_DESC_ID_BASE32); expected_msg = "650 HS_DESC REQUESTED "STR_HS_ADDR" NO_AUTH "\ - STR_HSDIR_EXIST_LONGNAME" "STR_HS_ID"\r\n"; + STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32 "\r\n"; tt_assert(received_msg); tt_str_op(received_msg,OP_EQ, expected_msg); tor_free(received_msg); /* test received event */ - rend_query.auth_type = 1; + rend_query.auth_type = REND_BASIC_AUTH; control_event_hs_descriptor_received(rend_query.onion_address, &rend_query, HSDIR_EXIST_ID); expected_msg = "650 HS_DESC RECEIVED "STR_HS_ADDR" BASIC_AUTH "\ - STR_HSDIR_EXIST_LONGNAME"\r\n"; + STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32"\r\n"; tt_assert(received_msg); tt_str_op(received_msg,OP_EQ, expected_msg); tor_free(received_msg); /* test failed event */ - rend_query.auth_type = 2; + rend_query.auth_type = REND_STEALTH_AUTH; control_event_hs_descriptor_failed(&rend_query, HSDIR_NONE_EXIST_ID, "QUERY_REJECTED"); @@ -184,22 +202,26 @@ test_hs_desc_event(void *arg) HSDIR_EXIST_ID, "QUERY_REJECTED"); expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" UNKNOWN "\ - STR_HSDIR_EXIST_LONGNAME" REASON=QUERY_REJECTED\r\n"; + STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32\ + " REASON=QUERY_REJECTED\r\n"; tt_assert(received_msg); tt_str_op(received_msg,OP_EQ, expected_msg); tor_free(received_msg); /* test valid content. */ char *exp_msg; - control_event_hs_descriptor_content(rend_query.onion_address, STR_DESC_ID, + control_event_hs_descriptor_content(rend_query.onion_address, STR_HS_CONTENT_DESC_ID, HSDIR_EXIST_ID, hs_desc_content); - tor_asprintf(&exp_msg, "650+HS_DESC_CONTENT " STR_HS_ADDR " " STR_DESC_ID \ - " " STR_HSDIR_EXIST_LONGNAME "\r\n%s\r\n.\r\n650 OK\r\n", - hs_desc_content); + tor_asprintf(&exp_msg, "650+HS_DESC_CONTENT " STR_HS_ADDR " "\ + STR_HS_CONTENT_DESC_ID " " STR_HSDIR_EXIST_LONGNAME\ + "\r\n%s\r\n.\r\n650 OK\r\n", hs_desc_content); + tt_assert(received_msg); tt_str_op(received_msg, OP_EQ, exp_msg); tor_free(received_msg); tor_free(exp_msg); + SMARTLIST_FOREACH(rend_query.hsdirs_fp, char *, d, tor_free(d)); + smartlist_free(rend_query.hsdirs_fp); done: UNMOCK(send_control_event_string);

1 0

[tor/master] Add missing descriptor ID to HS_DESC control event
by nickm＠torproject.org 14 May '15

14 May '15

commit c1ffeadff4db375886d40bb5928ddd4fe761ba9f Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Apr 30 12:28:11 2015 -0400 Add missing descriptor ID to HS_DESC control event For FAILED and RECEIVED action of the HS_DESC event, we now sends back the descriptor ID at the end like specified in the control-spec section 4.1.25. Fixes #15881 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug15881 | 3 ++ src/or/control.c | 87 +++++++++++++++++++++++++++++++++++++++++---------- src/or/control.h | 7 ++--- src/or/directory.c | 5 ++- src/or/or.h | 4 +++ src/or/rendclient.c | 7 +++++ src/or/rendcommon.c | 9 +++++- src/or/rendcommon.h | 6 ++++ src/test/test_hs.c | 10 +++--- 9 files changed, 109 insertions(+), 29 deletions(-) diff --git a/changes/bug15881 b/changes/bug15881 new file mode 100644 index 0000000..5cf561e --- /dev/null +++ b/changes/bug15881 @@ -0,0 +1,3 @@ + o Controller fixes: + - Add the descriptor ID in each HS_DESC control event. It was missing + but specified in control-spec.txt. Fixes ticket 15881. diff --git a/src/or/control.c b/src/or/control.c index d4e106e..b8b29d7 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -5904,6 +5904,44 @@ control_event_hs_descriptor_requested(const rend_data_t *rend_query, desc_id_base32); } +/** For an HS descriptor query <b>rend_data</b>, using the + * <b>onion_address</b> and HSDir fingerprint <b>hsdir_fp</b>, find out + * which descriptor ID in the query is the right one. + * + * Return a pointer of the binary descriptor ID found in the query's object + * or NULL if not found. */ +static const char * +get_desc_id_from_query(const rend_data_t *rend_data, const char *hsdir_fp) +{ + int replica; + const char *desc_id = NULL; + + /* Possible if the fetch was done using a descriptor ID. This means that + * the HSFETCH command was used. */ + if (!tor_digest_is_zero(rend_data->desc_id_fetch)) { + desc_id = rend_data->desc_id_fetch; + goto end; + } + + /* OK, we have an onion address so now let's find which descriptor ID + * is the one associated with the HSDir fingerprint. */ + for (replica = 0; replica < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; + replica++) { + const char *digest = rend_data->descriptor_id[replica]; + + SMARTLIST_FOREACH_BEGIN(rend_data->hsdirs_fp, char *, fingerprint) { + if (tor_memcmp(fingerprint, hsdir_fp, DIGEST_LEN) == 0) { + /* Found it! This descriptor ID is the right one. */ + desc_id = digest; + goto end; + } + } SMARTLIST_FOREACH_END(fingerprint); + } + +end: + return desc_id; +} + /** send HS_DESC upload event. * * <b>service_id</b> is the descriptor onion address. @@ -5940,30 +5978,45 @@ control_event_hs_descriptor_upload(const char *service_id, void control_event_hs_descriptor_receive_end(const char *action, const char *onion_address, - rend_auth_type_t auth_type, + const rend_data_t *rend_data, const char *id_digest, const char *reason) { + char *desc_id_field = NULL; char *reason_field = NULL; + char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; + const char *desc_id = NULL; - if (!action || !id_digest || !onion_address) { - log_warn(LD_BUG, "Called with action==%p, id_digest==%p " - "onion_address==%p", action, id_digest, onion_address); + if (!action || !id_digest || !rend_data || !onion_address) { + log_warn(LD_BUG, "Called with action==%p, id_digest==%p, " + "rend_data==%p, onion_address==%p", action, id_digest, + rend_data, onion_address); return; } + desc_id = get_desc_id_from_query(rend_data, id_digest); + if (desc_id != NULL) { + /* Set the descriptor ID digest to base32 so we can send it. */ + base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_id, + DIGEST_LEN); + /* Extra whitespace is needed before the value. */ + tor_asprintf(&desc_id_field, " %s", desc_id_base32); + } + if (reason) { tor_asprintf(&reason_field, " REASON=%s", reason); } send_control_event(EVENT_HS_DESC, ALL_FORMATS, - "650 HS_DESC %s %s %s %s%s\r\n", + "650 HS_DESC %s %s %s %s%s%s\r\n", action, rend_hsaddress_str_or_unknown(onion_address), - rend_auth_type_to_string(auth_type), + rend_auth_type_to_string(rend_data->auth_type), node_describe_longname_by_id(id_digest), + desc_id_field ? desc_id_field : "", reason_field ? reason_field : ""); + tor_free(desc_id_field); tor_free(reason_field); } @@ -6007,15 +6060,16 @@ control_event_hs_descriptor_upload_end(const char *action, */ void control_event_hs_descriptor_received(const char *onion_address, - rend_auth_type_t auth_type, + const rend_data_t *rend_data, const char *id_digest) { - if (!id_digest) { - log_warn(LD_BUG, "Called with id_digest==%p", id_digest); + if (!rend_data || !id_digest || !onion_address) { + log_warn(LD_BUG, "Called with rend_data==%p, id_digest==%p, " + "onion_address==%p", rend_data, id_digest, onion_address); return; } control_event_hs_descriptor_receive_end("RECEIVED", onion_address, - auth_type, id_digest, NULL); + rend_data, id_digest, NULL); } /** send HS_DESC UPLOADED event @@ -6039,17 +6093,18 @@ control_event_hs_descriptor_uploaded(const char *id_digest) * field. */ void -control_event_hs_descriptor_failed(const char *onion_address, - rend_auth_type_t auth_type, +control_event_hs_descriptor_failed(const rend_data_t *rend_data, const char *id_digest, const char *reason) { - if (!id_digest) { - log_warn(LD_BUG, "Called with id_digest==%p", id_digest); + if (!rend_data || !id_digest) { + log_warn(LD_BUG, "Called with rend_data==%p, id_digest==%p", + rend_data, id_digest); return; } - control_event_hs_descriptor_receive_end("FAILED", onion_address, auth_type, - id_digest, reason); + control_event_hs_descriptor_receive_end("FAILED", + rend_data->onion_address, + rend_data, id_digest, reason); } /** send HS_DESC_CONTENT event after completion of a successful fetch from diff --git a/src/or/control.h b/src/or/control.h index 644caf8..a9f2725 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -111,18 +111,17 @@ void control_event_hs_descriptor_upload(const char *service_id, const char *hs_dir); void control_event_hs_descriptor_receive_end(const char *action, const char *onion_address, - rend_auth_type_t auth_type, + const rend_data_t *rend_data, const char *id_digest, const char *reason); void control_event_hs_descriptor_upload_end(const char *action, const char *hs_dir, const char *reason); void control_event_hs_descriptor_received(const char *onion_address, - rend_auth_type_t auth_type, + const rend_data_t *rend_data, const char *id_digest); void control_event_hs_descriptor_uploaded(const char *hs_dir); -void control_event_hs_descriptor_failed(const char *onion_address, - rend_auth_type_t auth_type, +void control_event_hs_descriptor_failed(const rend_data_t *rend_data, const char *id_digest, const char *reason); void control_event_hs_descriptor_upload_failed(const char *hs_dir, diff --git a/src/or/directory.c b/src/or/directory.c index 85da97f..9fe3052 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2099,8 +2099,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) if (conn->base_.purpose == DIR_PURPOSE_FETCH_RENDDESC_V2) { #define SEND_HS_DESC_FAILED_EVENT(reason) ( \ - control_event_hs_descriptor_failed(conn->rend_data->onion_address, \ - conn->rend_data->auth_type, \ + control_event_hs_descriptor_failed(conn->rend_data, \ conn->identity_digest, \ reason) ) #define SEND_HS_DESC_FAILED_CONTENT() ( \ @@ -2141,7 +2140,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) log_info(LD_REND, "Successfully fetched v2 rendezvous " "descriptor."); control_event_hs_descriptor_received(service_id, - conn->rend_data->auth_type, + conn->rend_data, conn->identity_digest); control_event_hs_descriptor_content(service_id, conn->requested_resource, diff --git a/src/or/or.h b/src/or/or.h index d9be1be..5bb080f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -814,6 +814,10 @@ typedef struct rend_data_t { /** Rendezvous cookie used by both, client and service. */ char rend_cookie[REND_COOKIE_LEN]; + + /** List of HSDir fingerprints on which this request has been sent to. + * This contains binary identity digest of the directory. */ + smartlist_t *hsdirs_fp; } rend_data_t; /** Time interval for tracking replays of DH public keys received in diff --git a/src/or/rendclient.c b/src/or/rendclient.c index d0c4b87..59e938e 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -686,6 +686,7 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query, routerstatus_t *rs_hsdir) { routerstatus_t *hs_dir = rs_hsdir; + char *hsdir_fp; char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; char descriptor_cookie_base64[3*REND_DESC_COOKIE_LEN_BASE64]; #ifdef ENABLE_TOR2WEB_MODE @@ -709,6 +710,12 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query, } } + /* Add a copy of the HSDir identity digest to the query so we can track it + * on the control port. */ + hsdir_fp = tor_memdup(hs_dir->identity_digest, + sizeof(hs_dir->identity_digest)); + smartlist_add(rend_query->hsdirs_fp, hsdir_fp); + /* Encode descriptor cookie for logging purposes. Also, if the cookie is * malformed, no fetch is triggered thus this needs to be done before the * fetch request. */ diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index c3f0d32..f06a5ff 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1400,8 +1400,14 @@ rend_process_relay_cell(circuit_t *circ, const crypt_path_t *layer_hint, rend_data_t * rend_data_dup(const rend_data_t *data) { + rend_data_t *data_dup; tor_assert(data); - return tor_memdup(data, sizeof(rend_data_t)); + data_dup = tor_memdup(data, sizeof(rend_data_t)); + data_dup->hsdirs_fp = smartlist_new(); + SMARTLIST_FOREACH(data->hsdirs_fp, char *, fp, + smartlist_add(data_dup->hsdirs_fp, + tor_memdup(fp, DIGEST_LEN))); + return data_dup; } /** Compute descriptor ID for each replicas and save them. A valid onion @@ -1495,6 +1501,7 @@ rend_data_client_create(const char *onion_address, const char *desc_id, } rend_data->auth_type = auth_type; + rend_data->hsdirs_fp = smartlist_new(); return rend_data; diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index a4d55d2..806851c 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -16,6 +16,12 @@ static INLINE void rend_data_free(rend_data_t *data) { + if (!data) { + return; + } + /* Cleanup the HSDir identity digest. */ + SMARTLIST_FOREACH(data->hsdirs_fp, char *, d, tor_free(d)); + smartlist_free(data->hsdirs_fp); tor_free(data); } diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 4c43ebd..89438f2 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -160,7 +160,7 @@ test_hs_desc_event(void *arg) /* test received event */ rend_query.auth_type = 1; control_event_hs_descriptor_received(rend_query.onion_address, - rend_query.auth_type, HSDIR_EXIST_ID); + &rend_query, HSDIR_EXIST_ID); expected_msg = "650 HS_DESC RECEIVED "STR_HS_ADDR" BASIC_AUTH "\ STR_HSDIR_EXIST_LONGNAME"\r\n"; tt_assert(received_msg); @@ -169,8 +169,8 @@ test_hs_desc_event(void *arg) /* test failed event */ rend_query.auth_type = 2; - control_event_hs_descriptor_failed(rend_query.onion_address, - rend_query.auth_type, HSDIR_NONE_EXIST_ID, + control_event_hs_descriptor_failed(&rend_query, + HSDIR_NONE_EXIST_ID, "QUERY_REJECTED"); expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" STEALTH_AUTH "\ STR_HSDIR_NONE_EXIST_LONGNAME" REASON=QUERY_REJECTED\r\n"; @@ -180,8 +180,8 @@ test_hs_desc_event(void *arg) /* test invalid auth type */ rend_query.auth_type = 999; - control_event_hs_descriptor_failed(rend_query.onion_address, - rend_query.auth_type, HSDIR_EXIST_ID, + control_event_hs_descriptor_failed(&rend_query, + HSDIR_EXIST_ID, "QUERY_REJECTED"); expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" UNKNOWN "\ STR_HSDIR_EXIST_LONGNAME" REASON=QUERY_REJECTED\r\n";

1 0