tor-commits August 2021

tor-commits@lists.torproject.org

15 participants
1353 discussions

[manual/master] Update Mobile Tor page to include Snowflake
by gus＠torproject.org 06 Aug '21

06 Aug '21

commit b801f9062b0f4fec35e9b0e068cf92a6e66d967a Author: kulsoomzahra <kulsoomzahra24(a)gmail.com> Date: Sat Jul 31 13:05:58 2021 +0530 Update Mobile Tor page to include Snowflake --- assets/static/images/android-provide-a-bridge.png | Bin 159176 -> 202475 bytes assets/static/images/android-provided-a-bridge.png | Bin 142112 -> 163672 bytes assets/static/images/android-select-a-bridge.png | Bin 150983 -> 151550 bytes assets/static/images/android-selected-a-bridge.png | Bin 162159 -> 202162 bytes content/mobile-tor/contents.lr | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/static/images/android-provide-a-bridge.png b/assets/static/images/android-provide-a-bridge.png index c048fb1..0f914ab 100644 Binary files a/assets/static/images/android-provide-a-bridge.png and b/assets/static/images/android-provide-a-bridge.png differ diff --git a/assets/static/images/android-provided-a-bridge.png b/assets/static/images/android-provided-a-bridge.png index a2606ba..23a7439 100644 Binary files a/assets/static/images/android-provided-a-bridge.png and b/assets/static/images/android-provided-a-bridge.png differ diff --git a/assets/static/images/android-select-a-bridge.png b/assets/static/images/android-select-a-bridge.png index 75a10d6..deeba76 100644 Binary files a/assets/static/images/android-select-a-bridge.png and b/assets/static/images/android-select-a-bridge.png differ diff --git a/assets/static/images/android-selected-a-bridge.png b/assets/static/images/android-selected-a-bridge.png index 6e0d456..39fd697 100644 Binary files a/assets/static/images/android-selected-a-bridge.png and b/assets/static/images/android-selected-a-bridge.png differ diff --git a/content/mobile-tor/contents.lr b/content/mobile-tor/contents.lr index a40e23a..67aaf02 100644 --- a/content/mobile-tor/contents.lr +++ b/content/mobile-tor/contents.lr @@ -91,7 +91,7 @@ The first screen tells you about the status of the Tor network. Tap on 'Config B <img style="max-width:300px" class="col-md-6" src="../../static/images/android-censored.png" alt="Censored internet on Tor Browser for Android"> The next screen provides the option to either use a built-in bridge or custom bridge. -With the "Use a Bridge" option, you will have two options: "obfs4" and "meek-azure". +With the "Use a Bridge" option, you will have three options: "obfs4", "meek-azure", and "snowflake". <img style="max-width:300px" class="col-md-6" src="../../static/images/android-select-a-bridge.png" alt="Select a bridge on Tor Browser for Android">

1 0

[tpo/master] Merge branch 'bug_199'
by gus＠torproject.org 06 Aug '21

06 Aug '21

commit fb804f6ce9ccc17770032bfc517cc21b406375b1 Merge: ba21fecd 70ec0d26 Author: gus <gus(a)torproject.org> Date: Fri Aug 6 09:49:41 2021 -0300 Merge branch 'bug_199' bin/csv_to_markdown | 2 ++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ 15 files changed, 282 insertions(+)

1 0

[tpo/master] Bug 199: Add January - May 2021 articles
by gus＠torproject.org 06 Aug '21

06 Aug '21

