August 2017 - tor-commits - lists.torproject.org

[tor/master] prop224: Refactor descriptor reupload logic.
by nickm＠torproject.org 25 Aug '17

25 Aug '17

commit c980be951157b68e6bd658ce01850e96ce97d422 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 24 16:17:26 2017 +0300 prop224: Refactor descriptor reupload logic. We refactor the descriptor reupload logic to be similar to the v2 logic where we update a global 'consider_republishing_rend_descriptors' flag and then we use that to check for hash ring changes during the global hidden service callbacks. This fixes bugs where we would inspect the hash ring immediately as we receive new dirinfo (e.g. consensus) but before running the hidden service housekeeping events. That was leaving us in an inconsistent state wrt hsdir indices and causing bugs all around. --- src/or/hs_service.c | 48 ++++++++++++++++++++-------------------------- src/or/hs_service.h | 4 ++++ src/test/test_hs_common.c | 7 +++---- src/test/test_hs_service.c | 13 +++++++++++++ 4 files changed, 41 insertions(+), 31 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index e530a10a1..0fc5a9144 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -72,6 +72,11 @@ static const char address_tld[] = "onion"; * loading keys requires that we are an actual running tor process. */ static smartlist_t *hs_service_staging_list; +/** True if the list of available router descriptors might have changed which + * might result in an altered hash ring. Check if the hash ring changed and + * reupload if needed */ +static int consider_republishing_hs_descriptors = 0; + static void set_descriptor_revision_counter(hs_descriptor_t *hs_desc); /* Helper: Function to compare two objects in the service map. Return 1 if the @@ -2429,7 +2434,14 @@ run_upload_descriptor_event(time_t now) FOR_EACH_DESCRIPTOR_BEGIN(service, desc) { int for_next_period = 0; - /* Can this descriptor be uploaed? */ + /* If we were asked to re-examine the hash ring, and it changed, then + schedule an upload */ + if (consider_republishing_hs_descriptors && + service_desc_hsdirs_changed(service, desc)) { + service_desc_schedule_upload(desc, now, 0); + } + + /* Can this descriptor be uploaded? */ if (!should_service_upload_descriptor(service, desc, now)) { continue; } @@ -2456,6 +2468,9 @@ run_upload_descriptor_event(time_t now) upload_descriptor_to_all(service, desc, for_next_period); } FOR_EACH_DESCRIPTOR_END; } FOR_EACH_SERVICE_END; + + /* We are done considering whether to republish rend descriptors */ + consider_republishing_hs_descriptors = 0; } /* Called when the introduction point circuit is done building and ready to be @@ -2738,7 +2753,7 @@ service_add_fnames_to_list(const hs_service_t *service, smartlist_t *list) /** The set of HSDirs have changed: check if the change affects our descriptor * HSDir placement, and if it does, reupload the desc. */ -static int +int service_desc_hsdirs_changed(const hs_service_t *service, const hs_service_descriptor_t *desc) { @@ -2788,34 +2803,13 @@ service_desc_hsdirs_changed(const hs_service_t *service, /* ========== */ /* We just received a new batch of descriptors which might affect the shape of - * the HSDir hash ring. Signal that we should re-upload our HS descriptors. */ + * the HSDir hash ring. Signal that we should reexamine the hash ring and + * re-upload our HS descriptors if needed. */ void hs_hsdir_set_changed_consider_reupload(void) { - time_t now = approx_time(); - - /* Check if HS subsystem is initialized */ - if (!hs_service_map) { - return; - } - - /* Basic test: If we have not bootstrapped 100% yet, no point in even trying - to upload descriptor. */ - if (!router_have_minimum_dir_info()) { - return; - } - - log_info(LD_GENERAL, "Received new dirinfo: Checking hash ring for changes"); - - /* Go over all descriptors and check if the set of HSDirs changed for any of - * them. Schedule reupload if so. */ - FOR_EACH_SERVICE_BEGIN(service) { - FOR_EACH_DESCRIPTOR_BEGIN(service, desc) { - if (service_desc_hsdirs_changed(service, desc)) { - service_desc_schedule_upload(desc, now, 0); - } - } FOR_EACH_DESCRIPTOR_END; - } FOR_EACH_SERVICE_END; + log_info(LD_REND, "New dirinfo arrived: consider reuploading descriptor"); + consider_republishing_hs_descriptors = 1; } /* Return the number of service we have configured and usable. */ diff --git a/src/or/hs_service.h b/src/or/hs_service.h index 5bd19931f..d902e0b2c 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -280,6 +280,10 @@ int hs_service_receive_introduce2(origin_circuit_t *circ, void hs_service_intro_circ_has_closed(origin_circuit_t *circ); +int service_desc_hsdirs_changed(const hs_service_t *service, + const hs_service_descriptor_t *desc); + + #ifdef HS_SERVICE_PRIVATE #ifdef TOR_UNIT_TESTS diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index ec938ff5d..b1e47adf2 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -626,12 +626,11 @@ test_desc_reupload_logic(void *arg) curr_hsdir_index, nickname, 1); } - /* Now call router_dir_info_changed() again and see that it detected the hash - ring change and updated the upload time */ + /* Now call service_desc_hsdirs_changed() and see that it detected the hash + ring change */ time_t now = approx_time(); tt_assert(now); - router_dir_info_changed(); - tt_int_op(desc->next_upload_time, OP_EQ, now); + tt_int_op(service_desc_hsdirs_changed(service, desc), OP_EQ, 1); /* Now pretend that the descriptor changed, and order a reupload to all HSDirs. Make sure that the set of previous HSDirs was cleared. */ diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index cf1c36a52..4c7880c0e 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1005,6 +1005,13 @@ test_rotate_descriptors(void *arg) OP_EQ, 0); tt_assert(service->desc_next == NULL); + /* Now let's re-create desc_next and get out of overlap period. We should + test that desc_current gets replaced by desc_next, and desc_next becomes + NULL. */ + desc_next = service_descriptor_new(); + desc_next->next_upload_time = 240; /* Our marker to recognize it. */ + service->desc_next = desc_next; + /* Going out of the overlap period. */ ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", &mock_ns.valid_after); @@ -1017,6 +1024,12 @@ test_rotate_descriptors(void *arg) tt_mem_op(service->desc_current, OP_EQ, desc_next, sizeof(*desc_next)); tt_assert(service->desc_next == NULL); + /* Calling rotate_all_descriptors() another time should do nothing */ + rotate_all_descriptors(now); + tt_int_op(service->state.in_overlap_period, OP_EQ, 0); + tt_mem_op(service->desc_current, OP_EQ, desc_next, sizeof(*desc_next)); + tt_assert(service->desc_next == NULL); + done: hs_free_all(); UNMOCK(circuit_mark_for_close_);

1 0

[tor/master] sandbox: Fix double free when initializing HSv3 filenames
by nickm＠torproject.org 25 Aug '17

25 Aug '17

commit 2549b3e9233372556ae41c51b2e89c3ddb21a9ea Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 25 09:28:10 2017 -0400 sandbox: Fix double free when initializing HSv3 filenames Don't free a reference that has been stolen. Fixes #23329 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index 38ebe3f25..5d51d1dea 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3583,7 +3583,6 @@ sandbox_init_filter(void) /* steals references */ sandbox_cfg_allow_open_filename(&cfg, file_name); sandbox_cfg_allow_open_filename(&cfg, tmp_name); - tor_free(file_name); }); SMARTLIST_FOREACH(dirs, char *, dir, { /* steals reference */

1 0

[webwml/master] Fix typos
by hiro＠torproject.org 25 Aug '17

25 Aug '17

commit 8c2873b1bbf4a5d418dceaf951d6d23b07b0e695 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Aug 25 13:04:21 2017 +0200 Fix typos --- about/en/jobs.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/jobs.wml b/about/en/jobs.wml index d841c1aa..835d2b98 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -20,7 +20,7 @@ <ul> <li><a href="<page about/jobs-browserdeveloper>">Browser Developer</a></li> <li><a href="<page about/jobs-developerandroid>">Browser Developers for Mobile (Android)</a></li> - <li><a href="<page about/jobs-osdeveloperandroid>">Android OS developer</a></li> + <li><a href="<page about/jobs-osdeveloperandroid>">Android OS Developer</a></li> </ul>

1 0

[webwml/master] Fix posting date for os android dev
by hiro＠torproject.org 25 Aug '17

25 Aug '17

commit 520780ca66f1afcad3d4bf233bd5f96905e2fde4 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Aug 25 12:54:02 2017 +0200 Fix posting date for os android dev --- about/en/jobs-osdeveloperandroid.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about/en/jobs-osdeveloperandroid.wml b/about/en/jobs-osdeveloperandroid.wml index 1ef85c08..0ac17e2f 100644 --- a/about/en/jobs-osdeveloperandroid.wml +++ b/about/en/jobs-osdeveloperandroid.wml @@ -11,10 +11,10 @@ </div> <div id="maincol"> <h1> The Tor Project is looking for an Android OS developer!</h1> -<h2>(Posted 27 Jul 2017)</h2> +<h2>(Posted 23 Aug 2017)</h2> <p> -August23, 2017 +August 23, 2017 </p> <p> The Tor Project is looking for an Android OS Developer!

1 0

[webwml/master] Add link in jobs page
by hiro＠torproject.org 25 Aug '17

25 Aug '17

commit e636f1bdb606f67a3c30fbce85245c24bc526ca4 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Aug 25 12:52:48 2017 +0200 Add link in jobs page --- about/en/jobs.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/about/en/jobs.wml b/about/en/jobs.wml index 86d8eac9..d841c1aa 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -20,6 +20,7 @@ <ul> <li><a href="<page about/jobs-browserdeveloper>">Browser Developer</a></li> <li><a href="<page about/jobs-developerandroid>">Browser Developers for Mobile (Android)</a></li> + <li><a href="<page about/jobs-osdeveloperandroid>">Android OS developer</a></li> </ul>

1 0

[webwml/master] Fix tag again
by hiro＠torproject.org 25 Aug '17

25 Aug '17

commit 3baf0eec9c1c2b72686c18ec2d56f8070a58ff04 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Aug 25 12:47:21 2017 +0200 Fix tag again --- about/en/jobs-browserdeveloper.wml | 1 - 1 file changed, 1 deletion(-) diff --git a/about/en/jobs-browserdeveloper.wml b/about/en/jobs-browserdeveloper.wml index 413ffe97..dd119245 100644 --- a/about/en/jobs-browserdeveloper.wml +++ b/about/en/jobs-browserdeveloper.wml @@ -56,7 +56,6 @@ This is a full-time position. <h2>Preferred qualifications:</h2> <ul> - </li> <li> Familiarity and/or experience with writing add-ons and/or patches for Mozilla Firefox or other web browsers. </li>

1 0

[webwml/master] Fix tag
by hiro＠torproject.org 25 Aug '17

25 Aug '17

commit 2461403633b36018b0c1fa1d39c6548917391454 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Aug 25 12:46:25 2017 +0200 Fix tag --- about/en/jobs-developerandroid.wml | 1 - 1 file changed, 1 deletion(-) diff --git a/about/en/jobs-developerandroid.wml b/about/en/jobs-developerandroid.wml index de73b049..bd8a48d1 100644 --- a/about/en/jobs-developerandroid.wml +++ b/about/en/jobs-developerandroid.wml @@ -59,7 +59,6 @@ This is a full-time position. <h2>Preferred qualifications:</h2> <ul> - </li> <li> Familiarity and/or experience with writing add-ons and/or patches for Mozilla Firefox or other web browsers. </li>

1 0

[webwml/master] add android os dev job
by hiro＠torproject.org 25 Aug '17

25 Aug '17

commit 9656a69e8fe8b005eae100928c84833f894ffa25 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Aug 25 12:45:52 2017 +0200 add android os dev job --- about/en/jobs-osdeveloperandroid.wml | 139 +++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/about/en/jobs-osdeveloperandroid.wml b/about/en/jobs-osdeveloperandroid.wml new file mode 100644 index 00000000..1ef85c08 --- /dev/null +++ b/about/en/jobs-osdeveloperandroid.wml @@ -0,0 +1,139 @@ +## translation metadata +# Revision: $Revision: 25666 $ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Jobs (os developer android)" 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"> +<h1> The Tor Project is looking for an Android OS developer!</h1> +<h2>(Posted 27 Jul 2017)</h2> + +<p> +August23, 2017 +</p> +<p> +The Tor Project is looking for an Android OS Developer! +</p> +<p> + As an Android OS Developer, your job will be to work closely with other + members of the development team to build and release a Tor Browser for + Android with functionality and build processes in parity with the desktop + browser. This is a full-time position. +</p> +<p> + Being a Tor developer includes triaging, diagnosing, and fixing bugs; + looking for and resolving mobile privacy issues; responding on short + notice to urgent security issues; and working collaboratively with + coworkers and volunteers to implement new features and mobile behavior + changes. We also need help making our code more maintainable, testable, + and mergeable by upstream. The person in this position will review other + people's code, designs, and academic research papers to make suggestions + for improvement. +</p> + +<h2>This position will also focus on the following tasks/projects:</h2> +<ul> + <li> + Design TorService API/integration with Fennec Mobile Android Java code. + </li> + <li> + Automate a continuous build process. + </li> + <li> + Make Tor Browser for Android a standalone application by porting the Orbot connection to Tor. + </li> + <li> + Create a Gradle-dependent standalone Tor Service Library for Android. + </li> + <li> + Coordinate uplifting of mobile patches. + </li> +</ul> + +<h2>Required Qualifications:</h2> +<ul> + <li> + 5+ years experience with developing and testing Java/JNI, Android APIs, and library dependencies. + </li> + <li> + Experience with process management services on Android. + </li> + <li> + Experience with Android Software Development Kit (SDK). + </li> + <li> + Experience in cross-compiling Linux/C/C++ code and libraries to mobile devices via Android Native Development Kit (NDK). + </li> + <li> + Experience using network traffic capture and monitoring tools (Wireshark, PCAP). + </li> + <li> + Test writing in Espresso, Robotum, JUnit, and/or comparable environment. + </li> + <li> + Good interpersonal and open-source collaboration skills. + </li> +</ul> + +<h2>Desired qualifications:</h2> +<ul> + <li> + Experience with reproducible builds on desktop or mobile. + </li> + <li> + User interface and usability skills (nice, but not essential for this role). + </li> + <li> + Shipped public applications with NDK features. + </li> + <li> + Experience with Rust and Go on Android. + </li> + <li> + Automated testing and continuous integration using cloud based services. + </li> + <li> + Network knowledge and/or experience; experience investigating leaks. + </li> +</ul> +<h2> +Other notes: +</h2> +<p> +Academic degrees are great, but not required if you have the right experience! +</p> +<p> +The team coordinates via IRC, email, and bug trackers. This position may be performed remotely, but we would be happy to provide a desk at our office in Seattle, Washington. We also have informal shared workspace arrangements in NYC and San Francisco. +</p> +<p> +The Tor Project, Inc., is a 501(c)(3) non-profit organization that provides the technical infrastructure for privacy protection over the Internet. With paid staff and contractors of around 30 technologists and operational support people, plus many volunteers all over the world who contribute to our work, the Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. We only write free and open source software, and we don't believe in software patents. +</p> +<p> +The Tor Project has a competitive benefits package, including a generous PTO policy; 14 paid holidays per year (including the week between Christmas and New Year's, when the office is closed); health, vision, dental, disability, and life insurance paid in full for employee; flexible work schedule; and occasional travel opportunities. +</p> +<p> +The Tor Project, Inc., is an equal opportunity, affirmative action employer. +</p> +<h2> +To apply: +</h2> +<p> +Please email a PDF of your resume/CV, and a cover letter explaining how your qualifications and experience meet the requirements of this job description, including why you want to work on Tor. Email should be sent to hr at torproject.org with "Browser Developer" in the subject line. +Link to at least one of your code samples (ideally, more than one and all of which we will presume you are authorized to disclose). No phone calls, please! +</p> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi>

1 0

[tor/master] test: Fix memory leak in hs_descriptor/decode_bad_signature
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit dfaa5c65f9fbfde9a12d8eb3ed848cab6ed1a5f9 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 24 16:21:44 2017 -0400 test: Fix memory leak in hs_descriptor/decode_bad_signature Fixes #23319 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_descriptor.c | 2 +- src/or/hs_descriptor.h | 2 ++ src/test/test_hs_descriptor.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index f50e2f851..4bc54bdb2 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -147,7 +147,7 @@ static token_rule_t hs_desc_intro_point_v3_token_table[] = { }; /* Free the content of the plaintext section of a descriptor. */ -static void +STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc) { if (!desc) { diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index ce225d521..3e82746c3 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -256,6 +256,8 @@ STATIC int desc_sig_is_valid(const char *b64_sig, const char *encoded_desc, size_t encoded_len); STATIC size_t decode_superencrypted(const char *message, size_t message_len, uint8_t **encrypted_out); +STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc); + #endif /* HS_DESCRIPTOR_PRIVATE */ #endif /* TOR_HS_DESCRIPTOR_H */ diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 30a5b23cf..7f0d1dd18 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -581,7 +581,8 @@ test_decode_bad_signature(void *arg) expect_log_msg_containing("Malformed signature line. Rejecting."); teardown_capture_of_logs(); - done: ; + done: + desc_plaintext_data_free_contents(&desc_plaintext); } static void

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug23319_032_01'
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit f9cd870f50d770f629e370583b0e9df2f8844436 Merge: cbfc50d48 dfaa5c65f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 24 16:23:57 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23319_032_01' src/or/hs_descriptor.c | 2 +- src/or/hs_descriptor.h | 2 ++ src/test/test_hs_descriptor.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-)

1 0