- tor-commits - lists.torproject.org

[tor/release-0.4.3] hs-v3: Change all-zeroes hard-assert to a BUG-and-err.
by nickm＠torproject.org 13 Apr '20

13 Apr '20

commit f2f718bca504d0fe1cce566185f8c17e23862335 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 30 16:33:30 2020 +0300 hs-v3: Change all-zeroes hard-assert to a BUG-and-err. And also disallow all-zeroes keys from the filesystem; add a test for it too. --- src/feature/hs/hs_client.c | 7 +++++++ src/feature/hs/hs_descriptor.c | 8 ++++++-- src/test/test_hs_client.c | 4 ++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index af8cb0b41..da1202b64 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -2132,6 +2132,13 @@ parse_auth_file_content(const char *client_key_str) "can't be decoded: %s", seckey_b32); goto err; } + + if (fast_mem_is_zero((const char*)auth->enc_seckey.secret_key, + sizeof(auth->enc_seckey.secret_key))) { + log_warn(LD_REND, "Client authorization private key can't be all-zeroes"); + goto err; + } + strncpy(auth->onion_address, onion_address, HS_SERVICE_ADDR_LEN_BASE32); /* We are reading this from the disk, so set the permanent flag anyway. */ diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 65d6c7a58..27823aa79 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -1424,10 +1424,14 @@ decrypt_descriptor_cookie(const hs_descriptor_t *desc, tor_assert(!fast_mem_is_zero( (char *) &desc->superencrypted_data.auth_ephemeral_pubkey, sizeof(desc->superencrypted_data.auth_ephemeral_pubkey))); - tor_assert(!fast_mem_is_zero((char *) client_auth_sk, - sizeof(*client_auth_sk))); tor_assert(!fast_mem_is_zero((char *) desc->subcredential, DIGEST256_LEN)); + /* Catch potential code-flow cases of an unitialized private key sneaking + * into this function. */ + if (BUG(fast_mem_is_zero((char *)client_auth_sk, sizeof(*client_auth_sk)))) { + goto done; + } + /* Get the KEYS component to derive the CLIENT-ID and COOKIE-KEY. */ keystream_length = build_descriptor_cookie_keys(desc->subcredential, DIGEST256_LEN, diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index 5f7fe9c40..4d938e463 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -732,6 +732,10 @@ test_parse_auth_file_content(void *arg) /* Bigger key than it should be */ tt_assert(!parse_auth_file_content("xx:descriptor:x25519:" "vjqea4jbhwwc4hto7ekyvqfbeodghbaq6nxi45hz4wr3qvhqv3yqa")); + /* All-zeroes key */ + tt_assert(!parse_auth_file_content("xx:descriptor:x25519:" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")); + done: tor_free(auth); }

1 0

[tor/release-0.4.3] Merge branch 'bug33545_043_squashed' into maint-0.4.3
by nickm＠torproject.org 13 Apr '20

13 Apr '20

commit 55cb6c3fcdbeac31a88bcc62c0dbe5ded4605176 Merge: bfea7a732 f2f718bca Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 13 14:13:44 2020 -0400 Merge branch 'bug33545_043_squashed' into maint-0.4.3 changes/bug33545 | 4 ++++ src/feature/control/control_hs.c | 9 ++++++++- src/feature/hs/hs_client.c | 7 +++++++ src/feature/hs/hs_client.h | 2 +- src/feature/hs/hs_descriptor.c | 8 ++++++-- src/test/test_hs_client.c | 4 ++++ src/test/test_hs_control.c | 14 ++++++++++++++ 7 files changed, 44 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 13 Apr '20

13 Apr '20

commit 935fb0dca9191bd9368c5eadf662cf00f101a92d Merge: dd7838cd6 55cb6c3fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 13 14:15:25 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug33545 | 4 ++++ src/feature/control/control_hs.c | 9 ++++++++- src/feature/hs/hs_client.c | 7 +++++++ src/feature/hs/hs_client.h | 2 +- src/feature/hs/hs_descriptor.c | 8 ++++++-- src/test/test_hs_client.c | 4 ++++ src/test/test_hs_control.c | 14 ++++++++++++++ 7 files changed, 44 insertions(+), 4 deletions(-)

1 0

[community/master] Update home.html
by antonela＠torproject.org 13 Apr '20

13 Apr '20

commit fa7a03f3be8bf8dfde942383ff02c2ada3eb9686 Author: Antonela <hola(a)antonela.me> Date: Mon Apr 13 14:39:17 2020 -0300 Update home.html Fix card's width on small screens --- templates/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/home.html b/templates/home.html index 08d04c9..2ceb15e 100644 --- a/templates/home.html +++ b/templates/home.html @@ -8,7 +8,7 @@ <div class="container"> <div class="row"> {% for child in site.query('/').filter(F.section_id != 'gsoc')|sort(attribute='key') %} - <div class="col-sm-6 col-md-4 col-sm-12 col-xl-4 py-4"> + <div class="col-lg-4 col-md-6 col-sm-12 py-4"> <div class="card h-100 p-2"> <div class="card-body"> <h2 class="card-title ">{{ child.title }}</h2>

1 0

[community/master] Hide breadcrumbs
by antonela＠torproject.org 13 Apr '20

13 Apr '20

commit 670f2c6d0e11db93df984756e39cd438277375ad Author: Antonela <hola(a)antonela.me> Date: Mon Apr 13 14:13:24 2020 -0300 Hide breadcrumbs Related with https://gitlab.torproject.org/torproject/web/community/-/issues/68 --- templates/two-columns-page.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 637857f..c5c3757 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -1,9 +1,8 @@ - -{% include 'breadcrumb.html' %} + <div class="row"> {% include 'sidenav.html' %} - <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> + <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mt-5 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> <div class="col-10"> {{ this.body }} </div>

1 0

[community/master] Merge branch 'master' of git-rw.torproject.org:project/web/community
by antonela＠torproject.org 13 Apr '20

13 Apr '20

commit 9ef5e8d1b003e50b070d9312e479ed9be5255684 Merge: 670f2c6 9e56edf Author: Antonela <hola(a)antonela.me> Date: Mon Apr 13 14:13:31 2020 -0300 Merge branch 'master' of git-rw.torproject.org:project/web/community content/outreach/kit/contents.lr | 2 +- databags/outreach-materials.ini | 54 +++++++++++++++++++++++++++++++++++++++ templates/outreach-materials.html | 36 ++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-)

1 0

[community/master] Add printable outreach materials
by pili＠torproject.org 13 Apr '20

13 Apr '20

commit 14bbc3b24fc29135d5e2d38ee3985da348b141c7 Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Apr 8 18:32:23 2020 +0100 Add printable outreach materials Closes #28 --- content/outreach/kit/contents.lr | 2 +- databags/outreach-materials.ini | 54 +++++++++++++++++++++++++++++++++++++++ templates/outreach-materials.html | 36 ++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) diff --git a/content/outreach/kit/contents.lr b/content/outreach/kit/contents.lr index 59e782a..7f00085 100644 --- a/content/outreach/kit/contents.lr +++ b/content/outreach/kit/contents.lr @@ -12,7 +12,7 @@ subtitle: This kit includes printable flyers, stickers, and other materials to g --- key: 1 --- -html: two-columns-page.html +html: outreach-materials.html --- body: diff --git a/databags/outreach-materials.ini b/databags/outreach-materials.ini new file mode 100644 index 0000000..178b23b --- /dev/null +++ b/databags/outreach-materials.ini @@ -0,0 +1,54 @@ +[anti-censorship] +location = https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/pr… +filename_front = Front_anti-censorship_en_EN.pdf +filename_back = Back_stencil_en_EN.pdf +label = Tor for Anti-censorship +type = handout +year = 2019 + +[feminists] +location = https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/pr… +filename_front = Front_feminist_en_EN.pdf +filename_back = Back_feminist_en_EN.pdf +label = Tor for Feminists +type = handout +year = 2019 + +[human-rights] +location = https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/pr… +filename_front = Front_humanrights_en_EN.pdf +filename_back = Back_stencil_en_EN.pdf +label = Tor for Human Rights +type = handout +year = 2019 + +[privacy] +location = https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/pr… +filename_front = Front_privacy_en_EN.pdf +filename_back = Back_stencil_en_EN.pdf +label = Tor for Privacy +type = handout +year = 2019 + +[one-pager] +location = https://media.torproject.org/misc/ +filename_front = 2018-08-Tor-one-pager.pdf#page=1 +filename_back = 2018-08-Tor-one-pager.pdf#page=2 +label = Tor one pager +type = handout +year = 2018 + +[relay] +location = https://gitlab.torproject.org/torproject/ux/media/-/raw/master/outreach-mat… +filename_front = tor-relay_4.25x11_card_front.jpg +filename_back = tor-relay-4.25x11_card_back.jpg +label = Run a relay +type = handout +year = 2018 + +[brochure] +location = https://media.torproject.org/misc/2015-03-tor-brochure/ +filename = tor-brochure-en.pdf +label = Tor Brochure +type = brochure +year = 2015 \ No newline at end of file diff --git a/templates/outreach-materials.html b/templates/outreach-materials.html new file mode 100644 index 0000000..d0bdaa8 --- /dev/null +++ b/templates/outreach-materials.html @@ -0,0 +1,36 @@ +<div class="row pt-5"> + {% include 'sidenav.html' %} + <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> + {{ this.body }} + <div class="container py-3"> + <div class="row"> + <table class="table"> + <thead> + <tr> + <th scope="col">Title</th> + <th scope="col">Type</th> + <th scope="col">Links</th> + <th scope="col">Last Updated</th> + </tr> + </thead> + <tbody> + {% for id, item in bag('outreach-materials').items() %} + <tr> + <td>{{ item.label }}</td> + <td>{{ item.type }}</td> + <td> + {% if item.type=='handout' %} + <a href="{{item.location}}{{item.filename_front}}">Front</a> / <a href="{{item.location}}{{item.filename_back}}">Back</a> + {% else %} + <a href="{{item.location}}{{item.filename}}">File</a> + {% endif %} + </td> + <td>{{ item.year }}</td> + </tr> + {% endfor %} + </tbody> + </table> + </div> + </div> + </div> +</div> \ No newline at end of file

1 0

[community/master] Add printable outreach materials
by pili＠torproject.org 13 Apr '20

13 Apr '20

commit 9e56edf34c5bd1d0ef859409037bf92c549af3ce Merge: b2ca078 14bbc3b Author: Pili Guerra <pili(a)piliguerra.com> Date: Mon Apr 13 17:33:43 2020 +0100 Add printable outreach materials Closes #28 content/outreach/kit/contents.lr | 2 +- databags/outreach-materials.ini | 54 +++++++++++++++++++++++++++++++++++++++ templates/outreach-materials.html | 36 ++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-)

1 0

[lego/master] Fix sub-header capitalization
by antonela＠torproject.org 13 Apr '20

13 Apr '20

commit d08dee25e96a81c12727755ecf53414549e7a540 Author: Antonela <hola(a)antonela.me> Date: Mon Apr 13 13:31:01 2020 -0300 Fix sub-header capitalization Seems like someone edited the .css but the fix was removing the class from the header. So, fixed the shared style file and set the proper class to the header element. --- assets/scss/utilities/_text.scss | 6 +++--- templates/header.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/scss/utilities/_text.scss b/assets/scss/utilities/_text.scss index eef0ee7..7445bfc 100644 --- a/assets/scss/utilities/_text.scss +++ b/assets/scss/utilities/_text.scss @@ -24,9 +24,9 @@ // Transformation -.text-lowercase { text-transform: none !important; } -.text-uppercase { text-transform: none !important; } -.text-capitalize { text-transform: none !important; } +.text-lowercase { text-transform: lowercase;} +.text-uppercase { text-transform: uppercase;} +.text-capitalize { text-transform: capitalize;} // Weight and italics diff --git a/templates/header.html b/templates/header.html index 9290699..3e4b29b 100644 --- a/templates/header.html +++ b/templates/header.html @@ -12,7 +12,7 @@ <div class="row"> <div class="col-12 content-center pt-5"> <div class="row"> - <h6 class="mx-auto text-white text-uppercase">{% block section %}{{ this.section }}{% endblock %}</h6> + <h6 class="mx-auto text-white text-capitalize">{% block section %}{{ this.section }}{% endblock %}</h6> </div> <div class="row pb-5"> <h2 class="mx-auto display-3 text-white text-capitalize">{% block title %}{{ this.title }}{% endblock %}</h2>

1 0

[community/master] Fix consistency across headers
by antonela＠torproject.org 13 Apr '20

13 Apr '20

commit b2ca078543d9ad2c03cc0a6616a2be43f91e07a2 Author: Antonela <hola(a)antonela.me> Date: Mon Apr 13 13:12:22 2020 -0300 Fix consistency across headers Close https://gitlab.torproject.org/torproject/web/community/-/issues/124 --- content/relay-operations/technical-considerations/contents.lr | 2 ++ content/relay-operations/technical-setup/bridge/contents.lr | 9 +++++---- .../technical-setup/bridge/post-install/contents.lr | 9 ++++++--- .../relay-operations/technical-setup/post-install/contents.lr | 5 ++++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/content/relay-operations/technical-considerations/contents.lr b/content/relay-operations/technical-considerations/contents.lr index d2760c0..33ae63e 100644 --- a/content/relay-operations/technical-considerations/contents.lr +++ b/content/relay-operations/technical-considerations/contents.lr @@ -2,6 +2,8 @@ _model: page --- title: Technical considerations --- +color: primary +--- _template: layout.html --- body: diff --git a/content/relay-operations/technical-setup/bridge/contents.lr b/content/relay-operations/technical-setup/bridge/contents.lr index c1175cd..54a8c35 100644 --- a/content/relay-operations/technical-setup/bridge/contents.lr +++ b/content/relay-operations/technical-setup/bridge/contents.lr @@ -1,14 +1,12 @@ _model: page --- -title: - - Bridge +title: Bridge --- body: This guide will help you set up an obfs4 bridge to help censored users connect to the Tor network. The requirements are: 1. 24/7 Internet connectivity -2. The ability to expose TCP ports to the Internet (make sure that NAT doesn't get in the way) +2. The ability to expose TCP ports to the Internet (make sure that NAT doesn't get in the way) Note: If you're running a platform that is not listed on this page, you can [compile obfs4 from source](https://gitlab.com/yawning/obfs4#installation). --- @@ -23,3 +21,6 @@ section_id: bridge-operations subtitle: Run an obfs4 bridge to help censored users connect to the Tor network --- _slug: {{bridge}} +--- +color: primary +--- diff --git a/content/relay-operations/technical-setup/bridge/post-install/contents.lr b/content/relay-operations/technical-setup/bridge/post-install/contents.lr index d95da88..4abc2ea 100644 --- a/content/relay-operations/technical-setup/bridge/post-install/contents.lr +++ b/content/relay-operations/technical-setup/bridge/post-install/contents.lr @@ -4,17 +4,17 @@ title: Post-install --- body: -Congrats! +Congrats! If you get to this point, it means that your obfs4 bridge is running and is being distributed by BridgeDB to censored users. Note that it can take several days or weeks until you see a consistent set of users, so don't get discouraged if you don't see user connections right away. BridgeDB uses four buckets for bridge distribution: HTTPS, Moat, Email, and manual. Some buckets are used more than others, which also affects the time until your bridge sees users. Finally, there aren't many bridge users out there, so you cannot expect your bridge to be as popular as a relay. -If you want to connect to your bridge manually, you will need to know the bridge's obfs4 certificate. See the file `/var/lib/tor/pt_state/obfs4_bridgeline.txt` and paste the entire bridge line into Tor Browser: +If you want to connect to your bridge manually, you will need to know the bridge's obfs4 certificate. See the file `/var/lib/tor/pt_state/obfs4_bridgeline.txt` and paste the entire bridge line into Tor Browser: ``` Bridge obfs4 <IP ADDRESS>:<PORT> <FINGERPRINT> cert=<CERTIFICATE> iat-mode=0 ``` -You'll need to replace `<IP ADDRESS>`, `<PORT>`, and `<FINGERPRINT>` with the actual values, which you can find in the tor log. Make sure to use `<FINGERPRINT>`, not `<HASHED FINGERPRINT>`; and that `<PORT>` is the obfs4 port you chose - and not the OR port. +You'll need to replace `<IP ADDRESS>`, `<PORT>`, and `<FINGERPRINT>` with the actual values, which you can find in the tor log. Make sure to use `<FINGERPRINT>`, not `<HASHED FINGERPRINT>`; and that `<PORT>` is the obfs4 port you chose - and not the OR port. Finally, you can monitor your obfs4 bridge's usage on [Relay Search](https://metrics.torproject.org/rs.html#search). Just enter your bridge's `<HASHED FINGERPRINT>` in the form and click "Search". After having set up the bridge, it takes approximately three hours for the bridge to show up in Relay Search. @@ -24,3 +24,6 @@ html: two-columns-page.html key: 6 --- subtitle: How to find your bridge in Relay Search and connect manually +--- +color: primary +--- diff --git a/content/relay-operations/technical-setup/post-install/contents.lr b/content/relay-operations/technical-setup/post-install/contents.lr index 5236fbe..92441da 100644 --- a/content/relay-operations/technical-setup/post-install/contents.lr +++ b/content/relay-operations/technical-setup/post-install/contents.lr @@ -176,4 +176,7 @@ section: Relay operations --- section_id: relay-operations --- -subtitle: +subtitle: +--- +color: primary +---

1 0