March 2021 - tor-commits - lists.torproject.org

[community/staging] Merge branch 'chevron-icon-fix'
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 90fdb95aeeb5fe006ff5c2562b11ed09e08297e6 Merge: fed3585 fc3910e Author: gus <gus(a)torproject.org> Date: Mon May 18 17:51:10 2020 -0400 Merge branch 'chevron-icon-fix' templates/sidenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[community/staging] Update lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit cc5ea8266b3cdc397db18264bfc6f59a93968eb3 Author: hiro <hiro(a)torproject.org> Date: Fri May 15 14:52:34 2020 +0200 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index e9dd081..7f2289b 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit e9dd081027132aa21f6abd74be708323ff3b9180 +Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3

1 0

[community/staging] Fix chevron icon
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit fc3910e60270243c848b60cb0c38e602273dd761 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Mon May 18 21:28:30 2020 +0000 Fix chevron icon --- templates/sidenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sidenav.html b/templates/sidenav.html index 5175771..5ac15c8 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -1,7 +1,7 @@ <div class="container-fluid sidebar col-xs-12 col-sm-12 col-md-3 col-lg-3"> <nav class="smalltopics no-background navbar navbar-expand-lg navbar-light bg-white p-0 fixed"> <label class="side-toggler" for="menu-toggle"> - <a class="btn btn-lg outline-primary text-primary navbar-toggler" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> + <a class="btn btn-lg outline-primary text-primary navbar-toggler collapsed" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> <i class="fas"></i> </a> </label>

1 0