commit 70ec0d260e0a3632ff47c421e88bd79de4289ac1 Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Tue Aug 3 01:00:38 2021 +0000 Bug 199: Add January - May 2021 articles Also note down how csv_to_markdown likes csv files --- bin/csv_to_markdown | 2 ++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ .../contents.lr | 20 ++++++++++++++++++++ 15 files changed, 282 insertions(+) diff --git a/bin/csv_to_markdown b/bin/csv_to_markdown index fe0c697e..2cca2c1d 100755 --- a/bin/csv_to_markdown +++ b/bin/csv_to_markdown @@ -1,4 +1,6 @@ #!/usr/bin/python3 +# +# expects publisher,title,date,link csv files import csv import os diff --git a/content/press/browse-the-intercept-anonymously-and-securely-using-our-new-tor-onion-service/contents.lr b/content/press/browse-the-intercept-anonymously-and-securely-using-our-new-tor-onion-service/contents.lr new file mode 100644 index 00000000..61a20c58 --- /dev/null +++ b/content/press/browse-the-intercept-anonymously-and-securely-using-our-new-tor-onion-service/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: The Intercept +--- +title: Browse The Intercept Anonymously and Securely Using Our New Tor Onion Service +--- +link: https://theintercept.com/2021/04/28/tor-browser-onion/ +--- +pub_date: 21-4-28 +--- +summary: +--- +body: +--- diff --git a/content/press/bypassing-censorship-with-vpns--is-it-really-safe/contents.lr b/content/press/bypassing-censorship-with-vpns--is-it-really-safe/contents.lr new file mode 100644 index 00000000..592a559a --- /dev/null +++ b/content/press/bypassing-censorship-with-vpns--is-it-really-safe/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Deutsche Welle +--- +title: Bypassing censorship with VPNs -- is it really safe? +--- +link: https://www.dw.com/en/bypassing-censorship-with-vpns-is-that-really-safe/a-… +--- +pub_date: 21-3-11 +--- +summary: +--- +body: +--- diff --git a/content/press/how-to-get-affordable-dv-certificates-for-onion-sites/contents.lr b/content/press/how-to-get-affordable-dv-certificates-for-onion-sites/contents.lr new file mode 100644 index 00000000..8fb7394b --- /dev/null +++ b/content/press/how-to-get-affordable-dv-certificates-for-onion-sites/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Help Net Security +--- +title: How to get affordable DV certificates for onion sites +--- +link: https://www.helpnetsecurity.com/2021/03/26/how-to-get-affordable-dv-certifi… +--- +pub_date: 21-3-26 +--- +summary: +--- +body: +--- diff --git a/content/press/myanmar-citizens-use-protester-toolkit-to-skirt-internet-ban/contents.lr b/content/press/myanmar-citizens-use-protester-toolkit-to-skirt-internet-ban/contents.lr new file mode 100644 index 00000000..502e1e44 --- /dev/null +++ b/content/press/myanmar-citizens-use-protester-toolkit-to-skirt-internet-ban/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Bloomberg +--- +title: Myanmar Citizens Use Protester Toolkit to Skirt Internet Ban +--- +link: https://www.bloomberg.com/news/articles/2021-03-24/myanmar-citizens-find-wa… +--- +pub_date: 21-3-24 +--- +summary: +--- +body: +--- diff --git a/content/press/share-and-receive-files-anonymously-with-onionshare/contents.lr b/content/press/share-and-receive-files-anonymously-with-onionshare/contents.lr new file mode 100644 index 00000000..029c2095 --- /dev/null +++ b/content/press/share-and-receive-files-anonymously-with-onionshare/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: LifeHacker +--- +title: Share and Receive Files Anonymously with 'OnionShare' +--- +link: https://lifehacker.com/share-and-receive-files-anonymously-with-onionshare-… +--- +pub_date: 21-2-23 +--- +summary: +--- +body: +--- diff --git a/content/press/the-tor-project-announcing-new-board-members/contents.lr b/content/press/the-tor-project-announcing-new-board-members/contents.lr new file mode 100644 index 00000000..a07a3f62 --- /dev/null +++ b/content/press/the-tor-project-announcing-new-board-members/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Market Scanner +--- +title: The Tor Project: Announcing New Board Members +--- +link: https://www.marketscreener.com/news/latest/Tor-Project-nbsp-Announcing-new-… +--- +pub_date: 21-5-26 +--- +summary: +--- +body: +--- diff --git a/content/press/tor-browser-faq-what-is-it-and-how-does-it-protect-your-privacy/contents.lr b/content/press/tor-browser-faq-what-is-it-and-how-does-it-protect-your-privacy/contents.lr new file mode 100644 index 00000000..b7028497 --- /dev/null +++ b/content/press/tor-browser-faq-what-is-it-and-how-does-it-protect-your-privacy/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: CNet +--- +title: Tor browser FAQ: What is it and how does it protect your privacy? +--- +link: https://www.cnet.com/how-to/tor-browser-faq-what-is-it-and-how-does-it-prot… +--- +pub_date: 21-2-1 +--- +summary: +--- +body: +--- diff --git a/content/press/tor-project-auctions-nft-based-on-first-darkweb-site-for-17-million/contents.lr b/content/press/tor-project-auctions-nft-based-on-first-darkweb-site-for-17-million/contents.lr new file mode 100644 index 00000000..b2c423f7 --- /dev/null +++ b/content/press/tor-project-auctions-nft-based-on-first-darkweb-site-for-17-million/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Vice +--- +title: Tor Project Auctions NFT Based on First Darkweb Site for $1.7 Million +--- +link: https://www.vice.com/en/article/bvzn5v/tor-project-auctions-nft-based-on-fi… +--- +pub_date: 21-5-17 +--- +summary: +--- +body: +--- diff --git a/content/press/tor-project-auctions-off-the-first-onion-url-ever-created-as-an-nft/contents.lr b/content/press/tor-project-auctions-off-the-first-onion-url-ever-created-as-an-nft/contents.lr new file mode 100644 index 00000000..c87c60e0 --- /dev/null +++ b/content/press/tor-project-auctions-off-the-first-onion-url-ever-created-as-an-nft/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: BleepingComputer +--- +title: Tor Project auctions off the first Onion URL ever created as an NFT +--- +link: https://www.bleepingcomputer.com/news/technology/tor-project-auctions-off-t… +--- +pub_date: 21-5-12 +--- +summary: +--- +body: +--- diff --git a/content/press/tor-project-receives-670k-from-zcash-open-major-grants-for-coding-language-upgrade/contents.lr b/content/press/tor-project-receives-670k-from-zcash-open-major-grants-for-coding-language-upgrade/contents.lr new file mode 100644 index 00000000..9e9955c3 --- /dev/null +++ b/content/press/tor-project-receives-670k-from-zcash-open-major-grants-for-coding-language-upgrade/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: CoinDesk +--- +title: Tor Project Receives $670K From Zcash Open Major Grants for Coding Language Upgrade +--- +link: https://www.coindesk.com/tor-project-zcash-open-major-grants-zomg-arti-codi… +--- +pub_date: 21-6-8 +--- +summary: +--- +body: +--- diff --git a/content/press/tor-projects-crypto-donations-increased-23-in-2020/contents.lr b/content/press/tor-projects-crypto-donations-increased-23-in-2020/contents.lr new file mode 100644 index 00000000..b0634c53 --- /dev/null +++ b/content/press/tor-projects-crypto-donations-increased-23-in-2020/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: cointelegraph +--- +title: Tor Project’s crypto donations increased 23% in 2020 +--- +link: https://cointelegraph.com/news/tor-project-s-crypto-donations-increased-23-… +--- +pub_date: 21-1-26 +--- +summary: +--- +body: +--- diff --git a/content/press/tor-sells-nft-of-first-onion-url-for-2-million-in-eth-to-pleasrdao/contents.lr b/content/press/tor-sells-nft-of-first-onion-url-for-2-million-in-eth-to-pleasrdao/contents.lr new file mode 100644 index 00000000..cd422aa3 --- /dev/null +++ b/content/press/tor-sells-nft-of-first-onion-url-for-2-million-in-eth-to-pleasrdao/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Decrypt +--- +title: Tor Sells NFT of First .onion URL For $2 Million in ETH to PleasrDAO +--- +link: https://decrypt.co/71017/tor-sells-nft-of-first-onion-url-for-2-million-in-… +--- +pub_date: 21-5-14 +--- +summary: +--- +body: +--- diff --git a/content/press/tors-upcoming-nft-auction-to-let-bidders-own-piece-of-history/contents.lr b/content/press/tors-upcoming-nft-auction-to-let-bidders-own-piece-of-history/contents.lr new file mode 100644 index 00000000..c48855bd --- /dev/null +++ b/content/press/tors-upcoming-nft-auction-to-let-bidders-own-piece-of-history/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: BeInCrypto +--- +title: Tor’s Upcoming NFT Auction to Let Bidders Own Piece of History +--- +link: https://beincrypto.com/tor-plans-to-enter-nft-market/ +--- +pub_date: 21-5-12 +--- +summary: +--- +body: +--- diff --git a/content/press/what-will-changing-section-230-mean-for-the-internet/contents.lr b/content/press/what-will-changing-section-230-mean-for-the-internet/contents.lr new file mode 100644 index 00000000..2020b537 --- /dev/null +++ b/content/press/what-will-changing-section-230-mean-for-the-internet/contents.lr @@ -0,0 +1,20 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: The Verge +--- +title: What will changing Section 230 mean for the internet? +--- +link: https://www.theverge.com/22302850/section-230-reform-internet-speech-modera… +--- +pub_date: 21-2-26 +--- +summary: +--- +body: +---

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 06 Aug '21

