- tor-commits - lists.torproject.org

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 29 May '20

29 May '20

commit 697018fb5c9a013c00a97b0d0fbef5ca0e7d5af0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 19:50:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- mr/torbrowser_strings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mr/torbrowser_strings.dtd b/mr/torbrowser_strings.dtd index 6fc6beb246..542387c23d 100644 --- a/mr/torbrowser_strings.dtd +++ b/mr/torbrowser_strings.dtd @@ -9,11 +9,11 @@ <!ENTITY firstrun_privacy_next "टोर नेटवर्क कडे चला "> <!ENTITY firstrun_tornetwork_tab_title "टोर नेटवर्क "> <!ENTITY firstrun_tornetwork_title "विकेंद्रीकृत नेटवर्क चा प्रवास करा "> -<!ENTITY firstrun_tornetwork_message "टोर ब्राउझर आपल्याला टोर नेटवर्कशी जोडतो जो जगभरातील हजारो स्वयंसेवक लोकांनी चालावला जातो."> +<!ENTITY firstrun_tornetwork_message "टोर ब्राउझर आपल्याला टोर नेटवर्कशी जोडतो जो जगभरातील हजारो स्वयंसेवक लोकांनी चालावला जातो. वी पी एन उलट, इथे कोणताही एक अपयश्याचा बिंदु किव्व एक केंद्रीकृतपणा नसतो, त्याउलट तुमचं आंतरजाळ ब्राउझिंग हे खाजगीरित्या होता ."> <!ENTITY firstrun_tornetwork_next "पुढे "> <!ENTITY firstrun_secsettings_tab_title "सुरक्षा"> <!ENTITY firstrun_secsettings_title "आपला अनुभव निवडा "> -<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> +<!ENTITY firstrun_secsettings_message "आम्ही आतिरिक्त सेटिंग देतो तुमची सुरक्षा वाढवण्यसाठी. आमचे सुरकक्षीतेचे सेटिंग तुम्हाला सक्षम बनवते वाईट घटकांन पासून वाचायला जे तुमच्या संगणका वर हल्ला कारू शकतात."> <!ENTITY firstrun_secsettings_next "पुढे "> <!ENTITY firstrun_tips_tab_title "टिप्स "> <!ENTITY firstrun_tips_title "आनुभवी टिप्स ">

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Merge remote-tracking branch 'bradetpo/bug34315-01' into tor-browser-68.9.0esr-10.0-1
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 62b2d85bf2b29f90f554fb53079d30fd692e6d64 Merge: b53e2d8fb7fa 686bbbd739c9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 19:38:39 2020 +0000 Merge remote-tracking branch 'bradetpo/bug34315-01' into tor-browser-68.9.0esr-10.0-1 .../components/enterprisepolicies/EnterprisePolicies.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] squash! Bug 32418: Allow updates to be disabled via an enterprise policy.
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 686bbbd739c930ee49f6d4ba3909628c22340385 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu May 28 10:14:55 2020 -0400 squash! Bug 32418: Allow updates to be disabled via an enterprise policy. On Linux, avoid reading policies from /etc/firefox/policies/policies.json --- .../components/enterprisepolicies/EnterprisePolicies.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index 5276725703f6..afbfadffbf29 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// To avoid accessing the Windows Registry or macOS' file system attributes, -// Tor Browser only supports policies.json. -#define JSON_POLICIES_ONLY MOZ_PROXY_BYPASS_PROTECTION +// To ensure that policies intended for Firefox or another browser will not +// be used, Tor Browser only looks for policies in ${InstallDir}/distribution +#define AVOID_SYSTEM_POLICIES MOZ_PROXY_BYPASS_PROTECTION const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" @@ -15,7 +15,7 @@ const { AppConstants } = ChromeUtils.import( ); XPCOMUtils.defineLazyModuleGetters(this, { -#ifndef JSON_POLICIES_ONLY +#ifndef AVOID_SYSTEM_POLICIES WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm", macOSPoliciesParser: "resource://gre/modules/policies/macOSPoliciesParser.jsm", @@ -117,7 +117,7 @@ EnterprisePoliciesManager.prototype = { _chooseProvider() { let provider = null; -#ifndef JSON_POLICIES_ONLY +#ifndef AVOID_SYSTEM_POLICIES if (AppConstants.platform == "win") { provider = new WindowsGPOPoliciesProvider(); } else if (AppConstants.platform == "macosx") { @@ -481,6 +481,7 @@ class JSONPoliciesProvider { _getConfigurationFile() { let configFile = null; +#ifndef AVOID_SYSTEM_POLICIES if (AppConstants.platform == "linux") { let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance( Ci.nsIFile @@ -493,6 +494,7 @@ class JSONPoliciesProvider { return systemConfigFile; } } +#endif try { configFile = Services.dirsvc.get("XREAppDist", Ci.nsIFile); @@ -569,7 +571,7 @@ class JSONPoliciesProvider { } } -#ifndef JSON_POLICIES_ONLY +#ifndef AVOID_SYSTEM_POLICIES class WindowsGPOPoliciesProvider { constructor() { this._policies = null;