[community/staging] Normalize punctuation usage
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit eb380c814c4e4f911f629b79236496cf49ad030f Author: null pointer exception <57326449+deathgrippin(a)users.noreply.github.com> Date: Sun May 24 18:59:19 2020 +0000 Normalize punctuation usage --- README.md | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 1c3aa94..43c5592 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ You can click ```Edit this page``` and submit your content changes in a [Pull Re 5. Translations for the website are imported by Jenkins when bulding the page, but if you want to test them, download the correct branch of the translations repo to the ./i18n/ folder. -6. Finally +6. Finally: To run a local continuous builder: ```$ lektor server``` @@ -57,7 +57,6 @@ Check our [wiki pages](https://dip.torproject.org/web/community/wikis/How-to-dev To help us to translate, please join the Tor Project team in [Transifex](https://www.transifex.com/). - ### Getting help If you want to contribute to the Community portal, we will be happy to help you. Join us at #tor-www in [irc.oftc.net](https://www.oftc.net). @@ -69,30 +68,30 @@ If you want to contribute to the Community portal, we will be happy to help you. This is the workflow that Tor Internal people should use when making changes on the Community Portal: 1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. -2. To view your changes on the website, you can [run lektor locally](https://dip.torproject.org/web/tpo/wikis/Compiling-a-local-version… -3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards) -4. Add a comment to the issue, tagging the reviewer, e.g `@steph`, with: - - Location of page on lektor-staging `develop` branch, e.g https://lektor-staging.torproject.org/community/develop/ - - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://dip.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr` - - For the review workflow, please see (Reviewer Workflow) -5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… +2. To view your changes on the website, you can [run lektor locally](https://dip.torproject.org/web/tpo/wikis/Compiling-a-local-version…. +3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). +4. Add a comment to the issue, tagging the reviewer, e.g. `@steph`, with: + - Location of page on lektor-staging `develop` branch, e.g. https://lektor-staging.torproject.org/community/develop/. + - Contents file, containing your changes where it would be located on the **reviewer's repo**, e.g. `https://dip.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr`. + - For the review workflow, please see (Reviewer Workflow). +5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#…. 6. Merger should then move the the ticket to the `Closed` column. ### Reviewer Workflow -1. Review the page on lektor-staging +1. Review the page on lektor-staging. 2. Review the content on your repo's develop branch and use the gitlab edit button to make any changes. 3. When you are happy with your changes: - - Update the "Commit message" to explain why you have made your changes - - Update the "Target Branch" + - Update the "Commit message" to explain why you have made your changes. + - Update the "Target Branch". - Make sure that the "Start a new merge request with these changes" checkbox is checked. - - Click on "Commit changes" + - Click on "Commit changes". 4. You will be sent to a new page to create your merge request: - - Update "Title" with a short title to explain your changes - - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g `https://dip.torproject.org/web/community/issues/3` and tagging one of the repo maintainers e.g `@pili` so they know the change can be merged + - Update "Title" with a short title to explain your changes. + - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g. `https://dip.torproject.org/web/community/issues/3`, and tagging one of the repo maintainers, e.g. `@pili`, so they know the change can be merged. - Make sure that both "Delete source branch when merge request is accepted" and "Squash commits when merge request is accepted" are checked. - - Click "Submit merge request" -5. Reviewer should comment on the original issue with a link to the merge request created, e.g `https://dip.torproject.org/steph/community/merge_requests/2` + - Click "Submit merge request. +5. Reviewer should comment on the original issue with a link to the merge request created, e.g. `https://dip.torproject.org/steph/community/merge_requests/2`. ### Volunteer Workflow @@ -100,13 +99,13 @@ This is the workflow that external volunteers should use when making changes on We recommend that you use our [github mirror](https://github.com/torproject/community) to submit PRs and contributions to our Community repo. Once you have a PR ready you should: -0. Ideally try to run it locally and check that nothing breaks and everything still behaves as before -1. Make a PR and ping the team on #tor-www IRC channel to let us know there's a PR waiting for review +0. Ideally try to run it locally and check that nothing breaks and everything still behaves as before. +1. Make a PR and ping the team on #tor-www IRC channel to let us know there's a PR waiting for review. At this point, one of us on the website team will aim to review your PR within 24h during the week (this may take longer on the weekends). Review will involve: - - Reading the text to make sure it's accurate and there are no spelling errors or grammar mistakes - - If there are any front end and/or template changes involved, the changes will be pushed to our `develop` branch for functionality review + - Reading the text to make sure it's accurate and there are no spelling errors or grammar mistakes. + - If there are any front end and/or template changes involved, the changes will be pushed to our `develop` branch for functionality review. - If there are any fixes necessary, we will ask for changes to be made. Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master.

1 0

[community/staging] Close quotes
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 1de0beb43c554aeac816d3d3bc85a908e90f3398 Author: null pointer exception <57326449+deathgrippin(a)users.noreply.github.com> Date: Wed May 27 19:09:15 2020 +0000 Close quotes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 43c5592..591645f 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ This is the workflow that Tor Internal people should use when making changes on - Update "Title" with a short title to explain your changes. - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g. `https://dip.torproject.org/web/community/issues/3`, and tagging one of the repo maintainers, e.g. `@pili`, so they know the change can be merged. - Make sure that both "Delete source branch when merge request is accepted" and "Squash commits when merge request is accepted" are checked. - - Click "Submit merge request. + - Click "Submit merge request". 5. Reviewer should comment on the original issue with a link to the merge request created, e.g. `https://dip.torproject.org/steph/community/merge_requests/2`. ### Volunteer Workflow

1 0

[community/staging] Breadcrumbs are back
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 50083f476e7f14846d13fde0e53f72f6ba113458 Author: Antonela <hola(a)antonela.me> Date: Mon May 18 15:39:11 2020 -0300 Breadcrumbs are back \o/ --- templates/two-columns-page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index c5c3757..1b4883a 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -1,4 +1,4 @@ - +{% include 'breadcrumb.html' %} <div class="row"> {% include 'sidenav.html' %}

1 0

[community/staging] Move some advanced tips and references to a new section
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit f8e411b13c4c412c923513c58f94f35857e2ccda Author: gus <gus(a)torproject.org> Date: Wed May 27 23:36:12 2020 -0400 Move some advanced tips and references to a new section --- content/onion-services/setup/contents.lr | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index 7b46041..464596f 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -75,14 +75,21 @@ If your keys leak, other people can impersonate your onion service, deeming it c Now you can connect to your onion service using Tor Browser, and you should get the html page you setup back in step 1. If it doesn't work, look in your logs for some hints, and keep playing with it until it works. -## Step 5: More advanced tips +## Step 5: More tips -The above guide is just a baseline to setup an onion service. -In this section we will offer more resources to better configure and protect your onion service: +If you plan to keep your service available for a long time, you might want to make a backup copy of the `private_key` file somewhere. -- Best practices for onion services -https://riseup.net/en/security/network-security/tor/onionservices-best-practices -- More advanced tips for onion services -https://2019.www.torproject.org/docs/tor-onion-service.html.en#three -- Advanced onion service security -https://blog.torproject.org/announcing-vanguards-add-onion-services +If you want to forward multiple virtual ports for a single onion service, just add more `HiddenServicePort` lines. If you want to run multiple onion services from the same Tor client, just add another `HiddenServiceDir` line. All the following `HiddenServicePort` lines refer to this `HiddenServiceDir` line, until you add another `HiddenServiceDir` line: + + HiddenServiceDir /usr/local/etc/tor/hidden_service/ + HiddenServicePort 80 127.0.0.1:8080 + + HiddenServiceDir /usr/local/etc/tor/other_hidden_service/ + HiddenServicePort 6667 127.0.0.1:6667 + HiddenServicePort 22 127.0.0.1:22 + + +You can use [stem](https://stem.torproject.org/) to [automate the management of your onion services](https://stem.torproject.org/tutorials/over_the_river.html). + + * To set up an Onion Service on Raspbian have a look at Alec Muffett's [Enterprise Onion Toolkit](https://github.com/alecmuffett/eotk). + * [Onion services best practices](https://riseup.net/en/security/network-security/tor/onionservice… by Riseup Collective.

1 0

[community/staging] Add nginx Onion-Location instructions, thanks @ahf
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 3f25f456fd19796d5e4411e9cd8e3dc012927874 Author: gus <gus(a)torproject.org> Date: Mon Jun 1 13:40:14 2020 -0400 Add nginx Onion-Location instructions, thanks @ahf --- .../advanced/onion-location/contents.lr | 78 +++++++++++++++------- 1 file changed, 54 insertions(+), 24 deletions(-) diff --git a/content/onion-services/advanced/onion-location/contents.lr b/content/onion-services/advanced/onion-location/contents.lr index caf7d5f..4796554 100644 --- a/content/onion-services/advanced/onion-location/contents.lr +++ b/content/onion-services/advanced/onion-location/contents.lr @@ -25,18 +25,18 @@ For the header to be valid the following conditions need to be fulfilled: * The webpage defining the Onion-Location header must be served over HTTPS. * The webpage defining the Onion-Location header must not be an onionsite. -In this page, the commands to restart the web server are based on Debian-like operating systems and may differ on other systems. +In this page, the commands to manage the web server are based on Debian-like operating systems and may differ on other systems. Check your web server and operating system documentation. ### Apache -To configure this header in Apache 2.2 or above, you will need to enable a few modules and edit the website Virtual Host file. +To configure this header in Apache 2.2 or above, you will need to enable a `headers` and `rewrite` modules and edit the website Virtual Host file. -**Step 1.** Enable headers and rewrite modules and restart Apache2 +**Step 1.** Enable headers and rewrite modules and reload Apache2 $ sudo a2enmod headers rewrite - $ sudo systemctl restart apache2 + $ sudo systemctl reload apache2 If you get an error message, something has gone wrong and you cannot continue until you've figured out why this didn't work. @@ -52,9 +52,14 @@ Virtual Host example: ``` <VirtualHost *:443> - ServerName your-website.tld - DocumentRoot /var/www/html - Header set Onion-Location "http://rh5d6reakhpvuxe2t3next6um6iiq4jf43m7gmdrphfhopfpnoglzcyd%{REQUEST_UR…" + ServerName <your-website.tld> + DocumentRoot /path/to/htdocs + + Header set Onion-Location "http://your-onion-address.onion%{REQUEST_URI}s" + + SSLEngine on + SSLCertificateFile "/path/to/www.example.com.cert" + SSLCertificateKeyFile "/path/to/www.example.com.key" </VirtualHost> ``` @@ -72,40 +77,66 @@ To test if Onion-Location is working, fetch the website HTTP headers, for exampl $ wget --server-response --spider your-website.tld -Look for the `onion-location` entry and the onion service address. - +Look for `onion-location` entry and the onion service address. Or open the website in Tor Browser and a purple pill will appear in the address bar. ### Nginx -To configure Onion-Location header, you will need to edit Nginx website configuration file. +To configure Onion-Location header, you will need to edit nginx website configuration file. **Step 1.** Edit website configuration file -In `/etc/nginx/conf.d/<your-website.conf` add the new Onion-Location header and the onion service address. +In `/etc/nginx/conf.d/<your-website>.conf` add the Onion-Location header and the onion service address. For example: ``` - location / { - add_header Onion-Location http://rh5d6reakhpvuxe2t3next6um6iiq4jf43m7gmdrphfhopfpnoglzcyd.onion$reque…; - } + add_header Onion-Location http://<your-onion-address>.onion$request_uri; ``` + The configuration file with Onion-Location should look like: ``` server { - listen 443; + listen 80; + listen [::]:80; + + server_name <your-website.tld>; + + location / { + return 301 https://$host$request_uri; + } + +} + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name <your-website.tld> <your-onion-address.onion>; + + # managed by Certbot - https://certbot.eff.org/ + ssl_certificate /etc/letsencrypt/live/<hostname>/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/<hostname>/privkey.pem; - root /var/www/your-website/html; - index index.html index.htm; + add_header Strict-Transport-Security "max-age=63072000; includeSubdomains"; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header Onion-Location http://<your-onion-address>.onion$request_uri; - server_name your-website.tld; + # managed by Certbot - location / { - try_files $uri $uri/ =404; - add_header Onion-Location http://rh5d6reakhpvuxe2t3next6um6iiq4jf43m7gmdrphfhopfpnoglzcyd.onion$reque…; - } + include /etc/letsencrypt/options-ssl-nginx.conf; + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; + + access_log /var/log/nginx/<hostname>-access.log; + + index index.html; + root /path/to/htdocs; + + location / { + try_files $uri $uri/ =404; + } } ``` @@ -132,8 +163,7 @@ To test if Onion-Location is working, fetch the website HTTP headers, for exampl $ wget --server-response --spider your-website.tld -Look for the `onion-location` entry and the onion service address. - +Look for `onion-location` entry and the onion service address. Or open the website in Tor Browser and a purple pill will appear in the address bar. ### Using an HTML `<meta>` attribute

1 0

[community/staging] Update dip.tpo to gitlab.tpo
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit e494731476443e0f105e854e82427750ed0a9ed7 Author: gus <gus(a)torproject.org> Date: Wed May 27 23:15:03 2020 -0400 Update dip.tpo to gitlab.tpo --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 591645f..fc5b24c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ or browse it [online](http://gitweb.torproject.org/project/web/community.git). ## How to report bugs or feedback -First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. +First check if your issue wasn't already opened in [gitlab.torproject.org](https://gitlab.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. ## What is Lektor @@ -51,7 +51,7 @@ To just build the website once: ```$ lektor build -O <folder>``` #### How to develop on the website -Check our [wiki pages](https://dip.torproject.org/web/community/wikis/How-to-develop-on-the…. +Check our [wiki pages](https://gitlab.torproject.org/web/community/wikis/How-to-develop-on-…. ### Translations @@ -67,14 +67,14 @@ If you want to contribute to the Community portal, we will be happy to help you. This is the workflow that Tor Internal people should use when making changes on the Community Portal: -1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. -2. To view your changes on the website, you can [run lektor locally](https://dip.torproject.org/web/tpo/wikis/Compiling-a-local-version…. -3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). +1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://gitlab.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. +2. To view your changes on the website, you can [run lektor locally](https://gitlab.torproject.org/web/tpo/wikis/Compiling-a-local-vers…. +3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://gitlab.torproject.org/web/community/-/boards). 4. Add a comment to the issue, tagging the reviewer, e.g. `@steph`, with: - Location of page on lektor-staging `develop` branch, e.g. https://lektor-staging.torproject.org/community/develop/. - - Contents file, containing your changes where it would be located on the **reviewer's repo**, e.g. `https://dip.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr`. + - Contents file, containing your changes where it would be located on the **reviewer's repo**, e.g. `https://gitlab.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr`. - For the review workflow, please see (Reviewer Workflow). -5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#…. +5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://gitlab.torproject.org/web/tpo/wikis/Git-flow-and-merge-reques…. 6. Merger should then move the the ticket to the `Closed` column. ### Reviewer Workflow @@ -88,10 +88,10 @@ This is the workflow that Tor Internal people should use when making changes on - Click on "Commit changes". 4. You will be sent to a new page to create your merge request: - Update "Title" with a short title to explain your changes. - - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g. `https://dip.torproject.org/web/community/issues/3`, and tagging one of the repo maintainers, e.g. `@pili`, so they know the change can be merged. + - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g. `https://gitlab.torproject.org/web/community/issues/3`, and tagging one of the repo maintainers, e.g. `@pili`, so they know the change can be merged. - Make sure that both "Delete source branch when merge request is accepted" and "Squash commits when merge request is accepted" are checked. - Click "Submit merge request". -5. Reviewer should comment on the original issue with a link to the merge request created, e.g. `https://dip.torproject.org/steph/community/merge_requests/2`. +5. Reviewer should comment on the original issue with a link to the merge request created, e.g. `https://gitlab.torproject.org/steph/community/merge_requests/2`. ### Volunteer Workflow

1 0

[community/staging] Merge branch 'small-corrections'
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 3aaf57060238fa45bad30b4218b46ce994eead2f Merge: 8835040 0452aad Author: gus <gus(a)torproject.org> Date: Tue Jun 2 10:06:29 2020 -0400 Merge branch 'small-corrections' .../advanced/client-auth/contents.lr | 24 +++++++++++----------- .../advanced/onion-location/contents.lr | 20 +++++++++--------- 2 files changed, 22 insertions(+), 22 deletions(-)

1 0