06 Aug '21

commit d050be9814e713bd507d0f3bddc93d73a914f8f5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 6 05:47:38 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ka.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 6bf5756012..e919ca6b2e 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -860,7 +860,7 @@ msgid "" "connecting flow for Tor Browser users." msgstr "" "UX-საკითხებსა და ცენზურის არიდებაზე მომუშავე გუნდებმა, ერთიანი ძალისხმევით " -"გაამარტივეს, დაკავშირების საფეხურები, Tor-ბრაუზერის მომხმარებელთათვის." +"გაამარტივეს დაკავშირების საფეხურები, Tor-ბრაუზერის მომხმარებელთათვის." #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -981,7 +981,7 @@ msgid "" "The new shiny Tor Browser 10 for Desktop is now available from the Tor " "Browser download page and also from our distribution directory!" msgstr "" -"ახალი მბზინავი Tor-ბრაუზერი 10 კომპიუტერისთვის უკვე ხელმისაწვდომია Tor-" +"ახალი მბზინავი Tor-ბრაუზერი 10 უკვე ხელმისაწვდომია კომპიუტერისთვის, Tor-" "ბრაუზერის ჩამოტვირთვების გვერდიდან და გავრცელების სხვა წყაროებიდან." #: https//www.torproject.org/releases/tor-browser-10-0/

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 06 Aug '21

