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

[tor/master] test/parseconf: Add basic dirauth and bridgeauth tests
by nickm＠torproject.org 21 Oct '19

21 Oct '19

commit b266a804e96113a9a087bf2395ff54d72a81a082 Author: teor <teor(a)torproject.org> Date: Fri Oct 18 16:00:02 2019 +1000 test/parseconf: Add basic dirauth and bridgeauth tests Part of 32123. --- src/test/conf_examples/bridgeauth_1/expected | 7 +++++++ src/test/conf_examples/bridgeauth_1/expected_no_dirauth | 7 +++++++ src/test/conf_examples/bridgeauth_1/expected_no_dirauth_relay | 6 ++++++ src/test/conf_examples/bridgeauth_1/torrc | 8 ++++++++ src/test/conf_examples/dirauth_1/expected | 8 ++++++++ src/test/conf_examples/dirauth_1/expected_no_dirauth | 7 +++++++ src/test/conf_examples/dirauth_1/expected_no_dirauth_relay | 6 ++++++ src/test/conf_examples/dirauth_1/torrc | 8 ++++++++ 8 files changed, 57 insertions(+) diff --git a/src/test/conf_examples/bridgeauth_1/expected b/src/test/conf_examples/bridgeauth_1/expected new file mode 100644 index 000000000..d43aaf2c8 --- /dev/null +++ b/src/test/conf_examples/bridgeauth_1/expected @@ -0,0 +1,7 @@ +Address 198.51.100.123 +AuthoritativeDirectory 1 +BridgeAuthoritativeDir 1 +ContactInfo tor_parse_test(a)example.com +DirPort 80 +Nickname Unnamed +ORPort 443 diff --git a/src/test/conf_examples/bridgeauth_1/expected_no_dirauth b/src/test/conf_examples/bridgeauth_1/expected_no_dirauth new file mode 100644 index 000000000..d43aaf2c8 --- /dev/null +++ b/src/test/conf_examples/bridgeauth_1/expected_no_dirauth @@ -0,0 +1,7 @@ +Address 198.51.100.123 +AuthoritativeDirectory 1 +BridgeAuthoritativeDir 1 +ContactInfo tor_parse_test(a)example.com +DirPort 80 +Nickname Unnamed +ORPort 443 diff --git a/src/test/conf_examples/bridgeauth_1/expected_no_dirauth_relay b/src/test/conf_examples/bridgeauth_1/expected_no_dirauth_relay new file mode 100644 index 000000000..e059d7997 --- /dev/null +++ b/src/test/conf_examples/bridgeauth_1/expected_no_dirauth_relay @@ -0,0 +1,6 @@ +Address 198.51.100.123 +AuthoritativeDirectory 1 +BridgeAuthoritativeDir 1 +ContactInfo tor_parse_test(a)example.com +DirPort 80 +ORPort 443 diff --git a/src/test/conf_examples/bridgeauth_1/torrc b/src/test/conf_examples/bridgeauth_1/torrc new file mode 100644 index 000000000..740bc6c2e --- /dev/null +++ b/src/test/conf_examples/bridgeauth_1/torrc @@ -0,0 +1,8 @@ +AuthoritativeDirectory 1 +BridgeAuthoritativeDir 1 + +ContactInfo tor_parse_test(a)example.com + +Address 198.51.100.123 +ORPort 443 +DirPort 80 diff --git a/src/test/conf_examples/dirauth_1/expected b/src/test/conf_examples/dirauth_1/expected new file mode 100644 index 000000000..901f7d947 --- /dev/null +++ b/src/test/conf_examples/dirauth_1/expected @@ -0,0 +1,8 @@ +Address 192.0.2.1 +AuthoritativeDirectory 1 +ContactInfo tor_parse_test(a)example.net +DirPort 9030 +DownloadExtraInfo 1 +Nickname Unnamed +ORPort 9001 +V3AuthoritativeDirectory 1 diff --git a/src/test/conf_examples/dirauth_1/expected_no_dirauth b/src/test/conf_examples/dirauth_1/expected_no_dirauth new file mode 100644 index 000000000..f006c6f8f --- /dev/null +++ b/src/test/conf_examples/dirauth_1/expected_no_dirauth @@ -0,0 +1,7 @@ +Address 192.0.2.1 +AuthoritativeDirectory 1 +ContactInfo tor_parse_test(a)example.net +DirPort 9030 +Nickname Unnamed +ORPort 9001 +V3AuthoritativeDirectory 1 diff --git a/src/test/conf_examples/dirauth_1/expected_no_dirauth_relay b/src/test/conf_examples/dirauth_1/expected_no_dirauth_relay new file mode 100644 index 000000000..4b9ad49bb --- /dev/null +++ b/src/test/conf_examples/dirauth_1/expected_no_dirauth_relay @@ -0,0 +1,6 @@ +Address 192.0.2.1 +AuthoritativeDirectory 1 +ContactInfo tor_parse_test(a)example.net +DirPort 9030 +ORPort 9001 +V3AuthoritativeDirectory 1 diff --git a/src/test/conf_examples/dirauth_1/torrc b/src/test/conf_examples/dirauth_1/torrc new file mode 100644 index 000000000..b870e6e8e --- /dev/null +++ b/src/test/conf_examples/dirauth_1/torrc @@ -0,0 +1,8 @@ +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 + +ContactInfo tor_parse_test(a)example.net + +Address 192.0.2.1 +ORPort 9001 +DirPort 9030

