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

[gettor/master] Change virtualenv command
by hiro＠torproject.org 27 Sep '19

27 Sep '19

commit f2c7fb80e4ee1d016eff23ace0477e844277eb08 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 27 16:59:46 2019 +0200 Change virtualenv command --- roles/gettor/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 7713401..db186b4 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -35,7 +35,7 @@ chdir: "{{ gettor_path }}" - name: activate virtualenv - command: . {{ gettor_path }}/venv/bin/activate + command: source {{ gettor_path }}/venv/bin/activate - name: create database command: >

1 0

[gettor/master] Change virtualenv command
by hiro＠torproject.org 27 Sep '19

27 Sep '19

commit 2aee5d00fe906b71bf588bd34f5a71ba40dc74d6 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 27 16:58:06 2019 +0200 Change virtualenv command --- roles/gettor/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index ac5160f..7713401 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -30,7 +30,7 @@ - name: create virtualenv command: > - virtualenv -p python3 {{ gettor_path }}/venv + virtualenv {{ gettor_path }}/venv args: chdir: "{{ gettor_path }}"

1 0

[gettor/master] Fix links script
by hiro＠torproject.org 27 Sep '19

27 Sep '19

commit 919caf08b3ba3a65c91456e5cb7f021829d93351 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 27 16:56:33 2019 +0200 Fix links script --- scripts/add_links_to_db | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db index 74d4b69..72f557a 100755 --- a/scripts/add_links_to_db +++ b/scripts/add_links_to_db @@ -133,15 +133,15 @@ def main(): """ c.execute("DROP TABLE IF EXISTS links") c.execute( - "CREATE TABLE links(link TEXT, platform TEXT, language TEXT, arch TEXT," - " version TEXT, provider TEXT, status TEXT)" + "CREATE TABLE links(link TEXT, platform TEXT, language TEXT," + " arch TEXT, version TEXT, provider TEXT, status TEXT, file TEXT)" ) for k in keys: for p in providers: for l in languages: release_link = releases.get(k).replace("en-US", l) c.execute( - "INSERT INTO links(link, platform, language, arch, version, provider, status)" + "INSERT INTO links(link, platform, language, arch, version, provider, status, file)" "VALUES ('%s', '%s', '%s', '64', '%s', '%s', 'ACTIVE', '%s')" % (providers.get(p) + release_link, k, l, version, p, release_link))

1 0

[gettor/master] Fix quote bug
by hiro＠torproject.org 27 Sep '19

27 Sep '19

commit d3c0d4cab2edb826aa1a2a7ce687505cb4127f08 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 27 16:49:04 2019 +0200 Fix quote bug --- roles/gettor-web/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gettor-web/tasks/main.yml b/roles/gettor-web/tasks/main.yml index 8d383de..f281e36 100644 --- a/roles/gettor-web/tasks/main.yml +++ b/roles/gettor-web/tasks/main.yml @@ -20,7 +20,7 @@ - pip: name: lektor - virtualenv: {{ gettor_web_path }}/venv + virtualenv: "{{ gettor_web_path }}/venv" - name: activate virtualenv command: . {{ gettor_web_path }}/venv/bin/activate

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 27 Sep '19

27 Sep '19

commit 912116578160f5045b7566aad1e6520800f0464b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 27 14:45:59 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- nl/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/ssl-observatory.dtd b/nl/ssl-observatory.dtd index c68e5cf43..eedcff251 100644 --- a/nl/ssl-observatory.dtd +++ b/nl/ssl-observatory.dtd @@ -55,7 +55,7 @@ zeer ingrijpend bedrijfsnetwerk gebruikt:"> <!ENTITY ssl-observatory.prefs.explanation "HTTPS Everywhere kan het SSL-observatorium van EFF gebruiken. Dit doet twee dingen: ten eerste verstuurt het kopieën van HTTPS-certificaten naar het observatorium om ons -te helpen man-in-the-middle-aanvallen te detecteren en de veiligheid van het web te +te helpen man-in-het-midden-aanvallen te detecteren en de veiligheid van het web te verbeteren; ten tweede kunnen we u hierdoor waarschuwen over onveilige verbindingen en aanvallen op uw browser."> @@ -66,8 +66,8 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -"Als u bijvoorbeeld https://www.something.com bezoekt, geeft het door het -observatorium ontvangen certificaat aan dat iemand www.something.com bezocht, +"Als u bijvoorbeeld https://www.voorbeeld.nl bezoekt, geeft het door het +observatorium ontvangen certificaat aan dat iemand www.voorbeeld.nl bezocht, maar niet wie de website bezocht of welke specifieke pagina de bezoeker bekeek. Houd de muis boven de opties voor meer details:">

1 0

[gettor-web/master] Edit page with review inputs
by hiro＠torproject.org 27 Sep '19

27 Sep '19

commit 2c4f348fe22345fdc37f7cc98595565ea86eb211 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 27 16:45:22 2019 +0200 Edit page with review inputs --- .gitignore | 6 +++- content/contents.lr | 85 +---------------------------------------------------- 2 files changed, 6 insertions(+), 85 deletions(-) diff --git a/.gitignore b/.gitignore index 41a4e3a..9d840a8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,12 +3,14 @@ node_modules .sass-cache .DS_Store +cache + public *.mo *.po contents+*.lr -.cache +*.ipynb* *.egg-info *.pyc @@ -42,6 +44,8 @@ tramp /eshell/history /eshell/lastdir +node_modules + # elpa packages /elpa/ diff --git a/content/contents.lr b/content/contents.lr index f7b79bf..ebeeb66 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -21,88 +21,12 @@ The idea behind GetTor is very simple: ## How to verify a digital signature Digital signature is a process ensuring that a certain package was generated by its developers and has not been tampered with. -Below we explain why it is important and how to verify that the Tor program you download is the one we have created and has not been modified by some attacker. In GetTor emails we provide a link to a file with the same name as the package and the extension ".asc". These .asc files are OpenPGP signatures. They allow you to verify the file you've downloaded is exactly the one that we intended you to get. For example, `torbrowser-install-win64-8.5.4_en-US.exe` is accompanied by `torbrowser-install-win64-8.5.4_en-US.exe.asc`. -We now show how you can verify the downloaded file's digital signature on different operating systems. -Please notice that a signature is dated the moment the package has been signed. -Therefore every time a new file is uploaded a new signature is generated with a different date. -As long as you have verified the signature you should not worry that the reported date may vary. - -### Installing GnuPG - -First of all you need to have GnuPG installed before you can verify signatures. - -#### For Windows users: - -If you run Windows, [download Gpg4win](https://gpg4win.org/download.html) and run its installer. - -In order to verify the signature you will need to type a few commands in windows command-line, `cmd.exe`. - -#### For macOS users: - -If you are using macOS, you can [install GPGTools](https://www.gpgtools.org). - -In order to verify the signature you will need to type a few commands in the Terminal (under "Applications"). - -#### For GNU/Linux users: - -If you are using GNU/Linux, then you probably already have GnuPG in your system, as most GNU/Linux distributions come with it preinstalled. - -In order to verify the signature you will need to type a few commands in a terminal window. How to do this will vary depending on your distribution. - -### Fetching the Tor Developers key - -The Tor Browser team signs Tor Browser releases. -Import the Tor Browser Developers signing key (0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290): - - gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org - -This should show you something like: - - gpg: key 4E2C6E8793298290: public key "Tor Browser Developers (signing key) <torbrowser(a)torproject.org>" imported - gpg: Total number processed: 1 - gpg: imported: 1 - pub rsa4096 2014-12-15 [C] [expires: 2020-08-24] - EF6E286DDA85EA2A4BA7DE684E2C6E8793298290 - uid [ unknown] Tor Browser Developers (signing key) <torbrowser(a)torproject.org> - sub rsa4096 2018-05-26 [S] [expires: 2020-09-12] - -After importing the key, you can save it to a file (identifying it by fingerprint here): - - gpg --output ./tor.keyring --export 0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290 - -### Verifying the signature - -To verify the signature of the package you downloaded, you will need to download the corresponding ".asc" signature file as well as the installer file itself, and verify it with a command that asks GnuPG to verify the file that you downloaded. - -The examples below assume that you downloaded these two files to your "Downloads" folder. - -The result of the command should produce something like this: - - gpgv: Signature made 07/08/19 04:03:49 Pacific Daylight Time - gpgv: using RSA key EB774491D9FF06E2 - gpgv: Good signature from "Tor Browser Developers (signing key) <torbrowser(a)torproject.org>" - - -#### For Windows users: - - gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-8.5.4_en-US.exe.asc Downloads\torbrowser-install-win64-8.5.4_en-US.exe - -#### For macOS users: - - gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-8.5.4-osx64_en-US.dmg{.asc,} - -#### For GNU/Linux users (change 64 to 32 if you have the 32-bit package): - - gpgv --keyring ./tor.keyring tor-browser-linux64-8.5.4_en-US.tar.xz{.asc,} - - -You may also want to [learn more about GnuPG](https://www.gnupg.org/documentation/). - +Check [how to verify a digital signature](https://support.torproject.org/tbb/how-to-verify-signature/) ## How to get bridges @@ -119,10 +43,3 @@ Select 'Tor is censored in my country,' then click 'Select a built-in bridge.' C Click 'OK' to save your settings. Another way to get bridges is to send an email to bridges(a)torproject.org. Please note that you must send the email using an address from one of the following email providers: Riseup or Gmail. - -A bridge is just a normal relay with a slightly different configuration. - -Several countries, including China and Iran, have found ways to detect and block connections to Tor bridges. -<mark><a href="https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt">Obfsproxy</a></mark> bridges address this by adding another layer of obfuscation. -Setting up an obfsproxy bridge requires an additional software package and additional configurations. -See our page on <mark><a href="https://www.torproject.org/docs/pluggable-transports.html.en">pluggable transports</a></mark> for more info.

1 0

[gettor/master] Add some fix and refactoring
by hiro＠torproject.org 27 Sep '19

27 Sep '19

commit 1d88024fd3b3f34485645e2f87b0cebe8030c9c7 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 27 16:28:45 2019 +0200 Add some fix and refactoring --- roles/gettor/tasks/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 767518c..ac5160f 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -12,6 +12,18 @@ clone: no update: yes +- name: Check that the gmail test password file exists + stat: + path: /home/gettor/.config/test_gettor_gmail.key + register: stat_result + +- name: create a random password using many different char sets + copy: + dest: "/srv/gettor.torproject.org/home/gettor/config/test_gettor_gmail.key" + content: + password: "{{ lookup('password', 'chars=ascii_letters,digits,hexdigits,punctuation') }}" + when: not stat_result.stat.exists + - name: export stats command: > {{ gettor_path }}/scripts/export_stats

1 0

[tor-browser-build/master] Update testsuite_git_commit: Add android-x86_64 to nightly builds
by boklm＠torproject.org 27 Sep '19

27 Sep '19

commit 3648313adf9f11f692055ef449be013ee36b4661 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 27 13:51:45 2019 +0200 Update testsuite_git_commit: Add android-x86_64 to nightly builds --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index acc88f9..34d3929 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 2 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git -testsuite_git_commit: 6a2c39273bfd729446ef787e4f7d1bf3138cfc4a +testsuite_git_commit: d5e23151bf4ff48146c0c33355fe70def5e4d3f2 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[tor-browser-bundle-testsuite/master] Add android-x86_64 to nightly builds
by boklm＠torproject.org 27 Sep '19

27 Sep '19

commit d5e23151bf4ff48146c0c33355fe70def5e4d3f2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 27 13:47:54 2019 +0200 Add android-x86_64 to nightly builds --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index a6def45..1389092 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -104,6 +104,18 @@ sub set_tests { publish_dir => 'nightly-android-x86', }, { + name => 'nightly-android-x86_64', + descr => 'build tor-browser nightly android-x86_64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'torbrowser-android-x86_64', + ], + publish_dir => 'nightly-android-x86_64', + }, + { name => 'nightly-android-aarch64', descr => 'build tor-browser nightly android-aarch64', type => 'rbm_build',

1 0

[collector/master] Tweak URL-based unit tests.
by karsten＠torproject.org 27 Sep '19

27 Sep '19

commit 834ef7c5e76778e31f9ca8569e69423b32700acf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 27 12:23:19 2019 +0200 Tweak URL-based unit tests. Turns out that one of the tests that we disabled earlier was only slow, because creating a URL instance to https://something.dummy.org/ triggered an actual DNS resolve. There's absolutely no need to do this, so we can as well use localhost in all our test URLs. --- .../org/torproject/metrics/collector/conf/ConfigurationTest.java | 5 ++--- .../torproject/metrics/collector/downloader/DownloaderTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java index 67a9082..7845909 100644 --- a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java @@ -128,13 +128,12 @@ public class ConfigurationTest { } } - @Ignore("This test takes 40 seconds, which is too long.") @Test() public void testUrlArrayValues() throws Exception { URL[] array = new URL[randomSource.nextInt(30) + 1]; for (int i = 0; i < array.length; i++) { - array[i] = new URL("https://" - + Integer.toBinaryString(randomSource.nextInt(100)) + ".dummy.org"); + array[i] = new URL("http://localhost/" + + Integer.toBinaryString(randomSource.nextInt(100))); } String input = Arrays.toString(array).replace("[", "").replace("]", "") diff --git a/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java b/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java index 19db782..0617940 100644 --- a/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java +++ b/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java @@ -85,7 +85,7 @@ public class DownloaderTest { @Test public void testExistingResource() throws Exception { - URL requestedUrl = new URL("http://example.org/exists"); + URL requestedUrl = new URL("http://localhost/exists"); byte[] expectedDownloadedBytes = "content".getBytes(); HttpURLConnection urlConnection = mock(HttpURLConnection.class); httpUrlStreamHandler.addConnection(requestedUrl, urlConnection); @@ -98,7 +98,7 @@ public class DownloaderTest { @Test public void testNonExistingResource() throws Exception { - URL requestedUrl = new URL("http://example.org/notfound"); + URL requestedUrl = new URL("http://localhost/notfound"); HttpURLConnection urlConnection = mock(HttpURLConnection.class); httpUrlStreamHandler.addConnection(requestedUrl, urlConnection); given(urlConnection.getResponseCode()).willReturn(404); @@ -108,7 +108,7 @@ public class DownloaderTest { @Test public void testEmptyResource() throws Exception { - URL requestedUrl = new URL("http://example.org/empty"); + URL requestedUrl = new URL("http://localhost/empty"); byte[] expectedDownloadedBytes = new byte[0]; HttpURLConnection urlConnection = mock(HttpURLConnection.class); httpUrlStreamHandler.addConnection(requestedUrl, urlConnection); @@ -121,7 +121,7 @@ public class DownloaderTest { @Test(expected = SocketTimeoutException.class) public void testTimeout() throws Exception { - URL requestedUrl = new URL("http://example.org/timeout"); + URL requestedUrl = new URL("http://localhost/timeout"); SocketTimeoutException expectedException = new SocketTimeoutException(); HttpURLConnection urlConnection = mock(HttpURLConnection.class); httpUrlStreamHandler.addConnection(requestedUrl, urlConnection);

1 0