06 Aug '21

commit 4901172178d1b8ff2a85ec5623b7302fa13637c8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 6 03:46:29 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po b/es.po index 30635f88df..fcfd9bf951 100644 --- a/es.po +++ b/es.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-01 11:43+0200\n" -"PO-Revision-Date: 2021-08-06 03:15+0000\n" +"PO-Revision-Date: 2021-08-06 03:41+0000\n" "Last-Translator: cacu <carlosm2(a)riseup.net>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2155,11 +2155,11 @@ msgstr "Bloque de clave pública OpenPGP de contacto no válida" #: config/chroot_local-includes/usr/local/bin/tca:140 msgid "You turned on Offline Mode in the Welcome Screen." -msgstr "" +msgstr "Activaste el modo sin conexión en la pantalla de bienvenida." #: config/chroot_local-includes/usr/local/bin/tca:141 msgid "It is impossible to connect to Tor in Offline Mode." -msgstr "" +msgstr "Es imposible conectar a Tor en el modo sin conexión" #: config/chroot_local-includes/usr/local/bin/tca:142 msgid "" @@ -2712,7 +2712,7 @@ msgstr "No estás conectado a una red local aún. Para conectarte a la red Tor, #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1213 msgid "Open Wi-Fi settings" -msgstr "" +msgstr "Abrir ajustes Wi-Fi" #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1262 msgid "Testing Internet access…"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 06 Aug '21

06 Aug '21

commit f428448047214f17fdcf8c7adb5036fd3d9b075c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 6 03:45:46 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es.po b/es.po index 085c316989..9b45dfa2d7 100644 --- a/es.po +++ b/es.po @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-01 11:43+0200\n" -"PO-Revision-Date: 2021-08-03 14:33+0000\n" -"Last-Translator: David Figuera <dfb(a)fastmail.com>\n" +"PO-Revision-Date: 2021-08-06 03:41+0000\n" +"Last-Translator: cacu <carlosm2(a)riseup.net>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 06 Aug '21

06 Aug '21

commit 2bb758447126c76c96f75b94780067da75b43927 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 6 03:16:35 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es.po b/es.po index d05a859fdd..30635f88df 100644 --- a/es.po +++ b/es.po @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-01 11:43+0200\n" -"PO-Revision-Date: 2021-08-03 14:33+0000\n" -"Last-Translator: David Figuera <dfb(a)fastmail.com>\n" +"PO-Revision-Date: 2021-08-06 03:15+0000\n" +"Last-Translator: cacu <carlosm2(a)riseup.net>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1230,7 +1230,7 @@ msgstr "Dotfiles (formato de '.archivos' de configuración)" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225 msgid "Symlink every file in the Dotfiles folder into the Home folder" -msgstr "" +msgstr "Crear un enlace simbólico de cada archivo de la carpeta Dotfiles en la carpeta Home" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Setting.pm:111 msgid "Custom"

1 0

[tpo/master] Add new Tor Browser version 11.0a3
by sysrqb＠torproject.org 06 Aug '21

06 Aug '21

commit ba21fecdfab84fcee549408cd3da4f67de47d37e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Aug 6 03:03:35 2021 +0000 Add new Tor Browser version 11.0a3 --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 4bfe5775..435fdcf8 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -15,7 +15,7 @@ version = 10.5.2 version = 11.0a2 [torbrowser-android-alpha] -version = 11.0a2 +version = 11.0a3 [torbrowser-win-alpha] version = 11.0a2

