- tbb-commits - lists.torproject.org

[tor-browser-spec/master] Add rust symbols in audit script
by gk＠torproject.org 01 Dec '20

01 Dec '20

commit 033222ab1543cd4dae20fc8c40f5a1449cd3dd17 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 25 17:20:39 2020 +0000 Add rust symbols in audit script --- audits/java_audit.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/audits/java_audit.sh b/audits/java_audit.sh index 3e94fa3..51c9bf4 100644 --- a/audits/java_audit.sh +++ b/audits/java_audit.sh @@ -53,6 +53,13 @@ KEYWORDS+=(ActivityHandlerHelper.startIntentAndCatch) KEYWORDS+=(AppLinksInterceptor) KEYWORDS+=(AppLinksUseCases) +# Rust symbols +KEYWORDS+=("connect\(") +KEYWORDS+=("recvmsg\(") +KEYWORDS+=("sendmsg\(") +KEYWORDS+=("::post\(") +KEYWORDS+=("::get\(") + cd $REPO_DIR #function join_by { local d=$1; shift; local f=$1; shift; printf %s "$f" "${@/#/ $d}"; } #GREP_LINE="$(join_by \-G ${KEYWORDS[@]})"

1 0

[tor-browser-spec/master] Use correct word in network audit template
by gk＠torproject.org 01 Dec '20

01 Dec '20

commit 7be360991f5614cfbfa75913d0e367013dba921a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Dec 1 16:39:06 2020 +0000 Use correct word in network audit template --- audits/NETWORK_AUDIT_RUBRIC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audits/NETWORK_AUDIT_RUBRIC b/audits/NETWORK_AUDIT_RUBRIC index 89ec61c..b58bb49 100644 --- a/audits/NETWORK_AUDIT_RUBRIC +++ b/audits/NETWORK_AUDIT_RUBRIC @@ -1,5 +1,5 @@ `git diff esrA esrB` and then go over all the changes containing the -above mentioned potentially dangerous calls and features. Grep the diff for +below mentioned potentially dangerous calls and features. Grep the diff for the following strings and examine surrounding usage. =============== Native DNS Portion =============

1 0

[tor-browser-spec/master] Bug 40008: Add Fenix84 net audit
by gk＠torproject.org 01 Dec '20

01 Dec '20