1 0

[tor/master] dirauth: Add a macro comment to have_module_dirauth()
by nickm＠torproject.org 21 Oct '19

21 Oct '19

commit 475dffee424610593e9433b78a1fbb5bbabe69a4 Author: teor <teor(a)torproject.org> Date: Sun Oct 20 18:01:52 2019 +1000 dirauth: Add a macro comment to have_module_dirauth() --- src/feature/dirauth/authmode.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/feature/dirauth/authmode.h b/src/feature/dirauth/authmode.h index bfd5f4dc0..11bc40d8d 100644 --- a/src/feature/dirauth/authmode.h +++ b/src/feature/dirauth/authmode.h @@ -27,6 +27,7 @@ authdir_mode_v3(const or_options_t *options) return authdir_mode(options) && options->V3AuthoritativeDir != 0; } +/* Is the dirauth module enabled? */ #define have_module_dirauth() (1) #else /* !defined(HAVE_MODULE_DIRAUTH) */

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1430'
by nickm＠torproject.org 21 Oct '19

21 Oct '19

commit 7dc78aca2997c89c2bcf4f05cbb93ee326580488 Merge: 7a72e71f7 475dffee4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 21 12:43:26 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1430' .travis.yml | 2 + changes/ticket32123 | 5 ++ configure.ac | 13 ++++- doc/HACKING/Module.md | 29 +++++----- src/app/config/config.c | 1 + src/core/include.am | 12 +++- src/core/mainloop/mainloop.c | 1 + src/core/or/circuituse.c | 1 + src/feature/client/proxymode.c | 27 +++++++++ src/feature/client/proxymode.h | 17 ++++++ src/feature/dirauth/authmode.h | 1 + src/feature/relay/router.c | 4 ++ src/feature/relay/router.h | 6 ++ src/feature/relay/routermode.c | 17 ------ src/feature/relay/routermode.h | 20 ++++++- src/test/conf_examples/bridgeauth_1/expected | 7 +++ .../conf_examples/bridgeauth_1/expected_no_dirauth | 7 +++ .../bridgeauth_1/expected_no_dirauth_relay | 6 ++ src/test/conf_examples/bridgeauth_1/torrc | 8 +++ src/test/conf_examples/dirauth_1/expected | 8 +++ .../conf_examples/dirauth_1/expected_no_dirauth | 7 +++ .../dirauth_1/expected_no_dirauth_relay | 6 ++ src/test/conf_examples/dirauth_1/torrc | 8 +++ .../conf_examples/ops_1/expected_no_dirauth_relay | 1 + .../conf_examples/ops_3/expected_no_dirauth_relay | 2 + .../conf_examples/ops_4/expected_no_dirauth_relay | 1 + .../conf_examples/ops_5/expected_no_dirauth_relay | 2 + src/test/test_key_expiration.sh | 5 ++ src/test/test_keygen.sh | 5 +- src/test/test_parseconf.sh | 64 ++++++++++++++++++---- src/test/test_zero_length_keys.sh | 5 ++ 31 files changed, 252 insertions(+), 46 deletions(-)

1 0

[tor/master] changes: file for 32123
by nickm＠torproject.org 21 Oct '19

21 Oct '19