1 0

[snowflake/main] Change the representation of domain fronting in HTTP rendezvous.
by dcf＠torproject.org 05 Aug '21

05 Aug '21

commit 55f4814dfb5c196bb66416d4f3ba367498602489 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 18 10:39:51 2021 -0600 Change the representation of domain fronting in HTTP rendezvous. Formerly, BrokerChannel represented the broker URL and possible domain fronting as bc.url *url.URL bc.Host string That is, bc.url is the URL of the server which we contact directly, and bc.Host is the Host header to use in the request. With no domain fronting, bc.url points directly at the broker itself, and bc.Host is blank. With domain fronting, we do the following reshuffling: if front != "" { bc.Host = bc.url.Host bc.url.Host = front } That is, we alter bc.url to reflect that the server to which we send requests directly is the CDN, not the broker, and store the broker's own URL in the HTTP Host header. The above representation was always confusing to me, because in my mental model, we are always conceptually communicating with the broker; but we may optionally be using a CDN proxy in the middle. The new representation is bc.url *url.URL bc.front string bc.url is the URL of the broker itself, and never changes. bc.front is the optional CDN front domain, and likewise never changes after initialization. When domain fronting is in use, we do the swap in the http.Request struct, not in BrokerChannel itself: if bc.front != "" { request.Host = request.URL.Host request.URL.Host = bc.front } Compare to the representation in meek-client: https://gitweb.torproject.org/pluggable-transports/meek.git/tree/meek-clien… var options struct { URL string Front string } https://gitweb.torproject.org/pluggable-transports/meek.git/tree/meek-clien… if ok { // if front is set info.Host = info.URL.Host info.URL.Host = front } --- client/lib/lib_test.go | 12 ++++++------ client/lib/rendezvous.go | 23 +++++++++++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index 03c53dd..9087eed 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -172,14 +172,14 @@ func TestSnowflakeClient(t *testing.T) { Convey("Dialers", t, func() { Convey("Can construct WebRTCDialer.", func() { - broker := &BrokerChannel{Host: "test"} + broker := &BrokerChannel{front: "test"} d := NewWebRTCDialer(broker, nil, 1) So(d, ShouldNotBeNil) So(d.BrokerChannel, ShouldNotBeNil) - So(d.BrokerChannel.Host, ShouldEqual, "test") + So(d.BrokerChannel.front, ShouldEqual, "test") }) SkipConvey("WebRTCDialer can Catch a snowflake.", func() { - broker := &BrokerChannel{Host: "test"} + broker := &BrokerChannel{} d := NewWebRTCDialer(broker, nil, 1) conn, err := d.Catch() So(conn, ShouldBeNil) @@ -201,8 +201,8 @@ func TestSnowflakeClient(t *testing.T) { b, err := NewBrokerChannel("http://test.broker", "", transport, false) So(b.url, ShouldNotBeNil) So(err, ShouldBeNil) - So(b.Host, ShouldResemble, "") So(b.url.Host, ShouldResemble, "test.broker") + So(b.front, ShouldResemble, "") So(b.transport, ShouldNotBeNil) }) @@ -210,8 +210,8 @@ func TestSnowflakeClient(t *testing.T) { b, err := NewBrokerChannel("http://test.broker", "front", transport, false) So(b.url, ShouldNotBeNil) So(err, ShouldBeNil) - So(b.Host, ShouldResemble, "test.broker") - So(b.url.Host, ShouldResemble, "front") + So(b.url.Host, ShouldResemble, "test.broker") + So(b.front, ShouldResemble, "front") So(b.transport, ShouldNotBeNil) }) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index b89f432..caa4ae4 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -32,10 +32,8 @@ const ( // Signalling Channel to the Broker. type BrokerChannel struct { - // The Host header to put in the HTTP request (optional and may be - // different from the host name in URL). - Host string url *url.URL + front string // Optional front domain to replace url.Host in requests. transport http.RoundTripper // Used to make all requests. keepLocalAddresses bool NATType string @@ -61,14 +59,12 @@ func NewBrokerChannel(broker string, front string, transport http.RoundTripper, return nil, err } log.Println("Rendezvous using Broker at:", broker) - bc := new(BrokerChannel) - bc.url = targetURL - if front != "" { // Optional front domain. + if front != "" { log.Println("Domain fronting using:", front) - bc.Host = bc.url.Host - bc.url.Host = front } - + bc := new(BrokerChannel) + bc.url = targetURL + bc.front = front bc.transport = transport bc.keepLocalAddresses = keepLocalAddresses bc.NATType = nat.NATUnknown @@ -92,7 +88,7 @@ func limitedRead(r io.Reader, limit int64) ([]byte, error) { func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( *webrtc.SessionDescription, error) { log.Println("Negotiating via BrokerChannel...\nTarget URL: ", - bc.Host, "\nFront URL: ", bc.url.Host) + bc.url.Host, "\nFront URL: ", bc.front) // Ideally, we could specify an `RTCIceTransportPolicy` that would handle // this for us. However, "public" was removed from the draft spec. // See https://developer.mozilla.org/en-US/docs/Web/API/RTCConfiguration#RTCIceTra… @@ -126,8 +122,11 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( if nil != err { return nil, err } - if "" != bc.Host { // Set true host if necessary. - request.Host = bc.Host + if bc.front != "" { + // Do domain fronting. Replace the domain in the URL's with the + // front, and store the original domain the HTTP Host header. + request.Host = request.URL.Host + request.URL.Host = bc.front } resp, err := bc.transport.RoundTrip(request) if nil != err {