1 0

[translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
by translation＠torproject.org 29 May '20

29 May '20

commit 6b4d424a98d18ec003f7d744e2e672ffc833c325 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 19:23:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- mr/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mr/browserOnboarding.properties b/mr/browserOnboarding.properties index 5fbdcd64b3..e63591b43e 100644 --- a/mr/browserOnboarding.properties +++ b/mr/browserOnboarding.properties @@ -9,7 +9,7 @@ onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=à€à¥à€ªà€šà¥à€¯à€€à€Ÿ onboarding.tour-tor-privacy.title=à€žà¥à€šà€¬ à€à¥à€°à¥à€à€°à¥à€ž à€à€£à€¿ à€žà¥à€šà¥à€ªà€°à¥à€ž. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click âTor Networkâ to learn how we protect you on the network level. +onboarding.tour-tor-privacy.description=à€à¥à€° à€¬à¥à€°à€Ÿà€à€à€° à€à¥à€à¥à€žà€²à€Ÿ à€µà¥à€à€³ à€ à¥à€µà€€à€Ÿ à€à€£à€¿ à€¬à¥à€°à€Ÿà€à€à€° à€à€€à€¿à€¹à€Ÿà€žà€²à€Ÿ à€à€Ÿà€¢à¥à€š à€€à€Ÿà€à€€ à€à¥à€µà¥à€¹à€Ÿ à€€à¥à€®à€à€ à€¬à¥à€°à€Ÿà€à€à€¿à€à€ à€žà€€à¥à€° à€ªà¥à€°à¥à€£ à€¹à¥à€€à€Ÿ. à€¹à¥ à€¬à€Šà€² nischiità€°à€Ÿà€à€à€° à€à¥à€à¥à€žà€²à€Ÿ à€µà¥à€à€³ à€ à¥à€µà€€à€Ÿ à€à€£à€¿ à€¬à¥à€°à€Ÿà€à€à€° à€à€€à€¿à€¹à€Ÿà€žà€²à€Ÿ à€à€Ÿà€¢à¥à€š à€€à€Ÿà€à€€ à€à¥à€µà¥à€¹à€Ÿ à€€à¥à€®à€à€ à€¬à¥à€°à€Ÿà€à€à€¿à€à€ à€žà€€à¥à€° à€ªà¥à€°à¥à€£ à€¹à¥à€€à€Ÿ. à€¹à¥ à€¬à€Šà€² à€šà€¿à€¶à¥à€à€¿à€€ à€à€°à€€à€Ÿà€€ à€à¥ à€€à¥à€®à€à¥ à€à¥à€ªà€šà¥à€¯à€€à€Ÿ à€à€£à€¿ à€žà¥à€°à€à¥à€·à€Ÿ à€¬à¥à€°à€Ÿà€à€à€° à€®à€§à¥à€¯à¥ à€žà€à€°à€à¥à€·à€¿à€€ à€°à€Ÿà€¹à€€à¥à€². 'à€à¥à€° à€šà¥à€à€µà€°à¥à€' à€µà€° à€Šà€Ÿà€¬à€Ÿ à€¹à¥ à€à€Ÿà€£à€£à¥à€¯à€Ÿà€žà€Ÿà€ à¥ à€à¥ à€šà¥à€à€µà€°à¥à€ à€ªà€Ÿà€€à€³à¥à€µà€° à€€à¥à€®à¥à€¹à€Ÿà€²à€Ÿ à€žà€à €°à€à¥à€·à¥à€€ à€à€žà€ à€à¥à€²à€Ÿ à€à€Ÿà€€à€Ÿ. onboarding.tour-tor-privacy.button=à€à¥à€° à€šà¥à€à€µà€°à¥à€ à€à€¡à¥ à€à€²à€Ÿ onboarding.tour-tor-network=à€à¥à€° à€šà¥à€à€µà€°à¥à€

1 0

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 29 May '20

29 May '20

commit 4a7fdc8a5e956eabb1fa141e3ac97a49bdf70de5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 29 19:20:57 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- mr/torbrowser_strings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mr/torbrowser_strings.dtd b/mr/torbrowser_strings.dtd index 7a7a32a98b..6fc6beb246 100644 --- a/mr/torbrowser_strings.dtd +++ b/mr/torbrowser_strings.dtd @@ -5,11 +5,11 @@ <!ENTITY firstrun_welcome_next "सुरू करा "> <!ENTITY firstrun_privacy_tab_title "गोपनीयता"> <!ENTITY firstrun_privacy_title "स्नब ट्रॅकर्स आणि स्नूपर्स."> -<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> +<!ENTITY firstrun_privacy_message "टोर ब्राउझर कूकीसला वेघळ ठेवता आणि ब्राउझर इतिहासला काढून ताकत जेव्हा तुमचं ब्राउझिंग सत्र पूर्ण होता. हे बदल nischiitराउझर कूकीसला वेघळ ठेवता आणि ब्राउझर इतिहासला काढून ताकत जेव्हा तुमचं ब्राउझिंग सत्र पूर्ण होता. हे बदल निश्चित करतात की तुमची गोपनीयता आणि सुरक्षा ब्राउझर मध्ये संरक्षित राहतील. 'टोर नेटवर्क' वर दाबा हे जाणण्यासाठी की नेटवर्क पातळीवर तुम्हाला संरक ्षीत कसं केला जाता."> <!ENTITY firstrun_privacy_next "टोर नेटवर्क कडे चला "> <!ENTITY firstrun_tornetwork_tab_title "टोर नेटवर्क "> <!ENTITY firstrun_tornetwork_title "विकेंद्रीकृत नेटवर्क चा प्रवास करा "> -<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> +<!ENTITY firstrun_tornetwork_message "टोर ब्राउझर आपल्याला टोर नेटवर्कशी जोडतो जो जगभरातील हजारो स्वयंसेवक लोकांनी चालावला जातो."> <!ENTITY firstrun_tornetwork_next "पुढे "> <!ENTITY firstrun_secsettings_tab_title "सुरक्षा"> <!ENTITY firstrun_secsettings_title "आपला अनुभव निवडा ">

1 0

[tor-browser-build/master] Bug 34202: Remove unused xz project
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 28172b36ac6442b10985e818f6bd96f2623d093a Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 13 08:40:29 2020 +0000 Bug 34202: Remove unused xz project --- projects/xz/build | 16 ---------------- projects/xz/config | 23 ----------------------- 2 files changed, 39 deletions(-) diff --git a/projects/xz/build b/projects/xz/build deleted file mode 100644 index 4ef654c..0000000 --- a/projects/xz/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -distdir=/var/tmp/dist/[% project %] -mkdir -p $distdir -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -./autogen.sh -./configure [% c("var/configure_opt") %] --prefix=$distdir -make -j[% c("buildconf/num_procs") %] install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/xz/config b/projects/xz/config deleted file mode 100644 index eac35e1..0000000 --- a/projects/xz/config +++ /dev/null @@ -1,23 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 5.2.4 -git_url: https://git.tukaani.org/xz.git -git_hash: 'v[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: xz.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - android: - var: - arch_deps: - - autopoint - configure_opt_project: --disable-shared --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_34219'
by sysrqb＠torproject.org 29 May '20

29 May '20

commit ede6ffb414a8684f5dab8615836504acf2774734 Merge: e1accd2 40809c5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 17:16:29 2020 +0000 Merge remote-tracking branch 'gktpo/bug_34219' projects/tor/build | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_34202'
by sysrqb＠torproject.org 29 May '20

29 May '20

commit aa0a75cb536fe257bc3c74f694fa362ff6194b57 Merge: ede6ffb 28172b3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 19:09:46 2020 +0000 Merge remote-tracking branch 'gktpo/bug_34202' projects/xz/build | 16 ---------------- projects/xz/config | 23 ----------------------- 2 files changed, 39 deletions(-)

1 0

[tor-browser-build/master] Bug 34219: Enable ZSTD support on Android
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 40809c54c2e198cbe11d0d4f19bc9fd7c242166b Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 14 13:29:38 2020 +0000 Bug 34219: Enable ZSTD support on Android --- projects/tor/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor/build b/projects/tor/build index 30ecc7e..7747549 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -8,6 +8,10 @@ mkdir -p /var/tmp/build TORCONFIGDIR="$distdir/assets/common" libsdir=$distdir/jniLibs/[% c("var/abi") %] mkdir -p $libsdir $TORCONFIGDIR "$distdir/Tor" + # We need to make sure our ZSTD dependencey is properly picked up. + # --enable-zstd is not enough. + export ZSTD_CFLAGS=-I/var/tmp/dist/zstd/include + export ZSTD_LIBS=/var/tmp/dist/zstd/lib/libzstd.a [% END %] [% IF c("var/linux") || c("var/windows") %]

1 0

[gettor/master] Check to see if email is from an autoresponder
by cohosh＠torproject.org 29 May '20

29 May '20

commit 012ef1a4020c5d7b70f027a0184d32b440c7babb Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon May 25 11:06:57 2020 -0400 Check to see if email is from an autoresponder This checks to see if an incoming request is from a known autoresponder. GetTor can get into infinite loops with itself or postmaster addresses (Bug #34286) --- gettor/parse/email.py | 4 ++-- gettor/utils/validate_email.py | 21 +++++++++++++++++++++ tests/test_email_service.py | 17 ++++++++++++++++- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index d37614d..41b34ce 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -86,8 +86,8 @@ class EmailParser(object): ) # Add a check for auto-generated mail-daemon emails - if "mailer-daemon@" in norm_addr.lower(): - raise AddressError("Received mail from Mail Delivery System {}" + if validate_email.autoresponder(norm_addr): + raise AddressError("Received mail from a known autoresponder {}" .format(msg['From'])) return True diff --git a/gettor/utils/validate_email.py b/gettor/utils/validate_email.py index 0f18e3e..337849e 100644 --- a/gettor/utils/validate_email.py +++ b/gettor/utils/validate_email.py @@ -96,6 +96,13 @@ MX_DNS_CACHE = {} MX_CHECK_CACHE = {} +# List of known autoresponder email patterns +autoresponders = [ + r'mailer-daemon@.*', + r'postmaster@.*', + r'gettor.*(a)torproject.org' +] + def get_mx_ip(hostname): if hostname not in MX_DNS_CACHE: try: @@ -176,6 +183,20 @@ def validate_email(email, check_mx=False, verify=False, debug=False, smtp_timeou return None return True +def autoresponder(from_addr): + """ + We sometimes receive messages from autoresponders like Mail Deliver System + or postmaster due to bounced messages. This can send GetTor into an infinite + loop with the autoresponder (or itself). + + Returns true if the email address matches a known autoresponder pattern. + """ + for pattern in autoresponders: + if re.match(pattern, from_addr.lower()) is not None: + return True + + return False + if __name__ == "__main__": import time while True: diff --git a/tests/test_email_service.py b/tests/test_email_service.py index a41669f..47d7e5f 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -289,13 +289,28 @@ class EmailServiceTests(unittest.TestCase): ">\n") self.assertEqual(request["command"], "help") - def test_bounce(self): + def test_from_autoresponder(self): ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") request = ep.parse("From: MAILER-DAEMON(a)mx1.riseup.net\n" "Subject: Undelivered Mail Returned to Sender\r\n" "To: gettor(a)torproject.org\n osx en\n") self.assertEqual(request, {}) + request = ep.parse("From: postmaster(a)example.sk\n" + "Subject: Undelivered Mail Returned to Sender\r\n" + "To: gettor(a)torproject.org\n\n osx en\n") + + self.assertEqual(request, {}) + request = ep.parse("From: gettor(a)torproject.org\n" + "Subject: links\r\n" + "To: gettor(a)torproject.org\n\n osx en\n") + + self.assertEqual(request, {}) + request = ep.parse("From: gettor+en(a)torproject.org\n" + "Subject: links\r\n" + "To: gettor(a)torproject.org\n\n osx en\n") + + self.assertEqual(request, {}) if __name__ == "__main__": unittest.main()

1 0