commit b1f71eeed66e2c3f352a6f7f61884c088281fab6 Author: teor <teor(a)torproject.org> Date: Fri Oct 18 18:14:18 2019 +1000 changes: file for 32123 Create an optional relay module, which can be disabled using the --disable-module-relay configure option. When it is set, also disable the dirauth module. Add a minimal implemention, which disables the relay and dircache modes in tor. Closes ticket 32123. --- changes/ticket32123 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket32123 b/changes/ticket32123 new file mode 100644 index 000000000..8200f5fca --- /dev/null +++ b/changes/ticket32123 @@ -0,0 +1,5 @@ + o Major features (build system): + - Create an optional relay module, which can be disabled using the + --disable-module-relay configure option. When it is set, also disable + the dirauth module. Add a minimal implemention, which disables the + relay and dircache modes in tor. Closes ticket 32123.

1 0

[community/master] update content
by antonela＠torproject.org 21 Oct '19

21 Oct '19

commit 66520000dc35ef9451ffcccfa45a9f5662bfdde4 Author: Antonela <hola(a)antonela.me> Date: Mon Oct 21 13:40:23 2019 -0300 update content --- content/user-research/become-tester/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 46b41fb..de0ef97 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -4,7 +4,7 @@ section_id: user-research --- title: Become a Tester --- -subtitle: We regularly release Tor Browser Alpha versions to allow users to test software improvements and new ideas. [Sign up to be in our testing pool](https://survey.torproject.org/alpha-tester). +subtitle: We regularly release Tor Browser early versions to allow users to test software improvements and new ideas. Sign up to be in our testing pool. --- key: 1 ---

1 0

[community/master] Use id not title
by hiro＠torproject.org 21 Oct '19

21 Oct '19

commit 1fd10281307c8a07d9945e7881e517c1824551aa Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:23:45 2019 +0200 Use id not title --- templates/user-research.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user-research.html b/templates/user-research.html index 9f29641..339cca3 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -14,7 +14,7 @@ <div class="card-body"> <div class="card-body"> <h4 class="card-title text-primary"> - {% if child.title == "Become a Tester" %} + {% if child._id == "become-tester" %} <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-qa">{{ _(child.title) }}</a> {% else %} <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a>

1 0

[community/master] Not all pages are hidden
by hiro＠torproject.org 21 Oct '19

21 Oct '19

commit b2df2aa3ca13e86af733e8b1c4257df83e8a8415 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:16:26 2019 +0200 Not all pages are hidden --- content/user-research/become-tester/contents.lr | 2 ++ templates/user-research.html | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 7025245..5dfa354 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,6 +8,8 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test --- key: 1 --- +_hidden: yes +--- _template: layout.html --- html: two-columns-page.html diff --git a/templates/user-research.html b/templates/user-research.html index e12fa62..9f29641 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -8,13 +8,17 @@ </div> </div> <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> <div class="card-body"> <h4 class="card-title text-primary"> - <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + {% if child.title == "Become a Tester" %} + <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-qa">{{ _(child.title) }}</a> + {% else %} + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + {% endif %} </h4> <p class="card-text">{{ _(child.subtitle) }}</p> </div>

1 0

[community/master] Revert "Update user-research section to include hidden content"
by hiro＠torproject.org 21 Oct '19

21 Oct '19

commit 2d275464a50e6a4ba69614609df0be3e3d871325 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:07:17 2019 +0200 Revert "Update user-research section to include hidden content" This reverts commit c7309bc6e56a51d5e648fc7990671b2d589de1e6. --- content/user-research/become-tester/contents.lr | 4 +++- content/user-research/contents.lr | 2 -- content/user-research/guidelines/contents.lr | 4 ++-- content/user-research/open/contents.lr | 4 ++-- templates/two-columns-page.html | 2 +- templates/user-research.html | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 9540db2..7025245 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,6 +8,8 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test --- key: 1 --- -discoverable: no +_template: layout.html +--- +html: two-columns-page.html --- body: diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index e6fb45d..2ad1aeb 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -21,5 +21,3 @@ body: ## We respect our users' privacy when we conduct research. We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research. ---- -_discoverable: yes diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index d6256ca..247654c 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,10 +8,10 @@ title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. --- -_discoverable: yes ---- key: 3 --- +html: two-columns-page.html +--- body: Congrats! You're going to run your first User Research for Tor - and we are delighted to have you on board! diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr index 5aacad2..c1f5c1a 100644 --- a/content/user-research/open/contents.lr +++ b/content/user-research/open/contents.lr @@ -12,10 +12,10 @@ title: Open User Research --- subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community. --- -_discoverable: yes ---- key: 2 --- +html: two-columns-page.html +--- body: These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines). diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 3c6832b..5151905 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -6,7 +6,7 @@ <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> {{ this.body }} <div class="row"> - {% for child in this.children.include_hidden(true)|sort(attribute='key') %} + {% for child in this.children|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> diff --git a/templates/user-research.html b/templates/user-research.html index 7d6bd13..e12fa62 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -8,13 +8,13 @@ </div> </div> <div class="row"> - {% for child in site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %} + {% for child in this.children|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> <div class="card-body"> <h4 class="card-title text-primary"> - {{ _(child.title) }} + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> </h4> <p class="card-text">{{ _(child.subtitle) }}</p> </div>

1 0

[community/master] Revert previous commit and fix conflicts
by hiro＠torproject.org 21 Oct '19

21 Oct '19

commit 89f7bff151c6fda4611c2b5351f35bbea6052350 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:21:09 2019 +0200 Revert previous commit and fix conflicts --- content/user-research/become-tester/contents.lr | 4 ---- content/user-research/guidelines/contents.lr | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 5dfa354..46b41fb 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -10,8 +10,4 @@ key: 1 --- _hidden: yes --- -_template: layout.html ---- -html: two-columns-page.html ---- body: diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index 247654c..66ad447 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,6 +8,7 @@ title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. --- +>>>>>>> parent of 1e624ba... update content status key: 3 --- html: two-columns-page.html

1 0

[tpo/master] Update color info in jobs
by hiro＠torproject.org 21 Oct '19

21 Oct '19

commit 7bb83ee64487057ef868739081987b5001e729e4 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:03:10 2019 +0200 Update color info in jobs --- content/about/jobs/backend-engineer-ooni/contents.lr | 2 ++ content/about/jobs/browser-developer/contents.lr | 2 ++ content/about/jobs/developer-data-architect/contents.lr | 2 ++ content/about/jobs/senior-system-administrator/contents.lr | 2 ++ content/about/jobs/shadow-simulation-developer/contents.lr | 2 ++ 5 files changed, 10 insertions(+) diff --git a/content/about/jobs/backend-engineer-ooni/contents.lr b/content/about/jobs/backend-engineer-ooni/contents.lr index 280e9a5..21772ed 100644 --- a/content/about/jobs/backend-engineer-ooni/contents.lr +++ b/content/about/jobs/backend-engineer-ooni/contents.lr @@ -10,6 +10,8 @@ active: False --- title: Backend Engineer for OONI --- +color: primary +--- summary: The Tor Project, Inc. is looking for a dedicated backend engineer to work on OONI (https://ooni.torproject.org/) OONI is the Open Observatory of Network Interference: a free and open source software, global observation network for detecting censorship, surveillance, and traffic manipulation on the internet. diff --git a/content/about/jobs/browser-developer/contents.lr b/content/about/jobs/browser-developer/contents.lr index 8bbb489..888f4aa 100644 --- a/content/about/jobs/browser-developer/contents.lr +++ b/content/about/jobs/browser-developer/contents.lr @@ -10,6 +10,8 @@ section_id: about --- title: Browser Developer --- +color: primary +--- summary: The Tor Project is looking for a Browser Developer (C++ and Javascript)! diff --git a/content/about/jobs/developer-data-architect/contents.lr b/content/about/jobs/developer-data-architect/contents.lr index d3ec5e0..88706bb 100644 --- a/content/about/jobs/developer-data-architect/contents.lr +++ b/content/about/jobs/developer-data-architect/contents.lr @@ -8,6 +8,8 @@ active: False --- title: Developer Data Architect --- +color: primary +--- description: diff --git a/content/about/jobs/senior-system-administrator/contents.lr b/content/about/jobs/senior-system-administrator/contents.lr index 1598dae..113d4bf 100644 --- a/content/about/jobs/senior-system-administrator/contents.lr +++ b/content/about/jobs/senior-system-administrator/contents.lr @@ -8,6 +8,8 @@ section_id: about --- active: False --- +color: primary +--- title: Senior System Administrator --- summary: diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr b/content/about/jobs/shadow-simulation-developer/contents.lr index 338da9b..8fe07b5 100644 --- a/content/about/jobs/shadow-simulation-developer/contents.lr +++ b/content/about/jobs/shadow-simulation-developer/contents.lr @@ -8,6 +8,8 @@ section: about --- section_id: about --- +color: primary +--- title: Shadow Simulation Developer --- summary:

1 0