1 0

[snowflake/main] Use a URL with a Host component in BrokerChannel tests.
by dcf＠torproject.org 05 Aug '21

05 Aug '21

commit 191510c416db6b0229e62cc2b869aaf3cee907fa Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 18 11:44:43 2021 -0600 Use a URL with a Host component in BrokerChannel tests. The tests were using a broker URL of "test.broker" (i.e., a schema-less, host-less, relative path), and running assertions on the value of b.url.Path. This is strange, especially in tests regarding domain fronting, where we care about b.url.Host, not b.url.Path. This commit changes the broker URL to "http://test.broker" and changes tests to check b.url.Host. I also added an additional assertion for an empty b.Host in the non-domain-fronted case. --- client/lib/lib_test.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index c31a1a6..03c53dd 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -198,24 +198,25 @@ func TestSnowflakeClient(t *testing.T) { } Convey("Construct BrokerChannel with no front domain", func() { - b, err := NewBrokerChannel("test.broker", "", transport, false) + b, err := NewBrokerChannel("http://test.broker", "", transport, false) So(b.url, ShouldNotBeNil) So(err, ShouldBeNil) - So(b.url.Path, ShouldResemble, "test.broker") + So(b.Host, ShouldResemble, "") + So(b.url.Host, ShouldResemble, "test.broker") So(b.transport, ShouldNotBeNil) }) Convey("Construct BrokerChannel *with* front domain", func() { - b, err := NewBrokerChannel("test.broker", "front", transport, false) + b, err := NewBrokerChannel("http://test.broker", "front", transport, false) So(b.url, ShouldNotBeNil) So(err, ShouldBeNil) - So(b.url.Path, ShouldResemble, "test.broker") + So(b.Host, ShouldResemble, "test.broker") So(b.url.Host, ShouldResemble, "front") So(b.transport, ShouldNotBeNil) }) Convey("BrokerChannel.Negotiate responds with answer", func() { - b, err := NewBrokerChannel("test.broker", "", transport, false) + b, err := NewBrokerChannel("http://test.broker", "", transport, false) So(err, ShouldBeNil) answer, err := b.Negotiate(fakeOffer) So(err, ShouldBeNil) @@ -224,7 +225,7 @@ func TestSnowflakeClient(t *testing.T) { }) Convey("BrokerChannel.Negotiate fails", func() { - b, err := NewBrokerChannel("test.broker", "", + b, err := NewBrokerChannel("http://test.broker", "", &MockTransport{http.StatusOK, []byte(`{"error": "no snowflake proxies currently available"}`)}, false) So(err, ShouldBeNil) @@ -234,7 +235,7 @@ func TestSnowflakeClient(t *testing.T) { }) Convey("BrokerChannel.Negotiate fails with unexpected error", func() { - b, err := NewBrokerChannel("test.broker", "", + b, err := NewBrokerChannel("http://test.broker", "", &MockTransport{http.StatusInternalServerError, []byte("\n")}, false) So(err, ShouldBeNil) @@ -245,7 +246,7 @@ func TestSnowflakeClient(t *testing.T) { }) Convey("BrokerChannel.Negotiate fails with large read", func() { - b, err := NewBrokerChannel("test.broker", "", + b, err := NewBrokerChannel("http://test.broker", "", &MockTransport{http.StatusOK, make([]byte, readLimit+1)}, false) So(err, ShouldBeNil)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2021