commit b5ae80caf42ac4ef1a09441e65d2feca51e9217e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 25 17:21:54 2020 +0000 Bug 40008: Add Fenix84 net audit --- audits/FF84_NETWORK_AUDIT | 158 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/audits/FF84_NETWORK_AUDIT b/audits/FF84_NETWORK_AUDIT new file mode 100644 index 0000000..039dd96 --- /dev/null +++ b/audits/FF84_NETWORK_AUDIT @@ -0,0 +1,158 @@ +`git diff 1cb2c4893850a5b0a246f821a6390c07064c1227 9e429e392ec8446ff0f078f991d6332a307bc98f` +and then go over all the changes containing the +below mentioned potentially dangerous calls and features. Grep the diff for +the following strings and examine surrounding usage. + +=============== Native DNS Portion ============= + +PR_GetHostByName +PR_GetIPNodeByName +PR_GetAddrInfoByName +PR_StringToNetAddr (itself is good as it passes AI_NUMERICHOST to getaddrinfo. No resolution.) + +# FF84: +# Bug 1220810: +# - When |network.proxy.allow_hijacking_localhost| is false, then localhost == loopback +# - Tor Browser set |network.proxy.allow_hijacking_localhost| as true in #31065 +# Proxy-safe when pref is true + +# Bug 1667579: +# - New pref |network.connectivity-service.nat64-prefix| for specifying a NAT64 prefix +# for use if IPv4 is not available (default "") +# Proxy-safe, only affects order of internal DNS records + + +MDNS + +# FF84: Nothing new + + +TRR (DNS Trusted Recursive Resolver) + +# FF84: +# Bug 1673590: +# - Still protected by https://bugzil.la/1636411 + + +Direct Paths to DNS resolution: +nsDNSService::Resolve +nsDNSService::AsyncResolve +nsHostResolver::ResolveHost + +# FF84: +# Bug 1667356 +# - Protected by Mozilla's proxy-bypass protection for https://bugzil.la/1618271 + +# Bug 1671939: +# - Protected by Mozilla's proxy-bypass protection for https://bugzil.la/1618271 + +# Bug 1220810: +# - Protected by Mozilla's proxy-bypass protection for https://bugzil.la/1636411 + +============ Misc Socket Portion ============== + +SOCK_ +SOCKET_ +_SOCKET + +# FF84: Nothing of interest (mostly reformatting) + + +UDPSocket +TCPSocket + PR_NewTCPSocket + AsyncTCPSocket + +# FF84: Nothing of interest (mostly reformatting) + + +Misc PR_Socket + +# FF84: Nothing new + +=========== Misc XPCOM Portion ================ + +Misc XPCOM (including commands for pre-diff review approach) + *SocketProvider + grep -R udp-socket . + grep -R tcp-socket . + grep for tcpsocket + grep -R "NS_" | grep SOCKET | grep "_C" + grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket + +# FF84: Zero instances outside of tests and moved code + +============ Rust Portion ================ + +Rust + - XXX: What do we grep for here? Or do we rely on Ritter's compile-time tool? + - Check for new sendmsg and recvmsg usage + +# FF84: Nothing of interest (mostly reformatting and new web audio behavior for 1346880, and Pipewire for 1672945) + + + +============ Android Portion ============= + +Android Java calls + - URLConnection + - XXX: getInputStream? other methods? + - HttpURLConnection + - UrlConnectionDownloader + - ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls) + - grep -n openConnection\( mobile/android/thirdparty/ + - java.net.URL -- has SEVERAL proxy bypass URL fetching methods :/ + - java.net + - javax.net + - ch.boye.httpclientandroidlib.conn.* (esp ssl) + - ch.boye.httpclientandroidlib.impl.conn.* (esp ssl) + - Sudden appearance of thirdparty libs: + - OkHttp + - Retrofit + - Glide + - com.amitshekhar.android + - IntentHelper + - openUriExternal (can come from GeckoAppShell too) + - getHandlersForMimeType + - getHandlersForURL + - getHandlersForIntent + - android.content.Intent - too common; instead find launch methods: + - startActivity + - startActivities + - sendBroadcast + - sendOrderedBroadcast + - startService + - bindService + - android.app.PendingIntent + - android.app.DownloadManager + - ActivityHandlerHelper.startIntentAndCatch + +# FF84: Nothing new (using `java_audit.sh`) + +============ Application Services Portion ============= + +Start: 8e63363359c3d20385ed55f5308d19e321816898 # v63.0.0 +End: 6a234c2b1e1972f11e585551d4cf2e40e84bf16f # v67.0.0 + +# FF84: Nothing related to networking in Java/Koltlin/Rust code (using `java_audit.sh`) + +============ Android Components Portion ============= + +Start: 0a2993d44aae3d877bb97cee925096f83af01b3a # v63.0.8 +End: 614386935ec94cac531eb8cb061409e9a8410d09 # v67.0.3 + +# FF84: Zero new usage found of known proxy-bypass APIs (using `java_audit.sh`) + +============ Fenix Portion ============= + +Start: 5441935698f4d9e3606f3d6baf892f6e0106a2f6 # v83.1.0-rc.1 +End: 670e61b2b97d4f8066497e79178729c5802fe428 # v84.0.0-beta.2 + +# FF84: Zero new usage found of known proxy-bypass APIs (using `java_audit.sh`) + +============ Regression/Prior Vuln Review ========= + +Review proxy bypass bugs; check for new vectors to look for: + - https://trac.torproject.org/projects/tor/query?keywords=~tbb-proxy + - Look for new features like these. Especially external app launch vectors +

1 0

[tor-browser-build/master] Bug 40081: Build Mozilla code with --enable-rust-simd
by sysrqb＠torproject.org 01 Dec '20

01 Dec '20

commit 1f62decb1be130639412774a06b358eca06a4faf Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 8 10:25:00 2020 +0000 Bug 40081: Build Mozilla code with --enable-rust-simd Mozilla builds their CI and shipped code with Rust SIMD enabled (see: https://bugzilla.mozilla.org/show_bug.cgi?id=1578677#c4) We should therefore do the same. Thanks to a cypherpunk for pointing that out. --- projects/firefox/mozconfig-linux-i686 | 1 + projects/firefox/mozconfig-linux-x86_64 | 1 + projects/firefox/mozconfig-linux-x86_64-asan | 1 + projects/firefox/mozconfig-osx-x86_64 | 1 + projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + projects/geckoview/mozconfig-android-aarch64 | 1 + projects/geckoview/mozconfig-android-armv7 | 1 + projects/geckoview/mozconfig-android-x86 | 1 + projects/geckoview/mozconfig-android-x86_64 | 1 + 10 files changed, 10 insertions(+) diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 76c3ba3..2d0e08f 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -17,6 +17,7 @@ export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' ac_add_options --target=i686-linux-gnu ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 251cdc0..47c23e9 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -15,6 +15,7 @@ HOST_CXX=$CXX export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/projects/firefox/mozconfig-linux-x86_64-asan b/projects/firefox/mozconfig-linux-x86_64-asan index a1c4e46..8bee813 100644 --- a/projects/firefox/mozconfig-linux-x86_64-asan +++ b/projects/firefox/mozconfig-linux-x86_64-asan @@ -23,6 +23,7 @@ ac_add_options --disable-elf-hack ac_add_options --with-clang-path=/var/tmp/dist/clang/bin/clang ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 09c53fc..4609839 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -33,6 +33,7 @@ ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 3708dd7..0f267a5 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -23,6 +23,7 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-strip ac_add_options --enable-official-branding diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 52956e2..d1b0793 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -23,6 +23,7 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-strip ac_add_options --enable-official-branding diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index 5839477..4084714 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -7,6 +7,7 @@ CXX="clang++" ac_add_options --with-android-min-sdk=21 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 2530049..1ac85f7 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -7,6 +7,7 @@ CXX="clang++" ac_add_options --with-android-min-sdk=16 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index 160f95f..03de28b 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -7,6 +7,7 @@ CXX="clang++" ac_add_options --with-android-min-sdk=16 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index 5ca74e3..5ba86cf 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -7,6 +7,7 @@ CXX="clang++" ac_add_options --with-android-min-sdk=21 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android

1 0

[tor-browser/tor-browser-83.0-10.5-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 01 Dec '20

01 Dec '20

commit cc3f3dc643124975e0c298363542d26a52e45cba Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 30 07:54:38 2020 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files --- .mozconfig | 1 + .mozconfig-android | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 5 files changed, 5 insertions(+) diff --git a/.mozconfig b/.mozconfig index d71c858844e3..c50c57d410de 100755 --- a/.mozconfig +++ b/.mozconfig @@ -14,6 +14,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-android b/.mozconfig-android index 1b5e3f3178b7..50015ec615ef 100755 --- a/.mozconfig-android +++ b/.mozconfig-android @@ -3,6 +3,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Android diff --git a/.mozconfig-asan b/.mozconfig-asan index ca05fb12eedb..e42ff6c86bc5 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -22,6 +22,7 @@ ac_add_options --disable-jemalloc ac_add_options --disable-elf-hack ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-mac b/.mozconfig-mac index 9be7751f8241..5b4624ef1f67 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -38,6 +38,7 @@ ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 29c58d8fdab2..ce6ace1dad67 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -10,6 +10,7 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-strip ac_add_options --enable-official-branding

1 0

[tor-browser/tor-browser-78.5.0esr-10.5-1] squash! TB3: Tor Browser's official .mozconfigs.
by sysrqb＠torproject.org 01 Dec '20

01 Dec '20

commit 7a73628afb1c48d48e1b272382f4a51728ef00aa Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 30 07:54:38 2020 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files --- .mozconfig | 1 + .mozconfig-android | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 5 files changed, 5 insertions(+) diff --git a/.mozconfig b/.mozconfig index d71c858844e3..c50c57d410de 100755 --- a/.mozconfig +++ b/.mozconfig @@ -14,6 +14,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-android b/.mozconfig-android index 1b5e3f3178b7..50015ec615ef 100755 --- a/.mozconfig-android +++ b/.mozconfig-android @@ -3,6 +3,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Android diff --git a/.mozconfig-asan b/.mozconfig-asan index a1c4e467cf1a..8bee813bfee8 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -23,6 +23,7 @@ ac_add_options --disable-elf-hack ac_add_options --with-clang-path=/var/tmp/dist/clang/bin/clang ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-mac b/.mozconfig-mac index 9be7751f8241..5b4624ef1f67 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -38,6 +38,7 @@ ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 29c58d8fdab2..ce6ace1dad67 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -10,6 +10,7 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-strip ac_add_options --enable-official-branding

1 0

[Git][tpo/applications/android-components][android-components-67.0.3-10.5-1] 12 commits: Bug 40005: Modify Default toolbar menu
by Matthew Finkel 30 Nov '20

30 Nov '20

Matthew Finkel pushed to branch android-components-67.0.3-10.5-1 at The Tor Project / Applications / android-components Commits: 06756bca by Matthew Finkel at 2020-11-24T03:25:27+00:00 Bug 40005: Modify Default toolbar menu - - - - - eb9893c8 by Alex Catarineu at 2020-11-24T16:45:43+00:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 32b72c67 by Alex Catarineu at 2020-11-24T16:45:43+00:00 Bug 40002: Ensure system download manager is not used - - - - - ed46fc32 by Alex Catarineu at 2020-11-24T16:45:43+00:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - e708c980 by Alex Catarineu at 2020-11-24T17:11:42+00:00 Modify Addon support Bug 40011: Hide option for disallowing addons in private mode Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - e1eaf261 by Georg Koppen at 2020-11-24T17:14:11+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 481298d9 by Alex Catarineu at 2020-11-24T17:14:11+00:00 Bug 40015: Port padlock states for .onion services - - - - - 77d94719 by Alex Catarineu at 2020-11-24T17:14:11+00:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - be77ed01 by Alex Catarineu at 2020-11-24T17:14:11+00:00 Bug 40022: Migrate Tor security level from Fennec - - - - - d3936b47 by Matthew Finkel at 2020-11-24T17:14:11+00:00 Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - dbed701b by Matthew Finkel at 2020-11-24T17:14:53+00:00 Bug 40023: Stop PrivateNotificationService - - - - - a5b3a15a by Matthew Finkel at 2020-11-24T17:16:49+00:00 Add support for new GeckoView interfaces Bug 40006: Expose Security Level interface Bug 40019: Expose spoofEnglish pref Bug 34439: Isolate Icon loader on Android - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenu.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-78.5.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 719c1743fe8a972bec265cc84819c988ed399959 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 26 20:53:52 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 76ad489a71fe..4a258f4216e0 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 76ad489a71fe319065055f1e61fcf83bb9b3cdc2 +Subproject commit 4a258f4216e0adfa65a60f89183c3441ac2e83f8

1 0

[torbutton/master] Merge remote-tracking branch 'gitlab/merge-requests/27'
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 4a258f4216e0adfa65a60f89183c3441ac2e83f8 Merge: 76ad489a 227e9f25 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 26 20:49:27 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/27' chrome/content/torbutton.js | 203 +------------------------------------------- 1 file changed, 2 insertions(+), 201 deletions(-)

1 0

[torbutton/master] Bug 40024: Rip out remnants of Torbutton's internal version check
by gk＠torproject.org 26 Nov '20

26 Nov '20

commit 227e9f2503e0d300a2fc4072c4d5c9f570398ebb Author: Rusty Bird <rustybird(a)net-c.com> Date: Thu Nov 26 17:59:59 2020 +0000 Bug 40024: Rip out remnants of Torbutton's internal version check Since Tor Browser 9.0 (when the Onion Button was removed), Torbutton's internal browser version check is no longer hooked up to any UI. But it was still chugging along - making requests and logging to the Browser Console. Delete it, along with some now unnecessary support code. --- chrome/content/torbutton.js | 203 +------------------------------------------- 1 file changed, 2 insertions(+), 201 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index d795f642..db597c84 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -30,9 +30,6 @@ let { } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); let { configureControlPortModule } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); -const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; -const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; -const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; var m_tb_prefs = Services.prefs; @@ -65,33 +62,6 @@ async function clearData(flags) { }); } -// Bug 1506 P1: This object is only for updating the UI for toggling and style -var torbutton_window_pref_observer = -{ - register: function() - { - m_tb_prefs.addObserver("extensions.torbutton", this, false); - }, - - unregister: function() - { - m_tb_prefs.removeObserver("extensions.torbutton", this); - }, - - // topic: what event occurred - // subject: what nsIPrefBranch we're observing - // data: which pref has been changed (relative to subject) - observe: function(subject, topic, data) - { - if (topic != "nsPref:changed") return; - switch (data) { - case k_tb_browser_update_needed_pref: - torbutton_notify_if_update_needed(); - break; - } - } -} - // Bug 1506 P2: This object keeps Firefox prefs in sync with Torbutton prefs. // It probably could stand some simplification (See #3100). It also belongs // in a component, not the XUL overlay. @@ -242,32 +212,6 @@ torbutton_init = function() { } m_tb_wasinited = true; - // Determine if we are running inside Tor Browser. - var cur_version; - try { - cur_version = m_tb_prefs.getCharPref("torbrowser.version"); - torbutton_log(3, "This is a Tor Browser"); - } catch(e) { - torbutton_log(3, "This is not a Tor Browser: "+e); - } - - // If the Tor Browser version has changed since the last time Torbutton - // was loaded, reset the version check preferences in order to avoid - // incorrectly reporting that the browser needs to be updated. - var last_version; - try { - last_version = m_tb_prefs.getCharPref(k_tb_last_browser_version_pref); - } catch (e) {} - if (cur_version != last_version) { - m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); - if (m_tb_prefs.prefHasUserValue(k_tb_last_update_check_pref)) { - m_tb_prefs.clearUserPref(k_tb_last_update_check_pref); - } - - if (cur_version) - m_tb_prefs.setCharPref(k_tb_last_browser_version_pref, cur_version); - } - let tlps; try { tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] @@ -347,14 +291,10 @@ torbutton_init = function() { // listen for our toolbar button being added so we can initialize it torbutton_init_toolbutton(); - torbutton_log(1, 'registering pref observer'); - torbutton_window_pref_observer.register(); - torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); torbutton_update_toolbutton(); - torbutton_notify_if_update_needed(); try { createTorCircuitDisplay("extensions.torbutton.display_circuit"); @@ -505,128 +445,6 @@ function torbutton_get_toolbutton() { return o_toolbutton; } -function torbutton_update_is_needed() { - var updateNeeded = false; - try { - updateNeeded = m_tb_prefs.getBoolPref(k_tb_browser_update_needed_pref); - } catch (e) {} - - return updateNeeded; -} - -function torbutton_notify_if_update_needed() { - function setOrClearAttribute(aElement, aAttrName, aValue) - { - if (!aElement || !aAttrName) - return; - - if (aValue) - aElement.setAttribute(aAttrName, aValue); - else - aElement.removeAttribute(aAttrName); - } - - let updateNeeded = torbutton_update_is_needed(); - - // Change look of toolbar item (enable/disable animated update icon). - var btn = torbutton_get_toolbutton(); - setOrClearAttribute(btn, "tbUpdateNeeded", updateNeeded); - - // Make the "check for update" menu item bold if an update is needed. - var item = document.getElementById("torbutton-checkForUpdate"); - setOrClearAttribute(item, "tbUpdateNeeded", updateNeeded); -} - -// Bug 1506 P4: Checking for Tor Browser updates is pretty important, -// probably even as a fallback if we ever do get a working updater. -function torbutton_do_async_versioncheck() { - if (!m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { - return; - } - - // Suppress update check if done recently. - const kMinSecsBetweenChecks = 120 * 60; // 2.0 hours - var now = Date.now() / 1000; - var lastCheckTime; - try { - lastCheckTime = parseFloat(m_tb_prefs.getCharPref(k_tb_last_update_check_pref)); - if (isNaN(lastCheckTime)) - lastCheckTime = undefined; - } catch (e) {} - - if (lastCheckTime && ((now - lastCheckTime) < kMinSecsBetweenChecks)) - return; - - m_tb_prefs.setCharPref(k_tb_last_update_check_pref, now); - - torbutton_log(3, "Checking version with socks port: " - +m_tb_prefs.getIntPref("network.proxy.socks_port")); - try { - var req = new XMLHttpRequest(); - var url = m_tb_prefs.getCharPref("extensions.torbutton.versioncheck_url"); - req.open('GET', url, true); - req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; - req.overrideMimeType("text/json"); - req.onreadystatechange = function (oEvent) { - if (req.readyState === 4) { - if(req.status == 200) { - if(!req.responseText) { - torbutton_log(5, "Version check failed! No JSON present!"); - return -1; - } - try { - var version_list = JSON.parse(req.responseText); - var my_version = m_tb_prefs.getCharPref("torbrowser.version"); - var platformSuffix; - var platform = Services.appinfo.OS; - switch (platform) { - case "WINNT": - platformSuffix = "Windows"; - break; - case "Darwin": - platformSuffix = "MacOS"; - break; - case "Linux": - case "Android": - platformSuffix = platform; - break; - } - if (platformSuffix) - my_version += "-" + platformSuffix; - - if (version_list.indexOf(my_version) >= 0) { - torbutton_log(3, "Version check passed."); - m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); - return; - } - torbutton_log(5, "Your Tor Browser is out of date."); - m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, true); - return; - } catch(e) { - torbutton_log(5, "Version check failed! JSON parsing error: "+e); - return; - } - } else if (req.status == 404) { - // We're going to assume 404 means the service is not implemented yet. - torbutton_log(3, "Version check failed. Versions file is 404."); - return -1; - } - torbutton_log(5, "Version check failed! Web server error: "+req.status); - return -1; - } - }; - req.send(null); - } catch(e) { - if(e.result == 0x80004005) { // NS_ERROR_FAILURE - torbutton_log(5, "Version check failed! Is tor running?"); - return -1; - } - torbutton_log(5, "Version check failed! Tor internal error: "+e); - return -1; - } - -} - function torbutton_update_toolbutton() { let o_toolbutton = torbutton_get_toolbutton(); @@ -1625,16 +1443,6 @@ function torbutton_do_startup() } } -// Perform version check when a new tab is opened. -function torbutton_new_tab(event) -{ - // listening for new tabs - torbutton_log(3, "New tab"); - - /* Perform the version check on new tab, module timer */ - torbutton_do_async_versioncheck(); -} - // Bug 1506 P3: Used to decide if we should resize the window. // // Returns true if the window wind is neither maximized, full screen, @@ -1705,9 +1513,8 @@ function setupPreferencesForMobile() { }); } -// Bug 1506 P3: This is needed pretty much only for the version check -// and the window resizing. See comments for individual functions for -// details +// Bug 1506 P3: This is needed pretty much only for the window resizing. +// See comments for individual functions for details function torbutton_new_window(event) { torbutton_log(3, "New window"); @@ -1721,8 +1528,6 @@ function torbutton_new_window(event) if (!m_tb_wasinited) { torbutton_init(); } - // Add tab open listener.. - browser.tabContainer.addEventListener("TabOpen", torbutton_new_tab, false); torbutton_do_startup(); @@ -1734,16 +1539,12 @@ function torbutton_new_window(event) Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); } - // Check the version on every new window. We're already pinging check in these cases. - torbutton_do_async_versioncheck(); - torbutton_do_tor_check(); } // Bug 1506 P2: This is only needed because we have observers // in XUL that should be in an XPCOM component function torbutton_close_window(event) { - torbutton_window_pref_observer.unregister(); torbutton_tor_check_observer.unregister(); window.removeEventListener("sizemodechange", m_tb_resize_handler,

1 0