tbb-commits
Threads by month
- ----- 2025 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 18685 discussions

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.3.0esr-13.0-1-build2
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed new tag tor-browser-115.3.0esr-13.0-1-build2 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][maint-12.5] Use foursquare as domain front for snowflake
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build
Commits:
c490a775 by meskio at 2023-09-21T20:13:45+00:00
Use foursquare as domain front for snowflake
- - - - -
2 changed files:
- projects/common/bridges_list.snowflake.txt
- projects/tor-expert-bundle/pt_config.json
Changes:
=====================================
projects/common/bridges_list.snowflake.txt
=====================================
@@ -1,2 +1,2 @@
-snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
-snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
+snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
+snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
=====================================
projects/tor-expert-bundle/pt_config.json
=====================================
@@ -22,8 +22,8 @@
"obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0"
],
"snowflake" : [
- "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn",
- "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"
+ "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn",
+ "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"
]
}
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] Bug 41327: Disable UrlbarProviderInterventions
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
baa05b03 by Richard Pospesel at 2023-09-21T20:10:02+00:00
Bug 41327: Disable UrlbarProviderInterventions
- - - - -
3 changed files:
- browser/components/urlbar/UrlbarProvidersManager.sys.mjs
- browser/components/urlbar/UrlbarUtils.sys.mjs
- browser/components/urlbar/moz.build
Changes:
=====================================
browser/components/urlbar/UrlbarProvidersManager.sys.mjs
=====================================
@@ -51,8 +51,9 @@ var localProviderModules = {
"resource:///modules/UrlbarProviderHistoryUrlHeuristic.sys.mjs",
UrlbarProviderInputHistory:
"resource:///modules/UrlbarProviderInputHistory.sys.mjs",
- UrlbarProviderInterventions:
- "resource:///modules/UrlbarProviderInterventions.sys.mjs",
+ // disable as part of tor-browser#41327
+ // UrlbarProviderInterventions:
+ // "resource:///modules/UrlbarProviderInterventions.sys.mjs",
UrlbarProviderOmnibox: "resource:///modules/UrlbarProviderOmnibox.sys.mjs",
UrlbarProviderPlaces: "resource:///modules/UrlbarProviderPlaces.sys.mjs",
UrlbarProviderPreloadedSites:
=====================================
browser/components/urlbar/UrlbarUtils.sys.mjs
=====================================
@@ -21,8 +21,9 @@ ChromeUtils.defineESModuleGetters(lazy, {
SearchSuggestionController:
"resource://gre/modules/SearchSuggestionController.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
- UrlbarProviderInterventions:
- "resource:///modules/UrlbarProviderInterventions.sys.mjs",
+ // disable as part of tor-browser#41327
+ // UrlbarProviderInterventions:
+ // "resource:///modules/UrlbarProviderInterventions.sys.mjs",
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
UrlbarProviderSearchTips:
"resource:///modules/UrlbarProviderSearchTips.sys.mjs",
@@ -1387,20 +1388,22 @@ export var UrlbarUtils = {
return "tab";
case UrlbarUtils.RESULT_TYPE.TIP:
if (result.providerName === "UrlbarProviderInterventions") {
- switch (result.payload.type) {
- case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
- return "intervention_clear";
- case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
- return "intervention_refresh";
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
- return "intervention_update";
- default:
- return "intervention_unknown";
- }
+ return "intervention_unknown";
+ // disable as part of tor-browser#41327
+ // switch (result.payload.type) {
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
+ // return "intervention_clear";
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
+ // return "intervention_refresh";
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
+ // return "intervention_update";
+ // default:
+ // return "intervention_unknown";
+ // }
}
switch (result.payload.type) {
=====================================
browser/components/urlbar/moz.build
=====================================
@@ -30,7 +30,8 @@ EXTRA_JS_MODULES += [
"UrlbarProviderHeuristicFallback.sys.mjs",
"UrlbarProviderHistoryUrlHeuristic.sys.mjs",
"UrlbarProviderInputHistory.sys.mjs",
- "UrlbarProviderInterventions.sys.mjs",
+ # disable as part of tor-browser#41327
+ # "UrlbarProviderInterventions.sys.mjs",
"UrlbarProviderOmnibox.sys.mjs",
"UrlbarProviderOpenTabs.sys.mjs",
"UrlbarProviderPlaces.sys.mjs",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/baa05b0…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/baa05b0…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
ffe81f9d by Pier Angelo Vendrame at 2023-09-21T19:52:47+00:00
fixup! Firefox preference overrides.
Switch to STIX Two Math.
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -585,7 +585,7 @@ pref("toolkit.winRegisterApplicationRestart", false);
pref("gfx.bundled-fonts.activate", 1);
#ifdef XP_MACOSX
-pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
+pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
// Armenian
pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman");
@@ -647,6 +647,10 @@ pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer, Menlo, Courier New");
pref("font.name-list.serif.x-mlym", "Noto Serif Malayalam, Times, Times New Roman");
pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam, Helvetica, Arial");
pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam, Menlo, Courier New");
+// Mathematics
+pref("font.name-list.serif.x-math", "STIX Two Math, Times, Times New Roman");
+pref("font.name-list.sans-serif.x-math", "STIX Two Math, Helvetica, Arial");
+pref("font.name-list.monospace.x-math", "STIX Two Math, Menlo, Courier New");
// Oriya
pref("font.name-list.serif.x-orya", "Noto Sans Oriya, Times, Times New Roman");
pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya, Helvetica, Arial");
@@ -675,7 +679,7 @@ pref("font.name-list.monospace.x-unicode", "Menlo, Courier New, Noto Sans Baline
#endif
#ifdef XP_WIN
-pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, MS ゴシック, MS PGothic, MS Pゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi, Noto Naskh Arabic, Noto Sans, Noto Serif");
+pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, MS ゴシック, MS PGothic, MS Pゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi, Noto Naskh Arabic, Noto Sans, Noto Serif");
// Arabic
pref("font.name-list.serif.ar", "Times New Roman, Noto Naskh Arabic");
@@ -752,7 +756,7 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S
#endif
#ifdef XP_LINUX
-pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Math, Tinos, Twemoji Mozilla");
+pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols 2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Two Math, Tinos, Twemoji Mozilla");
// Arabic
pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos");
@@ -835,9 +839,9 @@ pref("font.name-list.serif.x-mlym", "Noto Serif Malayalam, Tinos");
pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam, Arimo");
pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam, Cousine");
// Mathematics
-pref("font.name-list.serif.x-math", "STIX Math Regular, Tinos");
-pref("font.name-list.sans-serif.x-math", "STIX Math Regular, Arimo");
-pref("font.name-list.monospace.x-math", "STIX Math Regular, Cousine");
+pref("font.name-list.serif.x-math", "STIX Two Math, Tinos");
+pref("font.name-list.sans-serif.x-math", "STIX Two Math, Arimo");
+pref("font.name-list.monospace.x-math", "STIX Two Math, Cousine");
// Oriya
pref("font.name-list.serif.x-orya", "Noto Sans Oriya, Tinos");
pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya, Arimo");
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ffe81f9…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ffe81f9…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
47690e68 by Pier Angelo Vendrame at 2023-09-21T19:51:24+00:00
fixup! Firefox preference overrides.
Switch to STIX Two Math.
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -585,7 +585,7 @@ pref("toolkit.winRegisterApplicationRestart", false);
pref("gfx.bundled-fonts.activate", 1);
#ifdef XP_MACOSX
-pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
+pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
// Armenian
pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman");
@@ -647,6 +647,10 @@ pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer, Menlo, Courier New");
pref("font.name-list.serif.x-mlym", "Noto Serif Malayalam, Times, Times New Roman");
pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam, Helvetica, Arial");
pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam, Menlo, Courier New");
+// Mathematics
+pref("font.name-list.serif.x-math", "STIX Two Math, Times, Times New Roman");
+pref("font.name-list.sans-serif.x-math", "STIX Two Math, Helvetica, Arial");
+pref("font.name-list.monospace.x-math", "STIX Two Math, Menlo, Courier New");
// Oriya
pref("font.name-list.serif.x-orya", "Noto Sans Oriya, Times, Times New Roman");
pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya, Helvetica, Arial");
@@ -675,7 +679,7 @@ pref("font.name-list.monospace.x-unicode", "Menlo, Courier New, Noto Sans Baline
#endif
#ifdef XP_WIN
-pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, MS ゴシック, MS PGothic, MS Pゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi, Noto Naskh Arabic, Noto Sans, Noto Serif");
+pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, MS ゴシック, MS PGothic, MS Pゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi, Noto Naskh Arabic, Noto Sans, Noto Serif");
// Arabic
pref("font.name-list.serif.ar", "Times New Roman, Noto Naskh Arabic");
@@ -752,7 +756,7 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S
#endif
#ifdef XP_LINUX
-pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Math, Tinos, Twemoji Mozilla");
+pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols 2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Two Math, Tinos, Twemoji Mozilla");
// Arabic
pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos");
@@ -835,9 +839,9 @@ pref("font.name-list.serif.x-mlym", "Noto Serif Malayalam, Tinos");
pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam, Arimo");
pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam, Cousine");
// Mathematics
-pref("font.name-list.serif.x-math", "STIX Math Regular, Tinos");
-pref("font.name-list.sans-serif.x-math", "STIX Math Regular, Arimo");
-pref("font.name-list.monospace.x-math", "STIX Math Regular, Cousine");
+pref("font.name-list.serif.x-math", "STIX Two Math, Tinos");
+pref("font.name-list.sans-serif.x-math", "STIX Two Math, Arimo");
+pref("font.name-list.monospace.x-math", "STIX Two Math, Cousine");
// Oriya
pref("font.name-list.serif.x-orya", "Noto Sans Oriya, Tinos");
pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya, Arimo");
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47690e6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47690e6…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Bug 40893: Update fonts for Tor Browser 13.0.
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
16528f1c by Pier Angelo Vendrame at 2023-09-21T19:50:32+00:00
Bug 40893: Update fonts for Tor Browser 13.0.
- - - - -
4 changed files:
- projects/fonts/build
- projects/fonts/config
- projects/fonts/fetch-noto-fonts
- rbm.conf
Changes:
=====================================
projects/fonts/build
=====================================
@@ -1,40 +1,42 @@
#!/bin/bash
[% c("var/set_default_env") -%]
-distdir=/var/tmp/dist/fonts
+# This script runs outside containers
+distdir=/var/tmp/$(whoami)/dist/fonts
mkdir -p $distdir
mv noto-fonts-* noto-fonts
-[% FOREACH fontfile = c("var/noto_fonts_common");
- GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
+[% FOREACH family = c("var/noto_fonts_common");
+ GET 'cp noto-fonts/' _ family _ '/*.ttf $distdir/' _ "\n";
END; %]
-[% IF c("var/linux") %]
- [% FOREACH fontfile = c("var/noto_fonts_linux");
- GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
- END; %]
-[% END %]
-[% IF c("var/macos") %]
- [% FOREACH fontfile = c("var/noto_fonts_mac");
- GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
- END; %]
-[% END %]
-[% IF c("var/windows") %]
- [% FOREACH fontfile = c("var/noto_fonts_windows");
- GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
- END; %]
-[% END %]
+[% IF c("var/linux");
+ SET font_list = c("var/noto_fonts_linux");
+ ELSIF c("var/macos");
+ SET font_list = c("var/noto_fonts_mac");
+ ELSIF c("var/windows");
+ SET font_list = c("var/noto_fonts_windows");
+ END;
+ FOREACH family = font_list;
+ GET 'cp noto-fonts/' _ family _ '/* $distdir/' _ "\n";
+ END;
+%]
-[% IF c("var/linux") || c("var/macos") %]
- unzip -o 2.0.0.zip -d STIX
- cp "STIX/stixfonts-2.0.0/archive/STIXv1.1.1/Fonts/STIX-Word/STIXMath-Regular.otf" $distdir/
+[% IF c("var/have_stix") %]
+ cp "$rootdir/[% c('input_files_by_name/stix') %]" $distdir/
[% END %]
+
[% IF c("var/linux") %]
- cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/
+ unzip "$rootdir/[% c('input_files_by_name/arimo') %]"
+ cp Arimo-*/fonts/ttf/*.ttf Cousine-* Tinos-* NotoSans{JP,KR,SC,TC}-Regular.otf $distdir/
[% END %]
+
cp README.txt "$distdir/000_README.txt"
-cd /var/tmp/dist
+cd $distdir/..
[% c('tar', {
tar_src => [ 'fonts' ],
tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
}) %]
+
+# Additional cleanup since we are outside containers
+rm -rf /var/tmp/$(whoami)
=====================================
projects/fonts/config
=====================================
@@ -1,170 +1,181 @@
# vim: filetype=yaml sw=2
-version: '2'
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]"
+version: '3'
+filename: "[% project %]-[% c('version') %]-[% c('var/platform') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]"
container:
- use_container: 1
+ # We just copy files around, no need to use a container.
+ use_container: 0
var:
- noto_git_hash: 20bc5918912503bc1537a407a694738c33c048aa
+ # noto-monthly-release-23.9.1
+ noto_git_hash: c890f6fec6fa37740f23fffdd2a28e156f3837a3
# Use this way so that the script that downloads the fonts can access the
# lists of all the targets.
noto_fonts_common:
- - NotoSansAdlam-Regular.ttf
- - NotoSansBalinese-Regular.ttf
- - NotoSansBamum-Regular.ttf
- - NotoSansBassaVah-Regular.ttf
- - NotoSansBatak-Regular.ttf
- - NotoSansBengali-Regular.ttf
- - NotoSansBuginese-Regular.ttf
- - NotoSansBuhid-Regular.ttf
- - NotoSansCanadianAboriginal-Regular.ttf
- - NotoSansChakma-Regular.ttf
- - NotoSansCham-Regular.ttf
- - NotoSansCherokee-Regular.ttf
- - NotoSansCoptic-Regular.ttf
- - NotoSansDeseret-Regular.ttf
- - NotoSansDevanagari-Regular.ttf
- - NotoSansElbasan-Regular.ttf
- - NotoSansEthiopic-Regular.ttf
- - NotoSansGeorgian-Regular.ttf
- - NotoSansGrantha-Regular.ttf
- - NotoSansGujarati-Regular.ttf
- - NotoSansGunjalaGondi-Regular.ttf
- - NotoSansGurmukhi-Regular.ttf
- - NotoSansHanifiRohingya-Regular.ttf
- - NotoSansHanunoo-Regular.ttf
- - NotoSansKannada-Regular.ttf
- - NotoSansKhmer-Regular.ttf
- - NotoSansJavanese-Regular.ttf
- - NotoSansKayahLi-Regular.ttf
- - NotoSansKhojki-Regular.ttf
- - NotoSansKhudawadi-Regular.ttf
- - NotoSansLao-Regular.ttf
- - NotoSansLepcha-Regular.ttf
- - NotoSansLimbu-Regular.ttf
- - NotoSansLisu-Regular.ttf
- - NotoSansMahajani-Regular.ttf
- - NotoSansMalayalam-Regular.ttf
- - NotoSansMandaic-Regular.ttf
- - NotoSansMasaramGondi-Regular.ttf
- - NotoSansMedefaidrin-Regular.ttf
- - NotoSansMeeteiMayek-Regular.ttf
- - NotoSansMendeKikakui-Regular.ttf
- - NotoSansMiao-Regular.ttf
- - NotoSansModi-Regular.ttf
- - NotoSansMongolian-Regular.ttf
- - NotoSansMro-Regular.ttf
- - NotoSansMyanmar-Regular.ttf
- - NotoSansMultani-Regular.ttf
- - NotoSansNewa-Regular.ttf
- - NotoSansNewTaiLue-Regular.ttf
- - NotoSansNKo-Regular.ttf
- - NotoSansOlChiki-Regular.ttf
- - NotoSansOriya-Regular.ttf
- - NotoSansOsage-Regular.ttf
- - NotoSansOsmanya-Regular.ttf
- - NotoSansPahawhHmong-Regular.ttf
- - NotoSansPauCinHau-Regular.ttf
- - NotoSansRejang-Regular.ttf
- - NotoSansRunic-Regular.ttf
- - NotoSansSamaritan-Regular.ttf
- - NotoSansSaurashtra-Regular.ttf
- - NotoSansSharada-Regular.ttf
- - NotoSansShavian-Regular.ttf
- - NotoSansSinhala-Regular.ttf
- - NotoSansSoraSompeng-Regular.ttf
- - NotoSansSoyombo-Regular.ttf
- - NotoSansSundanese-Regular.ttf
- - NotoSansSylotiNagri-Regular.ttf
- - NotoSansSymbols2-Regular.ttf
- - NotoSansSymbols-Regular.ttf
- - NotoSansSyriac-Regular.ttf
- - NotoSansTagalog-Regular.ttf
- - NotoSansTagbanwa-Regular.ttf
- - NotoSansTaiLe-Regular.ttf
- - NotoSansTaiTham-Regular.ttf
- - NotoSansTaiViet-Regular.ttf
- - NotoSansTakri-Regular.ttf
- - NotoSansTamil-Regular.ttf
- - NotoSansTelugu-Regular.ttf
- - NotoSansThaana-Regular.ttf
- - NotoSansTifinaghAdrar-Regular.ttf
- - NotoSansTifinaghAgrawImazighen-Regular.ttf
- - NotoSansTifinaghAhaggar-Regular.ttf
- - NotoSansTifinaghAir-Regular.ttf
- - NotoSansTifinaghAPT-Regular.ttf
- - NotoSansTifinaghAzawagh-Regular.ttf
- - NotoSansTifinaghGhat-Regular.ttf
- - NotoSansTifinaghHawad-Regular.ttf
- - NotoSansTifinagh-Regular.ttf
- - NotoSansTifinaghRhissaIxa-Regular.ttf
- - NotoSansTifinaghSIL-Regular.ttf
- - NotoSansTifinaghTawellemmet-Regular.ttf
- - NotoSansTirhuta-Regular.ttf
- - NotoSansVai-Regular.ttf
- - NotoSansWancho-Regular.ttf
- - NotoSansWarangCiti-Regular.ttf
- - NotoSansYi-Regular.ttf
- - NotoSansZanabazarSquare-Regular.ttf
- - NotoSerifBalinese-Regular.ttf
- - NotoSerifBengali-Regular.ttf
- - NotoSerifDevanagari-Regular.ttf
- - NotoSerifDogra-Regular.ttf
- - NotoSerifEthiopic-Regular.ttf
- - NotoSerifGeorgian-Regular.ttf
- - NotoSerifGrantha-Regular.ttf
- - NotoSerifGujarati-Regular.ttf
- - NotoSerifGurmukhi-Regular.ttf
- - NotoSerifKannada-Regular.ttf
- - NotoSerifKhmer-Regular.ttf
- - NotoSerifKhojki-Regular.ttf
- - NotoSerifLao-Regular.ttf
- - NotoSerifMalayalam-Regular.ttf
- - NotoSerifMyanmar-Regular.ttf
- - NotoSerifNyiakengPuachueHmong-Regular.ttf
- - NotoSerifSinhala-Regular.ttf
- - NotoSerifTamil-Regular.ttf
- - NotoSerifTelugu-Regular.ttf
- - NotoSerifTibetan-Regular.ttf
- - NotoSerifYezidi-Regular.ttf
+ - NotoSansAdlam
+ - NotoSansBalinese
+ - NotoSansBamum
+ - NotoSansBassaVah
+ - NotoSansBatak
+ - NotoSansBengali
+ - NotoSansBuginese
+ - NotoSansBuhid
+ - NotoSansCanadianAboriginal
+ - NotoSansChakma
+ - NotoSansCham
+ - NotoSansCherokee
+ - NotoSansCoptic
+ - NotoSansDeseret
+ - NotoSansDevanagari
+ - NotoSansElbasan
+ - NotoSansEthiopic
+ - NotoSansGeorgian
+ - NotoSansGrantha
+ - NotoSansGujarati
+ - NotoSansGunjalaGondi
+ - NotoSansGurmukhi
+ - NotoSansHanifiRohingya
+ - NotoSansHanunoo
+ - NotoSansKannada
+ - NotoSansKhmer
+ - NotoSansJavanese
+ - NotoSansKayahLi
+ - NotoSansKhojki
+ - NotoSansKhudawadi
+ - NotoSansLao
+ - NotoSansLepcha
+ - NotoSansLimbu
+ - NotoSansLisu
+ - NotoSansMahajani
+ - NotoSansMalayalam
+ - NotoSansMandaic
+ - NotoSansMasaramGondi
+ - NotoSansMedefaidrin
+ - NotoSansMeeteiMayek
+ - NotoSansMendeKikakui
+ - NotoSansMiao
+ - NotoSansModi
+ - NotoSansMongolian
+ - NotoSansMro
+ - NotoSansMyanmar
+ - NotoSansMultani
+ - NotoSansNewa
+ - NotoSansNewTaiLue
+ - NotoSansNKo
+ - NotoSansOlChiki
+ - NotoSansOriya
+ - NotoSansOsage
+ - NotoSansOsmanya
+ - NotoSansPahawhHmong
+ - NotoSansPauCinHau
+ - NotoSansRejang
+ - NotoSansRunic
+ - NotoSansSamaritan
+ - NotoSansSaurashtra
+ - NotoSansSharada
+ - NotoSansShavian
+ - NotoSansSinhala
+ - NotoSansSoraSompeng
+ - NotoSansSoyombo
+ - NotoSansSundanese
+ - NotoSansSylotiNagri
+ - NotoSansSymbols2
+ - NotoSansSymbols
+ - NotoSansSyriac
+ - NotoSansTagalog
+ - NotoSansTagbanwa
+ - NotoSansTaiLe
+ - NotoSansTaiTham
+ - NotoSansTaiViet
+ - NotoSansTakri
+ - NotoSansTamil
+ - NotoSansTelugu
+ - NotoSansThaana
+ - NotoSansTifinagh
+ - NotoSansTirhuta
+ - NotoSansVai
+ - NotoSansWancho
+ - NotoSansWarangCiti
+ - NotoSansYi
+ - NotoSansZanabazarSquare
+ - NotoSerifBalinese
+ - NotoSerifBengali
+ - NotoSerifDevanagari
+ - NotoSerifDogra
+ - NotoSerifEthiopic
+ - NotoSerifGeorgian
+ - NotoSerifGrantha
+ - NotoSerifGujarati
+ - NotoSerifGurmukhi
+ - NotoSerifKannada
+ - NotoSerifKhmer
+ - NotoSerifKhojki
+ - NotoSerifLao
+ - NotoSerifMalayalam
+ - NotoSerifMyanmar
+ - NotoSerifNPHmong
+ - NotoSerifSinhala
+ - NotoSerifTamil
+ - NotoSerifTelugu
+ - NotoSerifTibetan
+ - NotoSerifYezidi
noto_fonts_linux:
- - Arimo-Regular.ttf
- - Arimo-Bold.ttf
- - Arimo-Italic.ttf
- - Arimo-BoldItalic.ttf
- - Cousine-Regular.ttf
- - Tinos-Regular.ttf
- - Tinos-Bold.ttf
- - Tinos-Italic.ttf
- - Tinos-BoldItalic.ttf
- - NotoNaskhArabic-Regular.ttf
- - NotoSansArmenian-Regular.ttf
- - NotoSansHebrew-Regular.ttf
- - NotoSansSymbols-Regular.ttf
- - NotoSansSymbols2-Regular.ttf
- - NotoSansThaana-Regular.ttf
- - NotoSansThai-Regular.ttf
- - NotoSerifArmenian-Regular.ttf
- - NotoSerifHebrew-Regular.ttf
- - NotoSerifThai-Regular.ttf
+ - NotoNaskhArabic
+ - NotoSansArmenian
+ - NotoSansHebrew
+ - NotoSansSymbols
+ - NotoSansSymbols2
+ - NotoSansThaana
+ - NotoSansThai
+ - NotoSerifArmenian
+ - NotoSerifHebrew
+ - NotoSerifThai
noto_fonts_mac:
- - NotoSansArmenian-Regular.ttf
- - NotoSansHebrew-Regular.ttf
- - NotoSansThaana-Regular.ttf
- - NotoSerifArmenian-Regular.ttf
- - NotoSerifHebrew-Regular.ttf
+ - NotoSansArmenian
+ - NotoSansHebrew
+ - NotoSansThaana
+ - NotoSerifArmenian
+ - NotoSerifHebrew
noto_fonts_windows:
- - NotoNaskhArabic-Regular.ttf
- - NotoSans-Regular.ttf
- - NotoSerif-Regular.ttf
+ - NotoNaskhArabic
+ - NotoSans
+ - NotoSerif
+
+ have_stix: '[% c("var/linux") || c("var/macos") %]'
input_files:
- - project: container-image
- filename: README.txt
- filename: 'noto-fonts-[% c("var/noto_git_hash") %]-[% c("version") %]'
name: noto-fonts
exec: '[% INCLUDE "fetch-noto-fonts" %]'
+ - URL: https://github.com/googlefonts/Arimo/archive/302dc85954f887248b4ad442b0966e…
+ sha256sum: 1d06a61c69ab8a7edd6e2b79e38dcb3c5b572033f12de5cde5c3ea7caded2717
+ name: arimo
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 1f224341677c5ceaa717417d1cb94efbdb276801b3ab1ccea697eb3a8057b6ac
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 82755a6d4b12067daabf89eb5bf48d52b9fea4073a59792d331651510a901728
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 64e8ed603232b28eceebe0d18838a5e62297605203b33720d775ed628cdc222b
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 829e776e4929eb6467838b92c7b700085fac2073801e6b54b224661affb34688
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 971d6af5fcb3a0c05535a92a635fb63a86ea5eb935639c9b864be33f3bfaba80
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 0cd67b90617a03a69a815e758d0649d00f2be48a0cb570615e94e8e5a13aae2e
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 0f949a3fa0e23cd0ca94a0c4784bd8f9efb99c20070b9f73b5fd592b49c092ad
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: cf264a22292950ca1679b2ade07e9e6ecb26c649ab70975d0e113f979efa827a
+ enable: '[% c("var/linux") %]'
# Noto Sans CJK Version 2.004
- URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f…
sha256sum: dff723ba59d57d136764a04b9b2d03205544f7cd785a711442d6d2d085ac5073
@@ -178,6 +189,7 @@ input_files:
- URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f…
sha256sum: 5bab0cb3c1cf89dde07c4a95a4054b195afbcfe784d69d75c340780712237537
enable: '[% c("var/linux") %]'
- - URL: https://github.com/stipub/stixfonts/archive/2.0.0.zip
- sha256sum: 4327a16797dabebedce28a9075671730e22c7f74831b24b1fb91e27faec5a235
- enable: '[% c("var/linux") || c("var/macos") %]'
+ - URL: https://github.com/stipub/stixfonts/raw/v2.13b171/fonts/static_otf/STIXTwoM…
+ sha256sum: 3a5f3f26f40d5698b3c62dd085d48d6663696a3f80825aab8b553d5097518e8c
+ name: stix
+ enable: '[% c("var/have_stix") %]'
=====================================
projects/fonts/fetch-noto-fonts
=====================================
@@ -6,7 +6,7 @@ OUT_DIR="[% dest_dir %]/noto-fonts-[% c("var/noto_git_hash") %]-[% c("version")
pushd "$REPO_DIR"
git init
-git remote add origin https://github.com/googlefonts/noto-fonts.git
+git remote add origin https://github.com/notofonts/notofonts.github.io.git
git fetch --depth 1 origin "[% c('var/noto_git_hash') %]"
git checkout "[% c('var/noto_git_hash') %]"
@@ -15,11 +15,16 @@ mkdir "$OUT_DIR"
[%
platforms = [c("var/noto_fonts_common"), c("var/noto_fonts_linux"), c("var/noto_fonts_mac"), c("var/noto_fonts_windows")];
FOREACH platform = platforms;
- FOREACH fontfile = platform;
- GET 'font=$(find hinted -name ' _ fontfile _ ' -print | head -1)' _ "\n";
- # Do not use find -exec, because if the file does not exist, we have an
- # error only in the following phases. In this way, we try to fail earlier.
- GET 'cp -u $font "$OUT_DIR/"' _ "\n";
+ FOREACH family = platform;
+%]
+ font_src="fonts/[% family %]/hinted/ttf"
+ font_dst="$OUT_DIR/[% family %]"
+ mkdir -p $font_dst
+ # Use the wildcard for cases such as NotoSansTifinagh.
+ # But then to avoid NotoSans* matching everything on Windows, we create a
+ # directory for each family.
+ find $font_src -name '*-Regular.ttf' -and -not -name '*UI-Regular.ttf' -exec cp {} $font_dst/ \;
+[%
END;
END; %]
=====================================
rbm.conf
=====================================
@@ -396,6 +396,7 @@ targets:
merge_aars: 1
var:
android: 1
+ platform: android
compiler: android-toolchain
android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]'
CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'
@@ -503,6 +504,7 @@ targets:
compress_tar: gz
var:
linux: 1
+ platform: linux
compiler: gcc
configure_opt: '[% c("var/configure_opt_project") %]'
# Only build Namecoin for linux on nightly
@@ -574,6 +576,7 @@ targets:
windows:
var:
windows: 1
+ platform: windows
container:
suite: bullseye
arch: amd64
@@ -655,6 +658,7 @@ targets:
macos:
var:
macos: 1
+ platform: macos
osname: macos
container:
suite: bullseye
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Use foursquare as domain front for snowflake
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
cb513eec by meskio at 2023-09-21T19:08:08+00:00
Use foursquare as domain front for snowflake
- - - - -
2 changed files:
- projects/common/bridges_list.snowflake.txt
- projects/tor-expert-bundle/pt_config.json
Changes:
=====================================
projects/common/bridges_list.snowflake.txt
=====================================
@@ -1,2 +1,2 @@
-snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
-snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
+snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
+snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
=====================================
projects/tor-expert-bundle/pt_config.json
=====================================
@@ -24,8 +24,8 @@
"obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0"
],
"snowflake" : [
- "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn",
- "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"
+ "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn",
+ "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"
]
}
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] Bug 41327: Disable UrlbarProviderInterventions
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
82d6eaf6 by Richard Pospesel at 2023-09-21T18:42:31+00:00
Bug 41327: Disable UrlbarProviderInterventions
- - - - -
3 changed files:
- browser/components/urlbar/UrlbarProvidersManager.sys.mjs
- browser/components/urlbar/UrlbarUtils.sys.mjs
- browser/components/urlbar/moz.build
Changes:
=====================================
browser/components/urlbar/UrlbarProvidersManager.sys.mjs
=====================================
@@ -51,8 +51,9 @@ var localProviderModules = {
"resource:///modules/UrlbarProviderHistoryUrlHeuristic.sys.mjs",
UrlbarProviderInputHistory:
"resource:///modules/UrlbarProviderInputHistory.sys.mjs",
- UrlbarProviderInterventions:
- "resource:///modules/UrlbarProviderInterventions.sys.mjs",
+ // disable as part of tor-browser#41327
+ // UrlbarProviderInterventions:
+ // "resource:///modules/UrlbarProviderInterventions.sys.mjs",
UrlbarProviderOmnibox: "resource:///modules/UrlbarProviderOmnibox.sys.mjs",
UrlbarProviderPlaces: "resource:///modules/UrlbarProviderPlaces.sys.mjs",
UrlbarProviderPreloadedSites:
=====================================
browser/components/urlbar/UrlbarUtils.sys.mjs
=====================================
@@ -21,8 +21,9 @@ ChromeUtils.defineESModuleGetters(lazy, {
SearchSuggestionController:
"resource://gre/modules/SearchSuggestionController.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
- UrlbarProviderInterventions:
- "resource:///modules/UrlbarProviderInterventions.sys.mjs",
+ // disable as part of tor-browser#41327
+ // UrlbarProviderInterventions:
+ // "resource:///modules/UrlbarProviderInterventions.sys.mjs",
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
UrlbarProviderSearchTips:
"resource:///modules/UrlbarProviderSearchTips.sys.mjs",
@@ -1387,20 +1388,22 @@ export var UrlbarUtils = {
return "tab";
case UrlbarUtils.RESULT_TYPE.TIP:
if (result.providerName === "UrlbarProviderInterventions") {
- switch (result.payload.type) {
- case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
- return "intervention_clear";
- case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
- return "intervention_refresh";
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
- return "intervention_update";
- default:
- return "intervention_unknown";
- }
+ return "intervention_unknown";
+ // disable as part of tor-browser#41327
+ // switch (result.payload.type) {
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
+ // return "intervention_clear";
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
+ // return "intervention_refresh";
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
+ // return "intervention_update";
+ // default:
+ // return "intervention_unknown";
+ // }
}
switch (result.payload.type) {
=====================================
browser/components/urlbar/moz.build
=====================================
@@ -30,7 +30,8 @@ EXTRA_JS_MODULES += [
"UrlbarProviderHeuristicFallback.sys.mjs",
"UrlbarProviderHistoryUrlHeuristic.sys.mjs",
"UrlbarProviderInputHistory.sys.mjs",
- "UrlbarProviderInterventions.sys.mjs",
+ # disable as part of tor-browser#41327
+ # "UrlbarProviderInterventions.sys.mjs",
"UrlbarProviderOmnibox.sys.mjs",
"UrlbarProviderOpenTabs.sys.mjs",
"UrlbarProviderPlaces.sys.mjs",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/82d6eaf…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/82d6eaf…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] Bug 42089: Remove ability to submit site support requests
by Dan Ballard (@dan) 21 Sep '23
by Dan Ballard (@dan) 21 Sep '23
21 Sep '23
Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
8456bbb8 by clairehurst at 2023-09-21T16:13:32+00:00
Bug 42089: Remove ability to submit site support requests
- - - - -
13 changed files:
- android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorage.kt
- android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepository.kt
- android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/cookiehandling/CookieBannersStorage.kt
- fenix/app/metrics.yaml
- fenix/app/pings.yaml
- fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsController.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsInteractor.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannersStorageExt.kt
- fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt
- fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml
Changes:
=====================================
android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorage.kt
=====================================
@@ -21,7 +21,7 @@ import org.mozilla.geckoview.StorageController
*/
class GeckoCookieBannersStorage(
runtime: GeckoRuntime,
- private val reportSiteDomainsRepository: ReportSiteDomainsRepository,
+// private val reportSiteDomainsRepository: ReportSiteDomainsRepository,
) : CookieBannersStorage {
private val geckoStorage: StorageController = runtime.storageController
@@ -34,13 +34,13 @@ class GeckoCookieBannersStorage(
setGeckoException(uri, DISABLED, privateBrowsing)
}
- override suspend fun isSiteDomainReported(siteDomain: String): Boolean {
- return reportSiteDomainsRepository.isSiteDomainReported(siteDomain)
- }
-
- override suspend fun saveSiteDomain(siteDomain: String) {
- reportSiteDomainsRepository.saveSiteDomain(siteDomain)
- }
+// override suspend fun isSiteDomainReported(siteDomain: String): Boolean {
+// return reportSiteDomainsRepository.isSiteDomainReported(siteDomain)
+// }
+//
+// override suspend fun saveSiteDomain(siteDomain: String) {
+// reportSiteDomainsRepository.saveSiteDomain(siteDomain)
+// }
override suspend fun addPersistentExceptionInPrivateMode(uri: String) {
setPersistentPrivateGeckoException(uri, DISABLED)
=====================================
android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepository.kt
=====================================
@@ -12,64 +12,64 @@ import androidx.datastore.preferences.core.stringPreferencesKey
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
-import mozilla.components.browser.engine.gecko.cookiebanners.ReportSiteDomainsRepository.PreferencesKeys.REPORT_SITE_DOMAINS
+//import mozilla.components.browser.engine.gecko.cookiebanners.ReportSiteDomainsRepository.PreferencesKeys.REPORT_SITE_DOMAINS
import mozilla.components.support.base.log.logger.Logger
import java.io.IOException
/**
* A repository to save reported site domains with the datastore API.
*/
-class ReportSiteDomainsRepository(
- private val dataStore: DataStore<Preferences>,
-) {
-
- companion object {
- const val SEPARATOR = "@<;>@"
- const val REPORT_SITE_DOMAINS_REPOSITORY_NAME = "report_site_domains_preferences"
- const val PREFERENCE_KEY_NAME = "report_site_domains"
- }
-
- private object PreferencesKeys {
- val REPORT_SITE_DOMAINS = stringPreferencesKey(PREFERENCE_KEY_NAME)
- }
-
- /**
- * Check if the given site's domain url is saved locally.
- * @param siteDomain the [siteDomain] that will be checked.
- */
- suspend fun isSiteDomainReported(siteDomain: String): Boolean {
- return dataStore.data
- .catch { exception ->
- if (exception is IOException) {
- Logger.error("Error reading preferences.", exception)
- emit(emptyPreferences())
- } else {
- throw exception
- }
- }.map { preferences ->
- val reportSiteDomainsString = preferences[REPORT_SITE_DOMAINS] ?: ""
- val reportSiteDomainsList =
- reportSiteDomainsString.split(SEPARATOR).filter { it.isNotEmpty() }
- reportSiteDomainsList.contains(siteDomain)
- }.first()
- }
-
- /**
- * Save the given site's domain url in datastore to keep it persistent locally.
- * This method gets called after the site domain was reported with Nimbus.
- * @param siteDomain the [siteDomain] that will be saved.
- */
- suspend fun saveSiteDomain(siteDomain: String) {
- dataStore.edit { preferences ->
- val siteDomainsPreferences = preferences[REPORT_SITE_DOMAINS] ?: ""
- val siteDomainsList = siteDomainsPreferences.split(SEPARATOR).filter { it.isNotEmpty() }
- if (siteDomainsList.contains(siteDomain)) {
- return@edit
- }
- val domains = mutableListOf<String>()
- domains.addAll(siteDomainsList)
- domains.add(siteDomain)
- preferences[REPORT_SITE_DOMAINS] = domains.joinToString(SEPARATOR)
- }
- }
-}
+//class ReportSiteDomainsRepository(
+// private val dataStore: DataStore<Preferences>,
+//) {
+//
+// companion object {
+// const val SEPARATOR = "@<;>@"
+// const val REPORT_SITE_DOMAINS_REPOSITORY_NAME = "report_site_domains_preferences"
+// const val PREFERENCE_KEY_NAME = "report_site_domains"
+// }
+//
+// private object PreferencesKeys {
+// val REPORT_SITE_DOMAINS = stringPreferencesKey(PREFERENCE_KEY_NAME)
+// }
+//
+// /**
+// * Check if the given site's domain url is saved locally.
+// * @param siteDomain the [siteDomain] that will be checked.
+// */
+// suspend fun isSiteDomainReported(siteDomain: String): Boolean {
+// return dataStore.data
+// .catch { exception ->
+// if (exception is IOException) {
+// Logger.error("Error reading preferences.", exception)
+// emit(emptyPreferences())
+// } else {
+// throw exception
+// }
+// }.map { preferences ->
+// val reportSiteDomainsString = preferences[REPORT_SITE_DOMAINS] ?: ""
+// val reportSiteDomainsList =
+// reportSiteDomainsString.split(SEPARATOR).filter { it.isNotEmpty() }
+// reportSiteDomainsList.contains(siteDomain)
+// }.first()
+// }
+//
+// /**
+// * Save the given site's domain url in datastore to keep it persistent locally.
+// * This method gets called after the site domain was reported with Nimbus.
+// * @param siteDomain the [siteDomain] that will be saved.
+// */
+// suspend fun saveSiteDomain(siteDomain: String) {
+// dataStore.edit { preferences ->
+// val siteDomainsPreferences = preferences[REPORT_SITE_DOMAINS] ?: ""
+// val siteDomainsList = siteDomainsPreferences.split(SEPARATOR).filter { it.isNotEmpty() }
+// if (siteDomainsList.contains(siteDomain)) {
+// return@edit
+// }
+// val domains = mutableListOf<String>()
+// domains.addAll(siteDomainsList)
+// domains.add(siteDomain)
+// preferences[REPORT_SITE_DOMAINS] = domains.joinToString(SEPARATOR)
+// }
+// }
+//}
=====================================
android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/cookiehandling/CookieBannersStorage.kt
=====================================
@@ -24,14 +24,14 @@ interface CookieBannersStorage {
* Check if the given site's domain url is saved locally.
* @param siteDomain the [siteDomain] that will be checked.
*/
- suspend fun isSiteDomainReported(siteDomain: String): Boolean
+// suspend fun isSiteDomainReported(siteDomain: String): Boolean
/**
* Save the given site's domain url in datastore to keep it persistent locally.
* This method gets called after the site domain was reported with Nimbus.
* @param siteDomain the [siteDomain] that will be saved.
*/
- suspend fun saveSiteDomain(siteDomain: String)
+// suspend fun saveSiteDomain(siteDomain: String)
/**
* Set persistently the [CookieBannerHandlingMode.DISABLED] mode for the given [uri] in
=====================================
fenix/app/metrics.yaml
=====================================
@@ -7738,62 +7738,62 @@ cookie_banners:
metadata:
tags:
- Privacy&Security
- report_site_domain:
- type: url
- description: |
- A user can report a site domain(Ex. for https://edition.cnn.com/
- site domain will be cnn.com) when the cookie banner reducer is not
- working from the cookie banner details panel.
- lifetime: ping
- send_in_pings:
- - cookie-banner-report-site
- bugs:
- - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
- data_reviews:
- - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
- data_sensitivity:
- - technical
- - interaction
- notification_emails:
- - android-probes(a)mozilla.com
- expires: 119
- metadata:
- tags:
- - Privacy&Security
- report_site_cancel_button:
- type: event
- description: |
- The user has pressed the report site domain cancel button
- from the cookie banner reducer details panel.
- bugs:
- - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
- data_reviews:
- - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
- data_sensitivity:
- - interaction
- notification_emails:
- - android-probes(a)mozilla.com
- expires: 119
- metadata:
- tags:
- - Privacy&Security
- report_domain_site_button:
- type: event
- description: |
- The user has pressed the report site domain button
- from the cookie banner reducer details panel.
- bugs:
- - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
- data_reviews:
- - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
- data_sensitivity:
- - interaction
- notification_emails:
- - android-probes(a)mozilla.com
- expires: 119
- metadata:
- tags:
- - Privacy&Security
+# report_site_domain:
+# type: url
+# description: |
+# A user can report a site domain(Ex. for https://edition.cnn.com/
+# site domain will be cnn.com) when the cookie banner reducer is not
+# working from the cookie banner details panel.
+# lifetime: ping
+# send_in_pings:
+# - cookie-banner-report-site
+# bugs:
+# - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
+# data_reviews:
+# - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
+# data_sensitivity:
+# - technical
+# - interaction
+# notification_emails:
+# - android-probes(a)mozilla.com
+# expires: 119
+# metadata:
+# tags:
+# - Privacy&Security
+# report_site_cancel_button:
+# type: event
+# description: |
+# The user has pressed the report site domain cancel button
+# from the cookie banner reducer details panel.
+# bugs:
+# - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
+# data_reviews:
+# - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
+# data_sensitivity:
+# - interaction
+# notification_emails:
+# - android-probes(a)mozilla.com
+# expires: 119
+# metadata:
+# tags:
+# - Privacy&Security
+# report_domain_site_button:
+# type: event
+# description: |
+# The user has pressed the report site domain button
+# from the cookie banner reducer details panel.
+# bugs:
+# - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
+# data_reviews:
+# - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
+# data_sensitivity:
+# - interaction
+# notification_emails:
+# - android-probes(a)mozilla.com
+# expires: 119
+# metadata:
+# tags:
+# - Privacy&Security
site_permissions:
prompt_shown:
=====================================
fenix/app/pings.yaml
=====================================
@@ -65,15 +65,15 @@ spoc:
notification_emails:
- android-probes(a)mozilla.com
-cookie-banner-report-site:
- description: |
- This ping is needed when the cookie banner reducer doesn't work on
- a website, and the user wants to report the site.
- This ping doesn't include a client id.
- include_client_id: false
- bugs:
- - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
- data_reviews:
- - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
- notification_emails:
- - android-probes(a)mozilla.com
+#cookie-banner-report-site:
+# description: |
+# This ping is needed when the cookie banner reducer doesn't work on
+# a website, and the user wants to report the site.
+# This ping doesn't include a client id.
+# include_client_id: false
+# bugs:
+# - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
+# data_reviews:
+# - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
+# notification_emails:
+# - android-probes(a)mozilla.com
=====================================
fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
=====================================
@@ -16,7 +16,7 @@ import mozilla.components.browser.domains.autocomplete.BaseDomainAutocompletePro
import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
import mozilla.components.browser.engine.gecko.GeckoEngine
import mozilla.components.browser.engine.gecko.cookiebanners.GeckoCookieBannersStorage
-import mozilla.components.browser.engine.gecko.cookiebanners.ReportSiteDomainsRepository
+//import mozilla.components.browser.engine.gecko.cookiebanners.ReportSiteDomainsRepository
import mozilla.components.browser.engine.gecko.fetch.GeckoViewFetchClient
import mozilla.components.browser.engine.gecko.permission.GeckoSitePermissionsStorage
import mozilla.components.browser.icons.BrowserIcons
@@ -197,14 +197,14 @@ class Core(
)
}
- private val Context.dataStore by preferencesDataStore(
- name = ReportSiteDomainsRepository.REPORT_SITE_DOMAINS_REPOSITORY_NAME,
- )
+// private val Context.dataStore by preferencesDataStore(
+// name = ReportSiteDomainsRepository.REPORT_SITE_DOMAINS_REPOSITORY_NAME,
+// )
val cookieBannersStorage by lazyMonitored {
GeckoCookieBannersStorage(
geckoRuntime,
- ReportSiteDomainsRepository(context.dataStore),
+// ReportSiteDomainsRepository(context.dataStore),
)
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt
=====================================
@@ -94,7 +94,7 @@ class ProtectionsView(
binding.cookieBannerItem.apply {
setContent {
FirefoxTheme {
- if (cookieBannerMode == CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED) {
+ if (cookieBannerMode == CookieBannerUIMode.SITE_NOT_SUPPORTED) {
CookieBannerItem(
label = label,
cookieBannerUIMode = cookieBannerMode,
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsController.kt
=====================================
@@ -55,7 +55,7 @@ interface CookieBannerDetailsController {
/**
* @see [CookieBannerDetailsInteractor.handleRequestSiteSupportPressed]
*/
- fun handleRequestSiteSupportPressed()
+// fun handleRequestSiteSupportPressed()
}
/**
@@ -144,37 +144,37 @@ class DefaultCookieBannerDetailsController(
}
}
- override fun handleRequestSiteSupportPressed() {
- val tab = requireNotNull(browserStore.state.findTabOrCustomTab(sessionId)) {
- "A session is required to report site domain"
- }
- CookieBanners.reportDomainSiteButton.record(NoExtras())
- ioScope.launch {
- val siteDomain = getTabDomain(tab)
- siteDomain?.let { domain ->
- withContext(Dispatchers.Main) {
- protectionsStore.dispatch(ProtectionsAction.RequestReportSiteDomain(domain))
- CookieBanners.reportSiteDomain.set(domain)
- Pings.cookieBannerReportSite.submit()
- protectionsStore.dispatch(
- ProtectionsAction.UpdateCookieBannerMode(
- cookieBannerUIMode = CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED,
- ),
- )
- fragment.activity?.getRootView()?.let { view ->
- showSnackBar(
- view,
- context.getString(R.string.cookie_banner_handling_report_site_snack_bar_text_2),
- FenixSnackbar.LENGTH_LONG,
- )
- }
- withContext(Dispatchers.IO) {
- cookieBannersStorage.saveSiteDomain(domain)
- }
- }
- }
- }
- }
+// override fun handleRequestSiteSupportPressed() {
+// val tab = requireNotNull(browserStore.state.findTabOrCustomTab(sessionId)) {
+// "A session is required to report site domain"
+// }
+// CookieBanners.reportDomainSiteButton.record(NoExtras())
+// ioScope.launch {
+// val siteDomain = getTabDomain(tab)
+// siteDomain?.let { domain ->
+// withContext(Dispatchers.Main) {
+// protectionsStore.dispatch(ProtectionsAction.RequestReportSiteDomain(domain))
+// CookieBanners.reportSiteDomain.set(domain)
+// Pings.cookieBannerReportSite.submit()
+// protectionsStore.dispatch(
+// ProtectionsAction.UpdateCookieBannerMode(
+// cookieBannerUIMode = CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED,
+// ),
+// )
+// fragment.activity?.getRootView()?.let { view ->
+// showSnackBar(
+// view,
+// context.getString(R.string.cookie_banner_handling_report_site_snack_bar_text_2),
+// FenixSnackbar.LENGTH_LONG,
+// )
+// }
+// withContext(Dispatchers.IO) {
+// cookieBannersStorage.saveSiteDomain(domain)
+// }
+// }
+// }
+// }
+// }
@VisibleForTesting
internal suspend fun clearSiteData(tab: SessionState) {
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsInteractor.kt
=====================================
@@ -21,7 +21,7 @@ interface CookieBannerDetailsInteractor {
/**
* Called whenever the user press request support site domain.
*/
- fun handleRequestSiteSupportPressed()
+// fun handleRequestSiteSupportPressed()
}
/**
@@ -45,7 +45,7 @@ class DefaultCookieBannerDetailsInteractor(
controller.handleTogglePressed(vale)
}
- override fun handleRequestSiteSupportPressed() {
- controller.handleRequestSiteSupportPressed()
- }
+// override fun handleRequestSiteSupportPressed() {
+// controller.handleRequestSiteSupportPressed()
+// }
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt
=====================================
@@ -57,7 +57,7 @@ class CookieBannerHandlingDetailsView(
when (state.cookieBannerUIMode) {
CookieBannerUIMode.ENABLE -> setUiForExceptionMode(state)
CookieBannerUIMode.DISABLE -> setUiForExceptionMode(state)
- CookieBannerUIMode.SITE_NOT_SUPPORTED -> setUiForReportSiteMode()
+// CookieBannerUIMode.SITE_NOT_SUPPORTED -> setUiForReportSiteMode()
else -> {}
}
}
@@ -67,19 +67,19 @@ class CookieBannerHandlingDetailsView(
bindSwitch(state.cookieBannerUIMode)
}
- private fun setUiForReportSiteMode() {
- binding.cancelButton.visibility = View.VISIBLE
- binding.requestSupport.visibility = View.VISIBLE
- binding.cookieBannerSwitch.visibility = View.GONE
- binding.requestSupport.setOnClickListener {
- interactor.handleRequestSiteSupportPressed()
- onDismiss.invoke()
- }
- binding.cancelButton.setOnClickListener {
- CookieBanners.reportSiteCancelButton.record(NoExtras())
- interactor.onBackPressed()
- }
- }
+// private fun setUiForReportSiteMode() {
+// binding.cancelButton.visibility = View.VISIBLE
+// binding.requestSupport.visibility = View.VISIBLE
+// binding.cookieBannerSwitch.visibility = View.GONE
+// binding.requestSupport.setOnClickListener {
+// interactor.handleRequestSiteSupportPressed()
+// onDismiss.invoke()
+// }
+// binding.cancelButton.setOnClickListener {
+// CookieBanners.reportSiteCancelButton.record(NoExtras())
+// interactor.onBackPressed()
+// }
+// }
@VisibleForTesting
internal fun bindTitle(url: String, state: CookieBannerUIMode) {
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannersStorageExt.kt
=====================================
@@ -24,15 +24,15 @@ suspend fun CookieBannersStorage.getCookieBannerUIMode(
tab: SessionState,
): CookieBannerUIMode {
return if (context.settings().shouldUseCookieBanner) {
- val isSiteDomainReported = withContext(Dispatchers.IO) {
- val host = tab.content.url.toUri().host.orEmpty()
- val siteDomain = context.components.publicSuffixList.getPublicSuffixPlusOne(host).await()
- siteDomain?.let { isSiteDomainReported(it) }
- }
-
- if (isSiteDomainReported == true) {
- return CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED
- }
+// val isSiteDomainReported = withContext(Dispatchers.IO) {
+// val host = tab.content.url.toUri().host.orEmpty()
+// val siteDomain = context.components.publicSuffixList.getPublicSuffixPlusOne(host).await()
+// siteDomain?.let { isSiteDomainReported(it) }
+// }
+//
+// if (isSiteDomainReported == true) {
+// return CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED
+// }
val hasException = withContext(Dispatchers.IO) {
hasException(tab.content.url, tab.content.private)
=====================================
fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt
=====================================
@@ -52,9 +52,9 @@ sealed class ProtectionsAction : Action {
*
* @param url to report.
*/
- data class RequestReportSiteDomain(
- val url: String,
- ) : ProtectionsAction()
+// data class RequestReportSiteDomain(
+// val url: String,
+// ) : ProtectionsAction()
/**
* Indicates that cookie banner handling mode has been updated.
@@ -167,10 +167,10 @@ enum class CookieBannerUIMode(
* REQUEST_UNSUPPORTED_SITE_SUBMITTED - The user submitted a request
* for adding support for cookie banner handling for the domain.
*/
- REQUEST_UNSUPPORTED_SITE_SUBMITTED(
- R.string.reduce_cookie_banner_unsupported_site_request_submitted_2,
- R.drawable.ic_cookies_disabled,
- ),
+// REQUEST_UNSUPPORTED_SITE_SUBMITTED(
+// R.string.reduce_cookie_banner_unsupported_site_request_submitted_2,
+// R.drawable.ic_cookies_disabled,
+// ),
/**
HIDE - All the cookie banner handling in the tracking panel is hidden.
@@ -243,9 +243,9 @@ fun protectionsStateReducer(
is ProtectionsAction.ToggleCookieBannerHandlingProtectionEnabled -> state.copy(
cookieBannerUIMode = action.cookieBannerUIMode,
)
- is ProtectionsAction.RequestReportSiteDomain -> state.copy(
- url = action.url,
- )
+// is ProtectionsAction.RequestReportSiteDomain -> state.copy(
+// url = action.url,
+// )
is ProtectionsAction.UpdateCookieBannerMode -> state.copy(
cookieBannerUIMode = action.cookieBannerUIMode,
)
=====================================
fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml
=====================================
@@ -64,40 +64,40 @@
app:switchShowIcon="false"
app:switchTitle="@string/preferences_cookie_banner_reduction" />
- <androidx.appcompat.widget.AppCompatButton
- android:id="@+id/cancel_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:layout_marginTop="16dp"
- android:background="@android:color/transparent"
- android:gravity="center"
- android:minHeight="48dp"
- android:text="@string/cookie_banner_handling_details_site_is_not_supported_cancel_button"
- android:layout_marginEnd="16dp"
- android:textAllCaps="true"
- android:textColor="@color/fx_mobile_text_color_accent"
- android:textSize="14sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/details" />
+<!-- <androidx.appcompat.widget.AppCompatButton-->
+<!-- android:id="@+id/cancel_button"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:visibility="gone"-->
+<!-- android:layout_marginTop="16dp"-->
+<!-- android:background="@android:color/transparent"-->
+<!-- android:gravity="center"-->
+<!-- android:minHeight="48dp"-->
+<!-- android:text="@string/cookie_banner_handling_details_site_is_not_supported_cancel_button"-->
+<!-- android:layout_marginEnd="16dp"-->
+<!-- android:textAllCaps="true"-->
+<!-- android:textColor="@color/fx_mobile_text_color_accent"-->
+<!-- android:textSize="14sp"-->
+<!-- app:layout_constraintEnd_toEndOf="parent"-->
+<!-- app:layout_constraintStart_toStartOf="parent"-->
+<!-- app:layout_constraintTop_toBottomOf="@id/details" />-->
- <androidx.appcompat.widget.AppCompatButton
- android:id="@+id/request_support"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:layout_marginTop="16dp"
- android:background="@android:color/transparent"
- android:gravity="center"
- android:minHeight="48dp"
- android:layout_marginEnd="16dp"
- android:text="@string/cookie_banner_handling_details_site_is_not_supported_request_support_button_2"
- android:textAllCaps="true"
- android:textColor="@color/fx_mobile_text_color_accent"
- android:textSize="14sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintStart_toEndOf="@+id/cancel_button"
- app:layout_constraintTop_toBottomOf="@id/details" />
+<!-- <androidx.appcompat.widget.AppCompatButton-->
+<!-- android:id="@+id/request_support"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:visibility="gone"-->
+<!-- android:layout_marginTop="16dp"-->
+<!-- android:background="@android:color/transparent"-->
+<!-- android:gravity="center"-->
+<!-- android:minHeight="48dp"-->
+<!-- android:layout_marginEnd="16dp"-->
+<!-- android:text="@string/cookie_banner_handling_details_site_is_not_supported_request_support_button_2"-->
+<!-- android:textAllCaps="true"-->
+<!-- android:textColor="@color/fx_mobile_text_color_accent"-->
+<!-- android:textSize="14sp"-->
+<!-- app:layout_constraintEnd_toEndOf="parent"-->
+<!-- app:layout_constraintLeft_toLeftOf="parent"-->
+<!-- app:layout_constraintStart_toEndOf="@+id/cancel_button"-->
+<!-- app:layout_constraintTop_toBottomOf="@id/details" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/845…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/845…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-spec][main] Bug 40052: FF105 Audit
by richard (@richard) 20 Sep '23
by richard (@richard) 20 Sep '23
20 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-spec
Commits:
885c79fd by Richard Pospesel at 2023-09-20T20:58:45+00:00
Bug 40052: FF105 Audit
- - - - -
1 changed file:
- + audits/FF105_AUDIT
Changes:
=====================================
audits/FF105_AUDIT
=====================================
@@ -0,0 +1,86 @@
+# General
+
+The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript).
+
+The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation.
+
+`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit.
+
+## Firefox: https://github.com/mozilla/gecko-dev.git
+
+- Start: `a8c31da1c243a855de8c3b241a437dd1b65684d5` ( `FIREFOX_104_0_2_RELEASE` )
+- End: `2dd649f09f70ec5b9304d62daeb427a86bbc5a36` ( `FIREFOX_105_0_3_RELEASE` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+---
+
+## Application Services: https://github.com/mozilla/application-services.git
+
+- Start: `78b165b798118e9b5fa62af07aa44d663f386492` ( `v94.1.0` )
+- End: `be8254df118b2fc2aae726e1d13ca4c982bec920` ( `v94.3.1` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Android Components: https://github.com/mozilla-mobile/android-components.git
+
+- Start: `b3e0289b3f07929c0403ac6e672c88b5db079748`
+- End: `658c2d239f9aef5927f654aa36a0b0739b116d92` ( `v105.0.8` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Fenix: https://github.com/mozilla-mobile/fenix.git
+
+- Start: `a5d13e2ef26d4eb98a32c94b6c6530771e90cd56` ( `v105.0b1` )
+- End: `01fbfd63743f30ebca31bbfb775bddef94a01a3e` ( `v105.2.0` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Ticket Review ##
+
+Bugzilla Query: `https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=FIXED&target_milestone=105%20Branch&order=priority%2Cbug_severity&limit=0`
+
+#### Problematic Issues
+
+- **Use the WER runtime exception module to catch early crashes** https://bugzilla.mozilla.org/show_bug.cgi?id=1682520
+ - *RESOLUTION*: no new functionality here, just making it work better by moving the registration earlier in the Firefox boot process
+- **Add a pref to disable Spectre mitigations for Fission web content processes** https://bugzilla.mozilla.org/show_bug.cgi?id=1774178
+- **Add Surrogate COM Server to handle native Windows notifications when Firefox is closed.** https://bugzilla.mozilla.org/show_bug.cgi?id=1774083
+ - *RESOLUTOIN* COM sever registration happens in the official firefox installer which we do not use, so nothing to do here
+- **Add a cookie banner service to automatically handle website cookie banners** https://bugzilla.mozilla.org/show_bug.cgi?id=1783019
+ - *RESOLUTION* disabled this feature until fully audit, may bring back in the 13.5 time-frame
+- **Add a locale parameter to the text recognition API** https://bugzilla.mozilla.org/show_bug.cgi?id=1782579
+ - *RESOLUTION* we'v diabled this system entirely in https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42057
+- **Broken since Firefox 102.0: no instant fallback to direct connection when proxy became unreachable while runtime** https://bugzilla.mozilla.org/show_bug.cgi?id=1779005
+ - *RESOLUTION*: Tor Browser uses explicitly configured proxy settings so this auto-detect system is no used/does not apply to us
+- **On systems with IPv6 preferred DNS resolution clients will fail to connect when "localhost" is used as host for the WebSocket server** https://bugzilla.mozilla.org/show_bug.cgi?id=1769994
+- **Hide the text recognition context menu if the macOS version doesn't support APIs** https://bugzilla.mozilla.org/show_bug.cgi?id=1782981
+ - *RESOLUTION* we'v diabled this system entirely in https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42057
+- **Implement a context menu modal for text recognition** https://bugzilla.mozilla.org/show_bug.cgi?id=1782578
+ - *RESOLUTION* we've disabled this system entirely in https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42057
+## Export
+- [ ] Export Report and save to `tor-browser-spec/audits`
\ No newline at end of file
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/88…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/88…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (@richard) 20 Sep '23
by richard (@richard) 20 Sep '23
20 Sep '23
richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
d4ff59bc by Pier Angelo Vendrame at 2023-09-20T19:57:49+00:00
fixup! Firefox preference overrides.
Bug 41884: Disable browser.tabs.searchclipboardfor.middleclick.
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -536,6 +536,11 @@ pref("browser.menu.share_url.allow", false, locked);
// Disable special URL bar behaviors
pref("browser.urlbar.suggest.topsites", false);
+// tor-browser#41884: Do not start a search when clicking on the new tab button
+// with the middle mouse button (to prevent searching for anything you might
+// have selected or already in your clipboard).
+pref("browser.tabs.searchclipboardfor.middleclick", false);
+
// Skip checking omni.ja and other files for corruption since the result
// is only reported via telemetry (which is disabled). See tor-browser#40048.
pref("corroborator.enabled", false);
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d4ff59b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d4ff59b…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (@richard) 20 Sep '23
by richard (@richard) 20 Sep '23
20 Sep '23
richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
33432bfe by Pier Angelo Vendrame at 2023-09-20T19:54:17+00:00
fixup! Firefox preference overrides.
Bug 41884: Disable browser.tabs.searchclipboardfor.middleclick.
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -536,6 +536,11 @@ pref("browser.menu.share_url.allow", false, locked);
// Disable special URL bar behaviors
pref("browser.urlbar.suggest.topsites", false);
+// tor-browser#41884: Do not start a search when clicking on the new tab button
+// with the middle mouse button (to prevent searching for anything you might
+// have selected or already in your clipboard).
+pref("browser.tabs.searchclipboardfor.middleclick", false);
+
// Skip checking omni.ja and other files for corruption since the result
// is only reported via telemetry (which is disabled). See tor-browser#40048.
pref("corroborator.enabled", false);
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/33432bf…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/33432bf…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by richard (@richard) 20 Sep '23
by richard (@richard) 20 Sep '23
20 Sep '23
richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
5365a33c by Pier Angelo Vendrame at 2023-09-20T19:52:30+00:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41639: Update the wordmark of the about dialog.
- - - - -
6 changed files:
- browser/base/content/aboutDialogTor.css
- browser/branding/tb-alpha/content/about-wordmark.svg
- browser/branding/tb-nightly/content/about-wordmark.svg
- browser/branding/tb-release/content/about-wordmark.svg
- toolkit/themes/shared/desktop-jar.inc.mn
- − toolkit/themes/shared/illustrations/about-wordmark.png
Changes:
=====================================
browser/base/content/aboutDialogTor.css
=====================================
@@ -5,8 +5,8 @@
}
#rightBox {
- background-image: url('chrome://global/skin/illustrations/about-wordmark.png');
- background-position: left top;
+ background-size: auto;
+ padding-top: 32px;
}
#contributeDesc {
=====================================
browser/branding/tb-alpha/content/about-wordmark.svg
=====================================
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="270px" height="48px" viewBox="0 0 270 48">
- <path fill="#fff" d="M75.5,11.8V7.9c0-2.2,1.2-3.5,3.1-3.5c1,0,1.8,0.3,3,0.9l1.8-3.5c-1.7-1-3.5-1.4-5.7-1.4
- C73.2,0.3,70,2.8,70,8c0,2.3,0.2,3.7,0.2,3.7h-2.5v3.8H70V37h5.4V15.6h5.1l1.4-3.8H75.5z M92.3,11.2c-6.7,0-11,5.2-11,13.3
- c0,8.1,4.3,13.2,11.1,13.2c6.8,0,11.2-5,11.2-13.2C103.6,16.5,99.5,11.2,92.3,11.2z M92.5,33.6c-3.3,0-5.1-2.1-5.1-9.5
- c0-6.1,1.5-8.8,5-8.8c3.2,0,5.2,2.1,5.2,9.3C97.6,30.9,95.8,33.6,92.5,33.6z M43.7,11.1c-2.5,0-4.4,1.3-6.4,4c0-1.4-0.3-2.8-0.9-4
- l-5,1.3c0.6,1.6,0.9,3.6,0.9,6.8V37h5.5V19.9c0.5-2,2.4-3.7,4.7-3.7c0.6,0,1,0.1,1.6,0.4l1.7-5.1C45,11.2,44.5,11.1,43.7,11.1z
- M0,37h5.7V21.2h9.6v-4.6H5.7V7.2h11.8l0.7-4.7H0V37z M21.4,37h5.5V11.2l-5.5,1V37z M24.2,0.7c-2,0-3.6,1.6-3.6,3.7
- c0,2,1.5,3.6,3.5,3.6c2,0,3.7-1.6,3.7-3.6C27.8,2.3,26.2,0.7,24.2,0.7z M125.2,11.8h-6.4c-0.7,1.1-3.3,6.1-4,7.7
- c-1.2-2.3-3.4-6.3-4.6-8.2l-5.9,1.2l7.3,10.8L102.2,37h6.9c0.9-1.4,4.5-7.5,5.5-9.4c0.5,0.9,4.6,8,5.5,9.4h6.9l-9.2-13.8L125.2,11.8
- z M62.7,13.8c-2.1-1.9-4.4-2.6-6.9-2.6c-3.2,0-5.7,1-7.7,3.4C45.9,17.1,45,20,45,24.5c0,8.1,4.5,13.2,11.6,13.2
- c3.4,0,6.4-1.1,9.1-3.3L63.4,31c-1.9,1.6-3.9,2.5-6.3,2.5c-4.9,0-6.2-3.7-6.2-7.2v-0.4H66v-1.2C66,18.9,64.9,15.8,62.7,13.8z
- M51,21.8c0-4.1,1.7-6.5,4.8-6.5c2.8,0,4.5,2.4,4.5,6.5H51z M198.5,14.3l-2.4-2.4c-1.2,0.8-2.2,1.1-3.5,1.1c-3,0-3.8-1.4-7.6-1.4
- c-5.4,0-9.2,3.4-9.2,8.4c0,3.3,2.2,6.1,5.6,7.2c-3.4,1-4.5,2.2-4.5,4.3c0,2.2,1.8,3.6,4.7,3.6h3.8c2.5,0,3.9,0.2,4.9,0.9
- c0.9,0.6,1.4,1.6,1.4,3c0,3.1-2.2,4.4-6,4.4c-2,0-3.8-0.5-5.1-1.2c-0.9-0.6-1.5-1.6-1.5-2.9c0-0.8,0.3-1.7,0.7-2.2l-4.1,0.4
- c-0.3,1-0.5,1.7-0.5,2.6c0,3.5,3,6.4,10.8,6.4c6.1,0,9.9-2.5,9.9-7.9c0-2.1-0.8-3.9-2.7-5.3c-1.5-1.1-3.1-1.4-6-1.4h-4
- c-1.3,0-2-0.5-2-1.2c0-0.8,1.1-1.7,4.5-2.9c1.8,0,3.4-0.3,4.7-1.1c2.3-1.4,3.7-4.1,3.7-6.8c0-1.6-0.5-3-1.5-4.3
- c0.4,0.2,1.1,0.3,1.7,0.3C195.8,15.8,196.9,15.4,198.5,14.3z M185,24.8c-3.1,0-4.8-1.7-4.8-4.8c0-3.5,1.6-5.1,4.7-5.1
- c3.3,0,4.6,1.5,4.6,4.9C189.5,23.1,188,24.8,185,24.8z M168.6,1.3c-1.7,0-3,1.4-3,3.1c0,1.7,1.4,3,3,3c1.7,0,3.1-1.3,3.1-3
- C171.6,2.7,170.3,1.3,168.6,1.3z M245.7,34.5c-1.1,0-1.4-0.6-1.4-2.5V6.5c0-3.8-0.6-5.9-0.6-5.9l-3.9,0.8c0,0,0.6,1.9,0.6,5.1v26.4
- c0,1.8,0.4,2.8,1.2,3.5c0.7,0.7,1.7,1,2.9,1c1,0,1.5-0.1,2.5-0.5l-0.8-2.5C246.2,34.4,245.8,34.5,245.7,34.5z M212.7,11.6
- c-3.2,0-6.1,1.8-8.3,3.9c0,0,0.2-1.8,0.2-3.4V6.3c0-3.8-0.7-5.9-0.7-5.9L200,1.1c0,0,0.7,1.9,0.7,5.1V37h3.9V19.3
- c2.1-2.7,4.9-4.2,7.2-4.2c1.3,0,2.3,0.4,2.9,1c0.7,0.7,0.9,1.8,0.9,3.7V37h3.8V19.1c0-1.8-0.1-2.6-0.4-3.6
- C218.4,13.2,215.7,11.6,212.7,11.6z M265.4,12.1l-4.9,16.4c-0.6,2-1.6,5.2-1.6,5.2s-0.7-3.9-1.5-6.2l-5.1-16.2l-3.9,1.3l5.4,15.6
- c0.8,2.5,2.2,7.4,2.5,9l1.6-0.3c-1.3,5.1-2.5,6.7-5.7,7.6l1.2,2.7c4.4-1,6.4-4.3,8-9.3l8.6-25.8H265.4z M234.9,15l1.2-2.9h-6.2
- c0-3.3,0.5-7.2,0.5-7.2l-4.1,0.9c0,0-0.4,3.9-0.4,6.3h-3.2V15h3.2v17.1c0,2.5,0.7,4.1,2.4,5c0.9,0.4,1.9,0.7,3.3,0.7
- c1.8,0,3.1-0.4,4.4-1l-0.6-2.5c-0.7,0.3-1.3,0.5-2.4,0.5c-2.4,0-3.2-0.9-3.2-3.7V15H234.9z M166.5,37h4.1V11.5l-4.1,0.6V37z
- M156.8,21.3c0,5,0.4,10.5,0.4,10.5s-1.4-3.8-3.2-7.2L142.7,2.7h-4.8V37h4.2l-0.2-19.9c0-4.5-0.4-9.3-0.4-9.3s1.7,4.1,3.9,8.2l11,21
- h4.3V2.7h-4L156.8,21.3z M128.3,12.9c-0.3-0.1-0.7-0.1-1-0.1v2.3h0.3v-1c0.3,0,0.7,1,0.7,1s0.2,0,0.4,0c-0.2-0.3-0.3-0.7-0.6-1
- C128.8,14.1,128.9,13.1,128.3,12.9z M127.6,13.8v-0.7c0,0,0.7,0,0.7,0.3C128.3,13.9,127.8,13.9,127.6,13.8z M128,12
- c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S129.1,12,128,12z M128,15.5c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5s1.5,0.7,1.5,1.5
- S128.8,15.5,128,15.5z"/>
+<svg width="382" height="44" viewBox="0 0 382 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M337.358 34V0H341.173V13.6246C341.823 12.5477 342.633 11.678 343.605 11.0154C345.004 10.0617 346.689 9.58485 348.66 9.58485C351.521 9.58485 353.794 10.475 355.479 12.2553C357.164 14.0355 357.99 16.7377 357.959 20.3619V34H354.144V21.7924C354.144 19.4399 353.858 17.6438 353.285 16.4039C352.745 15.1641 351.998 14.3216 351.044 13.8766C350.09 13.3997 349.01 13.1613 347.801 13.1613C345.703 13.1613 344.066 13.9084 342.89 15.4025C341.745 16.8649 341.173 18.9472 341.173 21.6494V34H337.358Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M292.09 34L288.281 24.5105H273.058L269.248 34H264.957L278.547 0.619917H282.743L296.334 34H292.09ZM280.669 5.54972L286.826 20.8864H274.513L280.669 5.54972Z" fill="white"/>
+<path d="M299.66 34V0.619917H303.475V34H299.66Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M309.9 10.1571V43.5372H313.715V29.9955C314.454 31.2222 315.376 32.2233 316.48 32.9986C318.006 34.0477 319.771 34.5722 321.774 34.5722C323.904 34.5722 325.779 34.0477 327.401 32.9986C329.022 31.9495 330.278 30.4871 331.168 28.6115C332.09 26.7041 332.551 24.5264 332.551 22.0785C332.551 19.5989 332.09 17.4212 331.168 15.5456C330.278 13.6699 329.022 12.2076 327.401 11.1585C325.779 10.1094 323.904 9.58485 321.774 9.58485C319.771 9.58485 318.006 10.1094 316.48 11.1585C315.367 11.9405 314.438 12.9521 313.696 14.1934L313.476 10.1571H309.9ZM313.715 22.0785C313.715 23.827 314.017 25.3848 314.621 26.7518C315.257 28.1187 316.115 29.1837 317.196 29.9467C318.277 30.7097 319.516 31.0912 320.915 31.0912C322.409 31.0912 323.729 30.7097 324.873 29.9467C326.049 29.1837 326.971 28.1187 327.639 26.7518C328.338 25.3848 328.688 23.827 328.688 22.0785C328.688 20.3301 328.354 18.7723 327.687 17.4053C327.051 16.0383 326.145 14.9734 324.969 14.2104C323.792 13.4474 322.457 13.0659 320.963 13.0659C319.564 13.0659 318.308 13.4474 317.196 14.2104C316.115 14.9734 315.257 16.0383 314.621 17.4053C314.017 18.7723 313.715 20.3301 313.715 22.0785Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M378.009 31.5408L378.159 34H381.688L381.736 21.0771C381.767 18.5339 381.418 16.4198 380.686 14.7349C379.955 13.0182 378.858 11.7307 377.396 10.8724C375.934 10.014 374.106 9.58485 371.912 9.58485C370.386 9.58485 369.019 9.80739 367.811 10.2525C366.635 10.6657 365.602 11.2856 364.712 12.1122C363.822 12.9388 363.059 13.9084 362.423 15.021L365.856 16.4039C366.492 15.2595 367.303 14.417 368.288 13.8766C369.305 13.3361 370.498 13.0659 371.865 13.0659C373.295 13.0659 374.44 13.3838 375.298 14.0196C376.188 14.6237 376.84 15.5456 377.253 16.7854C377.563 17.6254 377.764 18.6268 377.859 19.7896H371.245C368.352 19.7896 366.095 20.4413 364.473 21.7447C362.884 23.0164 362.089 24.8602 362.089 27.2763C362.089 29.5652 362.868 31.3614 364.426 32.6648C366.015 33.9364 368.209 34.5722 371.006 34.5722C373.995 34.5722 376.283 33.6185 377.873 31.7111C377.891 31.6889 377.909 31.6665 377.927 31.6441C377.955 31.6099 377.982 31.5755 378.009 31.5408ZM377.921 23.9383V22.9846H372.103C369.878 22.9846 368.288 23.3502 367.334 24.0813C366.412 24.8125 365.952 25.8616 365.952 27.2286C365.952 28.4684 366.412 29.454 367.334 30.1851C368.256 30.8845 369.544 31.2342 371.197 31.2342C372.564 31.2342 373.756 30.9163 374.773 30.2805C375.791 29.6447 376.57 28.7863 377.11 27.7055C377.65 26.5928 377.921 25.3371 377.921 23.9383Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.1943 16.6591C100.019 16.0962 100.72 15.452 101.297 14.7265C102.41 13.3278 102.966 11.7541 102.966 10.0056C102.966 7.93926 102.489 6.20668 101.536 4.80789C100.614 3.40911 99.2945 2.36002 97.5778 1.66063C95.8929 0.929444 93.906 0.563853 91.6171 0.563853L85.0829 0.626673V0.611538H79.1698V33.9916H93.143C95.3684 33.9916 97.2917 33.626 98.913 32.8948C100.566 32.1637 101.838 31.0987 102.728 29.6999C103.65 28.2693 104.111 26.5526 104.111 24.5498C104.111 22.2609 103.475 20.4012 102.203 18.9706C101.413 18.0387 100.41 17.2683 99.1943 16.6591ZM92.5708 28.6031H85.0829V19.4795L86.3902 19.3998H91.9509C93.8265 19.368 95.2889 19.7812 96.338 20.6396C97.4189 21.4661 97.9593 22.6106 97.9593 24.073C97.9593 25.4718 97.4824 26.5844 96.5287 27.411C95.575 28.2057 94.2557 28.6031 92.5708 28.6031ZM85.0829 5.47549H91.331C93.0477 5.4437 94.3829 5.82519 95.3366 6.61995C96.3221 7.41472 96.8148 8.52739 96.8148 9.95796C96.8148 11.3567 96.3698 12.4535 95.4797 13.2483C94.6213 14.0113 93.4451 14.3927 91.9509 14.3927H85.0829V5.47549Z" fill="white"/>
+<path d="M11.3982 6.14309V33.9916H17.4066V6.14309H28.8525V0.611538H0V6.14309H11.3982Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0711 32.9902C30.9468 34.0393 33.0926 34.5638 35.5087 34.5638C37.893 34.5638 40.0071 34.0393 41.8509 32.9902C43.6948 31.9093 45.1412 30.4311 46.1903 28.5554C47.2394 26.6798 47.764 24.518 47.764 22.0702C47.764 19.6223 47.2394 17.4605 46.1903 15.5849C45.1412 13.7092 43.6789 12.2469 41.8032 11.1978C39.9594 10.1169 37.8294 9.57648 35.4133 9.57648C33.029 9.57648 30.8991 10.1169 29.0234 11.1978C27.1796 12.2469 25.7331 13.7092 24.684 15.5849C23.6349 17.4605 23.1104 19.6223 23.1104 22.0702C23.1104 24.518 23.6349 26.6798 24.684 28.5554C25.7649 30.4311 27.2273 31.9093 29.0711 32.9902ZM38.799 28.317C37.8453 28.921 36.7485 29.223 35.5087 29.223C34.2689 29.223 33.1562 28.921 32.1707 28.317C31.1852 27.6812 30.4063 26.8387 29.8341 25.7897C29.2937 24.7088 29.0234 23.4689 29.0234 22.0702C29.0234 20.6714 29.2937 19.4315 29.8341 18.3507C30.4063 17.2698 31.1693 16.4273 32.123 15.8233C33.0767 15.2193 34.1735 14.9173 35.4133 14.9173C36.6532 14.9173 37.7499 15.2352 38.7037 15.871C39.6892 16.475 40.4521 17.3175 40.9926 18.3984C41.5648 19.4474 41.8509 20.6714 41.8509 22.0702C41.8509 23.4689 41.5807 24.7088 41.0403 25.7897C40.4998 26.8387 39.7527 27.6812 38.799 28.317Z" fill="white"/>
+<path d="M57.4468 33.9916V21.3549C57.4468 19.9879 57.8442 18.8911 58.6389 18.0646C59.4655 17.2062 60.5146 16.5863 61.7862 16.2048C63.0896 15.8233 64.4566 15.6326 65.8872 15.6326V10.0533C64.1705 10.0533 62.5333 10.4666 60.9755 11.2932C59.5835 12.0318 58.4073 13.1132 57.4468 14.5372V10.1487H51.6768V33.9916H57.4468Z" fill="white"/>
+<path d="M114.044 33.9916V21.3549C114.044 19.9879 114.441 18.8911 115.236 18.0646C116.063 17.2062 117.112 16.5863 118.383 16.2048C119.687 15.8233 121.054 15.6326 122.484 15.6326V10.0533C120.768 10.0533 119.13 10.4666 117.573 11.2932C116.181 12.0318 115.004 13.1132 114.044 14.5373V10.1487H108.274V33.9916H114.044Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M130.119 32.9902C131.994 34.0393 134.14 34.5638 136.556 34.5638C138.94 34.5638 141.055 34.0393 142.898 32.9902C144.742 31.9093 146.189 30.4311 147.238 28.5554C148.287 26.6798 148.811 24.518 148.811 22.0702C148.811 19.6223 148.287 17.4605 147.238 15.5849C146.189 13.7092 144.726 12.2469 142.851 11.1978C141.007 10.1169 138.877 9.57648 136.461 9.57648C134.076 9.57648 131.947 10.1169 130.071 11.1978C128.227 12.2469 126.781 13.7092 125.731 15.5849C124.682 17.4605 124.158 19.6223 124.158 22.0702C124.158 24.518 124.682 26.6798 125.731 28.5554C126.812 30.4311 128.275 31.9093 130.119 32.9902ZM139.846 28.317C138.893 28.921 137.796 29.223 136.556 29.223C135.316 29.223 134.204 28.921 133.218 28.317C132.233 27.6812 131.454 26.8387 130.882 25.7897C130.341 24.7088 130.071 23.4689 130.071 22.0702C130.071 20.6714 130.341 19.4315 130.882 18.3507C131.454 17.2698 132.217 16.4273 133.17 15.8233C134.124 15.2193 135.221 14.9173 136.461 14.9173C137.701 14.9173 138.797 15.2352 139.751 15.871C140.737 16.475 141.5 17.3175 142.04 18.3984C142.612 19.4474 142.898 20.6714 142.898 22.0702C142.898 23.4689 142.628 24.7088 142.088 25.7897C141.547 26.8387 140.8 27.6812 139.846 28.317Z" fill="white"/>
+<path d="M176.559 26.044L181.836 10.1487H187.749L179.643 33.9916H173.92L168.579 17.1966L163.239 33.9916H157.469L149.362 10.1487H155.275L160.481 26.3146L165.718 10.1487H171.441L176.559 26.044Z" fill="white"/>
+<path d="M194.088 33.8486C195.423 34.3254 196.869 34.5638 198.427 34.5638C200.239 34.5638 201.845 34.2777 203.243 33.7055C204.674 33.1015 205.803 32.259 206.629 31.1782C207.456 30.0655 207.869 28.7939 207.869 27.3633C207.869 26.3778 207.646 25.3764 207.201 24.3591C206.756 23.3418 206.057 22.4199 205.103 21.5933C204.149 20.7668 202.894 20.1627 201.336 19.7812L198.379 19.0183C197.426 18.7957 196.71 18.5255 196.234 18.2076C195.757 17.8897 195.518 17.4923 195.518 17.0155C195.518 16.2843 195.773 15.7121 196.281 15.2988C196.822 14.8855 197.585 14.6789 198.57 14.6789C199.524 14.6789 200.43 14.8855 201.288 15.2988C202.178 15.7121 202.751 16.2843 203.005 17.0155L207.869 14.8219C207.487 13.7728 206.852 12.8668 205.962 12.1038C205.071 11.3091 203.991 10.6891 202.719 10.2441C201.447 9.79901 200.08 9.57648 198.618 9.57648C195.725 9.57648 193.5 10.2441 191.942 11.5793C190.384 12.8827 189.605 14.7424 189.605 17.1585C189.605 18.8116 190.257 20.2899 191.56 21.5933C192.864 22.8649 194.644 23.8027 196.901 24.4068L199.095 24.979C200.017 25.2015 200.732 25.4876 201.241 25.8373C201.781 26.187 202.051 26.6798 202.051 27.3156C202.051 27.9832 201.718 28.5078 201.05 28.8892C200.382 29.2389 199.492 29.4138 198.379 29.4138C197.235 29.4138 196.218 29.1277 195.328 28.5554C194.469 27.9514 193.802 27.252 193.325 26.4573L188.318 28.6985C188.858 29.9065 189.621 30.9556 190.607 31.8458C191.592 32.7041 192.753 33.3717 194.088 33.8486Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M222.071 34.5638C219.718 34.5638 217.636 34.0393 215.824 32.9902C214.044 31.9093 212.629 30.4311 211.58 28.5554C210.563 26.6798 210.054 24.518 210.054 22.0702C210.054 19.6223 210.578 17.4605 211.628 15.5849C212.677 13.7092 214.123 12.2469 215.967 11.1978C217.811 10.1169 219.925 9.57648 222.309 9.57648C224.407 9.57648 226.331 10.1328 228.079 11.2455C229.828 12.3264 231.211 13.9159 232.228 16.0141C233.277 18.0804 233.801 20.5919 233.801 23.5484H216.053C216.181 24.497 216.455 25.3235 216.873 26.0281C217.477 27.0454 218.288 27.8243 219.305 28.3647C220.322 28.9051 221.435 29.1754 222.643 29.1754C223.978 29.1754 225.059 28.8892 225.886 28.317C226.744 27.713 227.412 26.95 227.888 26.0281L233.277 28.1739C232.641 29.5092 231.783 30.6536 230.702 31.6073C229.653 32.561 228.413 33.2922 226.982 33.8009C225.552 34.3095 223.915 34.5638 222.071 34.5638ZM227.269 18.4937C227.326 18.6467 227.38 18.8056 227.43 18.9706H216.358C216.45 18.6481 216.558 18.3461 216.682 18.0646C217.159 16.9519 217.859 16.1253 218.78 15.5849C219.702 15.0127 220.815 14.7265 222.118 14.7265C223.326 14.7265 224.36 15.0286 225.218 15.6326C226.108 16.2366 226.792 17.1903 227.269 18.4937Z" fill="white"/>
+<path d="M242.993 21.3549V33.9916H237.223V10.1487H242.993V14.5372C243.954 13.1132 245.13 12.0318 246.522 11.2932C248.08 10.4666 249.717 10.0533 251.434 10.0533V15.6326C250.003 15.6326 248.636 15.8233 247.333 16.2048C246.061 16.5863 245.012 17.2062 244.185 18.0646C243.391 18.8911 242.993 19.9879 242.993 21.3549Z" fill="white"/>
</svg>
=====================================
browser/branding/tb-nightly/content/about-wordmark.svg
=====================================
@@ -1,17 +1,20 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="336" height="64" viewBox="0 0 336 64">
- <defs>
- <linearGradient id="a" x1="-10%" y1="45%" x2="110%" y2="55%">
- <stop offset="0" stop-color="#54ffbd"/>
- <stop offset=".45" stop-color="#0df"/>
- <stop offset=".7" stop-color="#58c2ff"/>
- <stop offset=".9" stop-color="#aba8ff"/>
- <stop offset="1" stop-color="#cb9eff"/>
- </linearGradient>
- </defs>
- <path d="M11.341 54.816l-7.026-10.6H1v15.57h3.008V48.843l7.245 10.943h3.074V44.213h-2.986zm6.518 4.97H21V44.213h-3.14zm14.007-6.058h5.094a4.376 4.376 0 0 1-4.567 3.37A5.011 5.011 0 0 1 27.167 52a5.086 5.086 0 0 1 5.182-5.142 4.882 4.882 0 0 1 4.237 2.155l2.614-1.771A8.279 8.279 0 0 0 32.349 44a8.006 8.006 0 1 0 .088 16 7.621 7.621 0 0 0 7.86-7.787v-1.3h-8.431zm20.965-3.243h-6.478v-6.272h-3.117v15.573h3.117v-6.357h6.478v6.357h3.095V44.213h-3.095zm6.035-3.5h4.458v12.8h3.052v-12.8h4.412v-2.772H58.866zm17.979-2.773h-3.117v15.574h10.516v-2.922h-7.4zm16.774 0L90 50.4l-3.623-6.187h-3.4l5.445 9v6.57h3.117V53.28L97 44.213z" fill="url(#a)"/>
- <path d="M1 3.879h21.427v5.8H7.147v7.859h15.28v5.752H7.147v12.642H1zM29.716 1.64a3.447 3.447 0 0 1 3.557 3.6 3.434 3.434 0 0 1-3.6 3.6 3.4 3.4 0 0 1-3.556-3.513 3.555 3.555 0 0 1 3.599-3.687zm-3.03 10.582h6.06v23.71h-6.06zm23.623 6.586a4.894 4.894 0 0 0-2.942-1.054c-2.459 0-3.864 1.581-3.864 5.049v13.129h-6.015v-23.71h5.752v3.424A5.649 5.649 0 0 1 48.9 12a7.191 7.191 0 0 1 4.04 1.229zm2.5 5.4a12.129 12.129 0 0 1 12.209-12.469c7.113 0 12.163 5.049 12.163 12.074v2.5H58.739c.659 2.986 2.986 4.962 6.543 4.962a6.355 6.355 0 0 0 5.883-3.513l5.05 3.03c-2.5 3.688-6.059 5.62-11.109 5.62-7.684.003-12.294-5.134-12.294-12.204zm6.015-2.678H71.3c-.658-3.03-3.117-4.7-6.323-4.7a6.091 6.091 0 0 0-6.15 4.7zm19.847-9.308h4.259v-1.186c0-6.455 2.722-9.133 8.694-9.133h2.107v5.225h-1.709c-2.81 0-3.425.966-3.425 3.908v1.186h5.137v5.444h-5v18.266h-5.8V17.666h-4.26zm16.2 11.855a12.139 12.139 0 0 1 12.382-12.338 12.338 12.338 0 1 1 0 24.676 11.959 11.959 0 0 1-12.377-12.338zm18.88 0a6.5 6.5 0 1 0-13 0 6.5 6.5 0 1 0 13 0zm14.051-.264l-8.562-11.591h7.113l5.05 7.288 5.181-7.288h6.981l-8.694 11.547 9.133 12.163h-7.064l-5.664-7.732-5.489 7.728h-7.069z" fill="#fff"/>
- <path d="M179.043 19.377a7.41 7.41 0 0 0 4.266-6.948c0-5.189-3.958-8.532-9.939-8.532h-13.721V36h14.161c6.068 0 10.158-3.43 10.158-9.059a7.711 7.711 0 0 0-4.925-7.564zM163.3 7.24h10.027c3.913 0 6.332 2.111 6.332 5.189s-2.11 5.365-6.024 5.365H163.3zm10.467 25.374H163.3V21.18h10.29c4.4 0 6.685 2.331 6.685 5.717 0 3.342-2.551 5.717-6.509 5.717zM191.8 16.738v-4.485h-3.475V36h3.563V22.983c0-5.233 2.286-7.52 6.244-7.52a5.2 5.2 0 0 1 2.9.748l1.495-3.43a7.752 7.752 0 0 0-3.957-.88 6.576 6.576 0 0 0-6.77 4.837zm23.22-4.968a12.192 12.192 0 0 0-12.313 12.357 12.335 12.335 0 1 0 24.67 0 12.2 12.2 0 0 0-12.359-12.357zm0 21.284a8.606 8.606 0 0 1-8.663-8.927 8.69 8.69 0 1 1 17.371 0 8.642 8.642 0 0 1-8.71 8.927zm41.3-2.112l-7.081-18.689h-3.342l-7.256 18.821-5.981-18.821h-3.782L236.657 36h3.518l7.3-18.821 7.3 18.821h3.254l8.224-23.747h-3.738zm22.649-8.663c-3.694-.747-6.553-1.231-6.553-3.693 0-2.2 1.5-3.782 5.146-3.782a7.666 7.666 0 0 1 6.509 3.166l2.99-2.023a11.483 11.483 0 0 0-9.5-4.221c-5.629-.044-8.839 3.21-8.839 6.9 0 4.749 4.353 5.849 8.443 6.64 3.474.7 6.728 1.231 6.728 3.87 0 2.375-1.935 4.133-5.629 4.133a8.77 8.77 0 0 1-7.651-3.87l-3.123 2.112c2.111 3.034 5.5 4.968 10.686 4.968 6.2.044 9.367-3.649 9.367-7.387-.004-4.877-4.489-6.021-8.579-6.813zm23.92-10.509a12.179 12.179 0 0 0-12.4 12.445c0 6.948 4.925 12.268 12.533 12.268a12.2 12.2 0 0 0 11.038-6.024l-3.078-1.8a8.489 8.489 0 0 1-7.96 4.573c-5.013 0-8.488-3.209-9.015-7.739h20.977v-1.631a11.714 11.714 0 0 0-12.095-12.092zm-8.8 10.553a8.821 8.821 0 0 1 8.8-7.344 8 8 0 0 1 8.4 7.344zM329.541 11.9a6.575 6.575 0 0 0-6.772 4.837v-4.484h-3.475V36h3.563V22.983c0-5.233 2.286-7.52 6.244-7.52a5.2 5.2 0 0 1 2.9.748l1.5-3.43a7.754 7.754 0 0 0-3.96-.881z" fill="#fff"/>
+<svg width="416" height="45" viewBox="0 0 416 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M303.369 4.05329C303.845 4.53015 304.402 4.76858 305.038 4.76858C305.705 4.76858 306.262 4.53015 306.707 4.05329C307.183 3.57644 307.422 3.0201 307.422 2.38429C307.422 1.71669 307.183 1.16035 306.707 0.715287C306.262 0.238429 305.705 0 305.038 0C304.402 0 303.845 0.238429 303.369 0.715287C302.892 1.16035 302.653 1.71669 302.653 2.38429C302.653 3.0201 302.892 3.57644 303.369 4.05329Z" fill="white"/>
+<path d="M340.961 34.1431V0.143055H344.776V13.7676C345.425 12.6907 346.236 11.821 347.208 11.1585C348.607 10.2048 350.292 9.72791 352.263 9.72791C355.124 9.72791 357.397 10.618 359.082 12.3983C360.767 14.1786 361.593 16.8808 361.561 20.5049V34.1431H357.746V21.9355C357.746 19.583 357.46 17.7868 356.888 16.547C356.348 15.3072 355.601 14.4647 354.647 14.0196C353.693 13.5428 352.612 13.3043 351.404 13.3043C349.306 13.3043 347.669 14.0514 346.493 15.5456C345.348 17.0079 344.776 19.0902 344.776 21.7924V34.1431H340.961Z" fill="white"/>
+<path d="M303.082 34.1431L303.178 10.3001H306.993L306.897 34.1431H303.082Z" fill="white"/>
+<path d="M292.442 34.1431L272.509 7.19473V34.1431H268.456V0.762972H272.557L292.442 27.6056V0.762972H296.495V34.1431H292.442Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M322.988 44.2525C321.462 44.2525 320.063 44.0935 318.791 43.7756C317.551 43.4895 316.486 43.1557 315.596 42.7742C314.738 42.4245 314.118 42.1225 313.737 41.8682L315.167 38.7686C315.58 38.9911 316.169 39.2613 316.931 39.5792C317.694 39.9289 318.585 40.215 319.602 40.4376C320.651 40.6919 321.764 40.8191 322.94 40.8191C324.466 40.8191 325.833 40.5012 327.041 39.8654C328.281 39.2613 329.234 38.2917 329.902 36.9565C330.601 35.6531 330.951 33.9682 330.951 31.9018V29.364C330.196 30.6211 329.242 31.6419 328.09 32.4264C326.596 33.4437 324.847 33.9523 322.845 33.9523C320.715 33.9523 318.839 33.4437 317.218 32.4264C315.596 31.4091 314.325 29.9944 313.403 28.1823C312.513 26.3385 312.068 24.2403 312.068 21.8878C312.068 19.4717 312.513 17.3576 313.403 15.5456C314.325 13.7017 315.596 12.2712 317.218 11.2539C318.839 10.2366 320.715 9.72791 322.845 9.72791C324.847 9.72791 326.596 10.2366 328.09 11.2539C329.242 12.0383 330.196 13.0686 330.951 14.3446V10.3001H334.766V31.8541C334.766 34.5881 334.257 36.877 333.24 38.7209C332.223 40.5647 330.824 41.9476 329.044 42.8696C327.263 43.7915 325.245 44.2525 322.988 44.2525ZM323.751 30.662C325.149 30.662 326.389 30.2805 327.47 29.5175C328.551 28.7546 329.393 27.7214 329.997 26.418C330.601 25.0827 330.903 23.5409 330.903 21.7924C330.903 20.1075 330.586 18.6134 329.95 17.31C329.346 15.9748 328.503 14.9416 327.422 14.2104C326.373 13.4474 325.133 13.0659 323.703 13.0659C322.209 13.0659 320.874 13.4474 319.697 14.2104C318.553 14.9416 317.647 15.9748 316.979 17.31C316.343 18.6134 316.025 20.1075 316.025 21.7924C316.025 23.5409 316.359 25.0827 317.027 26.418C317.694 27.7214 318.6 28.7546 319.745 29.5175C320.921 30.2805 322.256 30.662 323.751 30.662Z" fill="white"/>
+<path d="M384.62 0.762972V34.1431H388.435V0.762972H384.62Z" fill="white"/>
+<path d="M394.668 43.871C395.463 44.1253 396.162 44.2525 396.767 44.2525C398.197 44.2525 399.373 43.9822 400.295 43.4418C401.217 42.9014 401.996 42.1225 402.632 41.1052C403.299 40.0879 403.935 38.8798 404.539 37.4811L415.984 10.3001H411.883L403.855 29.6545L395.765 10.3001H391.712L401.997 34.1076L400.343 38.0533C399.961 38.9116 399.485 39.5633 398.912 40.0084C398.372 40.4853 397.673 40.7237 396.814 40.7237C396.496 40.7237 396.051 40.6442 395.479 40.4853C394.939 40.3263 394.303 40.0879 393.572 39.77L392.141 42.9649C393.031 43.3464 393.874 43.6484 394.668 43.871Z" fill="white"/>
+<path d="M373.328 10.3292H379.664V13.7155H373.317V27.4477C373.317 28.6557 373.635 29.5936 374.271 30.2612C374.938 30.897 375.86 31.2149 377.036 31.2149C377.418 31.2149 377.783 31.1672 378.133 31.0718C378.515 30.9447 379.007 30.6585 379.611 30.2135L381.09 33.3131C380.263 33.8535 379.516 34.2191 378.848 34.4098C378.181 34.6324 377.497 34.7436 376.798 34.7436C374.477 34.7436 372.681 34.1396 371.409 32.9316C370.138 31.7235 369.502 30.0227 369.502 27.8292V13.7155H364.064V10.3292H364.678C367.359 10.3292 369.528 8.14673 369.511 5.46568L369.502 3.93667V2.88952H373.328V10.3292Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.1943 16.8102C100.019 16.2473 100.72 15.6031 101.297 14.8777C102.41 13.4789 102.966 11.9052 102.966 10.1568C102.966 8.09037 102.489 6.35779 101.536 4.959C100.614 3.56022 99.2945 2.51113 97.5778 1.81174C95.8929 1.08055 93.906 0.714963 91.6171 0.714963L85.0829 0.777784V0.762649H79.1698V34.1427H93.143C95.3684 34.1427 97.2917 33.7771 98.913 33.046C100.566 32.3148 101.838 31.2498 102.728 29.851C103.65 28.4204 104.111 26.7037 104.111 24.7009C104.111 22.412 103.475 20.5523 102.203 19.1217C101.413 18.1899 100.41 17.4194 99.1943 16.8102ZM92.5708 28.7542H85.0829V19.6306L86.3902 19.5509H91.9509C93.8265 19.5191 95.2889 19.9324 96.338 20.7907C97.4189 21.6173 97.9593 22.7617 97.9593 24.2241C97.9593 25.6229 97.4824 26.7355 96.5287 27.5621C95.575 28.3569 94.2557 28.7542 92.5708 28.7542ZM85.0829 5.6266H91.331C93.0477 5.59481 94.3829 5.9763 95.3366 6.77107C96.3221 7.56583 96.8148 8.6785 96.8148 10.1091C96.8148 11.5079 96.3698 12.6046 95.4797 13.3994C94.6213 14.1624 93.4451 14.5439 91.9509 14.5439H85.0829V5.6266Z" fill="white"/>
+<path d="M11.3982 6.2942V34.1427H17.4066V6.2942H28.8525V0.762649H0V6.2942H11.3982Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0711 33.1413C30.9468 34.1904 33.0926 34.715 35.5087 34.715C37.893 34.715 40.0071 34.1904 41.8509 33.1413C43.6948 32.0604 45.1412 30.5822 46.1903 28.7065C47.2394 26.8309 47.764 24.6691 47.764 22.2213C47.764 19.7734 47.2394 17.6116 46.1903 15.736C45.1412 13.8604 43.6789 12.398 41.8032 11.3489C39.9594 10.268 37.8294 9.72759 35.4133 9.72759C33.029 9.72759 30.8991 10.268 29.0234 11.3489C27.1796 12.398 25.7331 13.8604 24.684 15.736C23.6349 17.6116 23.1104 19.7734 23.1104 22.2213C23.1104 24.6691 23.6349 26.8309 24.684 28.7065C25.7649 30.5822 27.2273 32.0604 29.0711 33.1413ZM38.799 28.4681C37.8453 29.0721 36.7485 29.3741 35.5087 29.3741C34.2689 29.3741 33.1562 29.0721 32.1707 28.4681C31.1852 27.8323 30.4063 26.9899 29.8341 25.9408C29.2937 24.8599 29.0234 23.6201 29.0234 22.2213C29.0234 20.8225 29.2937 19.5827 29.8341 18.5018C30.4063 17.4209 31.1693 16.5784 32.123 15.9744C33.0767 15.3704 34.1735 15.0684 35.4133 15.0684C36.6532 15.0684 37.7499 15.3863 38.7037 16.0221C39.6892 16.6261 40.4521 17.4686 40.9926 18.5495C41.5648 19.5986 41.8509 20.8225 41.8509 22.2213C41.8509 23.6201 41.5807 24.8599 41.0403 25.9408C40.4998 26.9899 39.7527 27.8323 38.799 28.4681Z" fill="white"/>
+<path d="M57.4468 34.1427V21.506C57.4468 20.139 57.8442 19.0422 58.6389 18.2157C59.4655 17.3573 60.5146 16.7374 61.7862 16.3559C63.0896 15.9744 64.4566 15.7837 65.8872 15.7837V10.2044C64.1705 10.2044 62.5333 10.6177 60.9755 11.4443C59.5835 12.1829 58.4073 13.2643 57.4468 14.6884V10.2998H51.6768V34.1427H57.4468Z" fill="white"/>
+<path d="M114.044 34.1427V21.506C114.044 20.139 114.441 19.0422 115.236 18.2157C116.063 17.3573 117.112 16.7374 118.383 16.3559C119.687 15.9744 121.054 15.7837 122.484 15.7837V10.2044C120.768 10.2044 119.13 10.6177 117.573 11.4443C116.181 12.1829 115.004 13.2643 114.044 14.6884V10.2998H108.274V34.1427H114.044Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M130.119 33.1413C131.994 34.1904 134.14 34.715 136.556 34.715C138.94 34.715 141.055 34.1904 142.898 33.1413C144.742 32.0604 146.189 30.5822 147.238 28.7065C148.287 26.8309 148.811 24.6691 148.811 22.2213C148.811 19.7734 148.287 17.6116 147.238 15.736C146.189 13.8604 144.726 12.398 142.851 11.3489C141.007 10.268 138.877 9.72759 136.461 9.72759C134.076 9.72759 131.947 10.268 130.071 11.3489C128.227 12.398 126.781 13.8604 125.731 15.736C124.682 17.6116 124.158 19.7734 124.158 22.2213C124.158 24.6691 124.682 26.8309 125.731 28.7065C126.812 30.5822 128.275 32.0604 130.119 33.1413ZM139.846 28.4681C138.893 29.0721 137.796 29.3741 136.556 29.3741C135.316 29.3741 134.204 29.0721 133.218 28.4681C132.233 27.8323 131.454 26.9899 130.882 25.9408C130.341 24.8599 130.071 23.6201 130.071 22.2213C130.071 20.8225 130.341 19.5827 130.882 18.5018C131.454 17.4209 132.217 16.5784 133.17 15.9744C134.124 15.3704 135.221 15.0684 136.461 15.0684C137.701 15.0684 138.797 15.3863 139.751 16.0221C140.737 16.6261 141.5 17.4686 142.04 18.5495C142.612 19.5986 142.898 20.8225 142.898 22.2213C142.898 23.6201 142.628 24.8599 142.088 25.9408C141.547 26.9899 140.8 27.8323 139.846 28.4681Z" fill="white"/>
+<path d="M176.559 26.1951L181.836 10.2998H187.749L179.643 34.1427H173.92L168.579 17.3477L163.239 34.1427H157.469L149.362 10.2998H155.275L160.481 26.4658L165.718 10.2998H171.441L176.559 26.1951Z" fill="white"/>
+<path d="M194.088 33.9997C195.423 34.4765 196.869 34.715 198.427 34.715C200.239 34.715 201.845 34.4288 203.243 33.8566C204.674 33.2526 205.803 32.4101 206.629 31.3293C207.456 30.2166 207.869 28.945 207.869 27.5144C207.869 26.5289 207.646 25.5275 207.201 24.5102C206.756 23.4929 206.057 22.571 205.103 21.7444C204.149 20.9179 202.894 20.3138 201.336 19.9324L198.379 19.1694C197.426 18.9468 196.71 18.6766 196.234 18.3587C195.757 18.0408 195.518 17.6434 195.518 17.1666C195.518 16.4354 195.773 15.8632 196.281 15.4499C196.822 15.0366 197.585 14.83 198.57 14.83C199.524 14.83 200.43 15.0366 201.288 15.4499C202.178 15.8632 202.751 16.4354 203.005 17.1666L207.869 14.973C207.487 13.9239 206.852 13.0179 205.962 12.2549C205.071 11.4602 203.991 10.8403 202.719 10.3952C201.447 9.95012 200.08 9.72759 198.618 9.72759C195.725 9.72759 193.5 10.3952 191.942 11.7304C190.384 13.0338 189.605 14.8935 189.605 17.3096C189.605 18.9627 190.257 20.441 191.56 21.7444C192.864 23.016 194.644 23.9539 196.901 24.5579L199.095 25.1301C200.017 25.3526 200.732 25.6388 201.241 25.9885C201.781 26.3382 202.051 26.8309 202.051 27.4667C202.051 28.1343 201.718 28.6589 201.05 29.0403C200.382 29.39 199.492 29.5649 198.379 29.5649C197.235 29.5649 196.218 29.2788 195.328 28.7065C194.469 28.1025 193.802 27.4031 193.325 26.6084L188.318 28.8496C188.858 30.0576 189.621 31.1067 190.607 31.9969C191.592 32.8552 192.753 33.5228 194.088 33.9997Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M222.071 34.715C219.718 34.715 217.636 34.1904 215.824 33.1413C214.044 32.0604 212.629 30.5822 211.58 28.7065C210.563 26.8309 210.054 24.6691 210.054 22.2213C210.054 19.7734 210.578 17.6116 211.628 15.736C212.677 13.8604 214.123 12.398 215.967 11.3489C217.811 10.268 219.925 9.72759 222.309 9.72759C224.407 9.72759 226.331 10.2839 228.079 11.3966C229.828 12.4775 231.211 14.067 232.228 16.1652C233.277 18.2316 233.801 20.743 233.801 23.6995H216.053C216.181 24.6481 216.455 25.4746 216.873 26.1792C217.477 27.1965 218.288 27.9754 219.305 28.5158C220.322 29.0562 221.435 29.3265 222.643 29.3265C223.978 29.3265 225.059 29.0403 225.886 28.4681C226.744 27.8641 227.412 27.1011 227.888 26.1792L233.277 28.3251C232.641 29.6603 231.783 30.8047 230.702 31.7584C229.653 32.7122 228.413 33.4433 226.982 33.952C225.552 34.4606 223.915 34.715 222.071 34.715ZM227.269 18.6448C227.326 18.7978 227.38 18.9568 227.43 19.1217H216.358C216.45 18.7992 216.558 18.4972 216.682 18.2157C217.159 17.103 217.859 16.2764 218.78 15.736C219.702 15.1638 220.815 14.8777 222.118 14.8777C223.326 14.8777 224.36 15.1797 225.218 15.7837C226.108 16.3877 226.792 17.3414 227.269 18.6448Z" fill="white"/>
+<path d="M242.993 21.506V34.1427H237.223V10.2998H242.993V14.6884C243.954 13.2643 245.13 12.1829 246.522 11.4443C248.08 10.6177 249.717 10.2044 251.434 10.2044V15.7837C250.003 15.7837 248.636 15.9744 247.333 16.3559C246.061 16.7374 245.012 17.3573 244.185 18.2157C243.391 19.0422 242.993 20.139 242.993 21.506Z" fill="white"/>
</svg>
=====================================
browser/branding/tb-release/content/about-wordmark.svg
=====================================
@@ -1,7 +1,12 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="336" height="48" viewBox="0 0 336 48">
- <path d="M.972 7.879H22.4v5.8H7.119v7.859H22.4v5.752H7.119v12.642H.972zM29.688 5.64a3.447 3.447 0 0 1 3.557 3.6 3.434 3.434 0 0 1-3.6 3.6 3.4 3.4 0 0 1-3.556-3.513 3.555 3.555 0 0 1 3.599-3.687zm-3.03 10.582h6.06v23.71h-6.06zm23.623 6.586a4.894 4.894 0 0 0-2.942-1.054c-2.459 0-3.864 1.581-3.864 5.049v13.129H37.46v-23.71h5.752v3.424A5.649 5.649 0 0 1 48.876 16a7.191 7.191 0 0 1 4.04 1.229zm2.5 5.4A12.129 12.129 0 0 1 64.99 15.739c7.113 0 12.163 5.049 12.163 12.074v2.5H58.711c.659 2.986 2.986 4.962 6.543 4.962a6.357 6.357 0 0 0 5.884-3.513l5.049 3.03c-2.5 3.688-6.059 5.62-11.109 5.62-7.684.003-12.294-5.134-12.294-12.204zM58.8 25.53h12.47c-.658-3.03-3.117-4.7-6.323-4.7a6.091 6.091 0 0 0-6.147 4.7zm19.847-9.308h4.259v-1.186c0-6.455 2.722-9.133 8.694-9.133h2.107v5.225h-1.713c-2.81 0-3.425.966-3.425 3.908v1.186h5.137v5.444H88.7v18.266h-5.8V21.666h-4.254zm16.2 11.855a12.139 12.139 0 0 1 12.383-12.338 12.338 12.338 0 1 1 0 24.676 11.96 11.96 0 0 1-12.382-12.338zm18.88 0a6.5 6.5 0 1 0-13 0 6.5 6.5 0 1 0 13 0zm14.051-.264l-8.562-11.591h7.113l5.05 7.288 5.181-7.288h6.981l-8.694 11.547 9.133 12.163h-7.069l-5.663-7.732-5.489 7.728h-7.069z" fill="#fff"/>
- <path d="M180.394 23.377a7.41 7.41 0 0 0 4.266-6.948c0-5.189-3.958-8.532-9.938-8.532H161V40h14.161c6.068 0 10.158-3.43 10.158-9.059a7.71 7.71 0 0 0-4.925-7.564zM164.65 11.24h10.028c3.913 0 6.332 2.111 6.332 5.189s-2.111 5.365-6.025 5.365H164.65zm10.467 25.374H164.65V25.18h10.291c4.4 0 6.685 2.331 6.685 5.717 0 3.342-2.551 5.717-6.509 5.717zm18.032-15.876v-4.485h-3.474V40h3.562V26.983c0-5.233 2.286-7.52 6.244-7.52a5.2 5.2 0 0 1 2.9.748l1.5-3.43a7.754 7.754 0 0 0-3.957-.88 6.576 6.576 0 0 0-6.775 4.837zm23.22-4.968a12.192 12.192 0 0 0-12.312 12.357 12.335 12.335 0 1 0 24.669 0 12.2 12.2 0 0 0-12.357-12.357zm0 21.284a8.606 8.606 0 0 1-8.663-8.927 8.69 8.69 0 1 1 17.371 0 8.642 8.642 0 0 1-8.708 8.927zm41.3-2.112l-7.081-18.689h-3.342l-7.256 18.821-5.98-18.821h-3.782L238.009 40h3.517l7.3-18.821 7.3 18.821h3.255l8.219-23.747h-3.738zm22.649-8.663c-3.694-.747-6.552-1.231-6.552-3.693 0-2.2 1.5-3.782 5.145-3.782a7.664 7.664 0 0 1 6.509 3.166l2.99-2.023a11.481 11.481 0 0 0-9.5-4.221c-5.629-.044-8.839 3.21-8.839 6.9 0 4.749 4.354 5.849 8.444 6.64 3.473.7 6.727 1.231 6.727 3.87 0 2.375-1.934 4.133-5.629 4.133a8.772 8.772 0 0 1-7.651-3.87l-3.122 2.112c2.11 3.034 5.5 4.968 10.685 4.968 6.2.044 9.368-3.649 9.368-7.387-.002-4.877-4.493-6.021-8.578-6.813zM304.24 15.77a12.178 12.178 0 0 0-12.4 12.445c0 6.948 4.925 12.268 12.532 12.268a12.2 12.2 0 0 0 11.038-6.024l-3.078-1.8a8.489 8.489 0 0 1-7.96 4.573c-5.013 0-8.487-3.209-9.015-7.739h20.977v-1.631A11.714 11.714 0 0 0 304.24 15.77zm-8.8 10.553a8.822 8.822 0 0 1 8.8-7.344 8 8 0 0 1 8.4 7.344zM330.893 15.9a6.576 6.576 0 0 0-6.773 4.837v-4.484h-3.475V40h3.563V26.983c0-5.233 2.286-7.52 6.244-7.52a5.2 5.2 0 0 1 2.9.748l1.5-3.43a7.757 7.757 0 0 0-3.959-.881z" fill="#fff"/>
+<svg width="252" height="34" viewBox="0 0 252 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.3982 33.4278V2.81346H17.4066V33.4278H11.3982ZM0 5.57924V0.0476854H28.8525V5.57924H0Z" fill="white"/>
+<path d="M35.5087 34C33.0926 34 30.9468 33.4755 29.0711 32.4264C27.2273 31.3455 25.7649 29.8672 24.684 27.9916C23.6349 26.1159 23.1104 23.9542 23.1104 21.5063C23.1104 19.0584 23.6349 16.8967 24.684 15.021C25.7331 13.1454 27.1796 11.683 29.0234 10.6339C30.8991 9.55306 33.029 9.01262 35.4133 9.01262C37.8294 9.01262 39.9594 9.55306 41.8032 10.6339C43.6789 11.683 45.1412 13.1454 46.1903 15.021C47.2394 16.8967 47.764 19.0584 47.764 21.5063C47.764 23.9542 47.2394 26.1159 46.1903 27.9916C45.1412 29.8672 43.6948 31.3455 41.8509 32.4264C40.0071 33.4755 37.893 34 35.5087 34ZM35.5087 28.6592C36.7485 28.6592 37.8453 28.3572 38.799 27.7532C39.7527 27.1173 40.4998 26.2749 41.0403 25.2258C41.5807 24.1449 41.8509 22.9051 41.8509 21.5063C41.8509 20.1075 41.5648 18.8836 40.9926 17.8345C40.4521 16.7536 39.6892 15.9112 38.7037 15.3072C37.7499 14.6713 36.6532 14.3534 35.4133 14.3534C34.1735 14.3534 33.0767 14.6554 32.123 15.2595C31.1693 15.8635 30.4063 16.7059 29.8341 17.7868C29.2937 18.8677 29.0234 20.1075 29.0234 21.5063C29.0234 22.9051 29.2937 24.1449 29.8341 25.2258C30.4063 26.2749 31.1852 27.1173 32.1707 27.7532C33.1562 28.3572 34.2689 28.6592 35.5087 28.6592Z" fill="white"/>
+<path d="M55.6347 20.8387C55.6347 18.2637 56.1275 16.1496 57.113 14.4965C58.1303 12.8116 59.4178 11.5559 60.9755 10.7293C62.5333 9.90276 64.1705 9.48948 65.8872 9.48948V15.0687C64.4566 15.0687 63.0896 15.2595 61.7862 15.641C60.5146 16.0224 59.4655 16.6424 58.6389 17.5007C57.8442 18.3273 57.4468 19.424 57.4468 20.791L55.6347 20.8387ZM51.6768 33.4278V9.58485H57.4468V33.4278H51.6768Z" fill="white"/>
+<path d="M81.8879 33.4278V28.0393H92.5708C94.2557 28.0393 95.575 27.6419 96.5287 26.8471C97.4825 26.0206 97.9593 24.9079 97.9593 23.5091C97.9593 22.0467 97.4189 20.9023 96.338 20.0757C95.2889 19.2174 93.8265 18.8041 91.9509 18.8359H81.8879V14.0673L88.9467 14.1627C91.9986 14.1627 94.6531 14.5124 96.9102 15.2118C99.1991 15.8794 100.964 16.9444 102.203 18.4067C103.475 19.8373 104.111 21.6971 104.111 23.986C104.111 25.9888 103.65 27.7055 102.728 29.136C101.838 30.5348 100.566 31.5998 98.913 32.331C97.2917 33.0622 95.3684 33.4278 93.143 33.4278H81.8879ZM79.1698 33.4278V0.0476854H85.0829V33.4278H79.1698ZM81.6972 19.122V13.8289H91.9509C93.4451 13.8289 94.6213 13.4474 95.4797 12.6844C96.3698 11.8897 96.8148 10.7929 96.8148 9.39411C96.8148 7.96353 96.3221 6.85087 95.3366 6.0561C94.3829 5.26134 93.0477 4.87985 91.331 4.91164H81.6972V0.0953709L91.6171 0C93.906 0 95.8929 0.365591 97.5778 1.09677C99.2945 1.79617 100.614 2.84525 101.536 4.24404C102.489 5.64282 102.966 7.37541 102.966 9.4418C102.966 11.1903 102.41 12.7639 101.297 14.1627C100.185 15.5615 98.611 16.6583 96.5764 17.453C94.5736 18.2478 92.2211 18.6452 89.5189 18.6452L81.6972 19.122Z" fill="white"/>
+<path d="M112.232 20.8387C112.232 18.2637 112.725 16.1496 113.71 14.4965C114.727 12.8116 116.015 11.5559 117.573 10.7293C119.13 9.90276 120.768 9.48948 122.484 9.48948V15.0687C121.054 15.0687 119.687 15.2595 118.383 15.641C117.112 16.0224 116.063 16.6424 115.236 17.5007C114.441 18.3273 114.044 19.424 114.044 20.791L112.232 20.8387ZM108.274 33.4278V9.58485H114.044V33.4278H108.274Z" fill="white"/>
+<path d="M136.556 34C134.14 34 131.994 33.4755 130.119 32.4264C128.275 31.3455 126.812 29.8672 125.731 27.9916C124.682 26.1159 124.158 23.9542 124.158 21.5063C124.158 19.0584 124.682 16.8967 125.731 15.021C126.781 13.1454 128.227 11.683 130.071 10.6339C131.947 9.55306 134.076 9.01262 136.461 9.01262C138.877 9.01262 141.007 9.55306 142.851 10.6339C144.726 11.683 146.189 13.1454 147.238 15.021C148.287 16.8967 148.811 19.0584 148.811 21.5063C148.811 23.9542 148.287 26.1159 147.238 27.9916C146.189 29.8672 144.742 31.3455 142.898 32.4264C141.055 33.4755 138.94 34 136.556 34ZM136.556 28.6592C137.796 28.6592 138.893 28.3572 139.846 27.7532C140.8 27.1173 141.547 26.2749 142.088 25.2258C142.628 24.1449 142.898 22.9051 142.898 21.5063C142.898 20.1075 142.612 18.8836 142.04 17.8345C141.5 16.7536 140.737 15.9112 139.751 15.3072C138.797 14.6713 137.701 14.3534 136.461 14.3534C135.221 14.3534 134.124 14.6554 133.17 15.2595C132.217 15.8635 131.454 16.7059 130.882 17.7868C130.341 18.8677 130.071 20.1075 130.071 21.5063C130.071 22.9051 130.341 24.1449 130.882 25.2258C131.454 26.2749 132.233 27.1173 133.218 27.7532C134.204 28.3572 135.316 28.6592 136.556 28.6592Z" fill="white"/>
+<path d="M173.92 33.4278L181.836 9.58485H187.749L179.643 33.4278H173.92ZM157.993 33.4278L165.718 9.58485H170.821L163.239 33.4278H157.993ZM157.469 33.4278L149.362 9.58485H155.275L162.952 33.4278H157.469ZM173.92 33.4278L166.338 9.58485H171.441L179.118 33.4278H173.92Z" fill="white"/>
+<path d="M198.427 34C196.869 34 195.423 33.7616 194.088 33.2847C192.753 32.8079 191.592 32.1402 190.607 31.2819C189.621 30.3918 188.858 29.3427 188.318 28.1346L193.325 25.8934C193.802 26.6882 194.469 27.3876 195.328 27.9916C196.218 28.5638 197.235 28.8499 198.379 28.8499C199.492 28.8499 200.382 28.6751 201.05 28.3254C201.717 27.9439 202.051 27.4194 202.051 26.7518C202.051 26.1159 201.781 25.6232 201.241 25.2735C200.732 24.9238 200.017 24.6377 199.095 24.4151L196.901 23.8429C194.644 23.2389 192.864 22.3011 191.56 21.0295C190.257 19.726 189.605 18.2478 189.605 16.5947C189.605 14.1786 190.384 12.3188 191.942 11.0154C193.5 9.68022 195.725 9.01262 198.618 9.01262C200.08 9.01262 201.447 9.23516 202.719 9.68022C203.991 10.1253 205.071 10.7452 205.962 11.54C206.852 12.3029 207.487 13.209 207.869 14.2581L203.005 16.4516C202.751 15.7204 202.178 15.1482 201.288 14.7349C200.43 14.3216 199.524 14.115 198.57 14.115C197.585 14.115 196.822 14.3216 196.281 14.7349C195.773 15.1482 195.518 15.7204 195.518 16.4516C195.518 16.9285 195.757 17.3259 196.234 17.6438C196.71 17.9617 197.426 18.2319 198.379 18.4544L201.336 19.2174C202.894 19.5989 204.149 20.2029 205.103 21.0295C206.057 21.856 206.756 22.7779 207.201 23.7952C207.646 24.8125 207.869 25.8139 207.869 26.7994C207.869 28.23 207.456 29.5016 206.629 30.6143C205.803 31.6952 204.674 32.5376 203.243 33.1417C201.845 33.7139 200.239 34 198.427 34Z" fill="white"/>
+<path d="M222.071 34C219.718 34 217.636 33.4755 215.824 32.4264C214.044 31.3455 212.629 29.8672 211.58 27.9916C210.563 26.1159 210.054 23.9542 210.054 21.5063C210.054 19.0584 210.578 16.8967 211.628 15.021C212.677 13.1454 214.123 11.683 215.967 10.6339C217.811 9.55306 219.925 9.01262 222.309 9.01262C224.407 9.01262 226.331 9.56896 228.079 10.6816C229.828 11.7625 231.211 13.352 232.228 15.4502C233.277 17.5166 233.801 20.028 233.801 22.9846H227.936C227.968 20.8864 227.745 19.2015 227.269 17.9299C226.792 16.6265 226.108 15.6727 225.218 15.0687C224.36 14.4647 223.326 14.1627 222.118 14.1627C220.815 14.1627 219.702 14.4488 218.78 15.021C217.859 15.5615 217.159 16.388 216.682 17.5007C216.205 18.5816 215.967 19.9645 215.967 21.6494C215.967 23.1753 216.269 24.4469 216.873 25.4642C217.477 26.4815 218.288 27.2604 219.305 27.8008C220.322 28.3413 221.435 28.6115 222.643 28.6115C223.978 28.6115 225.059 28.3254 225.886 27.7532C226.744 27.1491 227.412 26.3862 227.888 25.4642L233.277 27.6101C232.641 28.9453 231.783 30.0898 230.702 31.0435C229.653 31.9972 228.413 32.7284 226.982 33.237C225.552 33.7457 223.915 34 222.071 34ZM213.869 22.9846L213.916 18.4067H230.845V22.9846H213.869Z" fill="white"/>
+<path d="M241.181 20.8387C241.181 18.2637 241.674 16.1496 242.659 14.4965C243.677 12.8116 244.964 11.5559 246.522 10.7293C248.08 9.90276 249.717 9.48948 251.434 9.48948V15.0687C250.003 15.0687 248.636 15.2595 247.333 15.641C246.061 16.0224 245.012 16.6424 244.185 17.5007C243.391 18.3273 242.993 19.424 242.993 20.791L241.181 20.8387ZM237.223 33.4278V9.58485H242.993V33.4278H237.223Z" fill="white"/>
</svg>
=====================================
toolkit/themes/shared/desktop-jar.inc.mn
=====================================
@@ -121,7 +121,6 @@
skin/classic/global/icons/whatsnew.svg (../../shared/icons/whatsnew.svg)
skin/classic/global/illustrations/about-rights.svg (../../shared/illustrations/about-rights.svg)
skin/classic/global/illustrations/about-license.svg (../../shared/illustrations/about-license.svg)
- skin/classic/global/illustrations/about-wordmark.png (../../shared/illustrations/about-wordmark.png)
skin/classic/global/illustrations/error-malformed-url.svg (../../shared/illustrations/error-malformed-url.svg)
skin/classic/global/media/picture-in-picture-open.svg (../../shared/media/picture-in-picture-open.svg)
skin/classic/global/media/picture-in-picture-closed.svg (../../shared/media/picture-in-picture-closed.svg)
=====================================
toolkit/themes/shared/illustrations/about-wordmark.png deleted
=====================================
Binary files a/toolkit/themes/shared/illustrations/about-wordmark.png and /dev/null differ
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5365a33…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5365a33…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] Bug 1853731 - Use html:img for message-bar-icon....
by richard (@richard) 20 Sep '23
by richard (@richard) 20 Sep '23
20 Sep '23
richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
15dc8e7e by Emilio Cobos Álvarez at 2023-09-20T19:41:14+00:00
Bug 1853731 - Use html:img for message-bar-icon. r=Gijs,dao,settings-reviewers,desktop-theme-reviewers,sfoster
Differential Revision: https://phabricator.services.mozilla.com/D188521
- - - - -
3 changed files:
- browser/components/places/metadataViewer/interactionsViewer.html
- browser/components/preferences/dialogs/browserLanguages.xhtml
- toolkit/themes/shared/in-content/common-shared.css
Changes:
=====================================
browser/components/places/metadataViewer/interactionsViewer.html
=====================================
@@ -26,10 +26,7 @@
</head>
<body>
<div id="enabledWarning" class="message-bar message-bar-warning" hidden>
- <img
- class="message-bar-icon"
- src="chrome://global/skin/icons/warning.svg"
- />
+ <img class="message-bar-icon" />
<descripton class="message-bar-description">
You need to have <code>browser.places.interactions.enabled</code>
set to true (and restart) for metadata recording to be enabled.
=====================================
browser/components/preferences/dialogs/browserLanguages.xhtml
=====================================
@@ -81,7 +81,7 @@
class="message-bar message-bar-warning"
hidden="true"
>
- <image class="message-bar-icon" />
+ <html:img class="message-bar-icon" />
<description
class="message-bar-description"
data-l10n-id="browser-languages-error"
=====================================
toolkit/themes/shared/in-content/common-shared.css
=====================================
@@ -1292,7 +1292,7 @@ xul|treechildren::-moz-tree-image(selected) {
}
.message-bar-icon {
- list-style-image: url("chrome://global/skin/icons/info.svg");
+ content: url("chrome://global/skin/icons/info.svg");
width: 24px;
height: 24px;
padding: 4px;
@@ -1308,7 +1308,7 @@ xul|treechildren::-moz-tree-image(selected) {
}
.message-bar-warning > .message-bar-icon {
- list-style-image: url("chrome://global/skin/icons/warning.svg");
+ content: url("chrome://global/skin/icons/warning.svg");
}
input[type="text"][warning]:enabled:not(:focus) {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/15dc8e7…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/15dc8e7…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] Bug 1853731 - Use html:img for message-bar-icon....
by richard (@richard) 20 Sep '23
by richard (@richard) 20 Sep '23
20 Sep '23
richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
2670fdd7 by Emilio Cobos Álvarez at 2023-09-20T19:38:49+00:00
Bug 1853731 - Use html:img for message-bar-icon. r=Gijs,dao,settings-reviewers,desktop-theme-reviewers,sfoster
Differential Revision: https://phabricator.services.mozilla.com/D188521
- - - - -
3 changed files:
- browser/components/places/metadataViewer/interactionsViewer.html
- browser/components/preferences/dialogs/browserLanguages.xhtml
- toolkit/themes/shared/in-content/common-shared.css
Changes:
=====================================
browser/components/places/metadataViewer/interactionsViewer.html
=====================================
@@ -26,10 +26,7 @@
</head>
<body>
<div id="enabledWarning" class="message-bar message-bar-warning" hidden>
- <img
- class="message-bar-icon"
- src="chrome://global/skin/icons/warning.svg"
- />
+ <img class="message-bar-icon" />
<descripton class="message-bar-description">
You need to have <code>browser.places.interactions.enabled</code>
set to true (and restart) for metadata recording to be enabled.
=====================================
browser/components/preferences/dialogs/browserLanguages.xhtml
=====================================
@@ -81,7 +81,7 @@
class="message-bar message-bar-warning"
hidden="true"
>
- <image class="message-bar-icon" />
+ <html:img class="message-bar-icon" />
<description
class="message-bar-description"
data-l10n-id="browser-languages-error"
=====================================
toolkit/themes/shared/in-content/common-shared.css
=====================================
@@ -1292,7 +1292,7 @@ xul|treechildren::-moz-tree-image(selected) {
}
.message-bar-icon {
- list-style-image: url("chrome://global/skin/icons/info.svg");
+ content: url("chrome://global/skin/icons/info.svg");
width: 24px;
height: 24px;
padding: 4px;
@@ -1308,7 +1308,7 @@ xul|treechildren::-moz-tree-image(selected) {
}
.message-bar-warning > .message-bar-icon {
- list-style-image: url("chrome://global/skin/icons/warning.svg");
+ content: url("chrome://global/skin/icons/warning.svg");
}
input[type="text"][warning]:enabled:not(:focus) {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2670fdd…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2670fdd…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] fixup! Firefox preference overrides.
by ma1 (@ma1) 20 Sep '23
by ma1 (@ma1) 20 Sep '23
20 Sep '23
ma1 pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
1c325548 by hackademix at 2023-09-20T19:24:35+02:00
fixup! Firefox preference overrides.
Bug 41945: disable cookie banner automatic dismissal.
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -203,6 +203,12 @@ pref("browser.newtabpage.activity-stream.default.sites", "");
pref("browser.newtabpage.activity-stream.feeds.telemetry", false);
pref("browser.newtabpage.activity-stream.telemetry", false);
+// tor-browser#41945 - disable automatic cookie banners dismissal until
+// we're sure it does not causes fingerprinting risks or other issues.
+pref("cookiebanners.service.mode", 0);
+pref("cookiebanners.service.mode.privateBrowsing", 0);
+pref("cookiebanners.ui.desktop.enabled", false);
+
// tor-browser#40788: disable AS's calls to home.
// Notice that null is between quotes because it is a JSON string.
// Keep checked firefox.js to see if new entries are added.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1c32554…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1c32554…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] fixup! Firefox preference overrides.
by ma1 (@ma1) 20 Sep '23
by ma1 (@ma1) 20 Sep '23
20 Sep '23
ma1 pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
37ddf133 by hackademix at 2023-09-20T17:19:01+00:00
fixup! Firefox preference overrides.
Bug 41945: disable cookie banner automatic dismissal.
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -203,6 +203,12 @@ pref("browser.newtabpage.activity-stream.default.sites", "");
pref("browser.newtabpage.activity-stream.feeds.telemetry", false);
pref("browser.newtabpage.activity-stream.telemetry", false);
+// tor-browser#41945 - disable automatic cookie banners dismissal until
+// we're sure it does not causes fingerprinting risks or other issues.
+pref("cookiebanners.service.mode", 0);
+pref("cookiebanners.service.mode.privateBrowsing", 0);
+pref("cookiebanners.ui.desktop.enabled", false);
+
// tor-browser#40788: disable AS's calls to home.
// Notice that null is between quotes because it is a JSON string.
// Keep checked firefox.js to see if new entries are added.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/37ddf13…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/37ddf13…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] fixup! Tweaks to the build system
by richard (@richard) 20 Sep '23
by richard (@richard) 20 Sep '23
20 Sep '23
richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
62bc13e5 by Richard Pospesel at 2023-09-20T16:19:53+00:00
fixup! Tweaks to the build system
- - - - -
2 changed files:
- browser/app/moz.build
- browser/installer/package-manifest.in
Changes:
=====================================
browser/app/moz.build
=====================================
@@ -70,7 +70,8 @@ if CONFIG["CC_TYPE"] == "clang-cl":
if CONFIG["OS_ARCH"] == "WINNT":
RCINCLUDE = "splash.rc"
DIRS += [
- "pbproxy",
+ # tor-browser#41798 don't build private_browsing.exe on Windows
+ # "pbproxy",
"winlauncher",
]
USE_LIBS += [
=====================================
browser/installer/package-manifest.in
=====================================
@@ -137,10 +137,10 @@
@BINPATH@/firefox.VisualElementsManifest.xml
@BINPATH@/browser/VisualElements/VisualElements_150.png
@BINPATH@/browser/VisualElements/VisualElements_70.png
-@BINPATH@/private_browsing.exe
-@BINPATH@/private_browsing.VisualElementsManifest.xml
-@BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
-@BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
+; @BINPATH@/private_browsing.exe
+; @BINPATH@/private_browsing.VisualElementsManifest.xml
+; @BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
+; @BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
#else
@BINPATH@/@MOZ_APP_NAME@-bin
@BINPATH@/@MOZ_APP_NAME@
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/62bc13e…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/62bc13e…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] 2 commits: fixup! Tweaks to the build system
by richard (@richard) 20 Sep '23
by richard (@richard) 20 Sep '23
20 Sep '23
richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
b666c1c1 by Richard Pospesel at 2023-09-20T15:52:15+00:00
fixup! Tweaks to the build system
- - - - -
953539a4 by Richard Pospesel at 2023-09-20T15:52:15+00:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
- - - - -
12 changed files:
- browser/app/moz.build
- browser/branding/branding-common.mozbuild
- − browser/branding/tb-alpha/PrivateBrowsing_150.png
- − browser/branding/tb-alpha/PrivateBrowsing_70.png
- − browser/branding/tb-alpha/private_browsing.VisualElementsManifest.xml
- − browser/branding/tb-nightly/PrivateBrowsing_150.png
- − browser/branding/tb-nightly/PrivateBrowsing_70.png
- − browser/branding/tb-nightly/private_browsing.VisualElementsManifest.xml
- − browser/branding/tb-release/PrivateBrowsing_150.png
- − browser/branding/tb-release/PrivateBrowsing_70.png
- − browser/branding/tb-release/private_browsing.VisualElementsManifest.xml
- browser/installer/package-manifest.in
Changes:
=====================================
browser/app/moz.build
=====================================
@@ -70,7 +70,8 @@ if CONFIG["CC_TYPE"] == "clang-cl":
if CONFIG["OS_ARCH"] == "WINNT":
RCINCLUDE = "splash.rc"
DIRS += [
- "pbproxy",
+ # tor-browser#41798 don't build private_browsing.exe on Windows
+ # "pbproxy",
"winlauncher",
]
USE_LIBS += [
=====================================
browser/branding/branding-common.mozbuild
=====================================
@@ -18,11 +18,8 @@ def FirefoxBranding():
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
FINAL_TARGET_FILES['..'] += [
'firefox.VisualElementsManifest.xml',
- 'private_browsing.VisualElementsManifest.xml',
]
FINAL_TARGET_FILES.VisualElements += [
- 'PrivateBrowsing_150.png',
- 'PrivateBrowsing_70.png',
'VisualElements_150.png',
'VisualElements_70.png',
]
=====================================
browser/branding/tb-alpha/PrivateBrowsing_150.png deleted
=====================================
Binary files a/browser/branding/tb-alpha/PrivateBrowsing_150.png and /dev/null differ
=====================================
browser/branding/tb-alpha/PrivateBrowsing_70.png deleted
=====================================
Binary files a/browser/branding/tb-alpha/PrivateBrowsing_70.png and /dev/null differ
=====================================
browser/branding/tb-alpha/private_browsing.VisualElementsManifest.xml deleted
=====================================
@@ -1,12 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <VisualElements
- ShowNameOnSquare150x150Logo='on'
- Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
- Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
- ForegroundText='light'
- BackgroundColor='#1c191d'/>
-</Application>
=====================================
browser/branding/tb-nightly/PrivateBrowsing_150.png deleted
=====================================
Binary files a/browser/branding/tb-nightly/PrivateBrowsing_150.png and /dev/null differ
=====================================
browser/branding/tb-nightly/PrivateBrowsing_70.png deleted
=====================================
Binary files a/browser/branding/tb-nightly/PrivateBrowsing_70.png and /dev/null differ
=====================================
browser/branding/tb-nightly/private_browsing.VisualElementsManifest.xml deleted
=====================================
@@ -1,12 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <VisualElements
- ShowNameOnSquare150x150Logo='on'
- Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
- Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
- ForegroundText='light'
- BackgroundColor='#1c191d'/>
-</Application>
=====================================
browser/branding/tb-release/PrivateBrowsing_150.png deleted
=====================================
Binary files a/browser/branding/tb-release/PrivateBrowsing_150.png and /dev/null differ
=====================================
browser/branding/tb-release/PrivateBrowsing_70.png deleted
=====================================
Binary files a/browser/branding/tb-release/PrivateBrowsing_70.png and /dev/null differ
=====================================
browser/branding/tb-release/private_browsing.VisualElementsManifest.xml deleted
=====================================
@@ -1,12 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <VisualElements
- ShowNameOnSquare150x150Logo='on'
- Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
- Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
- ForegroundText='light'
- BackgroundColor='#420c5e'/>
-</Application>
=====================================
browser/installer/package-manifest.in
=====================================
@@ -137,10 +137,10 @@
@BINPATH@/firefox.VisualElementsManifest.xml
@BINPATH@/browser/VisualElements/VisualElements_150.png
@BINPATH@/browser/VisualElements/VisualElements_70.png
-@BINPATH@/private_browsing.exe
-@BINPATH@/private_browsing.VisualElementsManifest.xml
-@BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
-@BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
+; @BINPATH@/private_browsing.exe
+; @BINPATH@/private_browsing.VisualElementsManifest.xml
+; @BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
+; @BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
#else
@BINPATH@/@MOZ_APP_NAME@-bin
@BINPATH@/@MOZ_APP_NAME@
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c6b08b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c6b08b…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Bug 40956: Allow testing the updater in the relase and alpha channel.
by Pier Angelo Vendrame (@pierov) 20 Sep '23
by Pier Angelo Vendrame (@pierov) 20 Sep '23
20 Sep '23
Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
bcfb6be0 by Pier Angelo Vendrame at 2023-09-20T17:44:17+02:00
Bug 40956: Allow testing the updater in the relase and alpha channel.
When override_updater_url is set we used to copy marsigner.der as the
nightly secondary key. With this commit, we check if we are building a
release or an alpha, and in case we replace the secondary release key.
Also, this commit adds a Makefile target to create incrementals and
update response configuration that uses the unsigned files.
- - - - -
6 changed files:
- Makefile
- projects/firefox/build
- projects/firefox/config
- projects/release/config
- projects/release/link_old_mar_filenames
- projects/release/update_responses_config.yml
Changes:
=====================================
Makefile
=====================================
@@ -187,6 +187,12 @@ torbrowser-incrementals-release: submodule-update
tools/update-responses/gen_incrementals release
$(rbm) build release --step hash_incrementals --target release --target torbrowser
+torbrowser-incrementals-release-unsigned: submodule-update
+ $(rbm) build release --step update_responses_config --target release --target unsigned_releases_dir --target torbrowser
+ $(rbm) build release --step link_old_mar_filenames --target release --target unsigned_releases_dir --target torbrowser
+ NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals release
+ $(rbm) build release --step hash_incrementals --target release --target torbrowser
+
torbrowser-incrementals-alpha: submodule-update
$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser
tools/update-responses/download_missing_versions alpha
@@ -194,6 +200,12 @@ torbrowser-incrementals-alpha: submodule-update
tools/update-responses/gen_incrementals alpha
$(rbm) build release --step hash_incrementals --target alpha --target torbrowser
+torbrowser-incrementals-alpha-unsigned: submodule-update
+ $(rbm) build release --step update_responses_config --target alpha --target unsigned_releases_dir --target torbrowser
+ $(rbm) build release --step link_old_mar_filenames --target alpha --target unsigned_releases_dir --target torbrowser
+ NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals alpha
+ $(rbm) build release --step hash_incrementals --target alpha --target torbrowser
+
torbrowser-incrementals-nightly: submodule-update
$(rbm) build release --step update_responses_config --target nightly --target torbrowser
NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly
@@ -507,6 +519,12 @@ mullvadbrowser-incrementals-release: submodule-update
tools/update-responses/gen_incrementals release
$(rbm) build release --step hash_incrementals --target release --target mullvadbrowser
+mullvadbrowser-incrementals-release-unsigned: submodule-update
+ $(rbm) build release --step update_responses_config --target release --target unsigned_releases_dir --target mullvadbrowser
+ $(rbm) build release --step link_old_mar_filenames --target release --target unsigned_releases_dir --target mullvadbrowser
+ NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals release
+ $(rbm) build release --step hash_incrementals --target release --target mullvadbrowser
+
mullvadbrowser-incrementals-alpha: submodule-update
$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser
tools/update-responses/download_missing_versions alpha
@@ -514,6 +532,12 @@ mullvadbrowser-incrementals-alpha: submodule-update
tools/update-responses/gen_incrementals alpha
$(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser
+mullvadbrowser-incrementals-alpha-unsigned: submodule-update
+ $(rbm) build release --step update_responses_config --target alpha --target unsigned_releases_dir --target mullvadbrowser
+ $(rbm) build release --step link_old_mar_filenames --target alpha --target unsigned_releases_dir --target mullvadbrowser
+ NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals alpha
+ $(rbm) build release --step hash_incrementals --target alpha --target torbrowser
+
mullvadbrowser-incrementals-nightly: submodule-update
$(rbm) build release --step update_responses_config --target nightly --target mullvadbrowser
NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly
=====================================
projects/firefox/build
=====================================
@@ -91,7 +91,11 @@ MOZCONFIG_EOF
[% END -%]
[% IF c("var/override_updater_url") -%]
- cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
+ [% IF c("var/release") || c("var/alpha") -%]
+ cp $rootdir/marsigner.der toolkit/mozapps/update/updater/release_secondary.der
+ [% ELSIF c("var/nightly") -%]
+ cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
+ [% END -%]
[% END -%]
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
=====================================
projects/firefox/config
=====================================
@@ -35,9 +35,8 @@ var:
updater_url: 'https://aus1.torproject.org/torbrowser/update_3/'
# Uncomment this if you want to test the updater. You will need to provide a
- # marsigner.der in this directory, too. It will be used as a replacement for
- # the nightly builds keys only. So, using this option for alphas and releases
- # will not work (the browser will fail with a key/signature mismatch).
+ # marsigner.der in this directory, too. It will replace either the release
+ # key, or the nightly key, depending on the channel you are building.
# override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/'
rezip: |
=====================================
projects/release/config
=====================================
@@ -133,6 +133,10 @@ targets:
var:
create_unsigned_incrementals: 1
+ unsigned_releases_dir:
+ var:
+ unsigned_releases_dir: 1
+
input_files:
# Release
=====================================
projects/release/link_old_mar_filenames
=====================================
@@ -3,7 +3,7 @@
# This script is for #40933:
# Fix generating incrementals between 12.5.x and 13.0
[% FOREACH version = c("var/torbrowser_incremental_from") %]
- cd [% shell_quote(path(dest_dir)) %]/signed/[% version %]
+ cd [% shell_quote(path(dest_dir)) %]/[% IF c("var/unsigned_releases_dir") %]un[% END %]signed/[% version %]
test -e [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar || \
ln -s [% c("var/project-name") %]-linux32-[% version %]_ALL.mar \
[% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar
=====================================
projects/release/update_responses_config.yml
=====================================
@@ -3,7 +3,7 @@ tmp_dir: '[% c("tmp_dir") %]'
create_downloads_json: 1
appname_marfile: '[% c("var/project-name") %]'
appname_bundle: '[% c("var/project-name") %]'
-releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %]
+releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/[% IF c("var/unsigned_releases_dir") -%]un[% END %]signed[% END %]
download:
gpg_keyring: ../../keyring/torbrowser.gpg
archive_url: 'https://archive.torproject.org/tor-package-archive/[% c("var/projectname") %]'
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] Bug 41822: Unconditionally disable default browser UX in about:preferences
by Pier Angelo Vendrame (@pierov) 20 Sep '23
by Pier Angelo Vendrame (@pierov) 20 Sep '23
20 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
c6b08be6 by Richard Pospesel at 2023-09-19T21:46:39+00:00
Bug 41822: Unconditionally disable default browser UX in about:preferences
- - - - -
1 changed file:
- browser/components/preferences/main.js
Changes:
=====================================
browser/components/preferences/main.js
=====================================
@@ -1735,7 +1735,8 @@ var gMainPane = {
let defaultBrowserBox = document.getElementById("defaultBrowserBox");
let isInFlatpak = gGIOService?.isRunningUnderFlatpak;
// Flatpak does not support setting nor detection of default browser
- if (!shellSvc || isInFlatpak) {
+ // tor-browser#41822 disable making Tor Browser the default browser
+ if (shellSvc || isInFlatpak || true) {
defaultBrowserBox.hidden = true;
return;
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c6b08be…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c6b08be…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.3.0esr-13.0-1-build1
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed new tag base-browser-115.3.0esr-13.0-1-build1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.3.0esr-13.0-1-build1
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed new tag tor-browser-115.3.0esr-13.0-1-build1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] 2 commits: Bug 42037: Disable about:firefoxview page
by richard (@richard) 19 Sep '23
by richard (@richard) 19 Sep '23
19 Sep '23
richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
7e2251fa by Richard Pospesel at 2023-09-19T16:43:14+00:00
Bug 42037: Disable about:firefoxview page
- - - - -
0d8c542b by Richard Pospesel at 2023-09-19T16:43:28+00:00
fixup! Firefox preference overrides.
lock the pref to false which puts the firefoxview button in the tab bar
- - - - -
4 changed files:
- browser/app/profile/001-base-profile.js
- browser/components/about/AboutRedirector.cpp
- browser/components/about/components.conf
- browser/components/moz.build
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -18,7 +18,7 @@ pref("startup.homepage_welcome_url.additional", "");
pref("browser.aboutwelcome.enabled", false);
// Disable the Firefox View tab (tor-browser#41876)
-pref("browser.tabs.firefox-view", false);
+pref("browser.tabs.firefox-view", false, locked);
// Disable 'Switching to a new device" help menu item (tor-browser#41774)
pref("browser.device-migration.help-menu.hidden", true);
=====================================
browser/components/about/AboutRedirector.cpp
=====================================
@@ -70,13 +70,6 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::IS_SECURE_CHROME_UI},
- {"firefoxview", "chrome://browser/content/firefoxview/firefoxview.html",
- nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
- nsIAboutModule::HIDE_FROM_ABOUTABOUT},
- {"firefoxview-next",
- "chrome://browser/content/firefoxview/firefoxview-next.html",
- nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
- nsIAboutModule::HIDE_FROM_ABOUTABOUT},
{"policies", "chrome://browser/content/policies/aboutPolicies.html",
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
{"privatebrowsing", "about:blank",
=====================================
browser/components/about/components.conf
=====================================
@@ -12,8 +12,6 @@ pages = [
'home',
'logins',
'loginsimportreport',
- 'firefoxview',
- 'firefoxview-next',
'messagepreview',
'newtab',
'policies',
=====================================
browser/components/moz.build
=====================================
@@ -36,7 +36,6 @@ DIRS += [
"downloads",
"enterprisepolicies",
"extensions",
- "firefoxview",
"messagepreview",
"migration",
"newidentity",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1d65f2…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1d65f2…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] 2 commits: Bug 42037: Disable about:firefoxview page
by richard (@richard) 19 Sep '23
by richard (@richard) 19 Sep '23
19 Sep '23
richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
de2607a3 by Richard Pospesel at 2023-09-19T16:39:57+00:00
Bug 42037: Disable about:firefoxview page
- - - - -
da639dcd by Richard Pospesel at 2023-09-19T16:40:13+00:00
fixup! Firefox preference overrides.
lock the pref to false which puts the firefoxview button in the tab bar
- - - - -
4 changed files:
- browser/app/profile/001-base-profile.js
- browser/components/about/AboutRedirector.cpp
- browser/components/about/components.conf
- browser/components/moz.build
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -18,7 +18,7 @@ pref("startup.homepage_welcome_url.additional", "");
pref("browser.aboutwelcome.enabled", false);
// Disable the Firefox View tab (tor-browser#41876)
-pref("browser.tabs.firefox-view", false);
+pref("browser.tabs.firefox-view", false, locked);
// Disable 'Switching to a new device" help menu item (tor-browser#41774)
pref("browser.device-migration.help-menu.hidden", true);
=====================================
browser/components/about/AboutRedirector.cpp
=====================================
@@ -75,13 +75,6 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::IS_SECURE_CHROME_UI},
- {"firefoxview", "chrome://browser/content/firefoxview/firefoxview.html",
- nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
- nsIAboutModule::HIDE_FROM_ABOUTABOUT},
- {"firefoxview-next",
- "chrome://browser/content/firefoxview/firefoxview-next.html",
- nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
- nsIAboutModule::HIDE_FROM_ABOUTABOUT},
{"policies", "chrome://browser/content/policies/aboutPolicies.html",
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
{"privatebrowsing", "about:blank",
=====================================
browser/components/about/components.conf
=====================================
@@ -12,8 +12,6 @@ pages = [
'home',
'logins',
'loginsimportreport',
- 'firefoxview',
- 'firefoxview-next',
'manual',
'messagepreview',
'newtab',
=====================================
browser/components/moz.build
=====================================
@@ -37,7 +37,6 @@ DIRS += [
"downloads",
"enterprisepolicies",
"extensions",
- "firefoxview",
"messagepreview",
"migration",
"newidentity",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/54b2f6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/54b2f6…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] 216 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
8d5b04bb by Eitan Isaacson at 2023-09-19T17:25:59+02:00
Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
Differential Revision: https://phabricator.services.mozilla.com/D179737
- - - - -
1eb23599 by Pier Angelo Vendrame at 2023-09-19T17:26:00+02:00
Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized
Allow using NSS for checking MAR signatures also in platforms where
OS-native APIs are used by default, i.e., macOS and Windows.
Differential Revision: https://phabricator.services.mozilla.com/D177743
- - - - -
9f0d981f by Pier Angelo Vendrame at 2023-09-19T17:26:01+02:00
Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8
Differential Revision: https://phabricator.services.mozilla.com/D186456
- - - - -
fbb00729 by Henry Wilkes at 2023-09-19T17:29:22+02:00
Bug 41454: Move focus after calling openPreferences for a sub-category.
Temporary fix until mozilla bug 1799153 gets a patch upstream.
- - - - -
f6f0dc97 by Henry Wilkes at 2023-09-19T17:29:25+02:00
Bug 41483: Remove the firefox override for appstrings.properties
Remove this patch after upstream bugzilla bug 1790187
- - - - -
3b4952c9 by Pier Angelo Vendrame at 2023-09-19T17:29:26+02:00
Bug 41116: Normalize system fonts.
System fonts are an enormous fingerprinting vector.
Even with font allow lists and with our custom configuration on Linux,
which counter metrics measurements, getComputedStyle leaks several
details.
This patch counters both these kinds of attacks.
- - - - -
05a6ed2d by Marco Simonelli at 2023-09-19T17:29:26+02:00
Bug 41459: WebRTC fails to build under mingw (Part 1)
- properly define NOMINMAX for just MSVC builds
- - - - -
321ded50 by Marco Simonelli at 2023-09-19T17:29:27+02:00
Bug 41459: WebRTC fails to build under mingw (Part 2)
- fixes required to build third_party/libwebrtc
- - - - -
36b8e384 by Marco Simonelli at 2023-09-19T17:29:27+02:00
Bug 41459: WebRTC fails to build under mingw (Part 3)
- fixes required to build third_party/sipcc
- - - - -
f7026e64 by Marco Simonelli at 2023-09-19T17:29:28+02:00
Bug 41459: WebRTC fails to build under mingw (Part 4)
- fixes requried to build netwerk/sctp
- - - - -
f748a135 by Marco Simonelli at 2023-09-19T17:29:28+02:00
Bug 41459: WebRTC fails to build under mingw (Part 5)
- fixes required to build dom/media/webrtc
- - - - -
8d64db71 by Marco Simonelli at 2023-09-19T17:29:29+02:00
Bug 41459: WebRTC fails to build under mingw (Part 6)
- fixes required to build dom/media/systemservices
- - - - -
b6fe5879 by hackademix at 2023-09-19T17:29:29+02:00
Bug 41854: Allow overriding download spam protection.
- - - - -
1f45f64e by Pier Angelo Vendrame at 2023-09-19T17:51:54+02:00
Bug 41995: Generated headers on Windows are not reproducible
The flags optionally passed as a third parameter to DLL_BLOCKLIST_ENTRY
are stored in a set, so they are not ordered.
Sorting them before outputting them makes the creation of the headers
deterministic.
- - - - -
4c0c53f5 by Gaba at 2023-09-19T17:51:55+02:00
Adding issue and merge request templates
- - - - -
deb06b79 by Richard Pospesel at 2023-09-19T17:51:55+02:00
fixup! Adding issue and merge request templates
- - - - -
b339cd97 by Pier Angelo Vendrame at 2023-09-19T17:51:56+02:00
fixup! Adding issue and merge request templates
Do not assign to new issue to nah anymore
- - - - -
5df31a93 by Pier Angelo Vendrame at 2023-09-19T17:51:56+02:00
Base Browser's .mozconfigs.
Bug 17858: Cannot create incremental MARs for hardened builds.
Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
(which is part of mar-tools and is not distributed to end-users) with
ASan.
Bug 21849: Don't allow SSL key logging.
Bug 25741 - TBA: Disable features at compile-time
Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION
Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds
This fixes a problem where some preferences had the wrong default value.
Also see bug 27472 where we made a similar fix for Android.
Bug 29859: Disable HLS support for now
Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
Bug 33734: Set MOZ_NORMANDY to False
Bug 33851: Omit Parental Controls.
Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files
Bug 41584: Move some configuration options to base-browser level
- - - - -
3319467e by clairehurst at 2023-09-19T17:51:57+02:00
fixup! Base Browser's .mozconfigs.
Bug 42035: Update mozconfig for macos development
- - - - -
8ea460cf by Pier Angelo Vendrame at 2023-09-19T17:51:57+02:00
Tweaks to the build system
Bug 40857: Modified the fat .aar creation file
This is a workaround to build fat .aars with the compiling enviornment
disabled.
Mozilla does not use a similar configuration, but either runs a Firefox
build and discards its output, or uses artifacts build.
We might switch to artifact builds too, and drop this patch, or write a
better one to upstream. But until then we need this patch.
See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770.
Bug 41458: Prevent `mach package-multi-locale` from actually creating a package
macOS builds need some files to be moved around with
./mach package-multi-locale to create multi-locale packages.
The required command isn't exposed through any other mach command.
So, we patch package-multi-locale both to prevent it from failing when
doing official builds and to detect any future changes on it.
- - - - -
b8fa26df by Pier Angelo Vendrame at 2023-09-19T17:51:58+02:00
Bug 41108: Remove privileged macOS installation from 102
- - - - -
e3365456 by Dan Ballard at 2023-09-19T17:51:58+02:00
Bug 41149: Re-enable DLL injection protection in all builds not just nightlies
- - - - -
fe2f0865 by Matthew Finkel at 2023-09-19T17:51:59+02:00
Bug 24796: Comment out excess permissions from GeckoView
The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's
manifest, so we can't use the ifdef preprocessor guards around the
permissions we do not want. Commenting the permissions is the
next-best-thing.
- - - - -
74818f48 by Matthew Finkel at 2023-09-19T17:51:59+02:00
Bug 28125: Prevent non-Necko network connections
- - - - -
ef89dc88 by Mike Perry at 2023-09-19T17:52:00+02:00
Bug 12974: Disable NTLM and Negotiate HTTP Auth
The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421,
https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602
- - - - -
99f84d74 by Alex Catarineu at 2023-09-19T17:52:00+02:00
Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899
- - - - -
0443020b by Georg Koppen at 2023-09-19T17:52:01+02:00
Bug 16285: Exclude ClearKey system for now
In the past the ClearKey system had not been compiled when specifying
--disable-eme. But that changed and it is even bundled nowadays (see:
Mozilla's bug 1300654). We don't want to ship it right now as the use
case for it is not really visible while the code had security
vulnerabilities in the past.
- - - - -
9395baa4 by Kathy Brade at 2023-09-19T17:52:01+02:00
Bug 21431: Clean-up system extensions shipped in Firefox
Only ship the pdfjs extension.
- - - - -
511f02ef by Kathy Brade at 2023-09-19T17:52:02+02:00
Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
Hide elements on about:logins that mention sync, "Firefox LockWise", and
Mozilla's LockWise mobile apps.
Disable the "Create New Login" button when security.nocertdb is true.
- - - - -
2c053444 by Alex Catarineu at 2023-09-19T17:52:03+02:00
Bug 41457: Remove Mozilla permissions
Bug 40025: Remove Mozilla add-on install permissions
- - - - -
67de62b0 by Kathy Brade at 2023-09-19T17:52:03+02:00
Bug 40002: Remove about:ion
Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people
volunteer to participate in studies that collect detailed, sensitive data about
how they use their browser.
Bug 41662: Disable about:sync-logs
Even though we disable sync by default with
`identity.fxaccounts.enabled`, this about: page is still avilable.
We could throw an exception on the constructor of the related
component, but it would result only in an error in the console, without
a visible "this address does not look right" error page.
If we fix the issues with MOZ_SERVICES_SYNC, we can restore the
component.
- - - - -
648a76b7 by Arthur Edelstein at 2023-09-19T17:52:04+02:00
Bug 26353: Prevent speculative connect that violated FPI.
Connections were observed in the catch-all circuit when
the user entered an https or http URL in the URL bar, or
typed a search term.
- - - - -
f7945358 by Alex Catarineu at 2023-09-19T17:52:04+02:00
Bug 31740: Remove some unnecessary RemoteSettings instances
More concretely, SearchService.jsm 'hijack-blocklists' and
url-classifier-skip-urls.
Avoid creating instance for 'anti-tracking-url-decoration'.
If prefs are disabling their usage, avoid creating instances for
'cert-revocations' and 'intermediates'.
Do not ship JSON dumps for collections we do not expect to need. For
the ones in the 'main' bucket, this prevents them from being synced
unnecessarily (the code in remote-settings does so for collections
in the main bucket for which a dump or local data exists). For the
collections in the other buckets, we just save some size by not
shipping their dumps.
We also clear the collections database on the v2 -> v3 migration.
- - - - -
48ce36c4 by Pier Angelo Vendrame at 2023-09-19T17:52:05+02:00
fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
Bug 42083: RemoteSecuritySettings.init throws error in console
- - - - -
386496de by cypherpunks1 at 2023-09-19T17:52:05+02:00
Bug 41092: Add a RemoteSettings JSON dump for query-stripping
- - - - -
ebe44430 by Pier Angelo Vendrame at 2023-09-19T17:52:06+02:00
Bug 41635: Disable the Normandy component
Do not include Normandy at all whenever MOZ_NORMANDY is False.
- - - - -
d770bbf5 by Georg Koppen at 2023-09-19T17:52:06+02:00
Bug 30541: Disable WebGL readPixel() for web content
Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034
- - - - -
ae4edbaa by Alex Catarineu at 2023-09-19T17:52:07+02:00
Bug 28369: Stop shipping pingsender executable
- - - - -
a98e3d8f by cypherpunks1 at 2023-09-19T17:52:07+02:00
Bug 41568: Disable LaterRun
- - - - -
11601ba4 by cypherpunks1 at 2023-09-19T17:52:08+02:00
Bug 40717: Hide Windows SSO in settings
- - - - -
656aec7e by Pier Angelo Vendrame at 2023-09-19T17:52:08+02:00
Bug 41599: Always return an empty string as network ID
Firefox computes an internal network ID used to detect network changes
and act consequently (e.g., to improve WebSocket UX).
However, there are a few ways to get this internal network ID, so we
patch them out, to be sure any new code will not be able to use them and
possibly link users.
We also sent a patch to Mozilla to seed the internal network ID, to
prevent any accidental leak in the future.
Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756
- - - - -
8f060853 by cypherpunks1 at 2023-09-19T17:52:09+02:00
Bug 40175: Add origin attributes to about:reader top-level requests
- - - - -
f2f65c0f by Mike Perry at 2023-09-19T17:52:11+02:00
Firefox preference overrides.
This hack directly includes our preference changes in omni.ja.
Bug 18292: Staged updates fail on Windows
Temporarily disable staged updates on Windows.
Bug 18297: Use separate Noto JP,KR,SC,TC fonts
Bug 23404: Add Noto Sans Buginese to the macOS whitelist
Bug 23745: Set dom.indexedDB.enabled = true
Bug 13575: Disable randomised Firefox HTTP cache decay user tests.
(Fernando Fernandez Mancera <ffmancera(a)riseup.net>)
Bug 17252: Enable session identifiers with FPI
Session tickets and session identifiers were isolated
by OriginAttributes, so we can re-enable them by
allowing the default value (true) of
"security.ssl.disable_session_identifiers".
The pref "security.enable_tls_session_tickets" is obsolete
(removed in https://bugzilla.mozilla.org/917049)
Bug 14952: Enable http/2 and AltSvc
In Firefox, SPDY/HTTP2 now uses Origin Attributes for
isolation of connections, push streams, origin frames, etc.
That means we get first-party isolation provided
"privacy.firstparty.isolate" is true. So in this patch, we
stop overriding "network.http.spdy.enabled" and
"network.http.spdy.enabled.http2".
Alternate Services also use Origin Attributes for isolation.
So we stop overriding
"network.http.altsvc.enabled" and "network.http.altsvc.oe"
as well.
(All 4 of the abovementioned "network.http.*" prefs adopt
Firefox 60ESR's default value of true.)
However, we want to disable HTTP/2 push for now, so we
set "network.http.spdy.allow-push" to false.
"network.http.spdy.enabled.http2draft" was removed in Bug 1132357.
"network.http.sped.enabled.v2" was removed in Bug 912550.
"network.http.sped.enabled.v3" was removed in Bug 1097944.
"network.http.sped.enabled.v3-1" was removed in Bug 1248197.
Bug 26114: addons.mozilla.org is not special
* Don't expose navigator.mozAddonManager on any site
* Don't block NoScript from modifying addons.mozilla.org or other sites
Enable ReaderView mode again (#27281).
Bug 29916: Make sure enterprise policies are disabled
Bug 2874: Block Components.interfaces from content
Bug 26146: Spoof HTTP User-Agent header for desktop platforms
In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent
header and to JavaScript code via navigator.userAgent. To avoid
leaking the OS inside each HTTP request (which many web servers
log), always use the Windows 7 OS value in the desktop User-Agent
header. We continue to allow access to the actual OS via JavaScript,
since doing so improves compatibility with web applications such
as GitHub and Google Docs.
Bug 12885: Windows Jump Lists fail for Tor Browser
Jumplist entries are stored in a binary file in:
%APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\
and has a name in the form
[a-f0-9]+.customDestinations-ms
The hex at the front is unique per app, and is ultimately derived from
something called the 'App User Model ID' (AUMID) via some unknown
hashing method. The AUMID is provided as a key when programmatically
creating, updating, and deleting a jumplist. The default behaviour in
firefox is for the installer to define an AUMID for an app, and save it
in the registry so that the jumplist data can be removed by the
uninstaller.
However, the Tor Browser does not set this (or any other) regkey during
installation, so this codepath fails and the app's AUMID is left
undefined. As a result the app's AUMID ends up being defined by
windows, but unknowable by Tor Browser. This unknown AUMID is used to
create and modify the jumplist, but the delete API requires that we
provide the app's AUMID explicitly. Since we don't know what the AUMID
is (since the expected regkey where it is normally stored does not
exist) jumplist deletion will fail and we will leave behind a mostly
empty customDestinations-ms file. The name of the file is derived from
the binary path, so an enterprising person could reverse engineer how
that hex name is calculated, and generate the name for Tor Browser's
default Desktop installation path to determine whether a person had
used Tor Browser in the past.
The 'taskbar.grouping.useprofile' option that is enabled by this patch
works around this AUMID problem by having firefox.exe create it's own
AUMID based on the profile path (rather than looking for a regkey). This
way, if a user goes in and enables and disables jumplist entries, the
backing store is properly deleted.
Unfortunately, all windows users currently have this file lurking in
the above mentioned directory and this patch will not remove it since it
was created with an unknown AUMID. However, another patch could be
written which goes to that directory and deletes any item containing the
'Tor Browser' string. See bug 28996.
Bug 30845: Make sure default themes and other internal extensions are enabled
Bug 28896: Enable extensions in private browsing by default
Bug 31065: Explicitly allow proxying localhost
Bug 31598: Enable letterboxing
Disable Presentation API everywhere
Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer
security levels.
Bug 32321: Disable Mozilla's MitM pings
Bug 19890: Disable installation of system addons
By setting the URL to "" we make sure that already installed system
addons get deleted as well.
Bug 22548: Firefox downgrades VP9 videos to VP8.
On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor
Browser 7.0 all youtube videos are degraded to VP8.
This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0.
All clients will get better experience and lower traffic, beause TBB doesn't
use "Use hardware acceleration when available".
Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs
Bug 16441: Suppress "Reset Tor Browser" prompt.
Bug 29120: Use the in-memory media cache and increase its maximum size.
Bug 33697: use old search config based on list.json
Bug 33855: Ensure that site-specific browser mode is disabled.
Bug 30682: Disable Intermediate CA Preloading.
Bug 40061: Omit the Windows default browser agent from the build
Bug 40322: Consider disabling network.connectivity-service.enabled
Bug 40408: Disallow SVG Context Paint in all web content
Bug 40308: Disable network partitioning until we evaluate dFPI
Bug 40322: Consider disabling network.connectivity-service.enabled
Bug 40383: Disable dom.enable_event_timing
Bug 40423: Disable http/3
Bug 40177: Update prefs for Fx91esr
Bug 40700: Disable addons and features recommendations
Bug 40682: Disable network.proxy.allow_bypass
Bug 40736: Disable third-party cookies in PBM
Bug 19850: Enabled HTTPS-Only by default
Bug 40912: Hide the screenshot menu
Bug 41292: Disable moreFromMozilla in preferences page
Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector
Bug 24686: Set network.http.tailing.enabled to true
Bug 40183: Disable TLS ciphersuites using SHA-1
Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102
We reviewed all the preferences we set for 102, and remove a few old
ones. See the description of that issue to see all the preferences we
believed were still valid for 102, and some brief description for the
reasons to keep them.
- - - - -
3dfddd16 by hackademix at 2023-09-19T17:52:11+02:00
fixup! Firefox preference overrides.
Bug 42029 - Defense-in-depth: disable non-proxied UDP WebRTC
- - - - -
99c91351 by cypherpunks1 at 2023-09-19T17:52:12+02:00
fixup! Firefox preference overrides.
Bug 41876: Disable the Firefox View tab
- - - - -
f2009e99 by Pier Angelo Vendrame at 2023-09-19T17:52:12+02:00
fixup! Firefox preference overrides.
Bug 42043: Enable media.devices.enumerate.legacy.enabled.
- - - - -
a7b5c1e0 by Richard Pospesel at 2023-09-19T17:52:13+02:00
fixup! Firefox preference overrides.
Bug 41774: Hide the 'Switching to a new device' hepl menu item
- - - - -
0d19dfeb by Pier Angelo Vendrame at 2023-09-19T17:52:13+02:00
fixup! Firefox preference overrides.
Bug 41797: Lock RFP in release builds
- - - - -
abed1d29 by Richard Pospesel at 2023-09-19T17:52:14+02:00
fixup! Firefox preference overrides.
- - - - -
eb277895 by Richard Pospesel at 2023-09-19T17:52:14+02:00
fixup! Firefox preference overrides.
- - - - -
23c79f9f by Pier Angelo Vendrame at 2023-09-19T17:52:15+02:00
fixup! Firefox preference overrides.
Bug 41675: Remove javascript.options.large_arraybuffers.
It has been removed with MozBug 1703508 in Firefox 110.
- - - - -
03362d7e by Richard Pospesel at 2023-09-19T17:52:15+02:00
fixup! Firefox preference overrides.
Bug 42057: Disable GetIsTextRecognitionSupported by default
- - - - -
dd1d70e2 by Richard Pospesel at 2023-09-19T17:52:16+02:00
fixup! Firefox preference overrides.
- - - - -
20a5202d by Richard Pospesel at 2023-09-19T17:52:16+02:00
fixup! Firefox preference overrides.
Bug 42094: Explicitly disable media.aboutwebrtc.hist.enabled
- - - - -
ffa788ce by Richard Pospesel at 2023-09-19T17:52:17+02:00
Bug 41659: Add canonical color definitions to base-browser
- - - - -
1513c55a by Pier Angelo Vendrame at 2023-09-19T17:52:17+02:00
Bug 41043: Hardcode the UI font on Linux
The mechanism to choose the UI font does not play well with our
fontconfig configuration. As a result, the final criterion to choose
the font for the UI was its version.
Since we hardcode Arimo as a default sans-serif on preferences, we use
it also for the UI. FontConfig will fall back to some other font for
scripts Arimo does not cover as expected (we tested with Japanese).
- - - - -
1d12954c by Alex Catarineu at 2023-09-19T17:52:18+02:00
Bug 30605: Honor privacy.spoof_english in Android
This checks `privacy.spoof_english` whenever `setLocales` is
called from Fenix side and sets `intl.accept_languages`
accordingly.
Bug 40198: Expose privacy.spoof_english pref in GeckoView
- - - - -
92bc7d61 by Alex Catarineu at 2023-09-19T17:52:18+02:00
Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView
- - - - -
7dccaa4a by Alex Catarineu at 2023-09-19T17:52:19+02:00
Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
- - - - -
40c27ba2 by Alex Catarineu at 2023-09-19T17:52:19+02:00
Bug 26345: Hide tracking protection UI
- - - - -
6a58be57 by Pier Angelo Vendrame at 2023-09-19T17:52:20+02:00
Bug 9173: Change the default Firefox profile directory to be relative.
This commit makes Firefox look for the default profile directory in a
directory relative to the binary path.
The directory can be specified through the --with-relative-data-dir.
This is relative to the same directory as the firefox main binary for
Linux and Windows.
On macOS, we remove Contents/MacOS from it.
Or, in other words, the directory is relative to the application
bundle.
This behavior can be overriden at runtime, by placing a file called
system-install adjacent to the firefox main binary (also on macOS).
- - - - -
5586c4c7 by Alex Catarineu at 2023-09-19T17:52:20+02:00
Bug 27604: Fix addon issues when moving the profile directory
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838
- - - - -
de85b6e7 by Mike Perry at 2023-09-19T17:52:21+02:00
Bug 13028: Prevent potential proxy bypass cases.
It looks like these cases should only be invoked in the NSS command line
tools, and not the browser, but I decided to patch them anyway because there
literally is a maze of network function pointers being passed around, and it's
very hard to tell if some random code might not pass in the proper proxied
versions of the networking code here by accident.
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509
- - - - -
99a69d60 by Igor Oliveira at 2023-09-19T17:52:21+02:00
Bug 23104: Add a default line height compensation
Many fonts have issues with their vertical metrics. they
are used to influence the height of ascenders and depth
of descenders. Gecko uses it to calculate the line height
(font height + ascender + descender), however because of
that idiosyncratic behavior across multiple operating
systems, it can be used to identify the user's OS.
The solution proposed in the patch uses a default factor
to be multiplied with the font size, simulating the concept
of ascender and descender. This way all operating
systems will have the same line height.
- - - - -
aca4b3af by Pier Angelo Vendrame at 2023-09-19T17:52:22+02:00
Bug 40309: Avoid using regional OS locales
Avoid regional OS locales if the pref
`intl.regional_prefs.use_os_locales` is false but RFP is enabled.
- - - - -
c485ec8e by Matthew Finkel at 2023-09-19T17:52:22+02:00
Bug 40432: Prevent probing installed applications
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084
- - - - -
412229e4 by cypherpunks1 at 2023-09-19T17:52:23+02:00
Bug 33955: When copying an image only copy the image contents to the clipboard
- - - - -
0a264e86 by cypherpunks1 at 2023-09-19T17:52:23+02:00
Bug 41791: Omit the source URL when copying page contents to the clipboard
- - - - -
6f502b43 by Pier Angelo Vendrame at 2023-09-19T17:52:24+02:00
Base Browser strings
This commit adds all the strings needed by following Base Browser
patches.
- - - - -
61c6ae75 by Pier Angelo Vendrame at 2023-09-19T17:52:24+02:00
fixup! Base Browser strings
Bug 41528: Added the version string for the about dialog
- - - - -
8f3e4a89 by hackademix at 2023-09-19T17:52:25+02:00
Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs.
- - - - -
fbf7d6d3 by hackademix at 2023-09-19T17:52:25+02:00
Bug 41434: Letterboxing, improve logging.
- - - - -
e5371b40 by hackademix at 2023-09-19T17:52:30+02:00
Bug 31064: Letterboxing, exempt browser extensions.
- - - - -
ef999a6b by hackademix at 2023-09-19T17:52:30+02:00
Bug 32411: Letterboxing, exempt view-source: URIs.
- - - - -
2848e45e by hackademix at 2023-09-19T17:52:31+02:00
Bug 32308: use direct browser sizing for letterboxing.
Bug 30556: align letterboxing with 200x100 new win width stepping
- - - - -
a13b2101 by hackademix at 2023-09-19T17:52:32+02:00
Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
- - - - -
9a42a28f by Pier Angelo Vendrame at 2023-09-19T17:52:32+02:00
Bug 41369: Improve Firefox language settings for multi-lingual packages
Change the language selector to be sorted by language code, rather than
name, and to display the language code to the user.
Bug 41372: Handle Japanese as a special case in preferences on macOS
Japanese is treated in a special way on macOS. However, seeing the
Japanese language tag could be confusing for users, and moreover the
language name is not localized correctly like other langs.
Bug 41378: Tell users that they can change their language at the first start
With multi-lingual builds, Tor Browser matches the user's system
language, but some users might want to change it.
So, we tell them that it is possible, but only once.
- - - - -
b3991d35 by p13dz at 2023-09-19T17:52:33+02:00
Bug 40283: Workaround for the file upload bug
- - - - -
33d71005 by Arthur Edelstein at 2023-09-19T17:52:33+02:00
Bug 18905: Hide unwanted items from help menu
Bug 25660: Remove the "New Private Window" option
- - - - -
e8a07cc8 by cypherpunks1 at 2023-09-19T17:52:34+02:00
fixup! Bug 18905: Hide unwanted items from help menu
Bug 41642: Hide the new private window option only when autostart of PBM is enabled
- - - - -
bde14d8b by cypherpunks1 at 2023-09-19T17:52:34+02:00
Bug 41740: Change the RFP value of devicePixelRatio to 2
- - - - -
8a424e87 by Pier Angelo Vendrame at 2023-09-19T17:52:35+02:00
Bug 41739: Remove "Website appearance" from about:preferences.
It is ignored because of RFP and it is confusing for users.
- - - - -
27790a77 by cypherpunks1 at 2023-09-19T17:52:35+02:00
Bug 41881: Don't persist custom network requests on private windows
- - - - -
cc24918c by hackademix at 2023-09-19T17:52:36+02:00
Bug 42019: Empty browser's clipboard on browser shutdown
- - - - -
995bc5c3 by Henry Wilkes at 2023-09-19T17:52:36+02:00
fixup! Bug 42019: Empty browser's clipboard on browser shutdown
Bug 42097: Add comma.
- - - - -
30994ca3 by hackademix at 2023-09-19T17:52:36+02:00
Bug 42084: Ensure English spoofing works even if preferences are set out of order.
- - - - -
2edcafaa by Pier Angelo Vendrame at 2023-09-19T17:52:37+02:00
Bug 41603: Customize the creation of MOZ_SOURCE_URL
MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and
MOZ_SOURCE_CHANGESET.
But the code takes for granted that it refers to a Hg instance, so it
combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`.
With this commit, we change this logic to combine them to create a URL
that is valid for GitLab.
$MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag.
If that is needed, we could use /-/tree/, instead of /-/commit/.
- - - - -
10e3f69a by Henry Wilkes at 2023-09-19T17:52:38+02:00
Bug 31575: Disable Firefox Home (Activity Stream)
Treat about:blank as the default home page and new tab page.
Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order
to avoid several network requests that we do not need.
Bug 41624: Disable about:pocket-* pages.
Bug 40144: Redirect about:privatebrowsing to the user's home
- - - - -
c086e4fe by Kathy Brade at 2023-09-19T17:52:38+02:00
Bug 4234: Use the Firefox Update Process for Base Browser.
Windows: disable "runas" code path in updater (15201).
Windows: avoid writing to the registry (16236).
Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406,
16014, 16909, 24476, and 25909.
Also fix bug 27221: purge the startup cache if the Base Browser
version changed (even if the Firefox version and build ID did
not change), e.g., after a minor Base Browser update.
Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality.
Bug 26048: potentially confusing "restart to update" message
Within the update doorhanger, remove the misleading message that mentions
that windows will be restored after an update is applied, and replace the
"Restart and Restore" button label with an existing
"Restart to update Tor Browser" string.
Bug 28885: notify users that update is downloading
Add a "Downloading Base Browser update" item which appears in the
hamburger (app) menu while the update service is downloading a MAR
file. Before this change, the browser did not indicate to the user
that an update was in progress, which is especially confusing in
Tor Browser because downloads often take some time. If the user
clicks on the new menu item, the about dialog is opened to allow
the user to see download progress.
As part of this fix, the update service was changed to always show
update-related messages in the hamburger menu, even if the update
was started in the foreground via the about dialog or via the
"Check for Tor Browser Update" toolbar menu item. This change is
consistent with the Tor Browser goal of making sure users are
informed about the update process.
Removed #28885 parts of this patch which have been uplifted to Firefox.
- - - - -
9cb8573b by Pier Angelo Vendrame at 2023-09-19T17:52:39+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Bug 41528: Localized the version string in the about dialog
- - - - -
b5a45343 by Pier Angelo Vendrame at 2023-09-19T17:52:39+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Move the alpha channel creation to a commit on its own
- - - - -
4cb5ec5d by Pier Angelo Vendrame at 2023-09-19T17:52:40+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Allow customizing the updater URL with config options.
With this, we will not need sed hacks on tor-browser-build anymore.
- - - - -
e58eab91 by Pier Angelo Vendrame at 2023-09-19T17:52:40+02:00
Bug 42061: Create an alpha update channel.
- - - - -
bd4e1fa1 by Nicolas Vigier at 2023-09-19T17:52:41+02:00
Bug 41682: Add base-browser nightly mar signing key
- - - - -
997c8334 by hackademix at 2023-09-19T17:52:41+02:00
Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
- - - - -
9956824d by Pier Angelo Vendrame at 2023-09-19T17:52:42+02:00
Bug 41698: Reword the recommendation badges in about:addons
Firefox strings use { -brand-product-name }.
As a result, it seems that the fork is recommending extensions, whereas
AMO curators are doing that.
So, we replace the strings with custom ones that clarify that Mozilla is
recommending them.
We assign the strings with JS because our translation backend does not
support Fluent attributes, yet, but once it does, we should switch to
them, instead.
Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033
- - - - -
957df292 by Alex Catarineu at 2023-09-19T17:52:42+02:00
Bug 40069: Add helpers for message passing with extensions
- - - - -
8a0aa20f by Matthew Finkel at 2023-09-19T17:52:43+02:00
Bug 41598: Prevent NoScript from being removed/disabled.
Bug 40253: Explicitly allow NoScript in Private Browsing mode.
- - - - -
f6e64136 by hackademix at 2023-09-19T17:52:43+02:00
Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons
- - - - -
e45915de by Pier Angelo Vendrame at 2023-09-19T17:52:44+02:00
Bug 40925: Implemented the Security Level component
This component adds a new Security Level toolbar button which visually
indicates the current global security level via icon (as defined by the
extensions.torbutton.security_slider pref), a drop-down hanger with a
short description of the current security level, and a new section in
the about:preferences#privacy page where users can change their current
security level. In addition, the hanger and the preferences page will
show a visual warning when the user has modified prefs associated with
the security level and provide a one-click 'Restore Defaults' button to
get the user back on recommended settings.
Bug 40125: Expose Security Level pref in GeckoView
- - - - -
252cef77 by Henry Wilkes at 2023-09-19T17:52:44+02:00
fixup! Bug 40925: Implemented the Security Level component
Bug 42046: Clean up XUL layout hack in security level panel.
- - - - -
3d5225c2 by Pier Angelo Vendrame at 2023-09-19T17:52:48+02:00
Bug 40926: Implemented the New Identity feature
- - - - -
2631d150 by Henry Wilkes at 2023-09-19T17:52:48+02:00
Bug 41736: Customize toolbar for base-browser.
- - - - -
1d65f29c by Pier Angelo Vendrame at 2023-09-19T17:52:49+02:00
Bug 42027: Base Browser migration procedures.
This commit implmenents the the Base Browser's version of _migrateUI.
- - - - -
327cf983 by Richard Pospesel at 2023-09-19T17:52:50+02:00
Bug 41649: Create rebase and security backport gitlab issue templates
- - - - -
b69c7d5f by Pier Angelo Vendrame at 2023-09-19T17:52:50+02:00
fixup! Bug 41649: Create rebase and security backport gitlab issue templates
Add a step to make the default branch and add how to find a tag when it
does not exist yet.
- - - - -
d1b97543 by Richard Pospesel at 2023-09-19T17:52:51+02:00
Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
- - - - -
77222733 by clairehurst at 2023-09-19T17:52:51+02:00
fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
Bug 42035: Update tools/torbrowser/ scripts to support macOS dev environment
- - - - -
51270bfe by Henry Wilkes at 2023-09-19T17:52:51+02:00
Bug 41803: Add some developer tools for working on tor-browser.
- - - - -
1e9e56f3 by Kathy Brade at 2023-09-19T17:52:52+02:00
Bug 11641: Disable remoting by default.
Unless the -osint command line flag is used, the browser now defaults
to the equivalent of -no-remote. There is a new -allow-remote flag that
may be used to restore the original (Firefox-like) default behavior.
- - - - -
132220dd by Alex Catarineu at 2023-09-19T17:52:53+02:00
Add TorStrings module for localization
- - - - -
8ff432b2 by Henry Wilkes at 2023-09-19T17:52:53+02:00
fixup! Add TorStrings module for localization
Bug 41333: Stop using aboutTor.dtd. No longer use aboutTBUpdate strings in about:tor.
- - - - -
1ff30999 by Pier Angelo Vendrame at 2023-09-19T17:52:54+02:00
fixup! Add TorStrings module for localization
Marked tor_controlconn_failed as a 12.5-only
- - - - -
7f4e82d7 by Henry Wilkes at 2023-09-19T17:52:54+02:00
fixup! Add TorStrings module for localization
Bug 42091: Remove authPrompt "Learn More" href from TorStrings.
- - - - -
7c71e255 by Henry Wilkes at 2023-09-19T17:52:55+02:00
Tor Browser strings
This commit adds all the strings needed for Tor Browser patches.
- - - - -
b470bbf8 by Henry Wilkes at 2023-09-19T17:52:55+02:00
Tor Browser localization migration scripts.
- - - - -
94fc57f0 by Mike Perry at 2023-09-19T17:52:56+02:00
Bug 2176: Rebrand Firefox to TorBrowser
See also Bugs #5194, #7187, #8115, #8219.
This patch does some basic renaming of Firefox to TorBrowser. The rest of the
branding is done by images and icons.
Also fix bug 27905.
Bug 25702: Update Tor Browser icon to follow design guidelines
- Updated all of the branding in /browser/branding/official with new 'stable'
icon series.
- Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and
add the source svg in the same directory
- Copied /browser/branding/official over /browser/branding/nightly and the new
/browser/branding/alpha directories. Replaced content with 'nightly' and
'alpha' icon series.
Updated VisualElements_70.png and VisualElements_150.png with updated icons in
each branding directory (fixes #22654)
- Updated firefox.VisualElementsManfiest.xml with updated colors in each
branding directory
- Added firefox.svg to each branding directory from which all the other icons
are derived (apart from document.icns and document.ico)
- Added default256.png and default512.png icons
- Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed
original icon
- Use the Tor Browser icon within devtools/client/themes/images/.
Bug 30631: Blurry Tor Browser icon on macOS app switcher
It would seem the png2icns tool does not generate correct icns files and
so on macOS the larger icons were missing resulting in blurry icons in
the OS chrome. Regenerated the padded icons in a macOS VM using
iconutil.
Bug 28196: preparations for using torbutton tor-browser-brand.ftl
A small change to Fluent FileSource class is required so that we
can register a new source without its supported locales being
counted as available locales for the browser.
Bug 31803: Replaced about:debugging logo with flat version
Bug 21724: Make Firefox and Tor Browser distinct macOS apps
When macOS opens a document or selects a default browser, it sometimes
uses the CFBundleSignature. Changing from the Firefox MOZB signature to
a different signature TORB allows macOS to distinguish between Firefox
and Tor Browser.
Bug 32092: Fix Tor Browser Support link in preferences
For bug 40562, we moved onionPattern* from bug 27476 to here, as
about:tor needs these files but it is included earlier.
Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one
- - - - -
7119926f by Henry Wilkes at 2023-09-19T17:52:56+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41333: Add a branding svg logo.
Copied from branding/tb-<version>/firefox.svg.
- - - - -
db61f42c by Henry Wilkes at 2023-09-19T17:52:57+02:00
squash! Bug 2176: Rebrand Firefox to TorBrowser
Bug 42088: New application icons (used in-app and on linux).
- - - - -
bc0fcb88 by Henry Wilkes at 2023-09-19T17:52:58+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41957: Use full tor browser icon for site identity button for internal pages.
Also remove colors in tor-styles.css.
- - - - -
71268b41 by Pier Angelo Vendrame at 2023-09-19T17:52:58+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 42078: Update macOS icons
- - - - -
4caa911d by sanketh at 2023-09-19T17:52:59+02:00
Bug 40209: Implement Basic Crypto Safety
Adds a CryptoSafety actor which detects when you've copied a crypto
address from a HTTP webpage and shows a warning.
Closes #40209.
Bug 40428: Fix string attribute names
- - - - -
da75a72f by Mike Perry at 2023-09-19T17:52:59+02:00
TB3: Tor Browser's official .mozconfigs.
Also:
Add an --enable-tor-browser-data-outside-app-dir configure option
Add --with-tor-browser-version configure option
Bug 31457: disable per-installation profiles
The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.
Bug 31935: Disable profile downgrade protection.
Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.
Add --enable-tor-browser-update build option
Bug 40793: moved Tor configuration options from old-configure.in to moz.configure
Bug 41584: Move some configuration options to base-browser level
- - - - -
8471c1f7 by clairehurst at 2023-09-19T17:53:00+02:00
fixup! TB3: Tor Browser's official .mozconfigs.
Bug 42035: update mozconfig for macos development
- - - - -
144cb398 by Henry Wilkes at 2023-09-19T17:53:00+02:00
Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
tor-browser#41285: Enable fluent warnings.
- - - - -
9e917c2c by Pier Angelo Vendrame at 2023-09-19T17:53:01+02:00
Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Before reordering patches, we used to keep the Tor-related patches
(torbutton and tor-launcher) at the beginning.
After that issue, we decided to move them towards the end.
In addition to that, we have decided to move Tor Browser-only
preferences there, too, to make Base Browser-only fixups easier to
apply.
- - - - -
beb27b9f by Henry Wilkes at 2023-09-19T17:53:01+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Bug 41333: Remove TorCheckService.
- - - - -
885549c5 by Richard Pospesel at 2023-09-19T17:53:02+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
- - - - -
510e84ea by Henry Wilkes at 2023-09-19T17:53:04+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Bug 41906: Lock network.trr.mode to be explicitly off.
- - - - -
8b79c605 by Pier Angelo Vendrame at 2023-09-19T17:53:04+02:00
Bug 13252: Customize profile management on macOS
On macOS we allow both portable mode and system installation.
However, in the latter case, we customize Firefox's directories to
match the hierarchy we use for the portable mode.
Also, display an informative error message if the TorBrowser-Data
directory cannot be created due to an "access denied" or a
"read only volume" error.
- - - - -
de89d30e by Pier Angelo Vendrame at 2023-09-19T17:53:05+02:00
Bug 40933: Add tor-launcher functionality
Bug 41926: Reimplement the control port
- - - - -
2f6eb3b8 by Henry Wilkes at 2023-09-19T17:53:05+02:00
fixup! fixup! Bug 40933: Add tor-launcher functionality
Bug 41333: Remove TorCheckService.
- - - - -
83c00801 by Pier Angelo Vendrame at 2023-09-19T17:53:06+02:00
fixup! Bug 40933: Add tor-launcher functionality
Deleted old stuff, unified TorController with ControlSocket, simplified
everything (e.g., do not use the dispatcher anymore, just call stuff
directly or use a much simpler map).
- - - - -
6f78826f by Pier Angelo Vendrame at 2023-09-19T17:53:06+02:00
fixup! Bug 40933: Add tor-launcher functionality
Use `#` instead of `_` for private things here and there, to make
reviewing the changes easier.
- - - - -
e82c6f9a by Pier Angelo Vendrame at 2023-09-19T17:53:07+02:00
fixup! Bug 40933: Add tor-launcher functionality
Shuffle code here and there, so that it's feasible to check that
nothing actually changed with `git diff --color-moved`.
- - - - -
acc4e6c8 by Pier Angelo Vendrame at 2023-09-19T17:53:07+02:00
fixup! Bug 40933: Add tor-launcher functionality
Further refactors/improvements.
- - - - -
df87cd7c by Pier Angelo Vendrame at 2023-09-19T17:53:08+02:00
fixup! Bug 40933: Add tor-launcher functionality
Refactored the settings reading, the first connection and events setup.
- - - - -
45e1dd66 by Pier Angelo Vendrame at 2023-09-19T17:53:08+02:00
fixup! Bug 40933: Add tor-launcher functionality
Moved the control port parsing for asynchronous events from TorProvider
to TorControlPort.
- - - - -
ed0f19a9 by Pier Angelo Vendrame at 2023-09-19T17:53:09+02:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 41986: Fix the control port password handling
- - - - -
a65669a5 by Pier Angelo Vendrame at 2023-09-19T17:53:09+02:00
fixup! Bug 40933: Add tor-launcher functionality
- - - - -
5cd0b1e3 by Pier Angelo Vendrame at 2023-09-19T17:53:10+02:00
fixup! Bug 40933: Add tor-launcher functionality
Second chunk of changes requested during the review.
- - - - -
3909206e by Pier Angelo Vendrame at 2023-09-19T17:53:11+02:00
fixup! Bug 40933: Add tor-launcher functionality
Change the provider buidler to make build async and other fixes.
- - - - -
5f7787be by Pier Angelo Vendrame at 2023-09-19T17:53:11+02:00
fixup! Bug 40933: Add tor-launcher functionality
Make the restart case stronger.
- - - - -
34403ea2 by Pier Angelo Vendrame at 2023-09-19T17:53:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Move the restart to the ProviderBuilder.
- - - - -
8645a190 by Pier Angelo Vendrame at 2023-09-19T17:53:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Addressed more requests from the review, and added documentation.
- - - - -
8db51876 by Pier Angelo Vendrame at 2023-09-19T17:53:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 42102: Fix checkPort in TorProcess
- - - - -
4e6197f5 by Richard Pospesel at 2023-09-19T17:53:13+02:00
Bug 40597: Implement TorSettings module
- migrated in-page settings read/write implementation from about:preferences#tor
to the TorSettings module
- TorSettings initially loads settings from the tor daemon, and saves them to
firefox prefs
- TorSettings notifies observers when a setting has changed; currently only
QuickStart notification is implemented for parity with previous preference
notify logic in about:torconnect and about:preferences#tor
- about:preferences#tor, and about:torconnect now read and write settings
thorugh the TorSettings module
- all tor settings live in the torbrowser.settings.* preference branch
- removed unused pref modify permission for about:torconnect content page from
AsyncPrefs.jsm
Bug 40645: Migrate Moat APIs to Moat.jsm module
- - - - -
f44ef500 by Pier Angelo Vendrame at 2023-09-19T17:53:13+02:00
fixup! Bug 40597: Implement TorSettings module
Workaround for a race condition.
- - - - -
d7549479 by Pier Angelo Vendrame at 2023-09-19T17:53:14+02:00
fixup! Bug 40597: Implement TorSettings module
The provider building is now async.
- - - - -
402ad307 by Pier Angelo Vendrame at 2023-09-19T17:53:15+02:00
fixup! Bug 40597: Implement TorSettings module
Set the state back to Configure when the tor process exits, and disable
qiuckstart.
We should also show the "Not Connected" pill again.
- - - - -
b5aa34c8 by Arthur Edelstein at 2023-09-19T17:53:15+02:00
Bug 3455: Add DomainIsolator, for isolating circuit by domain.
Add an XPCOM component that registers a ProtocolProxyChannelFilter
which sets the username/password for each web request according to
url bar domain.
Bug 9442: Add New Circuit button
Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ.
Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce.
Bug 19206: Clear out the domain isolator state on `New Identity`.
Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes
Bug 21745: Fix handling of catch-all circuit
Bug 41741: Refactor the domain isolator and new circuit
- - - - -
36278c1a by cypherpunks1 at 2023-09-19T17:53:16+02:00
fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.
Bug 40175: Use first-party isolation on reader view
- - - - -
860c94e1 by Pier Angelo Vendrame at 2023-09-19T17:53:16+02:00
fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.
The provider building is now async.
- - - - -
548ccc94 by Henry Wilkes at 2023-09-19T17:53:16+02:00
Bug 41600: Add a tor circuit display panel.
- - - - -
4f8016ca by cypherpunks1 at 2023-09-19T17:53:17+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 40175: Support circuit display on about:reader
- - - - -
356932d8 by Richard Pospesel at 2023-09-19T17:53:17+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 41865: Use --text-color-deemphasized rather than --panel-description-color
- - - - -
2973fbe3 by Henry Wilkes at 2023-09-19T17:53:18+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42045: Allow circuit panel to grow in width for long addresses.
- - - - -
38886199 by Henry Wilkes at 2023-09-19T17:53:21+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 41980: Center-align the circuit heading.
- - - - -
0507161c by Henry Wilkes at 2023-09-19T17:53:21+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42091: Use TorUIUtils to shorten the onion address.
- - - - -
15fa681a by hackademix at 2023-09-19T17:53:22+02:00
Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop
Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs
- - - - -
42138254 by Amogh Pradeep at 2023-09-19T17:53:22+02:00
Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
See Bug 1357997 for partial uplift.
Also:
Bug 28051 - Use our Orbot for proxying our connections
Bug 31144 - ESR68 Network Code Review
- - - - -
508c1958 by Matthew Finkel at 2023-09-19T17:53:23+02:00
Bug 25741: TBA: Disable GeckoNetworkManager
The browser should not need information related to the network
interface or network state, tor should take care of that.
- - - - -
993ff8fa by Kathy Brade at 2023-09-19T17:53:23+02:00
Bug 14631: Improve profile access error messages.
Instead of always reporting that the profile is locked, display specific
messages for "access denied" and "read-only file system".
To allow for localization, get profile-related error strings from Torbutton.
Use app display name ("Tor Browser") in profile-related error alerts.
- - - - -
62399654 by Pier Angelo Vendrame at 2023-09-19T17:53:23+02:00
Bug 40807: Added QRCode.js to toolkit/modules
- - - - -
c15a7936 by Richard Pospesel at 2023-09-19T17:53:24+02:00
Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
This patch adds a new about:preferences#connection page which allows
modifying bridge, proxy, and firewall settings from within Tor Browser.
All of the functionality present in tor-launcher's Network
Configuration panel is present:
- Setting built-in bridges
- Requesting bridges from BridgeDB via moat
- Using user-provided bridges
- Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies
- Setting firewall ports
- Viewing and Copying Tor's logs
- The Networking Settings in General preferences has been removed
Bug 40774: Update about:preferences page to match new UI designs
- - - - -
74bdf570 by Richard Pospesel at 2023-09-19T17:53:24+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41977: Hide the 'Learn more' link in bridge cards
- - - - -
53d77950 by Henry Wilkes at 2023-09-19T17:53:25+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41812: Stop using -moz-box-flex
Fixes:
Bug 41904: Connection settings now inputs at full width.
Bug 41821: Tor logs now expand with dialog.
- - - - -
bd927112 by Henry Wilkes at 2023-09-19T17:53:26+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 42047: Remove sizing hacks for tor dialogs. We can just wait until
DOMContentLoaded to call _populateXUL. Then the subDialog code will take
care of the sizing for us.
- - - - -
9edf966b by Henry Wilkes at 2023-09-19T17:53:26+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41651: Use moz-toggle for enable-bridges switch.
- - - - -
da664169 by Richard Pospesel at 2023-09-19T17:53:27+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha
- - - - -
97658076 by Pier Angelo Vendrame at 2023-09-19T17:53:27+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
The provider building is now async.
- - - - -
be0507a1 by henry at 2023-09-19T17:53:28+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Added some error handling for the cases in which the Tor provider
failed to build.
- - - - -
c126645c by Richard Pospesel at 2023-09-19T17:53:28+02:00
Bug 27476: Implement about:torconnect captive portal within Tor Browser
- implements new about:torconnect page as tor-launcher replacement
- adds new torconnect component to browser
- tor process management functionality remains implemented in tor-launcher through the TorProtocolService module
- adds warning/error box to about:preferences#tor when not connected to tor
Bug 40773: Update the about:torconnect frontend page to match additional UI flows.
Bug 41608: Add a toolbar status button and a urlbar "Connect" button.
- - - - -
0202ab19 by Pier Angelo Vendrame at 2023-09-19T17:53:29+02:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Fixed another race condition and moved to ES modules while I was
touching this code.
- - - - -
5911c55f by Henry Wilkes at 2023-09-19T17:53:29+02:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Bug 42079: Support moving out of the TorConnectState.Bootsrapped state
for gTorConnectTitlebarStatus and gTorConnectUrlbarButton.
- - - - -
490e2a63 by Henry Wilkes at 2023-09-19T17:53:30+02:00
Bug 7494: Create local home page for TBB.
Bug 41333: Update about:tor to new design. Including:
+ make the favicon match the branding icon.
+ make the location bar show a search icon.
- - - - -
04123f41 by Henry Wilkes at 2023-09-19T17:53:30+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 41333: Remove TorCheckService.
- - - - -
eef1671d by Henry Wilkes at 2023-09-19T17:53:31+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42075: Increase inline margin for the message links in about:tor.
Also increase the end margin of the emoji icon.
- - - - -
68b2d132 by Henry Wilkes at 2023-09-19T17:53:32+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42073: Add onion pattern to about:tor background.
- - - - -
29904003 by Arthur Edelstein at 2023-09-19T17:53:32+02:00
Bug 12620: TorBrowser regression tests
Regression tests for Bug #2950: Make Permissions Manager memory-only
Regression tests for TB4: Tor Browser's Firefox preference overrides.
Note: many more functional tests could be made here
Regression tests for #2874: Block Components.interfaces from content
Bug 18923: Add a script to run all Tor Browser specific tests
Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt.
- - - - -
4d2619ef by Pier Angelo Vendrame at 2023-09-19T17:53:33+02:00
Bug 41668: Tweaks to the Base Browser updater for Tor Browser
This commit was once part of "Bug 4234: Use the Firefox Update Process
for Tor Browser.".
However, some parts of it were not needed for Base Browser and some
derivative browsers.
Therefore, we extracted from that commit the parts for Tor Browser
legacy, and we add them back to the patch set with this commit.
- - - - -
fc8c490d by Pier Angelo Vendrame at 2023-09-19T17:53:33+02:00
fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser
The provider building is now async.
- - - - -
5c8ce95c by Kathy Brade at 2023-09-19T17:53:34+02:00
Bug 12647: Support symlinks in the updater.
- - - - -
7af4c5b4 by Kathy Brade at 2023-09-19T17:53:34+02:00
Bug 19121: reinstate the update.xml hash check
This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122.
Revert most changes from Mozilla Bug 862173 "don't verify mar file hash
when using mar signing to verify the mar file (lessens main thread I/O)."
We kept the addition to the AppConstants API in case other JS code
references it in the future.
- - - - -
2eab30bc by Kathy Brade at 2023-09-19T17:53:35+02:00
Bug 16940: After update, load local change notes.
Add an about:tbupdate page that displays the first section from
TorBrowser/Docs/ChangeLog.txt and includes a link to the remote
post-update page (typically our blog entry for the release).
Always load about:tbupdate in a content process, but implement the
code that reads the file system (changelog) in the chrome process
for compatibility with future sandboxing efforts.
Also fix bug 29440. Now about:tbupdate is styled as a fairly simple
changelog page that is designed to be displayed via a link that is on
about:tor.
- - - - -
d25a7b17 by Pier Angelo Vendrame at 2023-09-19T17:53:38+02:00
fixup! Bug 16940: After update, load local change notes.
Remove the doubled and unused aboutTBUpdate.dtd
- - - - -
0d1302b6 by Georg Koppen at 2023-09-19T17:53:38+02:00
Bug 32658: Create a new MAR signing key
It's time for our rotation again: Move the backup key in the front
position and add a new backup key.
Bug 33803: Move our primary nightly MAR signing key to tor-browser
Bug 33803: Add a secondary nightly MAR signing key
- - - - -
78ec020d by Mike Perry at 2023-09-19T17:53:39+02:00
Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
eBay and Amazon don't treat Tor users very well. Accounts often get locked and
payments reversed.
Also:
Bug 16322: Update DuckDuckGo search engine
We are replacing the clearnet URL with an onion service one (thanks to a
patch by a cypherpunk) and are removing the duplicated DDG search
engine. Duplicating DDG happend due to bug 1061736 where Mozilla
included DDG itself into Firefox. Interestingly, this caused breaking
the DDG search if JavaScript is disabled as the Mozilla engine, which
gets loaded earlier, does not use the html version of the search page.
Moreover, the Mozilla engine tracked where the users were searching from
by adding a respective parameter to the search query. We got rid of that
feature as well.
Also:
This fixes bug 20809: the DuckDuckGo team has changed its server-side
code in a way that lets users with JavaScript enabled use the default
landing page while those without JavaScript available get redirected
directly to the non-JS page. We adapt the search engine URLs
accordingly.
Also fixes bug 29798 by making sure we only specify the Google search
engine we actually ship an .xml file for.
Also regression tests.
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40494: Update Startpage search provider
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40438: Add Blockchair as a search engine
Bug 33342: Avoid disconnect search addon error after removal.
We removed the addon in #32767, but it was still being loaded
from addonStartup.json.lz4 and throwing an error on startup
because its resource: location is not available anymore.
- - - - -
395eccd6 by Alex Catarineu at 2023-09-19T17:53:39+02:00
Bug 40073: Disable remote Public Suffix List fetching
In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented
fetching the Public Suffix List via RemoteSettings and replacing the default
one at runtime, which we do not want.
- - - - -
7216971e by Henry Wilkes at 2023-09-19T17:53:40+02:00
Bug 41906: Hide DNS over HTTPS preferences.
- - - - -
4c0b36c2 by Richard Pospesel at 2023-09-19T17:53:40+02:00
Bug 23247: Communicating security expectations for .onion
Encrypting pages hosted on Onion Services with SSL/TLS is redundant
(in terms of hiding content) as all traffic within the Tor network is
already fully encrypted. Therefore, serving HTTP pages from an Onion
Service is more or less fine.
Prior to this patch, Tor Browser would mostly treat pages delivered
via Onion Services as well as pages delivered in the ordinary fashion
over the internet in the same way. This created some inconsistencies
in behaviour and misinformation presented to the user relating to the
security of pages delivered via Onion Services:
- HTTP Onion Service pages did not have any 'lock' icon indicating
the site was secure
- HTTP Onion Service pages would be marked as unencrypted in the Page
Info screen
- Mixed-mode content restrictions did not apply to HTTP Onion Service
pages embedding Non-Onion HTTP content
This patch fixes the above issues, and also adds several new 'Onion'
icons to the mix to indicate all of the various permutations of Onion
Services hosted HTTP or HTTPS pages with HTTP or HTTPS content.
Strings for Onion Service Page Info page are pulled from Torbutton's
localization strings.
- - - - -
28414d6f by cypherpunks1 at 2023-09-19T17:53:41+02:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 41934: Treat unencrypted websocket connections to onion services as secure
- - - - -
7c093b39 by Henry Wilkes at 2023-09-19T17:53:41+02:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 42091: Shorten onion address in site identity panel to be consistent
with the circuit display.
- - - - -
78526f46 by Kathy Brade at 2023-09-19T17:53:42+02:00
Bug 30237: Add v3 onion services client authentication prompt
When Tor informs the browser that client authentication is needed,
temporarily load about:blank instead of about:neterror and prompt
for the user's key.
If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD
control port command to add the key (via Torbutton's control port
module) and reload the page.
If the user cancels the prompt, display the standard about:neterror
"Unable to connect" page. This requires a small change to
browser/actors/NetErrorChild.jsm to account for the fact that the
docShell no longer has the failedChannel information. The failedChannel
is used to extract TLS-related error info, which is not applicable
in the case of a canceled .onion authentication prompt.
Add a leaveOpen option to PopupNotifications.show so we can display
error messages within the popup notification doorhanger without
closing the prompt.
Add support for onion services strings to the TorStrings module.
Add support for Tor extended SOCKS errors (Tor proposal 304) to the
socket transport and SOCKS layers. Improved display of all of these
errors will be implemented as part of bug 30025.
Also fixes bug 19757:
Add a "Remember this key" checkbox to the client auth prompt.
Add an "Onion Services Authentication" section within the
about:preferences "Privacy & Security section" to allow
viewing and removal of v3 onion client auth keys that have
been stored on disk.
Also fixes bug 19251: use enhanced error pages for onion service errors.
- - - - -
59486520 by Pier Angelo Vendrame at 2023-09-19T17:53:42+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
The provider building is now async.
- - - - -
1f1b164e by Pier Angelo Vendrame at 2023-09-19T17:53:43+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Fix possible race conditions on the busy state.
- - - - -
67ce8609 by Pier Angelo Vendrame at 2023-09-19T17:53:44+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Re-build the provider every time we need it, since it might change now.
- - - - -
d51f004c by Henry Wilkes at 2023-09-19T17:53:44+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42092: Fix layout styling of saved onion keys dialog.
- - - - -
f528f338 by Henry Wilkes at 2023-09-19T17:53:45+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42091: Tidy up authPrompt.jsm.
Stop importing modules to the global scope and remove authUtil.jsm.
Refactor the description string handling.
- - - - -
6fdd448a by Henry Wilkes at 2023-09-19T17:53:45+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42091: Shorten the shown onion address in the auth prompt.
- - - - -
d7314a7a by Alex Catarineu at 2023-09-19T17:53:46+02:00
Bug 21952: Implement Onion-Location
Whenever a valid Onion-Location HTTP header (or corresponding HTML
<meta> http-equiv attribute) is found in a document load, we either
redirect to it (if the user opted-in via preference) or notify the
presence of an onionsite alternative with a badge in the urlbar.
- - - - -
9c046ad5 by Pier Angelo Vendrame at 2023-09-19T17:53:46+02:00
Bug 40458: Implement .tor.onion aliases
We have enabled HTTPS-Only mode, therefore we do not need
HTTPS-Everywhere anymore.
However, we want to keep supporting .tor.onion aliases (especially for
securedrop).
Therefore, in this patch we implemented the parsing of HTTPS-Everywhere
rulesets, and the redirect of .tor.onion domains.
Actually, Tor Browser believes they are actual domains. We change them
on the fly on the SOCKS proxy requests to resolve the domain, and on
the code that verifies HTTPS certificates.
- - - - -
7f083816 by Richard Pospesel at 2023-09-19T17:53:47+02:00
fixup! Bug 40458: Implement .tor.onion aliases
Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha
- - - - -
b31552fe by Pier Angelo Vendrame at 2023-09-19T17:53:47+02:00
Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
This patch associates the about:manual page to a translated page that
must be injected to browser/omni.ja after the build.
The content must be placed in chrome/browser/content/browser/manual/, so
that is then available at chrome://browser/content/manual/.
We preferred giving absolute freedom to the web team, rather than having
to change the patch in case of changes on the documentation.
- - - - -
d05ce45e by Henry Wilkes at 2023-09-19T17:53:48+02:00
fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
Bug 41333: Use fluent for manual menu entry since we're no longer using aboutTor.dtd.
- - - - -
da0ed2d2 by Pier Angelo Vendrame at 2023-09-19T17:53:48+02:00
Bug 41435: Add a Tor Browser migration function
For now this function only deletes old language packs for which we are
already packaging the strings with the application.
- - - - -
683152f9 by Henry Wilkes at 2023-09-19T17:53:49+02:00
Bug 42110: Add TorUIUtils module for common tor component methods.
- - - - -
a90a396f by Dan Ballard at 2023-09-19T17:53:49+02:00
Bug 40701: Add security warning when downloading a file
Shown in the downloads panel, about:downloads and places.xhtml.
- - - - -
8e194f14 by Richard Pospesel at 2023-09-19T17:53:50+02:00
fixup! Bug 40701: Add security warning when downloading a file
Bug 41971: Update Tails URL in downloads warning
- - - - -
d495e30c by Henry Wilkes at 2023-09-19T17:53:50+02:00
fixup! Bug 40701: Add security warning when downloading a file
Bug 41886: Fix downloads panel warning size.
- - - - -
491f92d4 by Henry Wilkes at 2023-09-19T17:53:51+02:00
Bug 41736: Customize toolbar for tor-browser.
- - - - -
ca6e3a74 by hackademix at 2023-09-19T17:53:51+02:00
Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key
- - - - -
f87bbfc1 by Henry Wilkes at 2023-09-19T17:53:52+02:00
Customize moz-toggle for tor-browser.
- - - - -
4e23d110 by Henry Wilkes at 2023-09-19T17:53:54+02:00
fixup! Customize moz-toggle for tor-browser.
Bug 41651: Use moz-toggle for enable-bridges switch.
- - - - -
0bf2c83e by Henry Wilkes at 2023-09-19T17:53:55+02:00
Bug 42072: 2023 year end campaign for about:tor.
- - - - -
54b2f6d1 by Henry Wilkes at 2023-09-19T17:53:55+02:00
fixup! Bug 42072: 2023 year end campaign for about:tor.
- - - - -
30 changed files:
- .eslintignore
- .gitignore
- + .gitlab/issue_templates/Backport Android Security Fixes.md
- + .gitlab/issue_templates/Rebase Browser - Alpha.md
- + .gitlab/issue_templates/Rebase Browser - Stable.md
- + .gitlab/issue_templates/bug.md
- + .gitlab/merge_request_templates/default.md
- accessible/android/SessionAccessibility.cpp
- accessible/android/SessionAccessibility.h
- accessible/ipc/DocAccessibleParent.cpp
- accessible/ipc/DocAccessibleParent.h
- accessible/ipc/moz.build
- + browser/actors/AboutTBUpdateChild.jsm
- + browser/actors/AboutTBUpdateParent.jsm
- + browser/actors/CryptoSafetyChild.jsm
- + browser/actors/CryptoSafetyParent.jsm
- − browser/actors/RFPHelperChild.sys.mjs
- − browser/actors/RFPHelperParent.sys.mjs
- browser/actors/moz.build
- browser/app/Makefile.in
- browser/app/macbuild/Contents/Info.plist.in
- browser/app/macbuild/Contents/MacOS-files.in
- browser/app/permissions
- + browser/app/profile/000-tor-browser.js
- + browser/app/profile/001-base-profile.js
- browser/app/profile/firefox.js
- browser/base/content/aboutDialog-appUpdater.js
- browser/base/content/aboutDialog.js
- browser/base/content/aboutDialog.xhtml
- + browser/base/content/aboutDialogTor.css
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bd8300…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bd8300…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] Deleted 112 commits: Bug 41649: Create rebase and security backport gitlab issue templates
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below.
Deleted commits:
327cf983 by Richard Pospesel at 2023-09-19T17:52:50+02:00
Bug 41649: Create rebase and security backport gitlab issue templates
- - - - -
b69c7d5f by Pier Angelo Vendrame at 2023-09-19T17:52:50+02:00
fixup! Bug 41649: Create rebase and security backport gitlab issue templates
Add a step to make the default branch and add how to find a tag when it
does not exist yet.
- - - - -
d1b97543 by Richard Pospesel at 2023-09-19T17:52:51+02:00
Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
- - - - -
77222733 by clairehurst at 2023-09-19T17:52:51+02:00
fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
Bug 42035: Update tools/torbrowser/ scripts to support macOS dev environment
- - - - -
51270bfe by Henry Wilkes at 2023-09-19T17:52:51+02:00
Bug 41803: Add some developer tools for working on tor-browser.
- - - - -
1e9e56f3 by Kathy Brade at 2023-09-19T17:52:52+02:00
Bug 11641: Disable remoting by default.
Unless the -osint command line flag is used, the browser now defaults
to the equivalent of -no-remote. There is a new -allow-remote flag that
may be used to restore the original (Firefox-like) default behavior.
- - - - -
132220dd by Alex Catarineu at 2023-09-19T17:52:53+02:00
Add TorStrings module for localization
- - - - -
8ff432b2 by Henry Wilkes at 2023-09-19T17:52:53+02:00
fixup! Add TorStrings module for localization
Bug 41333: Stop using aboutTor.dtd. No longer use aboutTBUpdate strings in about:tor.
- - - - -
1ff30999 by Pier Angelo Vendrame at 2023-09-19T17:52:54+02:00
fixup! Add TorStrings module for localization
Marked tor_controlconn_failed as a 12.5-only
- - - - -
7f4e82d7 by Henry Wilkes at 2023-09-19T17:52:54+02:00
fixup! Add TorStrings module for localization
Bug 42091: Remove authPrompt "Learn More" href from TorStrings.
- - - - -
7c71e255 by Henry Wilkes at 2023-09-19T17:52:55+02:00
Tor Browser strings
This commit adds all the strings needed for Tor Browser patches.
- - - - -
b470bbf8 by Henry Wilkes at 2023-09-19T17:52:55+02:00
Tor Browser localization migration scripts.
- - - - -
94fc57f0 by Mike Perry at 2023-09-19T17:52:56+02:00
Bug 2176: Rebrand Firefox to TorBrowser
See also Bugs #5194, #7187, #8115, #8219.
This patch does some basic renaming of Firefox to TorBrowser. The rest of the
branding is done by images and icons.
Also fix bug 27905.
Bug 25702: Update Tor Browser icon to follow design guidelines
- Updated all of the branding in /browser/branding/official with new 'stable'
icon series.
- Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and
add the source svg in the same directory
- Copied /browser/branding/official over /browser/branding/nightly and the new
/browser/branding/alpha directories. Replaced content with 'nightly' and
'alpha' icon series.
Updated VisualElements_70.png and VisualElements_150.png with updated icons in
each branding directory (fixes #22654)
- Updated firefox.VisualElementsManfiest.xml with updated colors in each
branding directory
- Added firefox.svg to each branding directory from which all the other icons
are derived (apart from document.icns and document.ico)
- Added default256.png and default512.png icons
- Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed
original icon
- Use the Tor Browser icon within devtools/client/themes/images/.
Bug 30631: Blurry Tor Browser icon on macOS app switcher
It would seem the png2icns tool does not generate correct icns files and
so on macOS the larger icons were missing resulting in blurry icons in
the OS chrome. Regenerated the padded icons in a macOS VM using
iconutil.
Bug 28196: preparations for using torbutton tor-browser-brand.ftl
A small change to Fluent FileSource class is required so that we
can register a new source without its supported locales being
counted as available locales for the browser.
Bug 31803: Replaced about:debugging logo with flat version
Bug 21724: Make Firefox and Tor Browser distinct macOS apps
When macOS opens a document or selects a default browser, it sometimes
uses the CFBundleSignature. Changing from the Firefox MOZB signature to
a different signature TORB allows macOS to distinguish between Firefox
and Tor Browser.
Bug 32092: Fix Tor Browser Support link in preferences
For bug 40562, we moved onionPattern* from bug 27476 to here, as
about:tor needs these files but it is included earlier.
Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one
- - - - -
7119926f by Henry Wilkes at 2023-09-19T17:52:56+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41333: Add a branding svg logo.
Copied from branding/tb-<version>/firefox.svg.
- - - - -
db61f42c by Henry Wilkes at 2023-09-19T17:52:57+02:00
squash! Bug 2176: Rebrand Firefox to TorBrowser
Bug 42088: New application icons (used in-app and on linux).
- - - - -
bc0fcb88 by Henry Wilkes at 2023-09-19T17:52:58+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41957: Use full tor browser icon for site identity button for internal pages.
Also remove colors in tor-styles.css.
- - - - -
71268b41 by Pier Angelo Vendrame at 2023-09-19T17:52:58+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 42078: Update macOS icons
- - - - -
4caa911d by sanketh at 2023-09-19T17:52:59+02:00
Bug 40209: Implement Basic Crypto Safety
Adds a CryptoSafety actor which detects when you've copied a crypto
address from a HTTP webpage and shows a warning.
Closes #40209.
Bug 40428: Fix string attribute names
- - - - -
da75a72f by Mike Perry at 2023-09-19T17:52:59+02:00
TB3: Tor Browser's official .mozconfigs.
Also:
Add an --enable-tor-browser-data-outside-app-dir configure option
Add --with-tor-browser-version configure option
Bug 31457: disable per-installation profiles
The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.
Bug 31935: Disable profile downgrade protection.
Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.
Add --enable-tor-browser-update build option
Bug 40793: moved Tor configuration options from old-configure.in to moz.configure
Bug 41584: Move some configuration options to base-browser level
- - - - -
8471c1f7 by clairehurst at 2023-09-19T17:53:00+02:00
fixup! TB3: Tor Browser's official .mozconfigs.
Bug 42035: update mozconfig for macos development
- - - - -
144cb398 by Henry Wilkes at 2023-09-19T17:53:00+02:00
Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
tor-browser#41285: Enable fluent warnings.
- - - - -
9e917c2c by Pier Angelo Vendrame at 2023-09-19T17:53:01+02:00
Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Before reordering patches, we used to keep the Tor-related patches
(torbutton and tor-launcher) at the beginning.
After that issue, we decided to move them towards the end.
In addition to that, we have decided to move Tor Browser-only
preferences there, too, to make Base Browser-only fixups easier to
apply.
- - - - -
beb27b9f by Henry Wilkes at 2023-09-19T17:53:01+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Bug 41333: Remove TorCheckService.
- - - - -
885549c5 by Richard Pospesel at 2023-09-19T17:53:02+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
- - - - -
510e84ea by Henry Wilkes at 2023-09-19T17:53:04+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Bug 41906: Lock network.trr.mode to be explicitly off.
- - - - -
8b79c605 by Pier Angelo Vendrame at 2023-09-19T17:53:04+02:00
Bug 13252: Customize profile management on macOS
On macOS we allow both portable mode and system installation.
However, in the latter case, we customize Firefox's directories to
match the hierarchy we use for the portable mode.
Also, display an informative error message if the TorBrowser-Data
directory cannot be created due to an "access denied" or a
"read only volume" error.
- - - - -
de89d30e by Pier Angelo Vendrame at 2023-09-19T17:53:05+02:00
Bug 40933: Add tor-launcher functionality
Bug 41926: Reimplement the control port
- - - - -
2f6eb3b8 by Henry Wilkes at 2023-09-19T17:53:05+02:00
fixup! fixup! Bug 40933: Add tor-launcher functionality
Bug 41333: Remove TorCheckService.
- - - - -
83c00801 by Pier Angelo Vendrame at 2023-09-19T17:53:06+02:00
fixup! Bug 40933: Add tor-launcher functionality
Deleted old stuff, unified TorController with ControlSocket, simplified
everything (e.g., do not use the dispatcher anymore, just call stuff
directly or use a much simpler map).
- - - - -
6f78826f by Pier Angelo Vendrame at 2023-09-19T17:53:06+02:00
fixup! Bug 40933: Add tor-launcher functionality
Use `#` instead of `_` for private things here and there, to make
reviewing the changes easier.
- - - - -
e82c6f9a by Pier Angelo Vendrame at 2023-09-19T17:53:07+02:00
fixup! Bug 40933: Add tor-launcher functionality
Shuffle code here and there, so that it's feasible to check that
nothing actually changed with `git diff --color-moved`.
- - - - -
acc4e6c8 by Pier Angelo Vendrame at 2023-09-19T17:53:07+02:00
fixup! Bug 40933: Add tor-launcher functionality
Further refactors/improvements.
- - - - -
df87cd7c by Pier Angelo Vendrame at 2023-09-19T17:53:08+02:00
fixup! Bug 40933: Add tor-launcher functionality
Refactored the settings reading, the first connection and events setup.
- - - - -
45e1dd66 by Pier Angelo Vendrame at 2023-09-19T17:53:08+02:00
fixup! Bug 40933: Add tor-launcher functionality
Moved the control port parsing for asynchronous events from TorProvider
to TorControlPort.
- - - - -
ed0f19a9 by Pier Angelo Vendrame at 2023-09-19T17:53:09+02:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 41986: Fix the control port password handling
- - - - -
a65669a5 by Pier Angelo Vendrame at 2023-09-19T17:53:09+02:00
fixup! Bug 40933: Add tor-launcher functionality
- - - - -
5cd0b1e3 by Pier Angelo Vendrame at 2023-09-19T17:53:10+02:00
fixup! Bug 40933: Add tor-launcher functionality
Second chunk of changes requested during the review.
- - - - -
3909206e by Pier Angelo Vendrame at 2023-09-19T17:53:11+02:00
fixup! Bug 40933: Add tor-launcher functionality
Change the provider buidler to make build async and other fixes.
- - - - -
5f7787be by Pier Angelo Vendrame at 2023-09-19T17:53:11+02:00
fixup! Bug 40933: Add tor-launcher functionality
Make the restart case stronger.
- - - - -
34403ea2 by Pier Angelo Vendrame at 2023-09-19T17:53:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Move the restart to the ProviderBuilder.
- - - - -
8645a190 by Pier Angelo Vendrame at 2023-09-19T17:53:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Addressed more requests from the review, and added documentation.
- - - - -
8db51876 by Pier Angelo Vendrame at 2023-09-19T17:53:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 42102: Fix checkPort in TorProcess
- - - - -
4e6197f5 by Richard Pospesel at 2023-09-19T17:53:13+02:00
Bug 40597: Implement TorSettings module
- migrated in-page settings read/write implementation from about:preferences#tor
to the TorSettings module
- TorSettings initially loads settings from the tor daemon, and saves them to
firefox prefs
- TorSettings notifies observers when a setting has changed; currently only
QuickStart notification is implemented for parity with previous preference
notify logic in about:torconnect and about:preferences#tor
- about:preferences#tor, and about:torconnect now read and write settings
thorugh the TorSettings module
- all tor settings live in the torbrowser.settings.* preference branch
- removed unused pref modify permission for about:torconnect content page from
AsyncPrefs.jsm
Bug 40645: Migrate Moat APIs to Moat.jsm module
- - - - -
f44ef500 by Pier Angelo Vendrame at 2023-09-19T17:53:13+02:00
fixup! Bug 40597: Implement TorSettings module
Workaround for a race condition.
- - - - -
d7549479 by Pier Angelo Vendrame at 2023-09-19T17:53:14+02:00
fixup! Bug 40597: Implement TorSettings module
The provider building is now async.
- - - - -
402ad307 by Pier Angelo Vendrame at 2023-09-19T17:53:15+02:00
fixup! Bug 40597: Implement TorSettings module
Set the state back to Configure when the tor process exits, and disable
qiuckstart.
We should also show the "Not Connected" pill again.
- - - - -
b5aa34c8 by Arthur Edelstein at 2023-09-19T17:53:15+02:00
Bug 3455: Add DomainIsolator, for isolating circuit by domain.
Add an XPCOM component that registers a ProtocolProxyChannelFilter
which sets the username/password for each web request according to
url bar domain.
Bug 9442: Add New Circuit button
Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ.
Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce.
Bug 19206: Clear out the domain isolator state on `New Identity`.
Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes
Bug 21745: Fix handling of catch-all circuit
Bug 41741: Refactor the domain isolator and new circuit
- - - - -
36278c1a by cypherpunks1 at 2023-09-19T17:53:16+02:00
fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.
Bug 40175: Use first-party isolation on reader view
- - - - -
860c94e1 by Pier Angelo Vendrame at 2023-09-19T17:53:16+02:00
fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.
The provider building is now async.
- - - - -
548ccc94 by Henry Wilkes at 2023-09-19T17:53:16+02:00
Bug 41600: Add a tor circuit display panel.
- - - - -
4f8016ca by cypherpunks1 at 2023-09-19T17:53:17+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 40175: Support circuit display on about:reader
- - - - -
356932d8 by Richard Pospesel at 2023-09-19T17:53:17+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 41865: Use --text-color-deemphasized rather than --panel-description-color
- - - - -
2973fbe3 by Henry Wilkes at 2023-09-19T17:53:18+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42045: Allow circuit panel to grow in width for long addresses.
- - - - -
38886199 by Henry Wilkes at 2023-09-19T17:53:21+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 41980: Center-align the circuit heading.
- - - - -
0507161c by Henry Wilkes at 2023-09-19T17:53:21+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42091: Use TorUIUtils to shorten the onion address.
- - - - -
15fa681a by hackademix at 2023-09-19T17:53:22+02:00
Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop
Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs
- - - - -
42138254 by Amogh Pradeep at 2023-09-19T17:53:22+02:00
Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
See Bug 1357997 for partial uplift.
Also:
Bug 28051 - Use our Orbot for proxying our connections
Bug 31144 - ESR68 Network Code Review
- - - - -
508c1958 by Matthew Finkel at 2023-09-19T17:53:23+02:00
Bug 25741: TBA: Disable GeckoNetworkManager
The browser should not need information related to the network
interface or network state, tor should take care of that.
- - - - -
993ff8fa by Kathy Brade at 2023-09-19T17:53:23+02:00
Bug 14631: Improve profile access error messages.
Instead of always reporting that the profile is locked, display specific
messages for "access denied" and "read-only file system".
To allow for localization, get profile-related error strings from Torbutton.
Use app display name ("Tor Browser") in profile-related error alerts.
- - - - -
62399654 by Pier Angelo Vendrame at 2023-09-19T17:53:23+02:00
Bug 40807: Added QRCode.js to toolkit/modules
- - - - -
c15a7936 by Richard Pospesel at 2023-09-19T17:53:24+02:00
Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
This patch adds a new about:preferences#connection page which allows
modifying bridge, proxy, and firewall settings from within Tor Browser.
All of the functionality present in tor-launcher's Network
Configuration panel is present:
- Setting built-in bridges
- Requesting bridges from BridgeDB via moat
- Using user-provided bridges
- Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies
- Setting firewall ports
- Viewing and Copying Tor's logs
- The Networking Settings in General preferences has been removed
Bug 40774: Update about:preferences page to match new UI designs
- - - - -
74bdf570 by Richard Pospesel at 2023-09-19T17:53:24+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41977: Hide the 'Learn more' link in bridge cards
- - - - -
53d77950 by Henry Wilkes at 2023-09-19T17:53:25+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41812: Stop using -moz-box-flex
Fixes:
Bug 41904: Connection settings now inputs at full width.
Bug 41821: Tor logs now expand with dialog.
- - - - -
bd927112 by Henry Wilkes at 2023-09-19T17:53:26+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 42047: Remove sizing hacks for tor dialogs. We can just wait until
DOMContentLoaded to call _populateXUL. Then the subDialog code will take
care of the sizing for us.
- - - - -
9edf966b by Henry Wilkes at 2023-09-19T17:53:26+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41651: Use moz-toggle for enable-bridges switch.
- - - - -
da664169 by Richard Pospesel at 2023-09-19T17:53:27+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha
- - - - -
97658076 by Pier Angelo Vendrame at 2023-09-19T17:53:27+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
The provider building is now async.
- - - - -
be0507a1 by henry at 2023-09-19T17:53:28+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Added some error handling for the cases in which the Tor provider
failed to build.
- - - - -
c126645c by Richard Pospesel at 2023-09-19T17:53:28+02:00
Bug 27476: Implement about:torconnect captive portal within Tor Browser
- implements new about:torconnect page as tor-launcher replacement
- adds new torconnect component to browser
- tor process management functionality remains implemented in tor-launcher through the TorProtocolService module
- adds warning/error box to about:preferences#tor when not connected to tor
Bug 40773: Update the about:torconnect frontend page to match additional UI flows.
Bug 41608: Add a toolbar status button and a urlbar "Connect" button.
- - - - -
0202ab19 by Pier Angelo Vendrame at 2023-09-19T17:53:29+02:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Fixed another race condition and moved to ES modules while I was
touching this code.
- - - - -
5911c55f by Henry Wilkes at 2023-09-19T17:53:29+02:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Bug 42079: Support moving out of the TorConnectState.Bootsrapped state
for gTorConnectTitlebarStatus and gTorConnectUrlbarButton.
- - - - -
490e2a63 by Henry Wilkes at 2023-09-19T17:53:30+02:00
Bug 7494: Create local home page for TBB.
Bug 41333: Update about:tor to new design. Including:
+ make the favicon match the branding icon.
+ make the location bar show a search icon.
- - - - -
04123f41 by Henry Wilkes at 2023-09-19T17:53:30+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 41333: Remove TorCheckService.
- - - - -
eef1671d by Henry Wilkes at 2023-09-19T17:53:31+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42075: Increase inline margin for the message links in about:tor.
Also increase the end margin of the emoji icon.
- - - - -
68b2d132 by Henry Wilkes at 2023-09-19T17:53:32+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42073: Add onion pattern to about:tor background.
- - - - -
29904003 by Arthur Edelstein at 2023-09-19T17:53:32+02:00
Bug 12620: TorBrowser regression tests
Regression tests for Bug #2950: Make Permissions Manager memory-only
Regression tests for TB4: Tor Browser's Firefox preference overrides.
Note: many more functional tests could be made here
Regression tests for #2874: Block Components.interfaces from content
Bug 18923: Add a script to run all Tor Browser specific tests
Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt.
- - - - -
4d2619ef by Pier Angelo Vendrame at 2023-09-19T17:53:33+02:00
Bug 41668: Tweaks to the Base Browser updater for Tor Browser
This commit was once part of "Bug 4234: Use the Firefox Update Process
for Tor Browser.".
However, some parts of it were not needed for Base Browser and some
derivative browsers.
Therefore, we extracted from that commit the parts for Tor Browser
legacy, and we add them back to the patch set with this commit.
- - - - -
fc8c490d by Pier Angelo Vendrame at 2023-09-19T17:53:33+02:00
fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser
The provider building is now async.
- - - - -
5c8ce95c by Kathy Brade at 2023-09-19T17:53:34+02:00
Bug 12647: Support symlinks in the updater.
- - - - -
7af4c5b4 by Kathy Brade at 2023-09-19T17:53:34+02:00
Bug 19121: reinstate the update.xml hash check
This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122.
Revert most changes from Mozilla Bug 862173 "don't verify mar file hash
when using mar signing to verify the mar file (lessens main thread I/O)."
We kept the addition to the AppConstants API in case other JS code
references it in the future.
- - - - -
2eab30bc by Kathy Brade at 2023-09-19T17:53:35+02:00
Bug 16940: After update, load local change notes.
Add an about:tbupdate page that displays the first section from
TorBrowser/Docs/ChangeLog.txt and includes a link to the remote
post-update page (typically our blog entry for the release).
Always load about:tbupdate in a content process, but implement the
code that reads the file system (changelog) in the chrome process
for compatibility with future sandboxing efforts.
Also fix bug 29440. Now about:tbupdate is styled as a fairly simple
changelog page that is designed to be displayed via a link that is on
about:tor.
- - - - -
d25a7b17 by Pier Angelo Vendrame at 2023-09-19T17:53:38+02:00
fixup! Bug 16940: After update, load local change notes.
Remove the doubled and unused aboutTBUpdate.dtd
- - - - -
0d1302b6 by Georg Koppen at 2023-09-19T17:53:38+02:00
Bug 32658: Create a new MAR signing key
It's time for our rotation again: Move the backup key in the front
position and add a new backup key.
Bug 33803: Move our primary nightly MAR signing key to tor-browser
Bug 33803: Add a secondary nightly MAR signing key
- - - - -
78ec020d by Mike Perry at 2023-09-19T17:53:39+02:00
Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
eBay and Amazon don't treat Tor users very well. Accounts often get locked and
payments reversed.
Also:
Bug 16322: Update DuckDuckGo search engine
We are replacing the clearnet URL with an onion service one (thanks to a
patch by a cypherpunk) and are removing the duplicated DDG search
engine. Duplicating DDG happend due to bug 1061736 where Mozilla
included DDG itself into Firefox. Interestingly, this caused breaking
the DDG search if JavaScript is disabled as the Mozilla engine, which
gets loaded earlier, does not use the html version of the search page.
Moreover, the Mozilla engine tracked where the users were searching from
by adding a respective parameter to the search query. We got rid of that
feature as well.
Also:
This fixes bug 20809: the DuckDuckGo team has changed its server-side
code in a way that lets users with JavaScript enabled use the default
landing page while those without JavaScript available get redirected
directly to the non-JS page. We adapt the search engine URLs
accordingly.
Also fixes bug 29798 by making sure we only specify the Google search
engine we actually ship an .xml file for.
Also regression tests.
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40494: Update Startpage search provider
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40438: Add Blockchair as a search engine
Bug 33342: Avoid disconnect search addon error after removal.
We removed the addon in #32767, but it was still being loaded
from addonStartup.json.lz4 and throwing an error on startup
because its resource: location is not available anymore.
- - - - -
395eccd6 by Alex Catarineu at 2023-09-19T17:53:39+02:00
Bug 40073: Disable remote Public Suffix List fetching
In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented
fetching the Public Suffix List via RemoteSettings and replacing the default
one at runtime, which we do not want.
- - - - -
7216971e by Henry Wilkes at 2023-09-19T17:53:40+02:00
Bug 41906: Hide DNS over HTTPS preferences.
- - - - -
4c0b36c2 by Richard Pospesel at 2023-09-19T17:53:40+02:00
Bug 23247: Communicating security expectations for .onion
Encrypting pages hosted on Onion Services with SSL/TLS is redundant
(in terms of hiding content) as all traffic within the Tor network is
already fully encrypted. Therefore, serving HTTP pages from an Onion
Service is more or less fine.
Prior to this patch, Tor Browser would mostly treat pages delivered
via Onion Services as well as pages delivered in the ordinary fashion
over the internet in the same way. This created some inconsistencies
in behaviour and misinformation presented to the user relating to the
security of pages delivered via Onion Services:
- HTTP Onion Service pages did not have any 'lock' icon indicating
the site was secure
- HTTP Onion Service pages would be marked as unencrypted in the Page
Info screen
- Mixed-mode content restrictions did not apply to HTTP Onion Service
pages embedding Non-Onion HTTP content
This patch fixes the above issues, and also adds several new 'Onion'
icons to the mix to indicate all of the various permutations of Onion
Services hosted HTTP or HTTPS pages with HTTP or HTTPS content.
Strings for Onion Service Page Info page are pulled from Torbutton's
localization strings.
- - - - -
28414d6f by cypherpunks1 at 2023-09-19T17:53:41+02:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 41934: Treat unencrypted websocket connections to onion services as secure
- - - - -
7c093b39 by Henry Wilkes at 2023-09-19T17:53:41+02:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 42091: Shorten onion address in site identity panel to be consistent
with the circuit display.
- - - - -
78526f46 by Kathy Brade at 2023-09-19T17:53:42+02:00
Bug 30237: Add v3 onion services client authentication prompt
When Tor informs the browser that client authentication is needed,
temporarily load about:blank instead of about:neterror and prompt
for the user's key.
If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD
control port command to add the key (via Torbutton's control port
module) and reload the page.
If the user cancels the prompt, display the standard about:neterror
"Unable to connect" page. This requires a small change to
browser/actors/NetErrorChild.jsm to account for the fact that the
docShell no longer has the failedChannel information. The failedChannel
is used to extract TLS-related error info, which is not applicable
in the case of a canceled .onion authentication prompt.
Add a leaveOpen option to PopupNotifications.show so we can display
error messages within the popup notification doorhanger without
closing the prompt.
Add support for onion services strings to the TorStrings module.
Add support for Tor extended SOCKS errors (Tor proposal 304) to the
socket transport and SOCKS layers. Improved display of all of these
errors will be implemented as part of bug 30025.
Also fixes bug 19757:
Add a "Remember this key" checkbox to the client auth prompt.
Add an "Onion Services Authentication" section within the
about:preferences "Privacy & Security section" to allow
viewing and removal of v3 onion client auth keys that have
been stored on disk.
Also fixes bug 19251: use enhanced error pages for onion service errors.
- - - - -
59486520 by Pier Angelo Vendrame at 2023-09-19T17:53:42+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
The provider building is now async.
- - - - -
1f1b164e by Pier Angelo Vendrame at 2023-09-19T17:53:43+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Fix possible race conditions on the busy state.
- - - - -
67ce8609 by Pier Angelo Vendrame at 2023-09-19T17:53:44+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Re-build the provider every time we need it, since it might change now.
- - - - -
d51f004c by Henry Wilkes at 2023-09-19T17:53:44+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42092: Fix layout styling of saved onion keys dialog.
- - - - -
f528f338 by Henry Wilkes at 2023-09-19T17:53:45+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42091: Tidy up authPrompt.jsm.
Stop importing modules to the global scope and remove authUtil.jsm.
Refactor the description string handling.
- - - - -
6fdd448a by Henry Wilkes at 2023-09-19T17:53:45+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42091: Shorten the shown onion address in the auth prompt.
- - - - -
d7314a7a by Alex Catarineu at 2023-09-19T17:53:46+02:00
Bug 21952: Implement Onion-Location
Whenever a valid Onion-Location HTTP header (or corresponding HTML
<meta> http-equiv attribute) is found in a document load, we either
redirect to it (if the user opted-in via preference) or notify the
presence of an onionsite alternative with a badge in the urlbar.
- - - - -
9c046ad5 by Pier Angelo Vendrame at 2023-09-19T17:53:46+02:00
Bug 40458: Implement .tor.onion aliases
We have enabled HTTPS-Only mode, therefore we do not need
HTTPS-Everywhere anymore.
However, we want to keep supporting .tor.onion aliases (especially for
securedrop).
Therefore, in this patch we implemented the parsing of HTTPS-Everywhere
rulesets, and the redirect of .tor.onion domains.
Actually, Tor Browser believes they are actual domains. We change them
on the fly on the SOCKS proxy requests to resolve the domain, and on
the code that verifies HTTPS certificates.
- - - - -
7f083816 by Richard Pospesel at 2023-09-19T17:53:47+02:00
fixup! Bug 40458: Implement .tor.onion aliases
Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha
- - - - -
b31552fe by Pier Angelo Vendrame at 2023-09-19T17:53:47+02:00
Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
This patch associates the about:manual page to a translated page that
must be injected to browser/omni.ja after the build.
The content must be placed in chrome/browser/content/browser/manual/, so
that is then available at chrome://browser/content/manual/.
We preferred giving absolute freedom to the web team, rather than having
to change the patch in case of changes on the documentation.
- - - - -
d05ce45e by Henry Wilkes at 2023-09-19T17:53:48+02:00
fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
Bug 41333: Use fluent for manual menu entry since we're no longer using aboutTor.dtd.
- - - - -
da0ed2d2 by Pier Angelo Vendrame at 2023-09-19T17:53:48+02:00
Bug 41435: Add a Tor Browser migration function
For now this function only deletes old language packs for which we are
already packaging the strings with the application.
- - - - -
683152f9 by Henry Wilkes at 2023-09-19T17:53:49+02:00
Bug 42110: Add TorUIUtils module for common tor component methods.
- - - - -
a90a396f by Dan Ballard at 2023-09-19T17:53:49+02:00
Bug 40701: Add security warning when downloading a file
Shown in the downloads panel, about:downloads and places.xhtml.
- - - - -
8e194f14 by Richard Pospesel at 2023-09-19T17:53:50+02:00
fixup! Bug 40701: Add security warning when downloading a file
Bug 41971: Update Tails URL in downloads warning
- - - - -
d495e30c by Henry Wilkes at 2023-09-19T17:53:50+02:00
fixup! Bug 40701: Add security warning when downloading a file
Bug 41886: Fix downloads panel warning size.
- - - - -
491f92d4 by Henry Wilkes at 2023-09-19T17:53:51+02:00
Bug 41736: Customize toolbar for tor-browser.
- - - - -
ca6e3a74 by hackademix at 2023-09-19T17:53:51+02:00
Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key
- - - - -
f87bbfc1 by Henry Wilkes at 2023-09-19T17:53:52+02:00
Customize moz-toggle for tor-browser.
- - - - -
4e23d110 by Henry Wilkes at 2023-09-19T17:53:54+02:00
fixup! Customize moz-toggle for tor-browser.
Bug 41651: Use moz-toggle for enable-bridges switch.
- - - - -
0bf2c83e by Henry Wilkes at 2023-09-19T17:53:55+02:00
Bug 42072: 2023 year end campaign for about:tor.
- - - - -
54b2f6d1 by Henry Wilkes at 2023-09-19T17:53:55+02:00
fixup! Bug 42072: 2023 year end campaign for about:tor.
- - - - -
30 changed files:
- .eslintignore
- .gitignore
- + .gitlab/issue_templates/Backport Android Security Fixes.md
- + .gitlab/issue_templates/Rebase Browser - Alpha.md
- + .gitlab/issue_templates/Rebase Browser - Stable.md
- + browser/actors/AboutTBUpdateChild.jsm
- + browser/actors/AboutTBUpdateParent.jsm
- + browser/actors/CryptoSafetyChild.jsm
- + browser/actors/CryptoSafetyParent.jsm
- browser/actors/moz.build
- browser/app/Makefile.in
- browser/app/macbuild/Contents/Info.plist.in
- + browser/app/profile/000-tor-browser.js
- browser/base/content/aboutDialog.xhtml
- + browser/base/content/aboutDialogTor.css
- + browser/base/content/abouttbupdate/aboutTBUpdate.css
- + browser/base/content/abouttbupdate/aboutTBUpdate.js
- + browser/base/content/abouttbupdate/aboutTBUpdate.xhtml
- browser/base/content/appmenu-viewcache.inc.xhtml
- + browser/base/content/browser-doctype.inc
- browser/base/content/browser-menubar.inc
- browser/base/content/browser-sets.inc
- browser/base/content/browser-siteIdentity.js
- browser/base/content/browser.js
- browser/base/content/browser.xhtml
- browser/base/content/default-bookmarks.html
- browser/base/content/hiddenWindowMac.xhtml
- browser/base/content/main-popupset.inc.xhtml
- browser/base/content/navigator-toolbox.inc.xhtml
- browser/base/content/pageinfo/pageInfo.xhtml
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1d65f2…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1d65f2…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] 216 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by richard (@richard) 19 Sep '23
by richard (@richard) 19 Sep '23
19 Sep '23
richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
8d5b04bb by Eitan Isaacson at 2023-09-19T17:25:59+02:00
Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
Differential Revision: https://phabricator.services.mozilla.com/D179737
- - - - -
1eb23599 by Pier Angelo Vendrame at 2023-09-19T17:26:00+02:00
Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized
Allow using NSS for checking MAR signatures also in platforms where
OS-native APIs are used by default, i.e., macOS and Windows.
Differential Revision: https://phabricator.services.mozilla.com/D177743
- - - - -
9f0d981f by Pier Angelo Vendrame at 2023-09-19T17:26:01+02:00
Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8
Differential Revision: https://phabricator.services.mozilla.com/D186456
- - - - -
fbb00729 by Henry Wilkes at 2023-09-19T17:29:22+02:00
Bug 41454: Move focus after calling openPreferences for a sub-category.
Temporary fix until mozilla bug 1799153 gets a patch upstream.
- - - - -
f6f0dc97 by Henry Wilkes at 2023-09-19T17:29:25+02:00
Bug 41483: Remove the firefox override for appstrings.properties
Remove this patch after upstream bugzilla bug 1790187
- - - - -
3b4952c9 by Pier Angelo Vendrame at 2023-09-19T17:29:26+02:00
Bug 41116: Normalize system fonts.
System fonts are an enormous fingerprinting vector.
Even with font allow lists and with our custom configuration on Linux,
which counter metrics measurements, getComputedStyle leaks several
details.
This patch counters both these kinds of attacks.
- - - - -
05a6ed2d by Marco Simonelli at 2023-09-19T17:29:26+02:00
Bug 41459: WebRTC fails to build under mingw (Part 1)
- properly define NOMINMAX for just MSVC builds
- - - - -
321ded50 by Marco Simonelli at 2023-09-19T17:29:27+02:00
Bug 41459: WebRTC fails to build under mingw (Part 2)
- fixes required to build third_party/libwebrtc
- - - - -
36b8e384 by Marco Simonelli at 2023-09-19T17:29:27+02:00
Bug 41459: WebRTC fails to build under mingw (Part 3)
- fixes required to build third_party/sipcc
- - - - -
f7026e64 by Marco Simonelli at 2023-09-19T17:29:28+02:00
Bug 41459: WebRTC fails to build under mingw (Part 4)
- fixes requried to build netwerk/sctp
- - - - -
f748a135 by Marco Simonelli at 2023-09-19T17:29:28+02:00
Bug 41459: WebRTC fails to build under mingw (Part 5)
- fixes required to build dom/media/webrtc
- - - - -
8d64db71 by Marco Simonelli at 2023-09-19T17:29:29+02:00
Bug 41459: WebRTC fails to build under mingw (Part 6)
- fixes required to build dom/media/systemservices
- - - - -
b6fe5879 by hackademix at 2023-09-19T17:29:29+02:00
Bug 41854: Allow overriding download spam protection.
- - - - -
1f45f64e by Pier Angelo Vendrame at 2023-09-19T17:51:54+02:00
Bug 41995: Generated headers on Windows are not reproducible
The flags optionally passed as a third parameter to DLL_BLOCKLIST_ENTRY
are stored in a set, so they are not ordered.
Sorting them before outputting them makes the creation of the headers
deterministic.
- - - - -
4c0c53f5 by Gaba at 2023-09-19T17:51:55+02:00
Adding issue and merge request templates
- - - - -
deb06b79 by Richard Pospesel at 2023-09-19T17:51:55+02:00
fixup! Adding issue and merge request templates
- - - - -
b339cd97 by Pier Angelo Vendrame at 2023-09-19T17:51:56+02:00
fixup! Adding issue and merge request templates
Do not assign to new issue to nah anymore
- - - - -
5df31a93 by Pier Angelo Vendrame at 2023-09-19T17:51:56+02:00
Base Browser's .mozconfigs.
Bug 17858: Cannot create incremental MARs for hardened builds.
Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
(which is part of mar-tools and is not distributed to end-users) with
ASan.
Bug 21849: Don't allow SSL key logging.
Bug 25741 - TBA: Disable features at compile-time
Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION
Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds
This fixes a problem where some preferences had the wrong default value.
Also see bug 27472 where we made a similar fix for Android.
Bug 29859: Disable HLS support for now
Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
Bug 33734: Set MOZ_NORMANDY to False
Bug 33851: Omit Parental Controls.
Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files
Bug 41584: Move some configuration options to base-browser level
- - - - -
3319467e by clairehurst at 2023-09-19T17:51:57+02:00
fixup! Base Browser's .mozconfigs.
Bug 42035: Update mozconfig for macos development
- - - - -
8ea460cf by Pier Angelo Vendrame at 2023-09-19T17:51:57+02:00
Tweaks to the build system
Bug 40857: Modified the fat .aar creation file
This is a workaround to build fat .aars with the compiling enviornment
disabled.
Mozilla does not use a similar configuration, but either runs a Firefox
build and discards its output, or uses artifacts build.
We might switch to artifact builds too, and drop this patch, or write a
better one to upstream. But until then we need this patch.
See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770.
Bug 41458: Prevent `mach package-multi-locale` from actually creating a package
macOS builds need some files to be moved around with
./mach package-multi-locale to create multi-locale packages.
The required command isn't exposed through any other mach command.
So, we patch package-multi-locale both to prevent it from failing when
doing official builds and to detect any future changes on it.
- - - - -
b8fa26df by Pier Angelo Vendrame at 2023-09-19T17:51:58+02:00
Bug 41108: Remove privileged macOS installation from 102
- - - - -
e3365456 by Dan Ballard at 2023-09-19T17:51:58+02:00
Bug 41149: Re-enable DLL injection protection in all builds not just nightlies
- - - - -
fe2f0865 by Matthew Finkel at 2023-09-19T17:51:59+02:00
Bug 24796: Comment out excess permissions from GeckoView
The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's
manifest, so we can't use the ifdef preprocessor guards around the
permissions we do not want. Commenting the permissions is the
next-best-thing.
- - - - -
74818f48 by Matthew Finkel at 2023-09-19T17:51:59+02:00
Bug 28125: Prevent non-Necko network connections
- - - - -
ef89dc88 by Mike Perry at 2023-09-19T17:52:00+02:00
Bug 12974: Disable NTLM and Negotiate HTTP Auth
The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421,
https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602
- - - - -
99f84d74 by Alex Catarineu at 2023-09-19T17:52:00+02:00
Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899
- - - - -
0443020b by Georg Koppen at 2023-09-19T17:52:01+02:00
Bug 16285: Exclude ClearKey system for now
In the past the ClearKey system had not been compiled when specifying
--disable-eme. But that changed and it is even bundled nowadays (see:
Mozilla's bug 1300654). We don't want to ship it right now as the use
case for it is not really visible while the code had security
vulnerabilities in the past.
- - - - -
9395baa4 by Kathy Brade at 2023-09-19T17:52:01+02:00
Bug 21431: Clean-up system extensions shipped in Firefox
Only ship the pdfjs extension.
- - - - -
511f02ef by Kathy Brade at 2023-09-19T17:52:02+02:00
Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
Hide elements on about:logins that mention sync, "Firefox LockWise", and
Mozilla's LockWise mobile apps.
Disable the "Create New Login" button when security.nocertdb is true.
- - - - -
2c053444 by Alex Catarineu at 2023-09-19T17:52:03+02:00
Bug 41457: Remove Mozilla permissions
Bug 40025: Remove Mozilla add-on install permissions
- - - - -
67de62b0 by Kathy Brade at 2023-09-19T17:52:03+02:00
Bug 40002: Remove about:ion
Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people
volunteer to participate in studies that collect detailed, sensitive data about
how they use their browser.
Bug 41662: Disable about:sync-logs
Even though we disable sync by default with
`identity.fxaccounts.enabled`, this about: page is still avilable.
We could throw an exception on the constructor of the related
component, but it would result only in an error in the console, without
a visible "this address does not look right" error page.
If we fix the issues with MOZ_SERVICES_SYNC, we can restore the
component.
- - - - -
648a76b7 by Arthur Edelstein at 2023-09-19T17:52:04+02:00
Bug 26353: Prevent speculative connect that violated FPI.
Connections were observed in the catch-all circuit when
the user entered an https or http URL in the URL bar, or
typed a search term.
- - - - -
f7945358 by Alex Catarineu at 2023-09-19T17:52:04+02:00
Bug 31740: Remove some unnecessary RemoteSettings instances
More concretely, SearchService.jsm 'hijack-blocklists' and
url-classifier-skip-urls.
Avoid creating instance for 'anti-tracking-url-decoration'.
If prefs are disabling their usage, avoid creating instances for
'cert-revocations' and 'intermediates'.
Do not ship JSON dumps for collections we do not expect to need. For
the ones in the 'main' bucket, this prevents them from being synced
unnecessarily (the code in remote-settings does so for collections
in the main bucket for which a dump or local data exists). For the
collections in the other buckets, we just save some size by not
shipping their dumps.
We also clear the collections database on the v2 -> v3 migration.
- - - - -
48ce36c4 by Pier Angelo Vendrame at 2023-09-19T17:52:05+02:00
fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
Bug 42083: RemoteSecuritySettings.init throws error in console
- - - - -
386496de by cypherpunks1 at 2023-09-19T17:52:05+02:00
Bug 41092: Add a RemoteSettings JSON dump for query-stripping
- - - - -
ebe44430 by Pier Angelo Vendrame at 2023-09-19T17:52:06+02:00
Bug 41635: Disable the Normandy component
Do not include Normandy at all whenever MOZ_NORMANDY is False.
- - - - -
d770bbf5 by Georg Koppen at 2023-09-19T17:52:06+02:00
Bug 30541: Disable WebGL readPixel() for web content
Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034
- - - - -
ae4edbaa by Alex Catarineu at 2023-09-19T17:52:07+02:00
Bug 28369: Stop shipping pingsender executable
- - - - -
a98e3d8f by cypherpunks1 at 2023-09-19T17:52:07+02:00
Bug 41568: Disable LaterRun
- - - - -
11601ba4 by cypherpunks1 at 2023-09-19T17:52:08+02:00
Bug 40717: Hide Windows SSO in settings
- - - - -
656aec7e by Pier Angelo Vendrame at 2023-09-19T17:52:08+02:00
Bug 41599: Always return an empty string as network ID
Firefox computes an internal network ID used to detect network changes
and act consequently (e.g., to improve WebSocket UX).
However, there are a few ways to get this internal network ID, so we
patch them out, to be sure any new code will not be able to use them and
possibly link users.
We also sent a patch to Mozilla to seed the internal network ID, to
prevent any accidental leak in the future.
Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756
- - - - -
8f060853 by cypherpunks1 at 2023-09-19T17:52:09+02:00
Bug 40175: Add origin attributes to about:reader top-level requests
- - - - -
f2f65c0f by Mike Perry at 2023-09-19T17:52:11+02:00
Firefox preference overrides.
This hack directly includes our preference changes in omni.ja.
Bug 18292: Staged updates fail on Windows
Temporarily disable staged updates on Windows.
Bug 18297: Use separate Noto JP,KR,SC,TC fonts
Bug 23404: Add Noto Sans Buginese to the macOS whitelist
Bug 23745: Set dom.indexedDB.enabled = true
Bug 13575: Disable randomised Firefox HTTP cache decay user tests.
(Fernando Fernandez Mancera <ffmancera(a)riseup.net>)
Bug 17252: Enable session identifiers with FPI
Session tickets and session identifiers were isolated
by OriginAttributes, so we can re-enable them by
allowing the default value (true) of
"security.ssl.disable_session_identifiers".
The pref "security.enable_tls_session_tickets" is obsolete
(removed in https://bugzilla.mozilla.org/917049)
Bug 14952: Enable http/2 and AltSvc
In Firefox, SPDY/HTTP2 now uses Origin Attributes for
isolation of connections, push streams, origin frames, etc.
That means we get first-party isolation provided
"privacy.firstparty.isolate" is true. So in this patch, we
stop overriding "network.http.spdy.enabled" and
"network.http.spdy.enabled.http2".
Alternate Services also use Origin Attributes for isolation.
So we stop overriding
"network.http.altsvc.enabled" and "network.http.altsvc.oe"
as well.
(All 4 of the abovementioned "network.http.*" prefs adopt
Firefox 60ESR's default value of true.)
However, we want to disable HTTP/2 push for now, so we
set "network.http.spdy.allow-push" to false.
"network.http.spdy.enabled.http2draft" was removed in Bug 1132357.
"network.http.sped.enabled.v2" was removed in Bug 912550.
"network.http.sped.enabled.v3" was removed in Bug 1097944.
"network.http.sped.enabled.v3-1" was removed in Bug 1248197.
Bug 26114: addons.mozilla.org is not special
* Don't expose navigator.mozAddonManager on any site
* Don't block NoScript from modifying addons.mozilla.org or other sites
Enable ReaderView mode again (#27281).
Bug 29916: Make sure enterprise policies are disabled
Bug 2874: Block Components.interfaces from content
Bug 26146: Spoof HTTP User-Agent header for desktop platforms
In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent
header and to JavaScript code via navigator.userAgent. To avoid
leaking the OS inside each HTTP request (which many web servers
log), always use the Windows 7 OS value in the desktop User-Agent
header. We continue to allow access to the actual OS via JavaScript,
since doing so improves compatibility with web applications such
as GitHub and Google Docs.
Bug 12885: Windows Jump Lists fail for Tor Browser
Jumplist entries are stored in a binary file in:
%APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\
and has a name in the form
[a-f0-9]+.customDestinations-ms
The hex at the front is unique per app, and is ultimately derived from
something called the 'App User Model ID' (AUMID) via some unknown
hashing method. The AUMID is provided as a key when programmatically
creating, updating, and deleting a jumplist. The default behaviour in
firefox is for the installer to define an AUMID for an app, and save it
in the registry so that the jumplist data can be removed by the
uninstaller.
However, the Tor Browser does not set this (or any other) regkey during
installation, so this codepath fails and the app's AUMID is left
undefined. As a result the app's AUMID ends up being defined by
windows, but unknowable by Tor Browser. This unknown AUMID is used to
create and modify the jumplist, but the delete API requires that we
provide the app's AUMID explicitly. Since we don't know what the AUMID
is (since the expected regkey where it is normally stored does not
exist) jumplist deletion will fail and we will leave behind a mostly
empty customDestinations-ms file. The name of the file is derived from
the binary path, so an enterprising person could reverse engineer how
that hex name is calculated, and generate the name for Tor Browser's
default Desktop installation path to determine whether a person had
used Tor Browser in the past.
The 'taskbar.grouping.useprofile' option that is enabled by this patch
works around this AUMID problem by having firefox.exe create it's own
AUMID based on the profile path (rather than looking for a regkey). This
way, if a user goes in and enables and disables jumplist entries, the
backing store is properly deleted.
Unfortunately, all windows users currently have this file lurking in
the above mentioned directory and this patch will not remove it since it
was created with an unknown AUMID. However, another patch could be
written which goes to that directory and deletes any item containing the
'Tor Browser' string. See bug 28996.
Bug 30845: Make sure default themes and other internal extensions are enabled
Bug 28896: Enable extensions in private browsing by default
Bug 31065: Explicitly allow proxying localhost
Bug 31598: Enable letterboxing
Disable Presentation API everywhere
Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer
security levels.
Bug 32321: Disable Mozilla's MitM pings
Bug 19890: Disable installation of system addons
By setting the URL to "" we make sure that already installed system
addons get deleted as well.
Bug 22548: Firefox downgrades VP9 videos to VP8.
On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor
Browser 7.0 all youtube videos are degraded to VP8.
This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0.
All clients will get better experience and lower traffic, beause TBB doesn't
use "Use hardware acceleration when available".
Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs
Bug 16441: Suppress "Reset Tor Browser" prompt.
Bug 29120: Use the in-memory media cache and increase its maximum size.
Bug 33697: use old search config based on list.json
Bug 33855: Ensure that site-specific browser mode is disabled.
Bug 30682: Disable Intermediate CA Preloading.
Bug 40061: Omit the Windows default browser agent from the build
Bug 40322: Consider disabling network.connectivity-service.enabled
Bug 40408: Disallow SVG Context Paint in all web content
Bug 40308: Disable network partitioning until we evaluate dFPI
Bug 40322: Consider disabling network.connectivity-service.enabled
Bug 40383: Disable dom.enable_event_timing
Bug 40423: Disable http/3
Bug 40177: Update prefs for Fx91esr
Bug 40700: Disable addons and features recommendations
Bug 40682: Disable network.proxy.allow_bypass
Bug 40736: Disable third-party cookies in PBM
Bug 19850: Enabled HTTPS-Only by default
Bug 40912: Hide the screenshot menu
Bug 41292: Disable moreFromMozilla in preferences page
Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector
Bug 24686: Set network.http.tailing.enabled to true
Bug 40183: Disable TLS ciphersuites using SHA-1
Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102
We reviewed all the preferences we set for 102, and remove a few old
ones. See the description of that issue to see all the preferences we
believed were still valid for 102, and some brief description for the
reasons to keep them.
- - - - -
3dfddd16 by hackademix at 2023-09-19T17:52:11+02:00
fixup! Firefox preference overrides.
Bug 42029 - Defense-in-depth: disable non-proxied UDP WebRTC
- - - - -
99c91351 by cypherpunks1 at 2023-09-19T17:52:12+02:00
fixup! Firefox preference overrides.
Bug 41876: Disable the Firefox View tab
- - - - -
f2009e99 by Pier Angelo Vendrame at 2023-09-19T17:52:12+02:00
fixup! Firefox preference overrides.
Bug 42043: Enable media.devices.enumerate.legacy.enabled.
- - - - -
a7b5c1e0 by Richard Pospesel at 2023-09-19T17:52:13+02:00
fixup! Firefox preference overrides.
Bug 41774: Hide the 'Switching to a new device' hepl menu item
- - - - -
0d19dfeb by Pier Angelo Vendrame at 2023-09-19T17:52:13+02:00
fixup! Firefox preference overrides.
Bug 41797: Lock RFP in release builds
- - - - -
abed1d29 by Richard Pospesel at 2023-09-19T17:52:14+02:00
fixup! Firefox preference overrides.
- - - - -
eb277895 by Richard Pospesel at 2023-09-19T17:52:14+02:00
fixup! Firefox preference overrides.
- - - - -
23c79f9f by Pier Angelo Vendrame at 2023-09-19T17:52:15+02:00
fixup! Firefox preference overrides.
Bug 41675: Remove javascript.options.large_arraybuffers.
It has been removed with MozBug 1703508 in Firefox 110.
- - - - -
03362d7e by Richard Pospesel at 2023-09-19T17:52:15+02:00
fixup! Firefox preference overrides.
Bug 42057: Disable GetIsTextRecognitionSupported by default
- - - - -
dd1d70e2 by Richard Pospesel at 2023-09-19T17:52:16+02:00
fixup! Firefox preference overrides.
- - - - -
20a5202d by Richard Pospesel at 2023-09-19T17:52:16+02:00
fixup! Firefox preference overrides.
Bug 42094: Explicitly disable media.aboutwebrtc.hist.enabled
- - - - -
ffa788ce by Richard Pospesel at 2023-09-19T17:52:17+02:00
Bug 41659: Add canonical color definitions to base-browser
- - - - -
1513c55a by Pier Angelo Vendrame at 2023-09-19T17:52:17+02:00
Bug 41043: Hardcode the UI font on Linux
The mechanism to choose the UI font does not play well with our
fontconfig configuration. As a result, the final criterion to choose
the font for the UI was its version.
Since we hardcode Arimo as a default sans-serif on preferences, we use
it also for the UI. FontConfig will fall back to some other font for
scripts Arimo does not cover as expected (we tested with Japanese).
- - - - -
1d12954c by Alex Catarineu at 2023-09-19T17:52:18+02:00
Bug 30605: Honor privacy.spoof_english in Android
This checks `privacy.spoof_english` whenever `setLocales` is
called from Fenix side and sets `intl.accept_languages`
accordingly.
Bug 40198: Expose privacy.spoof_english pref in GeckoView
- - - - -
92bc7d61 by Alex Catarineu at 2023-09-19T17:52:18+02:00
Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView
- - - - -
7dccaa4a by Alex Catarineu at 2023-09-19T17:52:19+02:00
Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
- - - - -
40c27ba2 by Alex Catarineu at 2023-09-19T17:52:19+02:00
Bug 26345: Hide tracking protection UI
- - - - -
6a58be57 by Pier Angelo Vendrame at 2023-09-19T17:52:20+02:00
Bug 9173: Change the default Firefox profile directory to be relative.
This commit makes Firefox look for the default profile directory in a
directory relative to the binary path.
The directory can be specified through the --with-relative-data-dir.
This is relative to the same directory as the firefox main binary for
Linux and Windows.
On macOS, we remove Contents/MacOS from it.
Or, in other words, the directory is relative to the application
bundle.
This behavior can be overriden at runtime, by placing a file called
system-install adjacent to the firefox main binary (also on macOS).
- - - - -
5586c4c7 by Alex Catarineu at 2023-09-19T17:52:20+02:00
Bug 27604: Fix addon issues when moving the profile directory
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838
- - - - -
de85b6e7 by Mike Perry at 2023-09-19T17:52:21+02:00
Bug 13028: Prevent potential proxy bypass cases.
It looks like these cases should only be invoked in the NSS command line
tools, and not the browser, but I decided to patch them anyway because there
literally is a maze of network function pointers being passed around, and it's
very hard to tell if some random code might not pass in the proper proxied
versions of the networking code here by accident.
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509
- - - - -
99a69d60 by Igor Oliveira at 2023-09-19T17:52:21+02:00
Bug 23104: Add a default line height compensation
Many fonts have issues with their vertical metrics. they
are used to influence the height of ascenders and depth
of descenders. Gecko uses it to calculate the line height
(font height + ascender + descender), however because of
that idiosyncratic behavior across multiple operating
systems, it can be used to identify the user's OS.
The solution proposed in the patch uses a default factor
to be multiplied with the font size, simulating the concept
of ascender and descender. This way all operating
systems will have the same line height.
- - - - -
aca4b3af by Pier Angelo Vendrame at 2023-09-19T17:52:22+02:00
Bug 40309: Avoid using regional OS locales
Avoid regional OS locales if the pref
`intl.regional_prefs.use_os_locales` is false but RFP is enabled.
- - - - -
c485ec8e by Matthew Finkel at 2023-09-19T17:52:22+02:00
Bug 40432: Prevent probing installed applications
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084
- - - - -
412229e4 by cypherpunks1 at 2023-09-19T17:52:23+02:00
Bug 33955: When copying an image only copy the image contents to the clipboard
- - - - -
0a264e86 by cypherpunks1 at 2023-09-19T17:52:23+02:00
Bug 41791: Omit the source URL when copying page contents to the clipboard
- - - - -
6f502b43 by Pier Angelo Vendrame at 2023-09-19T17:52:24+02:00
Base Browser strings
This commit adds all the strings needed by following Base Browser
patches.
- - - - -
61c6ae75 by Pier Angelo Vendrame at 2023-09-19T17:52:24+02:00
fixup! Base Browser strings
Bug 41528: Added the version string for the about dialog
- - - - -
8f3e4a89 by hackademix at 2023-09-19T17:52:25+02:00
Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs.
- - - - -
fbf7d6d3 by hackademix at 2023-09-19T17:52:25+02:00
Bug 41434: Letterboxing, improve logging.
- - - - -
e5371b40 by hackademix at 2023-09-19T17:52:30+02:00
Bug 31064: Letterboxing, exempt browser extensions.
- - - - -
ef999a6b by hackademix at 2023-09-19T17:52:30+02:00
Bug 32411: Letterboxing, exempt view-source: URIs.
- - - - -
2848e45e by hackademix at 2023-09-19T17:52:31+02:00
Bug 32308: use direct browser sizing for letterboxing.
Bug 30556: align letterboxing with 200x100 new win width stepping
- - - - -
a13b2101 by hackademix at 2023-09-19T17:52:32+02:00
Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
- - - - -
9a42a28f by Pier Angelo Vendrame at 2023-09-19T17:52:32+02:00
Bug 41369: Improve Firefox language settings for multi-lingual packages
Change the language selector to be sorted by language code, rather than
name, and to display the language code to the user.
Bug 41372: Handle Japanese as a special case in preferences on macOS
Japanese is treated in a special way on macOS. However, seeing the
Japanese language tag could be confusing for users, and moreover the
language name is not localized correctly like other langs.
Bug 41378: Tell users that they can change their language at the first start
With multi-lingual builds, Tor Browser matches the user's system
language, but some users might want to change it.
So, we tell them that it is possible, but only once.
- - - - -
b3991d35 by p13dz at 2023-09-19T17:52:33+02:00
Bug 40283: Workaround for the file upload bug
- - - - -
33d71005 by Arthur Edelstein at 2023-09-19T17:52:33+02:00
Bug 18905: Hide unwanted items from help menu
Bug 25660: Remove the "New Private Window" option
- - - - -
e8a07cc8 by cypherpunks1 at 2023-09-19T17:52:34+02:00
fixup! Bug 18905: Hide unwanted items from help menu
Bug 41642: Hide the new private window option only when autostart of PBM is enabled
- - - - -
bde14d8b by cypherpunks1 at 2023-09-19T17:52:34+02:00
Bug 41740: Change the RFP value of devicePixelRatio to 2
- - - - -
8a424e87 by Pier Angelo Vendrame at 2023-09-19T17:52:35+02:00
Bug 41739: Remove "Website appearance" from about:preferences.
It is ignored because of RFP and it is confusing for users.
- - - - -
27790a77 by cypherpunks1 at 2023-09-19T17:52:35+02:00
Bug 41881: Don't persist custom network requests on private windows
- - - - -
cc24918c by hackademix at 2023-09-19T17:52:36+02:00
Bug 42019: Empty browser's clipboard on browser shutdown
- - - - -
995bc5c3 by Henry Wilkes at 2023-09-19T17:52:36+02:00
fixup! Bug 42019: Empty browser's clipboard on browser shutdown
Bug 42097: Add comma.
- - - - -
30994ca3 by hackademix at 2023-09-19T17:52:36+02:00
Bug 42084: Ensure English spoofing works even if preferences are set out of order.
- - - - -
2edcafaa by Pier Angelo Vendrame at 2023-09-19T17:52:37+02:00
Bug 41603: Customize the creation of MOZ_SOURCE_URL
MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and
MOZ_SOURCE_CHANGESET.
But the code takes for granted that it refers to a Hg instance, so it
combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`.
With this commit, we change this logic to combine them to create a URL
that is valid for GitLab.
$MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag.
If that is needed, we could use /-/tree/, instead of /-/commit/.
- - - - -
10e3f69a by Henry Wilkes at 2023-09-19T17:52:38+02:00
Bug 31575: Disable Firefox Home (Activity Stream)
Treat about:blank as the default home page and new tab page.
Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order
to avoid several network requests that we do not need.
Bug 41624: Disable about:pocket-* pages.
Bug 40144: Redirect about:privatebrowsing to the user's home
- - - - -
c086e4fe by Kathy Brade at 2023-09-19T17:52:38+02:00
Bug 4234: Use the Firefox Update Process for Base Browser.
Windows: disable "runas" code path in updater (15201).
Windows: avoid writing to the registry (16236).
Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406,
16014, 16909, 24476, and 25909.
Also fix bug 27221: purge the startup cache if the Base Browser
version changed (even if the Firefox version and build ID did
not change), e.g., after a minor Base Browser update.
Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality.
Bug 26048: potentially confusing "restart to update" message
Within the update doorhanger, remove the misleading message that mentions
that windows will be restored after an update is applied, and replace the
"Restart and Restore" button label with an existing
"Restart to update Tor Browser" string.
Bug 28885: notify users that update is downloading
Add a "Downloading Base Browser update" item which appears in the
hamburger (app) menu while the update service is downloading a MAR
file. Before this change, the browser did not indicate to the user
that an update was in progress, which is especially confusing in
Tor Browser because downloads often take some time. If the user
clicks on the new menu item, the about dialog is opened to allow
the user to see download progress.
As part of this fix, the update service was changed to always show
update-related messages in the hamburger menu, even if the update
was started in the foreground via the about dialog or via the
"Check for Tor Browser Update" toolbar menu item. This change is
consistent with the Tor Browser goal of making sure users are
informed about the update process.
Removed #28885 parts of this patch which have been uplifted to Firefox.
- - - - -
9cb8573b by Pier Angelo Vendrame at 2023-09-19T17:52:39+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Bug 41528: Localized the version string in the about dialog
- - - - -
b5a45343 by Pier Angelo Vendrame at 2023-09-19T17:52:39+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Move the alpha channel creation to a commit on its own
- - - - -
4cb5ec5d by Pier Angelo Vendrame at 2023-09-19T17:52:40+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Allow customizing the updater URL with config options.
With this, we will not need sed hacks on tor-browser-build anymore.
- - - - -
e58eab91 by Pier Angelo Vendrame at 2023-09-19T17:52:40+02:00
Bug 42061: Create an alpha update channel.
- - - - -
bd4e1fa1 by Nicolas Vigier at 2023-09-19T17:52:41+02:00
Bug 41682: Add base-browser nightly mar signing key
- - - - -
997c8334 by hackademix at 2023-09-19T17:52:41+02:00
Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
- - - - -
9956824d by Pier Angelo Vendrame at 2023-09-19T17:52:42+02:00
Bug 41698: Reword the recommendation badges in about:addons
Firefox strings use { -brand-product-name }.
As a result, it seems that the fork is recommending extensions, whereas
AMO curators are doing that.
So, we replace the strings with custom ones that clarify that Mozilla is
recommending them.
We assign the strings with JS because our translation backend does not
support Fluent attributes, yet, but once it does, we should switch to
them, instead.
Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033
- - - - -
957df292 by Alex Catarineu at 2023-09-19T17:52:42+02:00
Bug 40069: Add helpers for message passing with extensions
- - - - -
8a0aa20f by Matthew Finkel at 2023-09-19T17:52:43+02:00
Bug 41598: Prevent NoScript from being removed/disabled.
Bug 40253: Explicitly allow NoScript in Private Browsing mode.
- - - - -
f6e64136 by hackademix at 2023-09-19T17:52:43+02:00
Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons
- - - - -
e45915de by Pier Angelo Vendrame at 2023-09-19T17:52:44+02:00
Bug 40925: Implemented the Security Level component
This component adds a new Security Level toolbar button which visually
indicates the current global security level via icon (as defined by the
extensions.torbutton.security_slider pref), a drop-down hanger with a
short description of the current security level, and a new section in
the about:preferences#privacy page where users can change their current
security level. In addition, the hanger and the preferences page will
show a visual warning when the user has modified prefs associated with
the security level and provide a one-click 'Restore Defaults' button to
get the user back on recommended settings.
Bug 40125: Expose Security Level pref in GeckoView
- - - - -
252cef77 by Henry Wilkes at 2023-09-19T17:52:44+02:00
fixup! Bug 40925: Implemented the Security Level component
Bug 42046: Clean up XUL layout hack in security level panel.
- - - - -
3d5225c2 by Pier Angelo Vendrame at 2023-09-19T17:52:48+02:00
Bug 40926: Implemented the New Identity feature
- - - - -
2631d150 by Henry Wilkes at 2023-09-19T17:52:48+02:00
Bug 41736: Customize toolbar for base-browser.
- - - - -
1d65f29c by Pier Angelo Vendrame at 2023-09-19T17:52:49+02:00
Bug 42027: Base Browser migration procedures.
This commit implmenents the the Base Browser's version of _migrateUI.
- - - - -
327cf983 by Richard Pospesel at 2023-09-19T17:52:50+02:00
Bug 41649: Create rebase and security backport gitlab issue templates
- - - - -
b69c7d5f by Pier Angelo Vendrame at 2023-09-19T17:52:50+02:00
fixup! Bug 41649: Create rebase and security backport gitlab issue templates
Add a step to make the default branch and add how to find a tag when it
does not exist yet.
- - - - -
d1b97543 by Richard Pospesel at 2023-09-19T17:52:51+02:00
Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
- - - - -
77222733 by clairehurst at 2023-09-19T17:52:51+02:00
fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
Bug 42035: Update tools/torbrowser/ scripts to support macOS dev environment
- - - - -
51270bfe by Henry Wilkes at 2023-09-19T17:52:51+02:00
Bug 41803: Add some developer tools for working on tor-browser.
- - - - -
1e9e56f3 by Kathy Brade at 2023-09-19T17:52:52+02:00
Bug 11641: Disable remoting by default.
Unless the -osint command line flag is used, the browser now defaults
to the equivalent of -no-remote. There is a new -allow-remote flag that
may be used to restore the original (Firefox-like) default behavior.
- - - - -
132220dd by Alex Catarineu at 2023-09-19T17:52:53+02:00
Add TorStrings module for localization
- - - - -
8ff432b2 by Henry Wilkes at 2023-09-19T17:52:53+02:00
fixup! Add TorStrings module for localization
Bug 41333: Stop using aboutTor.dtd. No longer use aboutTBUpdate strings in about:tor.
- - - - -
1ff30999 by Pier Angelo Vendrame at 2023-09-19T17:52:54+02:00
fixup! Add TorStrings module for localization
Marked tor_controlconn_failed as a 12.5-only
- - - - -
7f4e82d7 by Henry Wilkes at 2023-09-19T17:52:54+02:00
fixup! Add TorStrings module for localization
Bug 42091: Remove authPrompt "Learn More" href from TorStrings.
- - - - -
7c71e255 by Henry Wilkes at 2023-09-19T17:52:55+02:00
Tor Browser strings
This commit adds all the strings needed for Tor Browser patches.
- - - - -
b470bbf8 by Henry Wilkes at 2023-09-19T17:52:55+02:00
Tor Browser localization migration scripts.
- - - - -
94fc57f0 by Mike Perry at 2023-09-19T17:52:56+02:00
Bug 2176: Rebrand Firefox to TorBrowser
See also Bugs #5194, #7187, #8115, #8219.
This patch does some basic renaming of Firefox to TorBrowser. The rest of the
branding is done by images and icons.
Also fix bug 27905.
Bug 25702: Update Tor Browser icon to follow design guidelines
- Updated all of the branding in /browser/branding/official with new 'stable'
icon series.
- Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and
add the source svg in the same directory
- Copied /browser/branding/official over /browser/branding/nightly and the new
/browser/branding/alpha directories. Replaced content with 'nightly' and
'alpha' icon series.
Updated VisualElements_70.png and VisualElements_150.png with updated icons in
each branding directory (fixes #22654)
- Updated firefox.VisualElementsManfiest.xml with updated colors in each
branding directory
- Added firefox.svg to each branding directory from which all the other icons
are derived (apart from document.icns and document.ico)
- Added default256.png and default512.png icons
- Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed
original icon
- Use the Tor Browser icon within devtools/client/themes/images/.
Bug 30631: Blurry Tor Browser icon on macOS app switcher
It would seem the png2icns tool does not generate correct icns files and
so on macOS the larger icons were missing resulting in blurry icons in
the OS chrome. Regenerated the padded icons in a macOS VM using
iconutil.
Bug 28196: preparations for using torbutton tor-browser-brand.ftl
A small change to Fluent FileSource class is required so that we
can register a new source without its supported locales being
counted as available locales for the browser.
Bug 31803: Replaced about:debugging logo with flat version
Bug 21724: Make Firefox and Tor Browser distinct macOS apps
When macOS opens a document or selects a default browser, it sometimes
uses the CFBundleSignature. Changing from the Firefox MOZB signature to
a different signature TORB allows macOS to distinguish between Firefox
and Tor Browser.
Bug 32092: Fix Tor Browser Support link in preferences
For bug 40562, we moved onionPattern* from bug 27476 to here, as
about:tor needs these files but it is included earlier.
Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one
- - - - -
7119926f by Henry Wilkes at 2023-09-19T17:52:56+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41333: Add a branding svg logo.
Copied from branding/tb-<version>/firefox.svg.
- - - - -
db61f42c by Henry Wilkes at 2023-09-19T17:52:57+02:00
squash! Bug 2176: Rebrand Firefox to TorBrowser
Bug 42088: New application icons (used in-app and on linux).
- - - - -
bc0fcb88 by Henry Wilkes at 2023-09-19T17:52:58+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41957: Use full tor browser icon for site identity button for internal pages.
Also remove colors in tor-styles.css.
- - - - -
71268b41 by Pier Angelo Vendrame at 2023-09-19T17:52:58+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 42078: Update macOS icons
- - - - -
4caa911d by sanketh at 2023-09-19T17:52:59+02:00
Bug 40209: Implement Basic Crypto Safety
Adds a CryptoSafety actor which detects when you've copied a crypto
address from a HTTP webpage and shows a warning.
Closes #40209.
Bug 40428: Fix string attribute names
- - - - -
da75a72f by Mike Perry at 2023-09-19T17:52:59+02:00
TB3: Tor Browser's official .mozconfigs.
Also:
Add an --enable-tor-browser-data-outside-app-dir configure option
Add --with-tor-browser-version configure option
Bug 31457: disable per-installation profiles
The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.
Bug 31935: Disable profile downgrade protection.
Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.
Add --enable-tor-browser-update build option
Bug 40793: moved Tor configuration options from old-configure.in to moz.configure
Bug 41584: Move some configuration options to base-browser level
- - - - -
8471c1f7 by clairehurst at 2023-09-19T17:53:00+02:00
fixup! TB3: Tor Browser's official .mozconfigs.
Bug 42035: update mozconfig for macos development
- - - - -
144cb398 by Henry Wilkes at 2023-09-19T17:53:00+02:00
Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
tor-browser#41285: Enable fluent warnings.
- - - - -
9e917c2c by Pier Angelo Vendrame at 2023-09-19T17:53:01+02:00
Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Before reordering patches, we used to keep the Tor-related patches
(torbutton and tor-launcher) at the beginning.
After that issue, we decided to move them towards the end.
In addition to that, we have decided to move Tor Browser-only
preferences there, too, to make Base Browser-only fixups easier to
apply.
- - - - -
beb27b9f by Henry Wilkes at 2023-09-19T17:53:01+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Bug 41333: Remove TorCheckService.
- - - - -
885549c5 by Richard Pospesel at 2023-09-19T17:53:02+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
- - - - -
510e84ea by Henry Wilkes at 2023-09-19T17:53:04+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Bug 41906: Lock network.trr.mode to be explicitly off.
- - - - -
8b79c605 by Pier Angelo Vendrame at 2023-09-19T17:53:04+02:00
Bug 13252: Customize profile management on macOS
On macOS we allow both portable mode and system installation.
However, in the latter case, we customize Firefox's directories to
match the hierarchy we use for the portable mode.
Also, display an informative error message if the TorBrowser-Data
directory cannot be created due to an "access denied" or a
"read only volume" error.
- - - - -
de89d30e by Pier Angelo Vendrame at 2023-09-19T17:53:05+02:00
Bug 40933: Add tor-launcher functionality
Bug 41926: Reimplement the control port
- - - - -
2f6eb3b8 by Henry Wilkes at 2023-09-19T17:53:05+02:00
fixup! fixup! Bug 40933: Add tor-launcher functionality
Bug 41333: Remove TorCheckService.
- - - - -
83c00801 by Pier Angelo Vendrame at 2023-09-19T17:53:06+02:00
fixup! Bug 40933: Add tor-launcher functionality
Deleted old stuff, unified TorController with ControlSocket, simplified
everything (e.g., do not use the dispatcher anymore, just call stuff
directly or use a much simpler map).
- - - - -
6f78826f by Pier Angelo Vendrame at 2023-09-19T17:53:06+02:00
fixup! Bug 40933: Add tor-launcher functionality
Use `#` instead of `_` for private things here and there, to make
reviewing the changes easier.
- - - - -
e82c6f9a by Pier Angelo Vendrame at 2023-09-19T17:53:07+02:00
fixup! Bug 40933: Add tor-launcher functionality
Shuffle code here and there, so that it's feasible to check that
nothing actually changed with `git diff --color-moved`.
- - - - -
acc4e6c8 by Pier Angelo Vendrame at 2023-09-19T17:53:07+02:00
fixup! Bug 40933: Add tor-launcher functionality
Further refactors/improvements.
- - - - -
df87cd7c by Pier Angelo Vendrame at 2023-09-19T17:53:08+02:00
fixup! Bug 40933: Add tor-launcher functionality
Refactored the settings reading, the first connection and events setup.
- - - - -
45e1dd66 by Pier Angelo Vendrame at 2023-09-19T17:53:08+02:00
fixup! Bug 40933: Add tor-launcher functionality
Moved the control port parsing for asynchronous events from TorProvider
to TorControlPort.
- - - - -
ed0f19a9 by Pier Angelo Vendrame at 2023-09-19T17:53:09+02:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 41986: Fix the control port password handling
- - - - -
a65669a5 by Pier Angelo Vendrame at 2023-09-19T17:53:09+02:00
fixup! Bug 40933: Add tor-launcher functionality
- - - - -
5cd0b1e3 by Pier Angelo Vendrame at 2023-09-19T17:53:10+02:00
fixup! Bug 40933: Add tor-launcher functionality
Second chunk of changes requested during the review.
- - - - -
3909206e by Pier Angelo Vendrame at 2023-09-19T17:53:11+02:00
fixup! Bug 40933: Add tor-launcher functionality
Change the provider buidler to make build async and other fixes.
- - - - -
5f7787be by Pier Angelo Vendrame at 2023-09-19T17:53:11+02:00
fixup! Bug 40933: Add tor-launcher functionality
Make the restart case stronger.
- - - - -
34403ea2 by Pier Angelo Vendrame at 2023-09-19T17:53:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Move the restart to the ProviderBuilder.
- - - - -
8645a190 by Pier Angelo Vendrame at 2023-09-19T17:53:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Addressed more requests from the review, and added documentation.
- - - - -
8db51876 by Pier Angelo Vendrame at 2023-09-19T17:53:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 42102: Fix checkPort in TorProcess
- - - - -
4e6197f5 by Richard Pospesel at 2023-09-19T17:53:13+02:00
Bug 40597: Implement TorSettings module
- migrated in-page settings read/write implementation from about:preferences#tor
to the TorSettings module
- TorSettings initially loads settings from the tor daemon, and saves them to
firefox prefs
- TorSettings notifies observers when a setting has changed; currently only
QuickStart notification is implemented for parity with previous preference
notify logic in about:torconnect and about:preferences#tor
- about:preferences#tor, and about:torconnect now read and write settings
thorugh the TorSettings module
- all tor settings live in the torbrowser.settings.* preference branch
- removed unused pref modify permission for about:torconnect content page from
AsyncPrefs.jsm
Bug 40645: Migrate Moat APIs to Moat.jsm module
- - - - -
f44ef500 by Pier Angelo Vendrame at 2023-09-19T17:53:13+02:00
fixup! Bug 40597: Implement TorSettings module
Workaround for a race condition.
- - - - -
d7549479 by Pier Angelo Vendrame at 2023-09-19T17:53:14+02:00
fixup! Bug 40597: Implement TorSettings module
The provider building is now async.
- - - - -
402ad307 by Pier Angelo Vendrame at 2023-09-19T17:53:15+02:00
fixup! Bug 40597: Implement TorSettings module
Set the state back to Configure when the tor process exits, and disable
qiuckstart.
We should also show the "Not Connected" pill again.
- - - - -
b5aa34c8 by Arthur Edelstein at 2023-09-19T17:53:15+02:00
Bug 3455: Add DomainIsolator, for isolating circuit by domain.
Add an XPCOM component that registers a ProtocolProxyChannelFilter
which sets the username/password for each web request according to
url bar domain.
Bug 9442: Add New Circuit button
Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ.
Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce.
Bug 19206: Clear out the domain isolator state on `New Identity`.
Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes
Bug 21745: Fix handling of catch-all circuit
Bug 41741: Refactor the domain isolator and new circuit
- - - - -
36278c1a by cypherpunks1 at 2023-09-19T17:53:16+02:00
fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.
Bug 40175: Use first-party isolation on reader view
- - - - -
860c94e1 by Pier Angelo Vendrame at 2023-09-19T17:53:16+02:00
fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.
The provider building is now async.
- - - - -
548ccc94 by Henry Wilkes at 2023-09-19T17:53:16+02:00
Bug 41600: Add a tor circuit display panel.
- - - - -
4f8016ca by cypherpunks1 at 2023-09-19T17:53:17+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 40175: Support circuit display on about:reader
- - - - -
356932d8 by Richard Pospesel at 2023-09-19T17:53:17+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 41865: Use --text-color-deemphasized rather than --panel-description-color
- - - - -
2973fbe3 by Henry Wilkes at 2023-09-19T17:53:18+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42045: Allow circuit panel to grow in width for long addresses.
- - - - -
38886199 by Henry Wilkes at 2023-09-19T17:53:21+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 41980: Center-align the circuit heading.
- - - - -
0507161c by Henry Wilkes at 2023-09-19T17:53:21+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42091: Use TorUIUtils to shorten the onion address.
- - - - -
15fa681a by hackademix at 2023-09-19T17:53:22+02:00
Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop
Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs
- - - - -
42138254 by Amogh Pradeep at 2023-09-19T17:53:22+02:00
Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
See Bug 1357997 for partial uplift.
Also:
Bug 28051 - Use our Orbot for proxying our connections
Bug 31144 - ESR68 Network Code Review
- - - - -
508c1958 by Matthew Finkel at 2023-09-19T17:53:23+02:00
Bug 25741: TBA: Disable GeckoNetworkManager
The browser should not need information related to the network
interface or network state, tor should take care of that.
- - - - -
993ff8fa by Kathy Brade at 2023-09-19T17:53:23+02:00
Bug 14631: Improve profile access error messages.
Instead of always reporting that the profile is locked, display specific
messages for "access denied" and "read-only file system".
To allow for localization, get profile-related error strings from Torbutton.
Use app display name ("Tor Browser") in profile-related error alerts.
- - - - -
62399654 by Pier Angelo Vendrame at 2023-09-19T17:53:23+02:00
Bug 40807: Added QRCode.js to toolkit/modules
- - - - -
c15a7936 by Richard Pospesel at 2023-09-19T17:53:24+02:00
Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
This patch adds a new about:preferences#connection page which allows
modifying bridge, proxy, and firewall settings from within Tor Browser.
All of the functionality present in tor-launcher's Network
Configuration panel is present:
- Setting built-in bridges
- Requesting bridges from BridgeDB via moat
- Using user-provided bridges
- Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies
- Setting firewall ports
- Viewing and Copying Tor's logs
- The Networking Settings in General preferences has been removed
Bug 40774: Update about:preferences page to match new UI designs
- - - - -
74bdf570 by Richard Pospesel at 2023-09-19T17:53:24+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41977: Hide the 'Learn more' link in bridge cards
- - - - -
53d77950 by Henry Wilkes at 2023-09-19T17:53:25+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41812: Stop using -moz-box-flex
Fixes:
Bug 41904: Connection settings now inputs at full width.
Bug 41821: Tor logs now expand with dialog.
- - - - -
bd927112 by Henry Wilkes at 2023-09-19T17:53:26+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 42047: Remove sizing hacks for tor dialogs. We can just wait until
DOMContentLoaded to call _populateXUL. Then the subDialog code will take
care of the sizing for us.
- - - - -
9edf966b by Henry Wilkes at 2023-09-19T17:53:26+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41651: Use moz-toggle for enable-bridges switch.
- - - - -
da664169 by Richard Pospesel at 2023-09-19T17:53:27+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha
- - - - -
97658076 by Pier Angelo Vendrame at 2023-09-19T17:53:27+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
The provider building is now async.
- - - - -
be0507a1 by henry at 2023-09-19T17:53:28+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Added some error handling for the cases in which the Tor provider
failed to build.
- - - - -
c126645c by Richard Pospesel at 2023-09-19T17:53:28+02:00
Bug 27476: Implement about:torconnect captive portal within Tor Browser
- implements new about:torconnect page as tor-launcher replacement
- adds new torconnect component to browser
- tor process management functionality remains implemented in tor-launcher through the TorProtocolService module
- adds warning/error box to about:preferences#tor when not connected to tor
Bug 40773: Update the about:torconnect frontend page to match additional UI flows.
Bug 41608: Add a toolbar status button and a urlbar "Connect" button.
- - - - -
0202ab19 by Pier Angelo Vendrame at 2023-09-19T17:53:29+02:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Fixed another race condition and moved to ES modules while I was
touching this code.
- - - - -
5911c55f by Henry Wilkes at 2023-09-19T17:53:29+02:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Bug 42079: Support moving out of the TorConnectState.Bootsrapped state
for gTorConnectTitlebarStatus and gTorConnectUrlbarButton.
- - - - -
490e2a63 by Henry Wilkes at 2023-09-19T17:53:30+02:00
Bug 7494: Create local home page for TBB.
Bug 41333: Update about:tor to new design. Including:
+ make the favicon match the branding icon.
+ make the location bar show a search icon.
- - - - -
04123f41 by Henry Wilkes at 2023-09-19T17:53:30+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 41333: Remove TorCheckService.
- - - - -
eef1671d by Henry Wilkes at 2023-09-19T17:53:31+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42075: Increase inline margin for the message links in about:tor.
Also increase the end margin of the emoji icon.
- - - - -
68b2d132 by Henry Wilkes at 2023-09-19T17:53:32+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42073: Add onion pattern to about:tor background.
- - - - -
29904003 by Arthur Edelstein at 2023-09-19T17:53:32+02:00
Bug 12620: TorBrowser regression tests
Regression tests for Bug #2950: Make Permissions Manager memory-only
Regression tests for TB4: Tor Browser's Firefox preference overrides.
Note: many more functional tests could be made here
Regression tests for #2874: Block Components.interfaces from content
Bug 18923: Add a script to run all Tor Browser specific tests
Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt.
- - - - -
4d2619ef by Pier Angelo Vendrame at 2023-09-19T17:53:33+02:00
Bug 41668: Tweaks to the Base Browser updater for Tor Browser
This commit was once part of "Bug 4234: Use the Firefox Update Process
for Tor Browser.".
However, some parts of it were not needed for Base Browser and some
derivative browsers.
Therefore, we extracted from that commit the parts for Tor Browser
legacy, and we add them back to the patch set with this commit.
- - - - -
fc8c490d by Pier Angelo Vendrame at 2023-09-19T17:53:33+02:00
fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser
The provider building is now async.
- - - - -
5c8ce95c by Kathy Brade at 2023-09-19T17:53:34+02:00
Bug 12647: Support symlinks in the updater.
- - - - -
7af4c5b4 by Kathy Brade at 2023-09-19T17:53:34+02:00
Bug 19121: reinstate the update.xml hash check
This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122.
Revert most changes from Mozilla Bug 862173 "don't verify mar file hash
when using mar signing to verify the mar file (lessens main thread I/O)."
We kept the addition to the AppConstants API in case other JS code
references it in the future.
- - - - -
2eab30bc by Kathy Brade at 2023-09-19T17:53:35+02:00
Bug 16940: After update, load local change notes.
Add an about:tbupdate page that displays the first section from
TorBrowser/Docs/ChangeLog.txt and includes a link to the remote
post-update page (typically our blog entry for the release).
Always load about:tbupdate in a content process, but implement the
code that reads the file system (changelog) in the chrome process
for compatibility with future sandboxing efforts.
Also fix bug 29440. Now about:tbupdate is styled as a fairly simple
changelog page that is designed to be displayed via a link that is on
about:tor.
- - - - -
d25a7b17 by Pier Angelo Vendrame at 2023-09-19T17:53:38+02:00
fixup! Bug 16940: After update, load local change notes.
Remove the doubled and unused aboutTBUpdate.dtd
- - - - -
0d1302b6 by Georg Koppen at 2023-09-19T17:53:38+02:00
Bug 32658: Create a new MAR signing key
It's time for our rotation again: Move the backup key in the front
position and add a new backup key.
Bug 33803: Move our primary nightly MAR signing key to tor-browser
Bug 33803: Add a secondary nightly MAR signing key
- - - - -
78ec020d by Mike Perry at 2023-09-19T17:53:39+02:00
Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
eBay and Amazon don't treat Tor users very well. Accounts often get locked and
payments reversed.
Also:
Bug 16322: Update DuckDuckGo search engine
We are replacing the clearnet URL with an onion service one (thanks to a
patch by a cypherpunk) and are removing the duplicated DDG search
engine. Duplicating DDG happend due to bug 1061736 where Mozilla
included DDG itself into Firefox. Interestingly, this caused breaking
the DDG search if JavaScript is disabled as the Mozilla engine, which
gets loaded earlier, does not use the html version of the search page.
Moreover, the Mozilla engine tracked where the users were searching from
by adding a respective parameter to the search query. We got rid of that
feature as well.
Also:
This fixes bug 20809: the DuckDuckGo team has changed its server-side
code in a way that lets users with JavaScript enabled use the default
landing page while those without JavaScript available get redirected
directly to the non-JS page. We adapt the search engine URLs
accordingly.
Also fixes bug 29798 by making sure we only specify the Google search
engine we actually ship an .xml file for.
Also regression tests.
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40494: Update Startpage search provider
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40438: Add Blockchair as a search engine
Bug 33342: Avoid disconnect search addon error after removal.
We removed the addon in #32767, but it was still being loaded
from addonStartup.json.lz4 and throwing an error on startup
because its resource: location is not available anymore.
- - - - -
395eccd6 by Alex Catarineu at 2023-09-19T17:53:39+02:00
Bug 40073: Disable remote Public Suffix List fetching
In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented
fetching the Public Suffix List via RemoteSettings and replacing the default
one at runtime, which we do not want.
- - - - -
7216971e by Henry Wilkes at 2023-09-19T17:53:40+02:00
Bug 41906: Hide DNS over HTTPS preferences.
- - - - -
4c0b36c2 by Richard Pospesel at 2023-09-19T17:53:40+02:00
Bug 23247: Communicating security expectations for .onion
Encrypting pages hosted on Onion Services with SSL/TLS is redundant
(in terms of hiding content) as all traffic within the Tor network is
already fully encrypted. Therefore, serving HTTP pages from an Onion
Service is more or less fine.
Prior to this patch, Tor Browser would mostly treat pages delivered
via Onion Services as well as pages delivered in the ordinary fashion
over the internet in the same way. This created some inconsistencies
in behaviour and misinformation presented to the user relating to the
security of pages delivered via Onion Services:
- HTTP Onion Service pages did not have any 'lock' icon indicating
the site was secure
- HTTP Onion Service pages would be marked as unencrypted in the Page
Info screen
- Mixed-mode content restrictions did not apply to HTTP Onion Service
pages embedding Non-Onion HTTP content
This patch fixes the above issues, and also adds several new 'Onion'
icons to the mix to indicate all of the various permutations of Onion
Services hosted HTTP or HTTPS pages with HTTP or HTTPS content.
Strings for Onion Service Page Info page are pulled from Torbutton's
localization strings.
- - - - -
28414d6f by cypherpunks1 at 2023-09-19T17:53:41+02:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 41934: Treat unencrypted websocket connections to onion services as secure
- - - - -
7c093b39 by Henry Wilkes at 2023-09-19T17:53:41+02:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 42091: Shorten onion address in site identity panel to be consistent
with the circuit display.
- - - - -
78526f46 by Kathy Brade at 2023-09-19T17:53:42+02:00
Bug 30237: Add v3 onion services client authentication prompt
When Tor informs the browser that client authentication is needed,
temporarily load about:blank instead of about:neterror and prompt
for the user's key.
If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD
control port command to add the key (via Torbutton's control port
module) and reload the page.
If the user cancels the prompt, display the standard about:neterror
"Unable to connect" page. This requires a small change to
browser/actors/NetErrorChild.jsm to account for the fact that the
docShell no longer has the failedChannel information. The failedChannel
is used to extract TLS-related error info, which is not applicable
in the case of a canceled .onion authentication prompt.
Add a leaveOpen option to PopupNotifications.show so we can display
error messages within the popup notification doorhanger without
closing the prompt.
Add support for onion services strings to the TorStrings module.
Add support for Tor extended SOCKS errors (Tor proposal 304) to the
socket transport and SOCKS layers. Improved display of all of these
errors will be implemented as part of bug 30025.
Also fixes bug 19757:
Add a "Remember this key" checkbox to the client auth prompt.
Add an "Onion Services Authentication" section within the
about:preferences "Privacy & Security section" to allow
viewing and removal of v3 onion client auth keys that have
been stored on disk.
Also fixes bug 19251: use enhanced error pages for onion service errors.
- - - - -
59486520 by Pier Angelo Vendrame at 2023-09-19T17:53:42+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
The provider building is now async.
- - - - -
1f1b164e by Pier Angelo Vendrame at 2023-09-19T17:53:43+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Fix possible race conditions on the busy state.
- - - - -
67ce8609 by Pier Angelo Vendrame at 2023-09-19T17:53:44+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Re-build the provider every time we need it, since it might change now.
- - - - -
d51f004c by Henry Wilkes at 2023-09-19T17:53:44+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42092: Fix layout styling of saved onion keys dialog.
- - - - -
f528f338 by Henry Wilkes at 2023-09-19T17:53:45+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42091: Tidy up authPrompt.jsm.
Stop importing modules to the global scope and remove authUtil.jsm.
Refactor the description string handling.
- - - - -
6fdd448a by Henry Wilkes at 2023-09-19T17:53:45+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42091: Shorten the shown onion address in the auth prompt.
- - - - -
d7314a7a by Alex Catarineu at 2023-09-19T17:53:46+02:00
Bug 21952: Implement Onion-Location
Whenever a valid Onion-Location HTTP header (or corresponding HTML
<meta> http-equiv attribute) is found in a document load, we either
redirect to it (if the user opted-in via preference) or notify the
presence of an onionsite alternative with a badge in the urlbar.
- - - - -
9c046ad5 by Pier Angelo Vendrame at 2023-09-19T17:53:46+02:00
Bug 40458: Implement .tor.onion aliases
We have enabled HTTPS-Only mode, therefore we do not need
HTTPS-Everywhere anymore.
However, we want to keep supporting .tor.onion aliases (especially for
securedrop).
Therefore, in this patch we implemented the parsing of HTTPS-Everywhere
rulesets, and the redirect of .tor.onion domains.
Actually, Tor Browser believes they are actual domains. We change them
on the fly on the SOCKS proxy requests to resolve the domain, and on
the code that verifies HTTPS certificates.
- - - - -
7f083816 by Richard Pospesel at 2023-09-19T17:53:47+02:00
fixup! Bug 40458: Implement .tor.onion aliases
Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha
- - - - -
b31552fe by Pier Angelo Vendrame at 2023-09-19T17:53:47+02:00
Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
This patch associates the about:manual page to a translated page that
must be injected to browser/omni.ja after the build.
The content must be placed in chrome/browser/content/browser/manual/, so
that is then available at chrome://browser/content/manual/.
We preferred giving absolute freedom to the web team, rather than having
to change the patch in case of changes on the documentation.
- - - - -
d05ce45e by Henry Wilkes at 2023-09-19T17:53:48+02:00
fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
Bug 41333: Use fluent for manual menu entry since we're no longer using aboutTor.dtd.
- - - - -
da0ed2d2 by Pier Angelo Vendrame at 2023-09-19T17:53:48+02:00
Bug 41435: Add a Tor Browser migration function
For now this function only deletes old language packs for which we are
already packaging the strings with the application.
- - - - -
683152f9 by Henry Wilkes at 2023-09-19T17:53:49+02:00
Bug 42110: Add TorUIUtils module for common tor component methods.
- - - - -
a90a396f by Dan Ballard at 2023-09-19T17:53:49+02:00
Bug 40701: Add security warning when downloading a file
Shown in the downloads panel, about:downloads and places.xhtml.
- - - - -
8e194f14 by Richard Pospesel at 2023-09-19T17:53:50+02:00
fixup! Bug 40701: Add security warning when downloading a file
Bug 41971: Update Tails URL in downloads warning
- - - - -
d495e30c by Henry Wilkes at 2023-09-19T17:53:50+02:00
fixup! Bug 40701: Add security warning when downloading a file
Bug 41886: Fix downloads panel warning size.
- - - - -
491f92d4 by Henry Wilkes at 2023-09-19T17:53:51+02:00
Bug 41736: Customize toolbar for tor-browser.
- - - - -
ca6e3a74 by hackademix at 2023-09-19T17:53:51+02:00
Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key
- - - - -
f87bbfc1 by Henry Wilkes at 2023-09-19T17:53:52+02:00
Customize moz-toggle for tor-browser.
- - - - -
4e23d110 by Henry Wilkes at 2023-09-19T17:53:54+02:00
fixup! Customize moz-toggle for tor-browser.
Bug 41651: Use moz-toggle for enable-bridges switch.
- - - - -
0bf2c83e by Henry Wilkes at 2023-09-19T17:53:55+02:00
Bug 42072: 2023 year end campaign for about:tor.
- - - - -
54b2f6d1 by Henry Wilkes at 2023-09-19T17:53:55+02:00
fixup! Bug 42072: 2023 year end campaign for about:tor.
- - - - -
30 changed files:
- .eslintignore
- .gitignore
- + .gitlab/issue_templates/Backport Android Security Fixes.md
- + .gitlab/issue_templates/Rebase Browser - Alpha.md
- + .gitlab/issue_templates/Rebase Browser - Stable.md
- + .gitlab/issue_templates/bug.md
- + .gitlab/merge_request_templates/default.md
- accessible/android/SessionAccessibility.cpp
- accessible/android/SessionAccessibility.h
- accessible/ipc/DocAccessibleParent.cpp
- accessible/ipc/DocAccessibleParent.h
- accessible/ipc/moz.build
- + browser/actors/AboutTBUpdateChild.jsm
- + browser/actors/AboutTBUpdateParent.jsm
- + browser/actors/CryptoSafetyChild.jsm
- + browser/actors/CryptoSafetyParent.jsm
- − browser/actors/RFPHelperChild.sys.mjs
- − browser/actors/RFPHelperParent.sys.mjs
- browser/actors/moz.build
- browser/app/Makefile.in
- browser/app/macbuild/Contents/Info.plist.in
- browser/app/macbuild/Contents/MacOS-files.in
- browser/app/permissions
- + browser/app/profile/000-tor-browser.js
- + browser/app/profile/001-base-profile.js
- browser/app/profile/firefox.js
- browser/base/content/aboutDialog-appUpdater.js
- browser/base/content/aboutDialog.js
- browser/base/content/aboutDialog.xhtml
- + browser/base/content/aboutDialogTor.css
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bd8300…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bd8300…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.3.0esr-13.0-1
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed new branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.3.0esr-13.0-1
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed new branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_3_0esr_BUILD1
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed new tag FIREFOX_115_3_0esr_BUILD1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
81dd9f82 by Pier Angelo Vendrame at 2023-09-19T09:56:55+00:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 42078: Update macOS icons
- - - - -
6 changed files:
- browser/branding/tb-alpha/document.icns
- browser/branding/tb-alpha/firefox.icns
- browser/branding/tb-nightly/document.icns
- browser/branding/tb-nightly/firefox.icns
- browser/branding/tb-release/document.icns
- browser/branding/tb-release/firefox.icns
Changes:
=====================================
browser/branding/tb-alpha/document.icns
=====================================
Binary files a/browser/branding/tb-alpha/document.icns and b/browser/branding/tb-alpha/document.icns differ
=====================================
browser/branding/tb-alpha/firefox.icns
=====================================
Binary files a/browser/branding/tb-alpha/firefox.icns and b/browser/branding/tb-alpha/firefox.icns differ
=====================================
browser/branding/tb-nightly/document.icns
=====================================
Binary files a/browser/branding/tb-nightly/document.icns and b/browser/branding/tb-nightly/document.icns differ
=====================================
browser/branding/tb-nightly/firefox.icns
=====================================
Binary files a/browser/branding/tb-nightly/firefox.icns and b/browser/branding/tb-nightly/firefox.icns differ
=====================================
browser/branding/tb-release/document.icns
=====================================
Binary files a/browser/branding/tb-release/document.icns and b/browser/branding/tb-release/document.icns differ
=====================================
browser/branding/tb-release/firefox.icns
=====================================
Binary files a/browser/branding/tb-release/firefox.icns and b/browser/branding/tb-release/firefox.icns differ
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81dd9f8…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81dd9f8…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Bug 42074: 2023 year end campaign for tor browser HomeFragment
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
ec2162be by henry at 2023-09-18T16:12:37+01:00
fixup! Bug 42074: 2023 year end campaign for tor browser HomeFragment
- - - - -
1 changed file:
- fenix/app/src/main/res/values/torbrowser_strings.xml
Changes:
=====================================
fenix/app/src/main/res/values/torbrowser_strings.xml
=====================================
@@ -81,12 +81,8 @@
<!-- Large introduction text. -->
<string name="yec_2023_introduction">Right now, Tor Browser for Android is protecting your privacy!</string>
<!-- 2023 year-end-campaign. -->
- <!-- The first part of yec_2023_pleas_donate_full. Split out from the full string to bring some styling attention to this part. Follows directly below yec_2023_introduction. -->
- <string name="yec_2023_please_donate_beginning">This is possible because of donations from our community.</string>
- <!-- 2023 year-end-campaign. -->
<!-- Full donation message. Follows directly below yec_2023_introduction. -->
- <!-- %s will be replaced with the translated string of yec_2023_please_donate_beginning with some visual styling. -->
- <string name="yec_2023_please_donate_full">%s If you value the privacy that Tor Browser for Android offers yourself and others, please make a donation today.</string>
+ <string name="yec_2023_please_donate">This is possible because of donations from our community. If you value the privacy that Tor Browser for Android offers yourself and others, please make a donation today.</string>
<!-- 2023 year-end-campaign. -->
<!-- Shown only during a period where donations will be matched. The end date should match the end of the year. -->
<!-- %s will be replaced with the donation limit. This will be a whole-number and will be automatically pre-formatted according to the language/locale: using the language's numeral symbols and thousand-separators. -->
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ec2…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ec2…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Update ublock-origin to 1.52.0
by boklm (@boklm) 19 Sep '23
by boklm (@boklm) 19 Sep '23
19 Sep '23
boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
aab7b2d6 by Richard Pospesel at 2023-09-18T22:04:13+00:00
Update ublock-origin to 1.52.0
- - - - -
1 changed file:
- projects/browser/config
Changes:
=====================================
projects/browser/config
=====================================
@@ -87,9 +87,9 @@ input_files:
- URL: https://addons.mozilla.org/firefox/downloads/file/4164985/noscript-11.4.27.…
name: noscript
sha256sum: 6b57d9afce663f801177b7492fe7f00967ee3e66b6351b2cf3ff2a6c3ca99637
- - URL: https://addons.mozilla.org/firefox/downloads/file/4141256/ublock_origin-1.5…
+ - URL: https://addons.mozilla.org/firefox/downloads/file/4164949/ublock_origin-1.5…
name: ublock-origin
- sha256sum: 8b73468bc233a11dd2895219466381783d19123857dd0b6fd16a01820fca4834
+ sha256sum: 3932506ce4df306e4da7527d93d60fe0421cf15045c2f4ea73589d9a0902266b
enable: '[% c("var/mullvad-browser") %]'
- URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firef…
name: mullvad-extension
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (@pierov) 19 Sep '23
by Pier Angelo Vendrame (@pierov) 19 Sep '23
19 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
6a043750 by Richard Pospesel at 2023-09-19T07:46:09+00:00
fixup! Firefox preference overrides.
Bug 42094: Explicitly disable media.aboutwebrtc.hist.enabled
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -49,6 +49,7 @@ pref("browser.cache.disk.enable", false);
pref("permissions.memory_only", true);
pref("network.cookie.lifetimePolicy", 2);
pref("security.nocertdb", true);
+pref("media.aboutwebrtc.hist.enabled", false);
// Disk Activity
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6a04375…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6a04375…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.2.1esr-13.0-1] Bug 41995: Generated headers on Windows are not reproducible
by richard (@richard) 19 Sep '23
by richard (@richard) 19 Sep '23
19 Sep '23
richard pushed to branch base-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
0a1a48fd by Pier Angelo Vendrame at 2023-09-19T01:34:03+00:00
Bug 41995: Generated headers on Windows are not reproducible
The flags optionally passed as a third parameter to DLL_BLOCKLIST_ENTRY
are stored in a set, so they are not ordered.
Sorting them before outputting them makes the creation of the headers
deterministic.
- - - - -
1 changed file:
- toolkit/xre/dllservices/mozglue/gen_dll_blocklist_defs.py
Changes:
=====================================
toolkit/xre/dllservices/mozglue/gen_dll_blocklist_defs.py
=====================================
@@ -570,7 +570,7 @@ class DllBlocklistEntry(object):
flags_str = ""
- flags = self.get_flags_list()
+ flags = sorted(self.get_flags_list())
if flags:
flags_str = ", " + " | ".join(map(self.get_flag_string, flags))
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a1a48f…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a1a48f…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] Bug 41995: Generated headers on Windows are not reproducible
by richard (@richard) 19 Sep '23
by richard (@richard) 19 Sep '23
19 Sep '23
richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
43f9dbcb by Pier Angelo Vendrame at 2023-09-19T01:29:25+00:00
Bug 41995: Generated headers on Windows are not reproducible
The flags optionally passed as a third parameter to DLL_BLOCKLIST_ENTRY
are stored in a set, so they are not ordered.
Sorting them before outputting them makes the creation of the headers
deterministic.
- - - - -
1 changed file:
- toolkit/xre/dllservices/mozglue/gen_dll_blocklist_defs.py
Changes:
=====================================
toolkit/xre/dllservices/mozglue/gen_dll_blocklist_defs.py
=====================================
@@ -570,7 +570,7 @@ class DllBlocklistEntry(object):
flags_str = ""
- flags = self.get_flags_list()
+ flags = sorted(self.get_flags_list())
if flags:
flags_str = ", " + " | ".join(map(self.get_flag_string, flags))
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/43f9dbc…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/43f9dbc…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] 6 commits: fixup! Bug 30237: Add v3 onion services client authentication prompt
by richard (@richard) 19 Sep '23
by richard (@richard) 19 Sep '23
19 Sep '23
richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
de6b3303 by Henry Wilkes at 2023-09-19T01:24:50+00:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42091: Tidy up authPrompt.jsm.
Stop importing modules to the global scope and remove authUtil.jsm.
Refactor the description string handling.
- - - - -
1a422b66 by Henry Wilkes at 2023-09-19T01:24:50+00:00
fixup! Add TorStrings module for localization
Bug 42091: Remove authPrompt "Learn More" href from TorStrings.
- - - - -
7c864096 by Henry Wilkes at 2023-09-19T01:24:50+00:00
Bug 42110: Add TorUIUtils module for common tor component methods.
- - - - -
6662e2dd by Henry Wilkes at 2023-09-19T01:24:50+00:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42091: Use TorUIUtils to shorten the onion address.
- - - - -
d66b44eb by Henry Wilkes at 2023-09-19T01:24:50+00:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42091: Shorten the shown onion address in the auth prompt.
- - - - -
6f0199ab by Henry Wilkes at 2023-09-19T01:24:50+00:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 42091: Shorten onion address in site identity panel to be consistent
with the circuit display.
- - - - -
10 changed files:
- browser/base/content/browser-siteIdentity.js
- browser/base/content/browser.js
- browser/components/onionservices/content/authPreferences.js
- browser/components/onionservices/content/authPrompt.js
- − browser/components/onionservices/content/authUtil.jsm
- browser/components/onionservices/jar.mn
- browser/components/torcircuit/content/torCircuitPanel.js
- browser/modules/TorStrings.jsm
- + browser/modules/TorUIUtils.sys.mjs
- browser/modules/moz.build
Changes:
=====================================
browser/base/content/browser-siteIdentity.js
=====================================
@@ -729,7 +729,15 @@ var gIdentityHandler = {
host = this._uri.specIgnoringRef;
}
- return host;
+ // For tor browser we want to shorten onion addresses for the site identity
+ // panel (gIdentityHandler) to match the circuit display and the onion
+ // authorization panel.
+ // See tor-browser#42091 and tor-browser#41600.
+ // This will also shorten addresses for other consumers of this method,
+ // which includes the permissions panel (gPermissionPanel) and the
+ // protections panel (gProtectionsHandler), although the latter is hidden in
+ // tor browser.
+ return TorUIUtils.shortenOnionAddress(host);
},
/**
=====================================
browser/base/content/browser.js
=====================================
@@ -67,6 +67,7 @@ ChromeUtils.defineESModuleGetters(this, {
"resource:///modules/firefox-view-tabs-setup-manager.sys.mjs",
TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
TorDomainIsolator: "resource://gre/modules/TorDomainIsolator.sys.mjs",
+ TorUIUtils: "resource:///modules/TorUIUtils.sys.mjs",
TranslationsParent: "resource://gre/actors/TranslationsParent.sys.mjs",
UITour: "resource:///modules/UITour.sys.mjs",
UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
=====================================
browser/components/onionservices/content/authPreferences.js
=====================================
@@ -42,10 +42,11 @@ const OnionServicesAuthPreferences = {
elem = groupbox.querySelector(this.selector.learnMore);
elem.setAttribute("value", TorStrings.onionServices.learnMore);
- elem.setAttribute("href", TorStrings.onionServices.learnMoreURL);
- if (TorStrings.onionServices.learnMoreURL.startsWith("about:")) {
- elem.setAttribute("useoriginprincipal", "true");
- }
+ elem.setAttribute(
+ "href",
+ "about:manual#onion-services_onion-service-authentication"
+ );
+ elem.setAttribute("useoriginprincipal", "true");
elem = groupbox.querySelector(this.selector.savedKeysButton);
elem.setAttribute(
=====================================
browser/components/onionservices/content/authPrompt.js
=====================================
@@ -1,20 +1,19 @@
-// Copyright (c) 2020, The Tor Project, Inc.
+/* eslint-env mozilla/browser-window */
"use strict";
-/* globals gBrowser, PopupNotifications, Services, XPCOMUtils */
-
-ChromeUtils.defineESModuleGetters(this, {
- TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(this, {
- OnionAuthUtil: "chrome://browser/content/onionservices/authUtil.jsm",
- CommonUtils: "resource://services-common/utils.js",
- TorStrings: "resource:///modules/TorStrings.jsm",
-});
-
const OnionAuthPrompt = (function () {
+ // Only import to our internal scope, rather than the global scope of
+ // browser.xhtml.
+ const lazy = {};
+ ChromeUtils.defineESModuleGetters(lazy, {
+ TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
+ CommonUtils: "resource://services-common/utils.sys.mjs",
+ });
+ XPCOMUtils.defineLazyModuleGetters(lazy, {
+ TorStrings: "resource:///modules/TorStrings.jsm",
+ });
+
// OnionServicesAuthPrompt objects run within the main/chrome process.
// aReason is the topic passed within the observer notification that is
// causing this auth prompt to be displayed.
@@ -25,11 +24,16 @@ const OnionAuthPrompt = (function () {
this._onionHostname = aOnionName;
}
+ const topics = {
+ clientAuthMissing: "tor-onion-services-clientauth-missing",
+ clientAuthIncorrect: "tor-onion-services-clientauth-incorrect",
+ };
+
OnionServicesAuthPrompt.prototype = {
show(aWarningMessage) {
let mainAction = {
- label: TorStrings.onionServices.authPrompt.done,
- accessKey: TorStrings.onionServices.authPrompt.doneAccessKey,
+ label: lazy.TorStrings.onionServices.authPrompt.done,
+ accessKey: lazy.TorStrings.onionServices.authPrompt.doneAccessKey,
leaveOpen: true, // Callback is responsible for closing the notification.
callback: this._onDone.bind(this),
};
@@ -68,9 +72,9 @@ const OnionAuthPrompt = (function () {
this._prompt = PopupNotifications.show(
this._browser,
- OnionAuthUtil.domid.notification,
+ "tor-clientauth",
"",
- OnionAuthUtil.domid.anchor,
+ "tor-clientauth-notification-icon",
mainAction,
[cancelAction],
options
@@ -79,52 +83,38 @@ const OnionAuthPrompt = (function () {
_onPromptShowing(aWarningMessage) {
let xulDoc = this._browser.ownerDocument;
- let descElem = xulDoc.getElementById(OnionAuthUtil.domid.description);
+ let descElem = xulDoc.getElementById("tor-clientauth-notification-desc");
if (descElem) {
// Handle replacement of the onion name within the localized
// string ourselves so we can show the onion name as bold text.
// We do this by splitting the localized string and creating
// several HTML <span> elements.
- while (descElem.firstChild) {
- descElem.firstChild.remove();
- }
+ const fmtString = lazy.TorStrings.onionServices.authPrompt.description;
+ const [prefix, suffix] = fmtString.split("%S");
- let fmtString = TorStrings.onionServices.authPrompt.description;
- let prefix = "";
- let suffix = "";
- const kToReplace = "%S";
- let idx = fmtString.indexOf(kToReplace);
- if (idx < 0) {
- prefix = fmtString;
- } else {
- prefix = fmtString.substring(0, idx);
- suffix = fmtString.substring(idx + kToReplace.length);
- }
+ const domainEl = xulDoc.createElement("span");
+ domainEl.id = "tor-clientauth-notification-onionname";
+ domainEl.textContent = TorUIUtils.shortenOnionAddress(
+ this._onionHostname
+ );
- const kHTMLNS = "http://www.w3.org/1999/xhtml";
- let span = xulDoc.createElementNS(kHTMLNS, "span");
- span.textContent = prefix;
- descElem.appendChild(span);
- span = xulDoc.createElementNS(kHTMLNS, "span");
- span.id = OnionAuthUtil.domid.onionNameSpan;
- span.textContent = this._onionHostname;
- descElem.appendChild(span);
- span = xulDoc.createElementNS(kHTMLNS, "span");
- span.textContent = suffix;
- descElem.appendChild(span);
+ descElem.replaceChildren(prefix, domainEl, suffix);
}
// Set "Learn More" label and href.
- let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.domid.learnMore);
+ let learnMoreElem = xulDoc.getElementById(
+ "tor-clientauth-notification-learnmore"
+ );
if (learnMoreElem) {
- learnMoreElem.setAttribute("value", TorStrings.onionServices.learnMore);
+ learnMoreElem.setAttribute(
+ "value",
+ lazy.TorStrings.onionServices.learnMore
+ );
learnMoreElem.setAttribute(
"href",
- TorStrings.onionServices.learnMoreURL
+ "about:manual#onion-services_onion-service-authentication"
);
- if (TorStrings.onionServices.learnMoreURL.startsWith("about:")) {
- learnMoreElem.setAttribute("useoriginprincipal", "true");
- }
+ learnMoreElem.setAttribute("useoriginprincipal", "true");
}
this._showWarning(aWarningMessage);
@@ -139,7 +129,7 @@ const OnionAuthPrompt = (function () {
if (keyElem) {
keyElem.setAttribute(
"placeholder",
- TorStrings.onionServices.authPrompt.keyPlaceholder
+ lazy.TorStrings.onionServices.authPrompt.keyPlaceholder
);
this._boundOnKeyFieldKeyPress = this._onKeyFieldKeyPress.bind(this);
this._boundOnKeyFieldInput = this._onKeyFieldInput.bind(this);
@@ -186,14 +176,14 @@ const OnionAuthPrompt = (function () {
const base64key = this._keyToBase64(keyElem.value);
if (!base64key) {
- this._showWarning(TorStrings.onionServices.authPrompt.invalidKey);
+ this._showWarning(lazy.TorStrings.onionServices.authPrompt.invalidKey);
return;
}
this._prompt.remove();
const controllerFailureMsg =
- TorStrings.onionServices.authPrompt.failedToSetKey;
+ lazy.TorStrings.onionServices.authPrompt.failedToSetKey;
try {
// ^(subdomain.)*onionserviceid.onion$ (case-insensitive)
const onionServiceIdRegExp =
@@ -205,7 +195,7 @@ const OnionAuthPrompt = (function () {
const checkboxElem = this._getCheckboxElement();
const isPermanent = checkboxElem && checkboxElem.checked;
- const provider = await TorProviderBuilder.build();
+ const provider = await lazy.TorProviderBuilder.build();
await provider.onionAuthAdd(onionServiceId, base64key, isPermanent);
// Success! Reload the page.
this._browser.sendMessageToActor("Browser:Reload", {}, "BrowserTab");
@@ -227,7 +217,7 @@ const OnionAuthPrompt = (function () {
// this authentication prompt.
const failedURI = this._failedURI.spec;
const errorCode =
- this._reasonForPrompt === OnionAuthUtil.topic.clientAuthMissing
+ this._reasonForPrompt === topics.clientAuthMissing
? Cr.NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH
: Cr.NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH;
const io =
@@ -245,19 +235,17 @@ const OnionAuthPrompt = (function () {
_getKeyElement() {
let xulDoc = this._browser.ownerDocument;
- return xulDoc.getElementById(OnionAuthUtil.domid.keyElement);
+ return xulDoc.getElementById("tor-clientauth-notification-key");
},
_getCheckboxElement() {
let xulDoc = this._browser.ownerDocument;
- return xulDoc.getElementById(OnionAuthUtil.domid.checkboxElement);
+ return xulDoc.getElementById("tor-clientauth-persistkey-checkbox");
},
_showWarning(aWarningMessage) {
let xulDoc = this._browser.ownerDocument;
- let warningElem = xulDoc.getElementById(
- OnionAuthUtil.domid.warningElement
- );
+ let warningElem = xulDoc.getElementById("tor-clientauth-warning");
let keyElem = this._getKeyElement();
if (warningElem) {
if (aWarningMessage) {
@@ -289,7 +277,7 @@ const OnionAuthPrompt = (function () {
// a tor onion-auth file (which uses lowercase).
let rawKey;
try {
- rawKey = CommonUtils.decodeBase32(aKeyString.toUpperCase());
+ rawKey = lazy.CommonUtils.decodeBase32(aKeyString.toUpperCase());
} catch (e) {}
if (rawKey) {
@@ -313,24 +301,21 @@ const OnionAuthPrompt = (function () {
let retval = {
init() {
- Services.obs.addObserver(this, OnionAuthUtil.topic.clientAuthMissing);
- Services.obs.addObserver(this, OnionAuthUtil.topic.clientAuthIncorrect);
+ Services.obs.addObserver(this, topics.clientAuthMissing);
+ Services.obs.addObserver(this, topics.clientAuthIncorrect);
},
uninit() {
- Services.obs.removeObserver(this, OnionAuthUtil.topic.clientAuthMissing);
- Services.obs.removeObserver(
- this,
- OnionAuthUtil.topic.clientAuthIncorrect
- );
+ Services.obs.removeObserver(this, topics.clientAuthMissing);
+ Services.obs.removeObserver(this, topics.clientAuthIncorrect);
},
// aSubject is the DOM Window or browser where the prompt should be shown.
// aData contains the .onion name.
observe(aSubject, aTopic, aData) {
if (
- aTopic != OnionAuthUtil.topic.clientAuthMissing &&
- aTopic != OnionAuthUtil.topic.clientAuthIncorrect
+ aTopic != topics.clientAuthMissing &&
+ aTopic != topics.clientAuthIncorrect
) {
return;
}
=====================================
browser/components/onionservices/content/authUtil.jsm deleted
=====================================
@@ -1,25 +0,0 @@
-// Copyright (c) 2020, The Tor Project, Inc.
-
-"use strict";
-
-var EXPORTED_SYMBOLS = ["OnionAuthUtil"];
-
-const OnionAuthUtil = {
- topic: {
- clientAuthMissing: "tor-onion-services-clientauth-missing",
- clientAuthIncorrect: "tor-onion-services-clientauth-incorrect",
- },
- message: {
- authPromptCanceled: "Tor:OnionServicesAuthPromptCanceled",
- },
- domid: {
- anchor: "tor-clientauth-notification-icon",
- notification: "tor-clientauth",
- description: "tor-clientauth-notification-desc",
- learnMore: "tor-clientauth-notification-learnmore",
- onionNameSpan: "tor-clientauth-notification-onionname",
- keyElement: "tor-clientauth-notification-key",
- warningElement: "tor-clientauth-warning",
- checkboxElement: "tor-clientauth-persistkey-checkbox",
- },
-};
=====================================
browser/components/onionservices/jar.mn
=====================================
@@ -2,7 +2,6 @@ browser.jar:
content/browser/onionservices/authPreferences.css (content/authPreferences.css)
content/browser/onionservices/authPreferences.js (content/authPreferences.js)
content/browser/onionservices/authPrompt.js (content/authPrompt.js)
- content/browser/onionservices/authUtil.jsm (content/authUtil.jsm)
content/browser/onionservices/netError/ (content/netError/*)
content/browser/onionservices/onionservices.css (content/onionservices.css)
content/browser/onionservices/savedKeysDialog.js (content/savedKeysDialog.js)
=====================================
browser/components/torcircuit/content/torCircuitPanel.js
=====================================
@@ -408,21 +408,6 @@ var gTorCircuitPanel = {
return this._fallbackStringBundle.formatStringFromName(name, args);
},
- /**
- * Shorten the given address if it is an onion address.
- *
- * @param {string} address - The address to shorten.
- *
- * @returns {string} The shortened form of the address, or the address itself
- * if it was not shortened.
- */
- _shortenOnionAddress(address) {
- if (!address.endsWith(".onion") || address.length <= 22) {
- return address;
- }
- return `${address.slice(0, 7)}…${address.slice(-12)}`;
- },
-
/**
* Updates the circuit display in the panel to show the current browser data.
*/
@@ -465,12 +450,12 @@ var gTorCircuitPanel = {
this._panelElements.heading.textContent = this._getString(
"torbutton.circuit_display.heading",
// Only shorten the onion domain if it has no alias.
- [onionAlias ? domain : this._shortenOnionAddress(domain)]
+ [TorUIUtils.shortenOnionAddress(domain)]
);
if (onionAlias) {
this._panelElements.aliasLink.textContent =
- this._shortenOnionAddress(onionAlias);
+ TorUIUtils.shortenOnionAddress(onionAlias);
if (scheme === "http" || scheme === "https") {
// We assume the same scheme as the current page for the alias, which we
// expect to be either http or https.
@@ -521,7 +506,8 @@ var gTorCircuitPanel = {
);
// Set the address that we want to copy.
- this._panelElements.endItem.textContent = this._shortenOnionAddress(domain);
+ this._panelElements.endItem.textContent =
+ TorUIUtils.shortenOnionAddress(domain);
// Button description text, depending on whether our first node was a
// bridge, or otherwise a guard.
=====================================
browser/modules/TorStrings.jsm
=====================================
@@ -300,7 +300,6 @@ const Loader = {
const retval = {
learnMore: getString("learnMore", "Learn more"),
- learnMoreURL: "about:manual#onion-services_onion-service-authentication",
errorPage: {
browser: getString("errorPage.browser", "Browser"),
network: getString("errorPage.network", "Network"),
=====================================
browser/modules/TorUIUtils.sys.mjs
=====================================
@@ -0,0 +1,26 @@
+/**
+ * Common methods for tor UI components.
+ */
+export const TorUIUtils = {
+ /**
+ * Shorten the given address if it is an onion address.
+ *
+ * @param {string} address - The address to shorten.
+ *
+ * @returns {string} The shortened form of the address, or the address itself
+ * if it was not shortened.
+ */
+ shortenOnionAddress(address) {
+ if (
+ // Only shorten ".onion" addresses.
+ !address.endsWith(".onion") ||
+ // That are not "onion" aliases.
+ address.endsWith(".tor.onion") ||
+ // And are long.
+ address.length <= 21
+ ) {
+ return address;
+ }
+ return `${address.slice(0, 6)}…${address.slice(-12)}`;
+ },
+};
=====================================
browser/modules/moz.build
=====================================
@@ -152,6 +152,7 @@ EXTRA_JS_MODULES += [
"TorConnect.sys.mjs",
"TorSettings.sys.mjs",
"TorStrings.jsm",
+ "TorUIUtils.sys.mjs",
"TransientPrefs.jsm",
"URILoadingHelper.sys.mjs",
"webrtcUI.jsm",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2760a7…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2760a7…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by Pier Angelo Vendrame (@pierov) 18 Sep '23
by Pier Angelo Vendrame (@pierov) 18 Sep '23
18 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
2760a7b8 by Henry Wilkes at 2023-09-18T17:00:13+01:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41957: Use full tor browser icon for site identity button for internal pages.
Also remove colors in tor-styles.css.
- - - - -
11 changed files:
- − browser/branding/tb-alpha/content/identity-icons-brand.svg
- browser/branding/tb-alpha/content/jar.mn
- − browser/branding/tb-alpha/content/tor-styles.css
- − browser/branding/tb-nightly/content/identity-icons-brand.svg
- browser/branding/tb-nightly/content/jar.mn
- − browser/branding/tb-nightly/content/tor-styles.css
- − browser/branding/tb-release/content/identity-icons-brand.svg
- browser/branding/tb-release/content/jar.mn
- − browser/branding/tb-release/content/tor-styles.css
- browser/themes/shared/browser-shared.css
- browser/themes/shared/identity-block/identity-block.css
Changes:
=====================================
browser/branding/tb-alpha/content/identity-icons-brand.svg deleted
=====================================
@@ -1,8 +0,0 @@
-<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
- <g clip-rule="evenodd" fill-rule="evenodd">
- <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/>
- <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/>
- <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/>
- </g>
- <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/>
-</svg>
\ No newline at end of file
=====================================
browser/branding/tb-alpha/content/jar.mn
=====================================
@@ -16,7 +16,5 @@ browser.jar:
content/branding/icon64.png (../default64.png)
content/branding/icon128.png (../default128.png)
content/branding/icon256.png (../default256.png)
- content/branding/identity-icons-brand.svg
content/branding/aboutDialog.css
content/branding/tor-browser-logo.svg
- content/branding/tor-styles.css
=====================================
browser/branding/tb-alpha/content/tor-styles.css deleted
=====================================
@@ -1,11 +0,0 @@
-/* default theme*/
-:root {
- --tor-branding-color: var(--teal-70);
-}
-
-/* dark theme */
-@media (prefers-color-scheme: dark) {
- :root {
- --tor-branding-color: var(--teal-60);
- }
-}
=====================================
browser/branding/tb-nightly/content/identity-icons-brand.svg deleted
=====================================
@@ -1,8 +0,0 @@
-<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
- <g clip-rule="evenodd" fill-rule="evenodd">
- <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/>
- <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/>
- <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/>
- </g>
- <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/>
-</svg>
\ No newline at end of file
=====================================
browser/branding/tb-nightly/content/jar.mn
=====================================
@@ -16,7 +16,5 @@ browser.jar:
content/branding/icon64.png (../default64.png)
content/branding/icon128.png (../default128.png)
content/branding/icon256.png (../default256.png)
- content/branding/identity-icons-brand.svg
content/branding/aboutDialog.css
content/branding/tor-browser-logo.svg
- content/branding/tor-styles.css
=====================================
browser/branding/tb-nightly/content/tor-styles.css deleted
=====================================
@@ -1,11 +0,0 @@
-/* default theme*/
-:root {
- --tor-branding-color: var(--blue-60);
-}
-
-/* dark theme */
-@media (prefers-color-scheme: dark) {
- :root {
- --tor-branding-color: var(--blue-40);
- }
-}
=====================================
browser/branding/tb-release/content/identity-icons-brand.svg deleted
=====================================
@@ -1,8 +0,0 @@
-<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
- <g clip-rule="evenodd" fill-rule="evenodd">
- <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/>
- <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/>
- <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/>
- </g>
- <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/>
-</svg>
\ No newline at end of file
=====================================
browser/branding/tb-release/content/jar.mn
=====================================
@@ -16,7 +16,5 @@ browser.jar:
content/branding/icon64.png (../default64.png)
content/branding/icon128.png (../default128.png)
content/branding/icon256.png (../default256.png)
- content/branding/identity-icons-brand.svg
content/branding/aboutDialog.css
content/branding/tor-browser-logo.svg
- content/branding/tor-styles.css
=====================================
browser/branding/tb-release/content/tor-styles.css deleted
=====================================
@@ -1,11 +0,0 @@
-/* default theme*/
-:root {
- --tor-branding-color: var(--purple-60);
-}
-
-/* dark theme */
-@media (prefers-color-scheme: dark) {
- :root {
- --tor-branding-color: var(--purple-30);
- }
-}
=====================================
browser/themes/shared/browser-shared.css
=====================================
@@ -23,7 +23,6 @@
@import url("chrome://browser/skin/customizableui/customizeMode.css");
@import url("chrome://browser/skin/UITour.css");
@import url("chrome://browser/skin/browser-colors.css");
-@import url("chrome://branding/content/tor-styles.css");
@import url("chrome://browser/skin/tor-urlbar-button.css");
@import url("chrome://browser/skin/onionlocation.css");
=====================================
browser/themes/shared/identity-block/identity-block.css
=====================================
@@ -53,10 +53,6 @@
border-radius: var(--urlbar-icon-border-radius);
}
-#identity-box[pageproxystate="valid"].chromeUI #identity-icon-label {
- color: var(--tor-branding-color);
-}
-
#identity-icon-label {
padding-inline-start: 4px;
}
@@ -151,9 +147,12 @@
}
#identity-box[pageproxystate="valid"].chromeUI #identity-icon {
- list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
- fill: var(--tor-branding-color);
- fill-opacity: 1;
+ list-style-image: url(chrome://branding/content/icon16.png);
+}
+@media (min-resolution: 1.1dppx) {
+ #identity-box[pageproxystate="valid"].chromeUI #identity-icon {
+ list-style-image: url(chrome://branding/content/icon32.png);
+ }
}
#identity-box[pageproxystate="valid"].localResource #identity-icon {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2760a7b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2760a7b…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] squash! Bug 2176: Rebrand Firefox to TorBrowser
by Pier Angelo Vendrame (@pierov) 18 Sep '23
by Pier Angelo Vendrame (@pierov) 18 Sep '23
18 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
dec788d1 by Henry Wilkes at 2023-09-18T15:48:48+01:00
squash! Bug 2176: Rebrand Firefox to TorBrowser
Bug 42088: New application icons (used in-app and on linux).
- - - - -
30 changed files:
- browser/branding/tb-alpha/content/tor-browser-logo.svg
- browser/branding/tb-alpha/default128.png
- browser/branding/tb-alpha/default16.png
- browser/branding/tb-alpha/default22.png
- browser/branding/tb-alpha/default24.png
- browser/branding/tb-alpha/default256.png
- browser/branding/tb-alpha/default32.png
- browser/branding/tb-alpha/default48.png
- browser/branding/tb-alpha/default64.png
- − browser/branding/tb-alpha/firefox.svg
- browser/branding/tb-nightly/content/tor-browser-logo.svg
- browser/branding/tb-nightly/default128.png
- browser/branding/tb-nightly/default16.png
- browser/branding/tb-nightly/default22.png
- browser/branding/tb-nightly/default24.png
- browser/branding/tb-nightly/default256.png
- browser/branding/tb-nightly/default32.png
- browser/branding/tb-nightly/default48.png
- browser/branding/tb-nightly/default64.png
- − browser/branding/tb-nightly/firefox.svg
- browser/branding/tb-release/content/tor-browser-logo.svg
- browser/branding/tb-release/default128.png
- browser/branding/tb-release/default16.png
- browser/branding/tb-release/default22.png
- browser/branding/tb-release/default24.png
- browser/branding/tb-release/default256.png
- browser/branding/tb-release/default32.png
- browser/branding/tb-release/default48.png
- browser/branding/tb-release/default64.png
- − browser/branding/tb-release/firefox.svg
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dec788d…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dec788d…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Update rbm for rbm#40061
by boklm (@boklm) 18 Sep '23
by boklm (@boklm) 18 Sep '23
18 Sep '23
boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
0e729d3f by Nicolas Vigier at 2023-09-18T16:50:16+02:00
Update rbm for rbm#40061
- - - - -
1 changed file:
- rbm
Changes:
=====================================
rbm
=====================================
@@ -1 +1 @@
-Subproject commit c4c1716dcbffa58c102daa8a5f3e188acdaf823a
+Subproject commit fb51b232ea9281032762df30211400139ff80275
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/rbm][main] Bug 40061: Log copy of input_files when the RBM_VERBOSE_LOG environment variable is set
by boklm (@boklm) 18 Sep '23
by boklm (@boklm) 18 Sep '23
18 Sep '23
boklm pushed to branch main at The Tor Project / Applications / RBM
Commits:
fb51b232 by Nicolas Vigier at 2023-09-18T08:30:49+02:00
Bug 40061: Log copy of input_files when the RBM_VERBOSE_LOG environment variable is set
- - - - -
1 changed file:
- lib/RBM.pm
Changes:
=====================================
lib/RBM.pm
=====================================
@@ -1229,6 +1229,10 @@ sub build_run {
exec_name => 'put',
exec_as_root => 0,
});
+ if ($ENV{RBM_VERBOSE_LOG}) {
+ my $now = localtime;
+ path($build_log)->append_utf8("[$now] Copying file $file\n");
+ }
if (run_script($project, $cmd, sub { system(@_) }) != 0) {
$error = "Error uploading $file";
goto EXIT;
View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/fb51b232ea92810…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/fb51b232ea92810…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (@pierov) 18 Sep '23
by Pier Angelo Vendrame (@pierov) 18 Sep '23
18 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
5d6218da by Pier Angelo Vendrame at 2023-09-18T11:16:31+02:00
fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
Bug 42083: RemoteSecuritySettings.init throws error in console
- - - - -
1 changed file:
- security/manager/ssl/RemoteSecuritySettings.sys.mjs
Changes:
=====================================
security/manager/ssl/RemoteSecuritySettings.sys.mjs
=====================================
@@ -529,6 +529,10 @@ class CRLiteFilters {
}
async cleanAttachmentCache() {
+ if (!this.client) {
+ return;
+ }
+
// Bug 1795710 - misuse of Remote Settings `downloadToDisk` caused us to
// keep filters and stashes on disk indefinitely. We're no longer caching
// these downloads, so if there are any filters still in the cache they can
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5d6218d…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5d6218d…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] Bug 42074: 2023 year end campaign for tor browser HomeFragment
by Pier Angelo Vendrame (@pierov) 18 Sep '23
by Pier Angelo Vendrame (@pierov) 18 Sep '23
18 Sep '23
Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
2ebfc4b7 by clairehurst at 2023-09-18T08:49:21+00:00
Bug 42074: 2023 year end campaign for tor browser HomeFragment
- - - - -
1 changed file:
- fenix/app/src/main/res/values/torbrowser_strings.xml
Changes:
=====================================
fenix/app/src/main/res/values/torbrowser_strings.xml
=====================================
@@ -75,4 +75,30 @@
<!-- Onion location -->
<string name="preferences_tor_prioritize_onions">Prioritize .onion sites</string>
+
+ <!-- 2023 year-end-campaign. -->
+
+ <!-- Large introduction text. -->
+ <string name="yec_2023_introduction">Right now, Tor Browser for Android is protecting your privacy!</string>
+ <!-- 2023 year-end-campaign. -->
+ <!-- The first part of yec_2023_pleas_donate_full. Split out from the full string to bring some styling attention to this part. Follows directly below yec_2023_introduction. -->
+ <string name="yec_2023_please_donate_beginning">This is possible because of donations from our community.</string>
+ <!-- 2023 year-end-campaign. -->
+ <!-- Full donation message. Follows directly below yec_2023_introduction. -->
+ <!-- %s will be replaced with the translated string of yec_2023_please_donate_beginning with some visual styling. -->
+ <string name="yec_2023_please_donate_full">%s If you value the privacy that Tor Browser for Android offers yourself and others, please make a donation today.</string>
+ <!-- 2023 year-end-campaign. -->
+ <!-- Shown only during a period where donations will be matched. The end date should match the end of the year. -->
+ <!-- %s will be replaced with the donation limit. This will be a whole-number and will be automatically pre-formatted according to the language/locale: using the language's numeral symbols and thousand-separators. -->
+ <!-- NOTE: The amount should be shown as USD (United States dollar) currency. In the original English string, the leading "$" is the literal USD currency symbol, and this can be changed or removed when translating to whatever is most appropriate for USD currency in the locale. The ending "!" is also the literal exclamation point and can be similarly changed. -->
+ <!-- For example, "$%s" for English would eventually be shown as "$5,000", whilst "%s US$" for Arabic would be shown as "٥٬٠٠٠ US$". -->
+ <!-- Translators: If you need any help or clarification, feel free to ask a question on weblate or in IRC (#tor-l10n). -->
+ <string name="yec_2023_matched_donation">From now until December 31, donations to the Tor Project will be matched one-to-one, up to $%s!</string>
+ <!-- 2023 year-end-campaign. -->
+ <string name="yec_2023_close_button">Close</string>
+ <!-- 2023 year-end-campaign. -->
+ <string name="yec_2023_donate_button">Donate now</string>
+ <!-- 2023 year-end-campaign. -->
+ <string name="yec_2023_free_to_use">Tor Browser for Android will always be free to use—no donation is required to use this app.</string>
+
</resources>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2eb…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2eb…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 7494: Create local home page for TBB.
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
5813d89a by Henry Wilkes at 2023-09-15T20:18:20+00:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42073: Add onion pattern to about:tor background.
- - - - -
3 changed files:
- browser/components/abouttor/content/aboutTor.css
- + browser/components/abouttor/content/onion-pattern.svg
- browser/components/abouttor/jar.mn
Changes:
=====================================
browser/components/abouttor/content/aboutTor.css
=====================================
@@ -20,6 +20,11 @@ body {
/ 1fr minmax(max-content, 600px) 1fr;
justify-items: center;
padding-inline: 20px;
+ background:
+ local
+ url("chrome://browser/content/abouttor/onion-pattern.svg")
+ center bottom
+ repeat-x;
}
h1 {
=====================================
browser/components/abouttor/content/onion-pattern.svg
=====================================
@@ -0,0 +1,27 @@
+<svg fill="none" height="150" viewBox="0 0 1200 150" width="1200" xmlns="http://www.w3.org/2000/svg">
+ <path clip-rule="evenodd" d="m75 145c38.66 0 70-31.34 70-70 0-38.6599-31.34-70-70-70-38.6599 0-70 31.3401-70 70 0 38.66 31.3401 70 70 70zm0 5c41.421 0 75-33.579 75-75 0-41.4214-33.579-75-75-75-41.4214 0-75 33.5786-75 75 0 41.421 33.5786 75 75 75z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m75 126.25c28.305 0 51.25-22.945 51.25-51.25 0-28.3046-22.945-51.25-51.25-51.25-28.3046 0-51.25 22.9454-51.25 51.25 0 28.305 22.9454 51.25 51.25 51.25zm0 5c31.066 0 56.25-25.184 56.25-56.25s-25.184-56.25-56.25-56.25-56.25 25.184-56.25 56.25 25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m75 107.5c17.9493 0 32.5-14.5507 32.5-32.5s-14.5507-32.5-32.5-32.5-32.5 14.5507-32.5 32.5 14.5507 32.5 32.5 32.5zm0 5c20.7107 0 37.5-16.7893 37.5-37.5s-16.7893-37.5-37.5-37.5-37.5 16.7893-37.5 37.5 16.7893 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/>
+
+ <path clip-rule="evenodd" d="m75 88.75c7.5939 0 13.75-6.1561 13.75-13.75s-6.1561-13.75-13.75-13.75-13.75 6.1561-13.75 13.75 6.1561 13.75 13.75 13.75zm0 5c10.3553 0 18.75-8.3947 18.75-18.75s-8.3947-18.75-18.75-18.75-18.75 8.3947-18.75 18.75 8.3947 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/>
+ <path d="m294.846 0c2.762 0 5.017 2.24554 4.836 5.001-2.573 39.0897-35.095 69.999-74.836 69.999s-72.262-30.9093-74.836-69.999c-.181-2.75546 2.075-5.001 4.836-5.001z" fill="#3e0663"/>
+ <path d="m294.846 75c2.762 0 5.017 2.2455 4.836 5.001-2.573 39.09-35.095 69.999-74.836 69.999s-72.262-30.909-74.836-69.999c-.181-2.7555 2.075-5.001 4.836-5.001z" fill="#350556"/>
+ <path clip-rule="evenodd" d="m374.692 145c38.66 0 70-31.34 70-70 0-38.6599-31.34-70-70-70s-70 31.3401-70 70c0 38.66 31.34 70 70 70zm0 5c41.422 0 75-33.579 75-75 0-41.4214-33.578-75-75-75-41.421 0-75 33.5786-75 75 0 41.421 33.579 75 75 75z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m374.692 126.25c28.305 0 51.25-22.945 51.25-51.25 0-28.3046-22.945-51.25-51.25-51.25-28.304 0-51.25 22.9454-51.25 51.25 0 28.305 22.946 51.25 51.25 51.25zm0 5c31.066 0 56.25-25.184 56.25-56.25s-25.184-56.25-56.25-56.25-56.25 25.184-56.25 56.25 25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m374.692 107.5c17.95 0 32.5-14.5507 32.5-32.5s-14.55-32.5-32.5-32.5c-17.949 0-32.5 14.5507-32.5 32.5s14.551 32.5 32.5 32.5zm0 5c20.711 0 37.5-16.7893 37.5-37.5s-16.789-37.5-37.5-37.5c-20.71 0-37.5 16.7893-37.5 37.5s16.79 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m374.692 88.75c7.594 0 13.75-6.1561 13.75-13.75s-6.156-13.75-13.75-13.75-13.75 6.1561-13.75 13.75 6.156 13.75 13.75 13.75zm0 5c10.356 0 18.75-8.3947 18.75-18.75s-8.394-18.75-18.75-18.75c-10.355 0-18.75 8.3947-18.75 18.75s8.395 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/>
+ <path d="m449.692 4.99998c0-2.76142 2.246-5.0173044 5.001-4.835902 39.09 2.573422 69.999 35.095022 69.999 74.835922 0 39.741-30.909 72.262-69.999 74.836-2.755.181-5.001-2.075-5.001-4.836z" fill="#3e0663"/>
+ <path d="m524.692 4.99998c0-2.76142 2.246-5.0173044 5.001-4.835902 39.09 2.573422 69.999 35.095022 69.999 74.835922 0 39.741-30.909 72.262-69.999 74.836-2.755.181-5.001-2.075-5.001-4.836z" fill="#350556"/>
+ <path clip-rule="evenodd" d="m674.692 145c38.66 0 70-31.34 70-70 0-38.6599-31.34-70-70-70s-70 31.3401-70 70c0 38.66 31.34 70 70 70zm0 5c41.422 0 75-33.579 75-75 0-41.4214-33.578-75-75-75-41.421 0-75 33.5786-75 75 0 41.421 33.579 75 75 75z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m674.692 126.25c28.305 0 51.25-22.945 51.25-51.25 0-28.3046-22.945-51.25-51.25-51.25-28.304 0-51.25 22.9454-51.25 51.25 0 28.305 22.946 51.25 51.25 51.25zm0 5c31.066 0 56.25-25.184 56.25-56.25s-25.184-56.25-56.25-56.25-56.25 25.184-56.25 56.25 25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m674.692 107.5c17.95 0 32.5-14.5507 32.5-32.5s-14.55-32.5-32.5-32.5c-17.949 0-32.5 14.5507-32.5 32.5s14.551 32.5 32.5 32.5zm0 5c20.711 0 37.5-16.7893 37.5-37.5s-16.789-37.5-37.5-37.5c-20.71 0-37.5 16.7893-37.5 37.5s16.79 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m674.692 88.75c7.594 0 13.75-6.1561 13.75-13.75s-6.156-13.75-13.75-13.75-13.75 6.1561-13.75 13.75 6.156 13.75 13.75 13.75zm0 5c10.356 0 18.75-8.3947 18.75-18.75s-8.394-18.75-18.75-18.75c-10.355 0-18.75 8.3947-18.75 18.75s8.395 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/>
+ <path d="m894.538 0c2.762 0 5.018 2.24554 4.836 5.001-2.573 39.0897-35.095 69.999-74.836 69.999-39.74 0-72.262-30.9093-74.836-69.999-.181-2.75546 2.075-5.001 4.836-5.001z" fill="#3e0663"/>
+ <path d="m894.538 75c2.762 0 5.018 2.2455 4.836 5.001-2.573 39.09-35.095 69.999-74.836 69.999-39.74 0-72.262-30.909-74.836-69.999-.181-2.7555 2.075-5.001 4.836-5.001z" fill="#350556"/>
+ <path clip-rule="evenodd" d="m974.385 145c38.655 0 69.995-31.34 69.995-70 0-38.6599-31.34-70-69.995-70-38.66 0-70 31.3401-70 70 0 38.66 31.34 70 70 70zm0 5c41.425 0 74.995-33.579 74.995-75 0-41.4214-33.57-75-74.995-75-41.422 0-75 33.5786-75 75 0 41.421 33.578 75 75 75z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m974.385 126.25c28.305 0 51.245-22.945 51.245-51.25 0-28.3046-22.94-51.25-51.245-51.25s-51.25 22.9454-51.25 51.25c0 28.305 22.945 51.25 51.25 51.25zm0 5c31.065 0 56.245-25.184 56.245-56.25s-25.18-56.25-56.245-56.25c-31.066 0-56.25 25.184-56.25 56.25s25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m974.385 107.5c17.949 0 32.495-14.5507 32.495-32.5s-14.546-32.5-32.495-32.5c-17.95 0-32.5 14.5507-32.5 32.5s14.55 32.5 32.5 32.5zm0 5c20.71 0 37.495-16.7893 37.495-37.5s-16.785-37.5-37.495-37.5c-20.711 0-37.5 16.7893-37.5 37.5s16.789 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/>
+ <path clip-rule="evenodd" d="m974.385 88.75c7.593 0 13.75-6.1561 13.75-13.75s-6.157-13.75-13.75-13.75c-7.594 0-13.75 6.1561-13.75 13.75s6.156 13.75 13.75 13.75zm0 5c10.355 0 18.75-8.3947 18.75-18.75s-8.395-18.75-18.75-18.75c-10.356 0-18.75 8.3947-18.75 18.75s8.394 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/>
+ <path d="m1199.38 145c0 2.761-2.24 5.017-5 4.836-39.09-2.573-70-35.095-70-74.836 0-39.7409 30.91-72.26248 70-74.835903 2.76-.1814017 5 2.074493 5 4.835913z" fill="#3e0663"/>
+ <path d="m1124.38 145c0 2.761-2.24 5.017-5 4.836-39.09-2.573-70-35.095-70-74.836 0-39.7409 30.91-72.26248 70-74.835903 2.76-.1814017 5 2.074493 5 4.835913z" fill="#350556"/>
+</svg>
=====================================
browser/components/abouttor/jar.mn
=====================================
@@ -7,3 +7,4 @@ browser.jar:
content/browser/abouttor/26a1-high-voltage.svg (content/26a1-high-voltage.svg)
content/browser/abouttor/2728-sparkles.svg (content/2728-sparkles.svg)
content/browser/abouttor/2764-red-heart.svg (content/2764-red-heart.svg)
+ content/browser/abouttor/onion-pattern.svg (content/onion-pattern.svg)
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5813d89…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5813d89…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
0ce95033 by Henry Wilkes at 2023-09-15T20:11:51+00:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42092: Fix layout styling of saved onion keys dialog.
- - - - -
3 changed files:
- browser/components/onionservices/content/authPreferences.css
- browser/components/onionservices/content/savedKeysDialog.js
- browser/components/onionservices/content/savedKeysDialog.xhtml
Changes:
=====================================
browser/components/onionservices/content/authPreferences.css
=====================================
@@ -3,7 +3,11 @@
@import url("chrome://browser/skin/browser-colors.css");
#torOnionServiceKeys-overview-container {
- margin-right: 30px;
+ margin-inline-end: 30px;
+}
+
+#onionservices-savedkeys-dialog {
+ min-width: 45em;
}
#onionservices-savedkeys-tree treechildren::-moz-tree-cell-text {
@@ -11,14 +15,17 @@
}
#onionservices-savedkeys-errorContainer {
- margin-top: 4px;
+ margin-block-start: 4px;
min-height: 3em;
}
+#onionservices-savedkeys-errorContainer:not(.show-error) {
+ visibility: hidden;
+}
+
#onionservices-savedkeys-errorIcon {
- margin-right: 4px;
+ margin-inline-end: 4px;
list-style-image: url("chrome://global/skin/icons/warning.svg");
-moz-context-properties: fill;
fill: var(--warning-color);
- visibility: hidden;
}
=====================================
browser/components/onionservices/content/savedKeysDialog.js
=====================================
@@ -189,10 +189,10 @@ var gOnionServicesSavedKeysDialog = {
},
_showError(aMessage) {
- const dialog = document.querySelector(this.selector.dialog);
- const errorIcon = dialog.querySelector(this.selector.errorIcon);
- errorIcon.style.visibility = aMessage ? "visible" : "hidden";
- const errorDesc = dialog.querySelector(this.selector.errorMessage);
+ document
+ .getElementById("onionservices-savedkeys-errorContainer")
+ .classList.toggle("show-error", !!aMessage);
+ const errorDesc = document.querySelector(this.selector.errorMessage);
errorDesc.textContent = aMessage ? aMessage : "";
},
=====================================
browser/components/onionservices/content/savedKeysDialog.xhtml
=====================================
@@ -9,7 +9,6 @@
id="onionservices-savedkeys-dialog"
windowtype="OnionServices:SavedKeys"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- style="width: 45em"
>
<script src="chrome://browser/content/onionservices/savedKeysDialog.js" />
@@ -23,8 +22,6 @@
id="onionservices-savedkeys-tree"
flex="1"
hidecolumnpicker="true"
- width="750"
- style="height: 20em"
onselect="gOnionServicesSavedKeysDialog.updateButtonsState();"
>
<treecols>
@@ -38,7 +35,7 @@
</treecols>
<treechildren />
</tree>
- <hbox id="onionservices-savedkeys-errorContainer" align="baseline" flex="1">
+ <hbox id="onionservices-savedkeys-errorContainer" align="center">
<image id="onionservices-savedkeys-errorIcon" />
<description id="onionservices-savedkeys-errorMessage" flex="1" />
</hbox>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0ce9503…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0ce9503…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
3d4edb72 by Henry Wilkes at 2023-09-15T18:51:48+00:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Bug 42079: Support moving out of the TorConnectState.Bootsrapped state
for gTorConnectTitlebarStatus and gTorConnectUrlbarButton.
- - - - -
2 changed files:
- browser/components/torconnect/content/torConnectTitlebarStatus.js
- browser/components/torconnect/content/torConnectUrlbarButton.js
Changes:
=====================================
browser/components/torconnect/content/torConnectTitlebarStatus.js
=====================================
@@ -72,7 +72,6 @@ var gTorConnectTitlebarStatus = {
this.node.hidden = true;
return;
case TorConnectState.Bootstrapped:
- this._startHiding();
textId = "titlebarStatusConnected";
connected = true;
break;
@@ -114,6 +113,14 @@ var gTorConnectTitlebarStatus = {
);
this.node.classList.toggle("tor-connect-status-connected", connected);
this.connected = connected;
+ if (connected) {
+ this._startHiding();
+ } else {
+ // We can leave the connected state when we are no longer Bootstrapped
+ // because the underlying tor process exited early and needs a
+ // restart. In this case we want to re-show the status.
+ this._stopHiding();
+ }
}
this.node.classList.toggle(
"tor-connect-status-potentially-blocked",
@@ -125,8 +132,23 @@ var gTorConnectTitlebarStatus = {
* Mark the component to be hidden after some delay.
*/
_startHiding() {
- setTimeout(() => {
+ if (this._hidingTimeout) {
+ // Already hiding.
+ return;
+ }
+ this._hidingTimeout = setTimeout(() => {
this.node.hidden = true;
}, 5000);
},
+
+ /**
+ * Re-show the component immediately.
+ */
+ _stopHiding() {
+ if (this._hidingTimeout) {
+ clearTimeout(this._hidingTimeout);
+ this._hidingTimeout = 0;
+ }
+ this.node.hidden = false;
+ },
};
=====================================
browser/components/torconnect/content/torConnectUrlbarButton.js
=====================================
@@ -112,10 +112,10 @@ var gTorConnectUrlbarButton = {
* Callback for when the TorConnect state changes.
*/
_torConnectStateChanged() {
- if (
- TorConnect.state === TorConnectState.Bootstrapped ||
- TorConnect.state === TorConnectState.Disabled
- ) {
+ if (TorConnect.state === TorConnectState.Disabled) {
+ // NOTE: We do not uninit early when we reach the
+ // TorConnectState.Bootstrapped state because we can still leave the
+ // Bootstrapped state if the tor process exists early and needs a restart.
this.uninit();
return;
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d4edb7…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d4edb7…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 40933: Add tor-launcher functionality
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
a4ff8505 by Pier Angelo Vendrame at 2023-09-15T18:31:31+00:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 42102: Fix checkPort in TorProcess
- - - - -
2 changed files:
- toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs
- toolkit/components/tor-launcher/TorProcess.sys.mjs
Changes:
=====================================
toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs
=====================================
@@ -8,7 +8,7 @@
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
- FileUtils: "resource://gre/modules/FileUtils.sys.jsm",
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
});
const kPropBundleURI = "chrome://torbutton/locale/torlauncher.properties";
@@ -565,7 +565,7 @@ export const TorLauncherUtil = Object.freeze({
}
if (useIPC === undefined) {
- socksPortInfo.useIPC =
+ useIPC =
!this.isWindows &&
Services.prefs.getBoolPref(
"extensions.torlauncher.socks_port_use_ipc",
@@ -574,7 +574,7 @@ export const TorLauncherUtil = Object.freeze({
}
// Fill in missing SOCKS info from prefs.
- if (socksPortInfo.useIPC) {
+ if (useIPC) {
if (!socksPortInfo.ipcFile) {
socksPortInfo.ipcFile = TorLauncherUtil.getTorFile("socks_ipc", false);
}
@@ -611,7 +611,7 @@ export const TorLauncherUtil = Object.freeze({
return;
}
- if (socksPortInfo.useIPC) {
+ if (socksPortInfo.ipcFile) {
const fph = Services.io
.getProtocolHandler("file")
.QueryInterface(Ci.nsIFileProtocolHandler);
=====================================
toolkit/components/tor-launcher/TorProcess.sys.mjs
=====================================
@@ -49,9 +49,7 @@ export class TorProcess {
const checkPort = port =>
port === undefined ||
- (Number.isInteger(controlSettings.port) &&
- controlSettings.port > 0 &&
- controlSettings.port < 65535);
+ (Number.isInteger(port) && port > 0 && port < 65535);
if (!checkPort(controlSettings?.port)) {
throw new Error("Invalid control port");
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a4ff850…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a4ff850…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] 2 commits: fixup! Bug 41649: Create rebase and security backport gitlab issue templates
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
0a8b54dc by Pier Angelo Vendrame at 2023-09-15T17:39:33+00:00
fixup! Bug 41649: Create rebase and security backport gitlab issue templates
Add a step to make the default branch and add how to find a tag when it
does not exist yet.
- - - - -
bbfe9bf0 by Pier Angelo Vendrame at 2023-09-15T17:39:33+00:00
fixup! Adding issue and merge request templates
Do not assign to new issue to nah anymore
- - - - -
2 changed files:
- .gitlab/issue_templates/Rebase Browser - Alpha.md
- − .gitlab/issue_templates/UXBug.md
Changes:
=====================================
.gitlab/issue_templates/Rebase Browser - Alpha.md
=====================================
@@ -39,10 +39,21 @@
- **Allowed to merge**: `Maintainers`
- **Allowed to push and merge**: `Maintainers`
- **Allowed to force push**: `false`
+ - If you copied and pasted from old rules, double check you didn't add spaces at the end, as GitLab will not trim them!
### **Create New Branches**
-- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag (found during the stable rebase)
+- [ ] Find the Firefox mercurial tag `$(ESR_TAG)`
+ - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release
+ - Otherwise:
+ - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags`
+ - [ ] Find and inspect the commit tagged with `$(ESR_TAG)`
+ - Tags are in yellow in the Mercurial web UI
+ - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)`
+ - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`)
+ - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead
+ - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"`
+- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag
- Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
- **Example**: `base-browser-102.8.0esr-12.5-1`
- [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag
@@ -111,6 +122,11 @@
- Update and push `base-browser` branch
- [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch
- [ ] Push these commits to `upstream`
+- [ ] Set `$(TOR_BROWSER_BRANCH)` as the default GitLab branch
+ - [ ] Go to [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…
+ - [ ] Expand `Branch defaults`
+ - [ ] Set the branch and leave the `Auto-close` checkbox unchecked
+ - [ ] Save changes
### **Sign and Tag**
=====================================
.gitlab/issue_templates/UXBug.md deleted
=====================================
@@ -1,29 +0,0 @@
-<!--
-* Use this issue template for reporting a new UX bug.
--->
-
-### Summary
-**Summarize the bug encountered concisely.**
-
-
-### Steps to reproduce:
-**How one can reproduce the issue - this is very important.**
-
-1. Step 1
-2. Step 2
-3. ...
-
-### What is the current bug behavior?
-**What actually happens.**
-
-
-### What is the expected behavior?
-**What you want to see instead**
-
-
-
-## Relevant logs and/or screenshots
-**Do you have screenshots? Attach them to this ticket please.**
-
-/label ~tor-ux ~needs-investigation ~bug
-/assign @nah
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd0362…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd0362…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Adding gitlab merge request template
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
985b6697 by Richard Pospesel at 2023-09-15T17:36:58+00:00
fixup! Adding gitlab merge request template
moved misc/other to the endof the list as a fallback
- - - - -
1 changed file:
- .gitlab/merge_request_templates/default.md
Changes:
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -41,12 +41,12 @@
- **frontend (review)** : donuts, richard
- **localization** : henry, pierov
- **macos** : clairehurst, dan
- - **misc/other** : pierov, richard
- **nightly builds** : boklm
- **rebases/release-prep** : dan, ma1, pierov, richard
- **security** : ma1
- **signing** : boklm, richard
- **updater** : pierov
+ - **misc/other** : pierov, richard
#### Change Description
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/985…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/985…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] fixup! Updated default merge request template
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
d850df4e by Richard Pospesel at 2023-09-15T17:31:51+00:00
fixup! Updated default merge request template
moved misc/other back to bottom since its meant as a fallback
- - - - -
1 changed file:
- .gitlab/merge_request_templates/default.md
Changes:
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -42,12 +42,12 @@
- **frontend (review)** : donuts, richard
- **localization** : henry, pierov
- **macos** : clairehurst, dan
- - **misc/other** : pierov, richard
- **nightly builds** : boklm
- **rebases/release-prep** : dan, ma1, pierov, richard
- **security** : ma1
- **signing** : boklm, richard
- **updater** : pierov
+ - **misc/other** : pierov, richard
#### Change Description
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.2.1esr-13.0-1] fixup! Adding issue and merge request templates
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch base-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
a4da2726 by Richard Pospesel at 2023-09-15T17:29:19+00:00
fixup! Adding issue and merge request templates
- - - - -
1 changed file:
- .gitlab/merge_request_templates/default.md
Changes:
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -38,7 +38,7 @@
- [ ] Request review from an applications developer depending on modified system:
- **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
- **accessibility** : henry
- - **android** : dan
+ - **android** : clairehurst, dan
- **build system** : boklm
- **extensions** : ma1
- **firefox internals (XUL/JS/XPCOM)** : ma1
@@ -46,8 +46,9 @@
- **frontend (implementation)** : henry
- **frontend (review)** : donuts, richard
- **localization** : henry, pierov
+ - **macos** : clairehurst, dan
- **nightly builds** : boklm
- - **rebases/release-prep** : dan_b, ma1, pierov, richard
+ - **rebases/release-prep** : dan, ma1, pierov, richard
- **security** : ma1
- **signing** : boklm, richard
- **updater** : pierov
@@ -56,3 +57,7 @@
#### Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset; if the patch includes UX updates be sure to include screenshots/video of how any new behaviour -->
+
+#### How Tested
+
+<!-- Description of steps taken to verify the change -->
\ No newline at end of file
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a4da272…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a4da272…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Adding issue and merge request templates
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
cd03624c by Richard Pospesel at 2023-09-15T17:27:18+00:00
fixup! Adding issue and merge request templates
- - - - -
1 changed file:
- .gitlab/merge_request_templates/default.md
Changes:
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -38,7 +38,7 @@
- [ ] Request review from an applications developer depending on modified system:
- **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
- **accessibility** : henry
- - **android** : dan
+ - **android** : clairehurst, dan
- **build system** : boklm
- **extensions** : ma1
- **firefox internals (XUL/JS/XPCOM)** : ma1
@@ -46,8 +46,9 @@
- **frontend (implementation)** : henry
- **frontend (review)** : donuts, richard
- **localization** : henry, pierov
+ - **macos** : clairehurst, dan
- **nightly builds** : boklm
- - **rebases/release-prep** : dan_b, ma1, pierov, richard
+ - **rebases/release-prep** : dan, ma1, pierov, richard
- **security** : ma1
- **signing** : boklm, richard
- **updater** : pierov
@@ -56,3 +57,7 @@
#### Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset; if the patch includes UX updates be sure to include screenshots/video of how any new behaviour -->
+
+#### How Tested
+
+<!-- Description of steps taken to verify the change -->
\ No newline at end of file
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cd03624…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cd03624…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Updated default merge request template
by richard (@richard) 15 Sep '23
by richard (@richard) 15 Sep '23
15 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
f544324a by Richard Pospesel at 2023-09-15T17:07:38+00:00
Updated default merge request template
- - - - -
1 changed file:
- .gitlab/merge_request_templates/default.md
Changes:
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -33,7 +33,7 @@
- [ ] Request review from an applications developer depending on modified system:
- **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
- **accessibility** : henry
- - **android** : dan
+ - **android** : clairehurst, dan
- **build system** : boklm
- **extensions** : ma1
- **firefox internals (XUL/JS/XPCOM)** : ma1
@@ -41,13 +41,18 @@
- **frontend (implementation)** : henry
- **frontend (review)** : donuts, richard
- **localization** : henry, pierov
+ - **macos** : clairehurst, dan
+ - **misc/other** : pierov, richard
- **nightly builds** : boklm
- - **rebases/release-prep** : dan_b, ma1, pierov, richard
+ - **rebases/release-prep** : dan, ma1, pierov, richard
- **security** : ma1
- **signing** : boklm, richard
- **updater** : pierov
- - **misc/other** : pierov, richard
#### Change Description
<!-- Whatever context the reviewer needs to effectively review the patchset; if the patch includes UX updates be sure to include screenshots/video of how any new behaviour -->
+
+#### How Tested
+
+<!-- Description of steps taken to verify the change -->
\ No newline at end of file
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] 25 commits: fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (@pierov) 14 Sep '23
by Pier Angelo Vendrame (@pierov) 14 Sep '23
14 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
acebcc4c by Pier Angelo Vendrame at 2023-09-14T19:11:10+02:00
fixup! Bug 40933: Add tor-launcher functionality
Deleted old stuff, unified TorController with ControlSocket, simplified
everything (e.g., do not use the dispatcher anymore, just call stuff
directly or use a much simpler map).
- - - - -
96edc001 by Pier Angelo Vendrame at 2023-09-14T19:11:11+02:00
fixup! Bug 40933: Add tor-launcher functionality
Use `#` instead of `_` for private things here and there, to make
reviewing the changes easier.
- - - - -
a2eebe17 by Pier Angelo Vendrame at 2023-09-14T19:11:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Shuffle code here and there, so that it's feasible to check that
nothing actually changed with `git diff --color-moved`.
- - - - -
545ab0f1 by Pier Angelo Vendrame at 2023-09-14T19:11:12+02:00
fixup! Bug 40933: Add tor-launcher functionality
Further refactors/improvements.
- - - - -
fb7bb380 by Pier Angelo Vendrame at 2023-09-14T19:11:13+02:00
fixup! Bug 40597: Implement TorSettings module
Workaround for a race condition.
- - - - -
ae07f248 by Pier Angelo Vendrame at 2023-09-14T19:11:13+02:00
fixup! Bug 40933: Add tor-launcher functionality
Refactored the settings reading, the first connection and events setup.
- - - - -
dc538277 by Pier Angelo Vendrame at 2023-09-14T19:11:14+02:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Fixed another race condition and moved to ES modules while I was
touching this code.
- - - - -
52144e2b by Pier Angelo Vendrame at 2023-09-14T19:11:14+02:00
fixup! Bug 40933: Add tor-launcher functionality
Moved the control port parsing for asynchronous events from TorProvider
to TorControlPort.
- - - - -
d5c6fb9e by Pier Angelo Vendrame at 2023-09-14T19:11:15+02:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 41986: Fix the control port password handling
- - - - -
f28fe46a by Pier Angelo Vendrame at 2023-09-14T19:11:15+02:00
fixup! Bug 40933: Add tor-launcher functionality
- - - - -
5dd564d5 by Pier Angelo Vendrame at 2023-09-14T19:11:16+02:00
fixup! Bug 40933: Add tor-launcher functionality
Second chunk of changes requested during the review.
- - - - -
ebd23167 by Pier Angelo Vendrame at 2023-09-14T19:11:16+02:00
fixup! Add TorStrings module for localization
Marked tor_controlconn_failed as a 12.5-only
- - - - -
44347a46 by Pier Angelo Vendrame at 2023-09-14T19:11:17+02:00
fixup! Bug 40933: Add tor-launcher functionality
Change the provider buidler to make build async and other fixes.
- - - - -
700bbaba by Pier Angelo Vendrame at 2023-09-14T19:11:17+02:00
fixup! Bug 40597: Implement TorSettings module
The provider building is now async.
- - - - -
d8c5d36e by Pier Angelo Vendrame at 2023-09-14T19:11:17+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
The provider building is now async.
- - - - -
47a17382 by Pier Angelo Vendrame at 2023-09-14T19:11:18+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
The provider building is now async.
- - - - -
8d5ec618 by Pier Angelo Vendrame at 2023-09-14T19:11:18+02:00
fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.
The provider building is now async.
- - - - -
11e651cc by Pier Angelo Vendrame at 2023-09-14T19:11:19+02:00
fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser
The provider building is now async.
- - - - -
7019179e by Pier Angelo Vendrame at 2023-09-14T19:11:19+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Fix possible race conditions on the busy state.
- - - - -
491b730b by Pier Angelo Vendrame at 2023-09-14T19:11:20+02:00
fixup! Bug 40933: Add tor-launcher functionality
Make the restart case stronger.
- - - - -
a4f54a1d by Pier Angelo Vendrame at 2023-09-14T19:11:20+02:00
fixup! Bug 40933: Add tor-launcher functionality
Move the restart to the ProviderBuilder.
- - - - -
f291f9b4 by Pier Angelo Vendrame at 2023-09-14T19:11:21+02:00
fixup! Bug 40597: Implement TorSettings module
Set the state back to Configure when the tor process exits, and disable
qiuckstart.
We should also show the "Not Connected" pill again.
- - - - -
255fd5d3 by henry at 2023-09-14T19:11:21+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Added some error handling for the cases in which the Tor provider
failed to build.
- - - - -
725d46c1 by Pier Angelo Vendrame at 2023-09-14T19:11:22+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Re-build the provider every time we need it, since it might change now.
- - - - -
00986a07 by Pier Angelo Vendrame at 2023-09-14T19:11:22+02:00
fixup! Bug 40933: Add tor-launcher functionality
Addressed more requests from the review, and added documentation.
- - - - -
23 changed files:
- browser/components/BrowserGlue.sys.mjs
- browser/components/onionservices/content/authPrompt.js
- browser/components/onionservices/content/savedKeysDialog.js
- − browser/components/torconnect/TorConnectChild.jsm
- + browser/components/torconnect/TorConnectChild.sys.mjs
- browser/components/torconnect/TorConnectParent.jsm → browser/components/torconnect/TorConnectParent.sys.mjs
- browser/components/torconnect/moz.build
- browser/components/torpreferences/content/connectionPane.js
- browser/components/torpreferences/content/torLogDialog.jsm
- browser/modules/Moat.sys.mjs
- browser/modules/TorConnect.sys.mjs
- browser/modules/TorSettings.sys.mjs
- toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs
- toolkit/components/tor-launcher/TorControlPort.sys.mjs
- toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs
- toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs
- toolkit/components/tor-launcher/TorParsers.sys.mjs
- toolkit/components/tor-launcher/TorProcess.sys.mjs
- toolkit/components/tor-launcher/TorProvider.sys.mjs
- toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs
- toolkit/components/tor-launcher/TorStartupService.sys.mjs
- toolkit/mozapps/update/UpdateService.sys.mjs
- toolkit/torbutton/chrome/locale/en-US/torlauncher.properties
Changes:
=====================================
browser/components/BrowserGlue.sys.mjs
=====================================
@@ -67,6 +67,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
"resource://messaging-system/lib/SpecialMessageActions.sys.mjs",
TRRRacer: "resource:///modules/TRRPerformance.sys.mjs",
TelemetryUtils: "resource://gre/modules/TelemetryUtils.sys.mjs",
+ TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
UIState: "resource://services-sync/UIState.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
WebChannel: "resource://gre/modules/WebChannel.sys.mjs",
@@ -772,10 +773,10 @@ let JSWINDOWACTORS = {
TorConnect: {
parent: {
- moduleURI: "resource:///modules/TorConnectParent.jsm",
+ esModuleURI: "resource:///actors/TorConnectParent.sys.mjs",
},
child: {
- moduleURI: "resource:///modules/TorConnectChild.jsm",
+ esModuleURI: "resource:///actors/TorConnectChild.sys.mjs",
events: {
DOMWindowCreated: {},
},
@@ -1750,6 +1751,8 @@ BrowserGlue.prototype = {
lazy.DragDropFilter.init();
+ lazy.TorProviderBuilder.firstWindowLoaded();
+
this._firstWindowTelemetry(aWindow);
this._firstWindowLoaded();
=====================================
browser/components/onionservices/content/authPrompt.js
=====================================
@@ -179,12 +179,12 @@ const OnionAuthPrompt = (function () {
},
async _onDone() {
- let keyElem = this._getKeyElement();
+ const keyElem = this._getKeyElement();
if (!keyElem) {
return;
}
- let base64key = this._keyToBase64(keyElem.value);
+ const base64key = this._keyToBase64(keyElem.value);
if (!base64key) {
this._showWarning(TorStrings.onionServices.authPrompt.invalidKey);
return;
@@ -192,8 +192,7 @@ const OnionAuthPrompt = (function () {
this._prompt.remove();
- // Use Torbutton's controller module to add the private key to Tor.
- let controllerFailureMsg =
+ const controllerFailureMsg =
TorStrings.onionServices.authPrompt.failedToSetKey;
try {
// ^(subdomain.)*onionserviceid.onion$ (case-insensitive)
@@ -204,29 +203,19 @@ const OnionAuthPrompt = (function () {
.match(onionServiceIdRegExp)
.groups.onionServiceId.toLowerCase();
- let checkboxElem = this._getCheckboxElement();
- let isPermanent = checkboxElem && checkboxElem.checked;
- TorProviderBuilder.build()
- .onionAuthAdd(onionServiceId, base64key, isPermanent)
- .then(aResponse => {
- // Success! Reload the page.
- this._browser.sendMessageToActor(
- "Browser:Reload",
- {},
- "BrowserTab"
- );
- })
- .catch(aError => {
- if (aError.torMessage) {
- this.show(aError.torMessage);
- } else {
- console.error(controllerFailureMsg, aError);
- this.show(controllerFailureMsg);
- }
- });
+ const checkboxElem = this._getCheckboxElement();
+ const isPermanent = checkboxElem && checkboxElem.checked;
+ const provider = await TorProviderBuilder.build();
+ await provider.onionAuthAdd(onionServiceId, base64key, isPermanent);
+ // Success! Reload the page.
+ this._browser.sendMessageToActor("Browser:Reload", {}, "BrowserTab");
} catch (e) {
- console.error(controllerFailureMsg, e);
- this.show(controllerFailureMsg);
+ if (e.torMessage) {
+ this.show(e.torMessage);
+ } else {
+ console.error(controllerFailureMsg, e);
+ this.show(controllerFailureMsg);
+ }
}
},
=====================================
browser/components/onionservices/content/savedKeysDialog.js
=====================================
@@ -26,42 +26,46 @@ var gOnionServicesSavedKeysDialog = {
},
_tree: undefined,
- _isBusy: false, // true when loading data, deleting a key, etc.
+ _busyCount: 0,
+ get _isBusy() {
+ // true when loading data, deleting a key, etc.
+ return this._busyCount > 0;
+ },
// Public functions (called from outside this file).
async deleteSelectedKeys() {
- this._setBusyState(true);
-
- const indexesToDelete = [];
- const count = this._tree.view.selection.getRangeCount();
- for (let i = 0; i < count; ++i) {
- const minObj = {};
- const maxObj = {};
- this._tree.view.selection.getRangeAt(i, minObj, maxObj);
- for (let idx = minObj.value; idx <= maxObj.value; ++idx) {
- indexesToDelete.push(idx);
+ this._withBusy(async () => {
+ const indexesToDelete = [];
+ const count = this._tree.view.selection.getRangeCount();
+ for (let i = 0; i < count; ++i) {
+ const minObj = {};
+ const maxObj = {};
+ this._tree.view.selection.getRangeAt(i, minObj, maxObj);
+ for (let idx = minObj.value; idx <= maxObj.value; ++idx) {
+ indexesToDelete.push(idx);
+ }
}
- }
- if (indexesToDelete.length) {
- const controllerFailureMsg =
- TorStrings.onionServices.authPreferences.failedToRemoveKey;
- try {
- // Remove in reverse index order to avoid issues caused by index changes.
- for (let i = indexesToDelete.length - 1; i >= 0; --i) {
- await this._deleteOneKey(indexesToDelete[i]);
- }
- } catch (e) {
- console.error("Removing a saved key failed", e);
- if (e.torMessage) {
- this._showError(e.torMessage);
- } else {
- this._showError(controllerFailureMsg);
+ if (indexesToDelete.length) {
+ const controllerFailureMsg =
+ TorStrings.onionServices.authPreferences.failedToRemoveKey;
+ const provider = await TorProviderBuilder.build();
+ try {
+ // Remove in reverse index order to avoid issues caused by index
+ // changes.
+ for (let i = indexesToDelete.length - 1; i >= 0; --i) {
+ await this._deleteOneKey(provider, indexesToDelete[i]);
+ }
+ } catch (e) {
+ console.error("Removing a saved key failed", e);
+ if (e.torMessage) {
+ this._showError(e.torMessage);
+ } else {
+ this._showError(controllerFailureMsg);
+ }
}
}
- }
-
- this._setBusyState(false);
+ });
},
async deleteAllKeys() {
@@ -84,16 +88,12 @@ var gOnionServicesSavedKeysDialog = {
},
async _init() {
- await this._populateXUL();
-
+ this._populateXUL();
window.addEventListener("keypress", this._onWindowKeyPress.bind(this));
-
- // We don't use await here because we want _loadSavedKeys() to run
- // in the background and not block loading of this dialog.
this._loadSavedKeys();
},
- async _populateXUL() {
+ _populateXUL() {
const dialog = document.querySelector(this.selector.dialog);
const authPrefStrings = TorStrings.onionServices.authPreferences;
dialog.setAttribute("title", authPrefStrings.dialogTitle);
@@ -119,56 +119,68 @@ var gOnionServicesSavedKeysDialog = {
async _loadSavedKeys() {
const controllerFailureMsg =
TorStrings.onionServices.authPreferences.failedToGetKeys;
- this._setBusyState(true);
-
- try {
- this._tree.view = this;
-
- const keyInfoList = await TorProviderBuilder.build().onionAuthViewKeys();
- if (keyInfoList) {
- // Filter out temporary keys.
- this._keyInfoList = keyInfoList.filter(aKeyInfo =>
- aKeyInfo.flags?.includes("Permanent")
- );
- // Sort by the .onion address.
- this._keyInfoList.sort((aObj1, aObj2) => {
- const hsAddr1 = aObj1.address.toLowerCase();
- const hsAddr2 = aObj2.address.toLowerCase();
- if (hsAddr1 < hsAddr2) {
- return -1;
- }
- return hsAddr1 > hsAddr2 ? 1 : 0;
- });
- }
+ this._withBusy(async () => {
+ try {
+ this._tree.view = this;
+
+ const provider = await TorProviderBuilder.build();
+ const keyInfoList = await provider.onionAuthViewKeys();
+ if (keyInfoList) {
+ // Filter out temporary keys.
+ this._keyInfoList = keyInfoList.filter(aKeyInfo =>
+ aKeyInfo.flags?.includes("Permanent")
+ );
+ // Sort by the .onion address.
+ this._keyInfoList.sort((aObj1, aObj2) => {
+ const hsAddr1 = aObj1.address.toLowerCase();
+ const hsAddr2 = aObj2.address.toLowerCase();
+ if (hsAddr1 < hsAddr2) {
+ return -1;
+ }
+ return hsAddr1 > hsAddr2 ? 1 : 0;
+ });
+ }
- // Render the tree content.
- this._tree.rowCountChanged(0, this.rowCount);
- } catch (e) {
- if (e.torMessage) {
- this._showError(e.torMessage);
- } else {
- this._showError(controllerFailureMsg);
+ // Render the tree content.
+ this._tree.rowCountChanged(0, this.rowCount);
+ } catch (e) {
+ if (e.torMessage) {
+ this._showError(e.torMessage);
+ } else {
+ this._showError(controllerFailureMsg);
+ }
}
- }
-
- this._setBusyState(false);
+ });
},
// This method may throw; callers should catch errors.
- async _deleteOneKey(aIndex) {
+ async _deleteOneKey(provider, aIndex) {
const keyInfoObj = this._keyInfoList[aIndex];
- await TorProviderBuilder.build().onionAuthRemove(keyInfoObj.address);
+ await provider.onionAuthRemove(keyInfoObj.address);
this._tree.view.selection.clearRange(aIndex, aIndex);
this._keyInfoList.splice(aIndex, 1);
this._tree.rowCountChanged(aIndex + 1, -1);
},
- _setBusyState(aIsBusy) {
- this._isBusy = aIsBusy;
- this.updateButtonsState();
+ async _withBusy(func) {
+ this._busyCount++;
+ if (this._busyCount === 1) {
+ this.updateButtonsState();
+ }
+ try {
+ await func();
+ } finally {
+ this._busyCount--;
+ if (this._busyCount === 0) {
+ this.updateButtonsState();
+ }
+ }
},
_onWindowKeyPress(event) {
+ if (this._isBusy) {
+ return;
+ }
if (event.keyCode === KeyEvent.DOM_VK_ESCAPE) {
window.close();
} else if (event.keyCode === KeyEvent.DOM_VK_DELETE) {
=====================================
browser/components/torconnect/TorConnectChild.jsm deleted
=====================================
@@ -1,9 +0,0 @@
-// Copyright (c) 2021, The Tor Project, Inc.
-
-var EXPORTED_SYMBOLS = ["TorConnectChild"];
-
-const { RemotePageChild } = ChromeUtils.import(
- "resource://gre/actors/RemotePageChild.jsm"
-);
-
-class TorConnectChild extends RemotePageChild {}
=====================================
browser/components/torconnect/TorConnectChild.sys.mjs
=====================================
@@ -0,0 +1,5 @@
+// Copyright (c) 2021, The Tor Project, Inc.
+
+import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
+
+export class TorConnectChild extends RemotePageChild {}
=====================================
browser/components/torconnect/TorConnectParent.jsm → browser/components/torconnect/TorConnectParent.sys.mjs
=====================================
@@ -1,14 +1,17 @@
// Copyright (c) 2021, The Tor Project, Inc.
-var EXPORTED_SYMBOLS = ["TorConnectParent"];
-
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");
-const { InternetStatus, TorConnect, TorConnectTopics, TorConnectState } =
- ChromeUtils.import("resource:///modules/TorConnect.jsm");
-const { TorSettings, TorSettingsTopics, TorSettingsData } = ChromeUtils.import(
- "resource:///modules/TorSettings.jsm"
-);
+import {
+ InternetStatus,
+ TorConnect,
+ TorConnectTopics,
+ TorConnectState,
+} from "resource:///modules/TorConnect.sys.mjs";
+import {
+ TorSettings,
+ TorSettingsTopics,
+ TorSettingsData,
+} from "resource:///modules/TorSettings.sys.mjs";
const BroadcastTopic = "about-torconnect:broadcast";
@@ -17,7 +20,7 @@ This object is basically a marshalling interface between the TorConnect module
and a particular about:torconnect page
*/
-class TorConnectParent extends JSWindowActorParent {
+export class TorConnectParent extends JSWindowActorParent {
constructor(...args) {
super(...args);
@@ -35,10 +38,20 @@ class TorConnectParent extends JSWindowActorParent {
DetectedLocation: TorConnect.detectedLocation,
ShowViewLog: TorConnect.logHasWarningOrError,
HasEverFailed: TorConnect.hasEverFailed,
- QuickStartEnabled: TorSettings.quickstart.enabled,
UIState: TorConnect.uiState,
};
+ // Workaround for a race condition, but we should fix it asap.
+ // about:torconnect is loaded before TorSettings is actually initialized.
+ // The getter might throw and the page not loaded correctly as a result.
+ // Silence any warning for now, but we should really fix it.
+ // See also tor-browser#41921.
+ try {
+ this.state.QuickStartEnabled = TorSettings.quickstart.enabled;
+ } catch (e) {
+ this.state.QuickStartEnabled = false;
+ }
+
// JSWindowActiveParent derived objects cannot observe directly, so create a member
// object to do our observing for us
//
@@ -84,6 +97,16 @@ class TorConnectParent extends JSWindowActorParent {
self.state.ShowViewLog = true;
break;
}
+ case TorSettingsTopics.Ready: {
+ if (
+ self.state.QuickStartEnabled !== TorSettings.quickstart.enabled
+ ) {
+ self.state.QuickStartEnabled = TorSettings.quickstart.enabled;
+ } else {
+ return;
+ }
+ break;
+ }
case TorSettingsTopics.SettingChanged: {
if (aData === TorSettingsData.QuickStartEnabled) {
self.state.QuickStartEnabled = obj.value;
@@ -107,6 +130,7 @@ class TorConnectParent extends JSWindowActorParent {
const topic = TorConnectTopics[key];
Services.obs.addObserver(this.torConnectObserver, topic);
}
+ Services.obs.addObserver(this.torConnectObserver, TorSettingsTopics.Ready);
Services.obs.addObserver(
this.torConnectObserver,
TorSettingsTopics.SettingChanged
@@ -130,6 +154,10 @@ class TorConnectParent extends JSWindowActorParent {
const topic = TorConnectTopics[key];
Services.obs.removeObserver(this.torConnectObserver, topic);
}
+ Services.obs.removeObserver(
+ this.torConnectObserver,
+ TorSettingsTopics.Ready
+ );
Services.obs.removeObserver(
this.torConnectObserver,
TorSettingsTopics.SettingChanged
=====================================
browser/components/torconnect/moz.build
=====================================
@@ -1,6 +1,6 @@
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ["jar.mn"]
-EXTRA_JS_MODULES += [
- 'TorConnectChild.jsm',
- 'TorConnectParent.jsm',
+FINAL_TARGET_FILES.actors += [
+ "TorConnectChild.sys.mjs",
+ "TorConnectParent.sys.mjs",
]
=====================================
browser/components/torpreferences/content/connectionPane.js
=====================================
@@ -153,8 +153,16 @@ const gConnectionPane = (function () {
// populate xul with strings and cache the relevant elements
_populateXUL() {
// saves tor settings to disk when navigate away from about:preferences
- window.addEventListener("blur", val => {
- TorProviderBuilder.build().flushSettings();
+ window.addEventListener("blur", async () => {
+ try {
+ // Build a new provider each time because this might be called also
+ // when closing the browser (if about:preferences was open), maybe
+ // when the provider was already uninitialized.
+ const provider = await TorProviderBuilder.build();
+ provider.flushSettings();
+ } catch (e) {
+ console.warn("Could not save the tor settings.", e);
+ }
});
document
@@ -746,11 +754,17 @@ const gConnectionPane = (function () {
placeholder.replaceWith(...cards);
this._checkBridgeCardsHeight();
};
- this._checkConnectedBridge = () => {
+ this._checkConnectedBridge = async () => {
// TODO: We could make sure TorSettings is in sync by monitoring also
// changes of settings. At that point, we could query it, instead of
// doing a query over the control port.
- const bridge = TorProviderBuilder.build().currentBridge;
+ let bridge = null;
+ try {
+ const provider = await TorProviderBuilder.build();
+ bridge = provider.currentBridge;
+ } catch (e) {
+ console.warn("Could not get current bridge", e);
+ }
if (bridge?.fingerprint !== this._currentBridgeId) {
this._currentBridgeId = bridge?.fingerprint ?? null;
this._updateConnectedBridges();
=====================================
browser/components/torpreferences/content/torLogDialog.jsm
=====================================
@@ -26,7 +26,7 @@ class TorLogDialog {
};
}
- _populateXUL(aDialog) {
+ async _populateXUL(aDialog) {
this._dialog = aDialog;
const dialogWin = this._dialog.parentElement;
dialogWin.setAttribute("title", TorStrings.settings.torLogDialogTitle);
@@ -56,7 +56,12 @@ class TorLogDialog {
}, RESTORE_TIME);
});
- this._logTextarea.value = TorProviderBuilder.build().getLog();
+ // A waiting state should not be needed at this point.
+ // Also, we probably cannot even arrive here if the provider failed to
+ // initialize, otherwise we could use a try/catch, and write the exception
+ // text in the logs, instead.
+ const provider = await TorProviderBuilder.build();
+ this._logTextarea.value = provider.getLog();
}
init(window, aDialog) {
=====================================
browser/modules/Moat.sys.mjs
=====================================
@@ -46,9 +46,8 @@ class MeekTransport {
try {
// figure out which pluggable transport to use
const supportedTransports = ["meek", "meek_lite"];
- const proxy = (
- await lazy.TorProviderBuilder.build().getPluggableTransports()
- ).find(
+ const provider = await lazy.TorProviderBuilder.build();
+ const proxy = (await provider.getPluggableTransports()).find(
pt =>
pt.type === "exec" &&
supportedTransports.some(t => pt.transports.includes(t))
=====================================
browser/modules/TorConnect.sys.mjs
=====================================
@@ -9,7 +9,6 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
MoatRPC: "resource:///modules/Moat.sys.mjs",
TorBootstrapRequest: "resource://gre/modules/TorBootstrapRequest.sys.mjs",
- TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
});
// TODO: Should we move this to the about:torconnect actor?
@@ -19,6 +18,7 @@ ChromeUtils.defineModuleGetter(
"resource:///modules/BrowserWindowTracker.jsm"
);
+import { TorLauncherUtil } from "resource://gre/modules/TorLauncherUtil.sys.mjs";
import {
TorSettings,
TorSettingsTopics,
@@ -91,15 +91,15 @@ export const TorConnectState = Object.freeze({
│ │ │ │ │
└─┼─────▶ │ │ │
│ └──────────────────────────────────────────────────────────┘ │
- │ │ ▲ │
- │ │ beginAutoBootstrap() │ cancelBootstrap() │
- │ ▼ │ │
- │ ┌───────────────────────┐ │ │
- └────── │ AutoBootstrapping │ ─┘ │
- └───────────────────────┘ │
- │ │
- │ │
- ▼ │
+ │ │ ▲ ▲ │
+ │ │ beginAutoBootstrap() │ cancelBootstrap() │ │
+ │ ▼ │ │ │
+ │ ┌───────────────────────┐ │ │ │
+ └────── │ AutoBootstrapping │ ─┘ │ │
+ └───────────────────────┘ │ │
+ │ │ │
+ │ ┌────────────────────────────────┘ │
+ ▼ │ │
┌───────────────────────┐ │
│ Bootstrapped │ ◀───────────────────────────────────┘
└───────────────────────┘
@@ -145,8 +145,8 @@ const TorConnectStateTransitions = Object.freeze(
],
],
[TorConnectState.Error, [TorConnectState.Configuring]],
+ [TorConnectState.Bootstrapped, [TorConnectState.Configuring]],
// terminal states
- [TorConnectState.Bootstrapped, []],
[TorConnectState.Disabled, []],
])
);
@@ -703,8 +703,13 @@ export const TorConnect = (() => {
// bootstrapped failed for all potential settings, so reset daemon to use original
TorSettings.setSettings(this.originalSettings);
- await TorSettings.applySettings();
+ // The original settings should be good, so we save them to
+ // preferences before trying to apply them, as it might fail
+ // if the actual problem is with the connection to the control
+ // port.
+ // FIXME: We should handle this case in a better way.
TorSettings.saveToPrefs();
+ await TorSettings.applySettings();
// only explicitly change state here if something else has not transitioned us
if (!this.transitioning) {
@@ -718,6 +723,8 @@ export const TorConnect = (() => {
// restore original settings in case of error
try {
TorSettings.setSettings(this.originalSettings);
+ // As above
+ TorSettings.saveToPrefs();
await TorSettings.applySettings();
} catch (errRestore) {
console.log(
@@ -733,12 +740,19 @@ export const TorConnect = (() => {
TorConnect._countryCodes =
await this.mrpc.circumvention_countries();
}
- TorConnect._changeState(
- TorConnectState.Error,
- err?.message,
- err?.details,
- true
- );
+ if (!this.transitioning) {
+ TorConnect._changeState(
+ TorConnectState.Error,
+ err?.message,
+ err?.details,
+ true
+ );
+ } else {
+ console.error(
+ "TorConnect: Received AutoBootstrapping error after transitioning",
+ err
+ );
+ }
} finally {
// important to uninit MoatRPC object or else the pt process will live as long as tor-browser
this.mrpc?.uninit();
@@ -751,7 +765,11 @@ export const TorConnect = (() => {
TorConnectState.Bootstrapped,
new StateCallback(TorConnectState.Bootstrapped, async function () {
await new Promise((resolve, reject) => {
- // on_transition not defined because no way to leave Bootstrapped state
+ // We may need to leave the bootstrapped state if the tor daemon
+ // exits (if it is restarted, we will have to bootstrap again).
+ this.on_transition = nextState => {
+ resolve();
+ };
// notify observers of bootstrap completion
Services.obs.notifyObservers(
null,
@@ -895,6 +913,25 @@ export const TorConnect = (() => {
this._logHasWarningOrError = true;
break;
}
+ case TorTopics.ProcessExited: {
+ // Treat a failure as a possibly broken configuration.
+ // So, prevent quickstart at the next start.
+ Services.prefs.setBoolPref(TorLauncherPrefs.prompt_at_startup, true);
+ switch (this._state) {
+ case TorConnectState.Bootstrapping:
+ case TorConnectState.AutoBootstrapping:
+ case TorConnectState.Bootstrapped:
+ // If we are in the bootstrap or auto bootstrap, we could go
+ // through the error phase (and eventually we might do it, if some
+ // transition calls fail). However, this would start the
+ // connection assist, so we go directly to configuring.
+ // FIXME: Find a better way to handle this.
+ this._changeState(TorConnectState.Configuring);
+ break;
+ // Other states naturally resolve in configuration.
+ }
+ break;
+ }
default:
// ignore
break;
@@ -911,7 +948,10 @@ export const TorConnect = (() => {
* @type {boolean}
*/
get enabled() {
- return lazy.TorProviderBuilder.build().ownsTorDaemon;
+ // FIXME: This is called before the TorProvider is ready.
+ // As a matter of fact, at the moment it is equivalent to the following
+ // line, but this might become a problem in the future.
+ return TorLauncherUtil.shouldStartAndOwnTor;
},
get shouldShowTorConnect() {
=====================================
browser/modules/TorSettings.sys.mjs
=====================================
@@ -5,6 +5,7 @@
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs",
TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs",
});
@@ -273,9 +274,10 @@ export const TorSettings = (() => {
},
/* load or init our settings, and register observers */
- init() {
- const provider = lazy.TorProviderBuilder.build();
- if (provider.ownsTorDaemon) {
+ async init() {
+ // TODO: We could use a shared promise, and wait for it to be fullfilled
+ // instead of Service.obs.
+ if (lazy.TorLauncherUtil.shouldStartAndOwnTor) {
// if the settings branch exists, load settings from prefs
if (Services.prefs.getBoolPref(TorSettingsPrefs.enabled, false)) {
this.loadFromPrefs();
@@ -285,9 +287,12 @@ export const TorSettings = (() => {
}
Services.obs.addObserver(this, lazy.TorProviderTopics.ProcessIsReady);
- if (provider.isRunning) {
- this.handleProcessReady();
- }
+ try {
+ const provider = await lazy.TorProviderBuilder.build();
+ if (provider.isRunning) {
+ this.handleProcessReady();
+ }
+ } catch {}
}
},
@@ -559,7 +564,8 @@ export const TorSettings = (() => {
}
/* Push to Tor */
- await lazy.TorProviderBuilder.build().writeSettings(settingsMap);
+ const provider = await lazy.TorProviderBuilder.build();
+ await provider.writeSettings(settingsMap);
return this;
},
=====================================
toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs
=====================================
@@ -26,11 +26,6 @@ export class TorBootstrapRequest {
#bootstrapPromiseResolve = null;
#bootstrapPromise = null;
#timeoutID = null;
- #provider = null;
-
- constructor() {
- this.#provider = TorProviderBuilder.build();
- }
observe(subject, topic, data) {
const obj = subject?.wrappedJSObject;
@@ -85,10 +80,14 @@ export class TorBootstrapRequest {
}, this.timeout);
}
- // wait for bootstrapping to begin and maybe handle error
- this.#provider.connect().catch(err => {
- this.#stop(err.message, "");
- });
+ // Wait for bootstrapping to begin and maybe handle error.
+ // Notice that we do not resolve the promise here in case of success, but
+ // we do it from the BootstrapStatus observer.
+ TorProviderBuilder.build()
+ .then(provider => provider.connect())
+ .catch(err => {
+ this.#stop(err.message, err.torMessage);
+ });
}).finally(() => {
// and remove ourselves once bootstrap is resolved
Services.obs.removeObserver(this, TorTopics.BootstrapStatus);
@@ -111,8 +110,15 @@ export class TorBootstrapRequest {
this.#timeoutID = null;
}
+ let provider;
+ try {
+ provider = await TorProviderBuilder.build();
+ } catch {
+ // This was probably the error that lead to stop in the first place.
+ // No need to continue propagating it.
+ }
try {
- await this.#provider.stopBootstrap();
+ await provider?.stopBootstrap();
} catch (e) {
console.error("Failed to stop the bootstrap.", e);
if (!message) {
=====================================
toolkit/components/tor-launcher/TorControlPort.sys.mjs
=====================================
@@ -1,43 +1,16 @@
-import { TorParsers } from "resource://gre/modules/TorParsers.sys.mjs";
-
-/**
- * @callback MessageCallback A callback to receive messages from the control
- * port.
- * @param {string} message The message to handle
- */
-/**
- * @callback RemoveCallback A function used to remove a previously registered
- * callback.
- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
-class CallbackDispatcher {
- #callbackPairs = [];
+import { ConsoleAPI } from "resource://gre/modules/Console.sys.mjs";
- /**
- * Register a callback to handle a certain type of responses.
- *
- * @param {RegExp} regex The regex that tells which messages the callback
- * wants to handle.
- * @param {MessageCallback} callback The function to call
- * @returns {RemoveCallback} A function to remove the just added callback
- */
- addCallback(regex, callback) {
- this.#callbackPairs.push([regex, callback]);
- }
+import { TorParsers } from "resource://gre/modules/TorParsers.sys.mjs";
- /**
- * Push a certain message to all the callbacks whose regex matches it.
- *
- * @param {string} message The message to push to the callbacks
- */
- pushMessage(message) {
- for (const [regex, callback] of this.#callbackPairs) {
- if (message.match(regex)) {
- callback(message);
- }
- }
- }
-}
+const logger = new ConsoleAPI({
+ maxLogLevel: "warn",
+ maxLogLevelPref: "browser.tor_provider.cp_log_level",
+ prefix: "TorControlPort",
+});
/**
* A wrapper around XPCOM sockets and buffers to handle streams in a standard
@@ -273,13 +246,38 @@ class AsyncSocket {
* @property {Function} reject The function to reject the promise associated to
* the command
*/
-
+/**
+ * The ID of a circuit.
+ * From control-spec.txt:
+ * CircuitID = 1*16 IDChar
+ * IDChar = ALPHA / DIGIT
+ * Currently, Tor only uses digits, but this may change.
+ *
+ * @typedef {string} CircuitID
+ */
+/**
+ * The ID of a stream.
+ * From control-spec.txt:
+ * CircuitID = 1*16 IDChar
+ * IDChar = ALPHA / DIGIT
+ * Currently, Tor only uses digits, but this may change.
+ *
+ * @typedef {string} StreamID
+ */
+/**
+ * The fingerprint of a node.
+ * From control-spec.txt:
+ * Fingerprint = "$" 40*HEXDIG
+ * However, we do not keep the $ in our structures.
+ *
+ * @typedef {string} NodeFingerprint
+ */
/**
* @typedef {object} Bridge
* @property {string} transport The transport of the bridge, or vanilla if not
* specified.
* @property {string} addr The IP address and port of the bridge
- * @property {string} id The fingerprint of the bridge
+ * @property {NodeFingerprint} id The fingerprint of the bridge
* @property {string} args Optional arguments passed to the bridge
*/
/**
@@ -303,13 +301,9 @@ class AsyncSocket {
* @property {string} Flags Additional flags, such as Permanent
*/
/**
- * @callback EventFilterCallback
- * @param {any} data Either a raw string, or already parsed data
- * @returns {boolean}
- */
-/**
- * @callback EventCallback
- * @param {any} data Either a raw string, or already parsed data
+ * @callback EventCallback A callback to receive messages from the control
+ * port.
+ * @param {string} message The message to handle
*/
class TorError extends Error {
@@ -324,7 +318,7 @@ class TorError extends Error {
}
}
-class ControlSocket {
+export class TorController {
/**
* The socket to write to the control port.
*
@@ -332,19 +326,6 @@ class ControlSocket {
*/
#socket;
- /**
- * The dispatcher used for the data we receive over the control port.
- *
- * @type {CallbackDispatcher}
- */
- #mainDispatcher = new CallbackDispatcher();
- /**
- * A secondary dispatcher used only to dispatch aynchronous events.
- *
- * @type {CallbackDispatcher}
- */
- #notificationDispatcher = new CallbackDispatcher();
-
/**
* Data we received on a read but that was not a complete line (missing a
* final CRLF). We will prepend it to the next read.
@@ -365,24 +346,59 @@ class ControlSocket {
*/
#commandQueue = [];
- constructor(asyncSocket) {
- this.#socket = asyncSocket;
+ /**
+ * The event handler.
+ *
+ * @type {TorEventHandler}
+ */
+ #eventHandler;
- // #mainDispatcher pushes only async notifications (650) to
- // #notificationDispatcher
- this.#mainDispatcher.addCallback(
- /^650/,
- this.#handleNotification.bind(this)
- );
- // callback for handling responses and errors
- this.#mainDispatcher.addCallback(
- /^[245]\d\d/,
- this.#handleCommandReply.bind(this)
+ /**
+ * Connect to a control port over a Unix socket.
+ * Not available on Windows.
+ *
+ * @param {nsIFile} ipcFile The path to the Unix socket to connect to
+ * @param {TorEventHandler} eventHandler The event handler to use for
+ * asynchronous notifications
+ */
+ static fromIpcFile(ipcFile, eventHandler) {
+ return new TorController(AsyncSocket.fromIpcFile(ipcFile), eventHandler);
+ }
+
+ /**
+ * Connect to a control port over a TCP socket.
+ *
+ * @param {string} host The hostname to connect to
+ * @param {number} port The port to connect the to
+ * @param {TorEventHandler} eventHandler The event handler to use for
+ * asynchronous notifications
+ */
+ static fromSocketAddress(host, port, eventHandler) {
+ return new TorController(
+ AsyncSocket.fromSocketAddress(host, port),
+ eventHandler
);
+ }
+ /**
+ * Construct the controller and start the message pump.
+ * The class should not be constructed directly, but through static methods.
+ * However, this is public because JavaScript does not support private
+ * constructors.
+ *
+ * @private
+ * @param {AsyncSocket} socket The socket to use
+ * @param {TorEventHandler} eventHandler The event handler to use for
+ * asynchronous notifications
+ */
+ constructor(socket, eventHandler) {
+ this.#socket = socket;
+ this.#eventHandler = eventHandler;
this.#startMessagePump();
}
+ // Socket and communication handling
+
/**
* Return the next line in the queue. If there is not any, block until one is
* read (or until a communication error happens, including the underlying
@@ -463,6 +479,24 @@ class ControlSocket {
return message.join("\r\n");
}
+ /**
+ * Handles a message that was received as a reply to a command (i.e., all the
+ * messages that are not async notification messages starting with 650).
+ *
+ * @param {string} message The message to handle
+ */
+ #handleCommandReply(message) {
+ const cmd = this.#commandQueue.shift();
+ // We resolve also for messages that are failures for sure. The commands
+ // should always check the output.
+ cmd.resolve(message);
+
+ // send next command if one is available
+ if (this.#commandQueue.length) {
+ this.#writeNextCommand();
+ }
+ }
+
/**
* Read messages on the socket and routed them to a dispatcher until the
* socket is open or some error happens (including the underlying socket being
@@ -475,14 +509,25 @@ class ControlSocket {
// condition becoming false.
while (this.#socket) {
const message = await this.#readMessage();
- // log("controlPort >> " + message);
- this.#mainDispatcher.pushMessage(message);
+ try {
+ if (message.startsWith("650")) {
+ this.#handleNotification(message);
+ } else {
+ this.#handleCommandReply(message);
+ }
+ } catch (err) {
+ // E.g., if a notification handler fails. Without this internal
+ // try/catch we risk of closing the connection while not actually
+ // needed.
+ logger.error("Caught an exception while handling a message", err);
+ }
}
} catch (err) {
+ logger.debug("Caught an exception, closing the control port", err);
try {
this.#close(err);
} catch (ec) {
- console.error(
+ logger.error(
"Caught another error while closing the control socket.",
ec
);
@@ -497,7 +542,6 @@ class ControlSocket {
*/
#writeNextCommand() {
const cmd = this.#commandQueue[0];
- // log("controlPort << " + cmd.commandString);
this.#socket.write(`${cmd.commandString}\r\n`).catch(cmd.reject);
}
@@ -508,12 +552,11 @@ class ControlSocket {
* needs to handle multi-line messages.
*
* @param {string} commandString
- * @returns {Promise<string>} The message sent by the control port. It will
- * always start with 2xx. In case of other codes the function will throw,
- * instead. This means that the return value will never be an empty string
- * (even though it will not include the final CRLF).
+ * @returns {Promise<string>} The message sent by the control port. The return
+ * value should never be an empty string (even though it will not include the
+ * final CRLF).
*/
- async sendCommand(commandString) {
+ async #sendCommand(commandString) {
if (!this.#socket) {
throw new Error("ControlSocket not open");
}
@@ -534,42 +577,16 @@ class ControlSocket {
}
/**
- * Handles a message starting with 2xx, 4xx, or 5xx.
- * This function should be used only as a callback for the main dispatcher.
- *
- * @param {string} message The message to handle
- */
- #handleCommandReply(message) {
- const cmd = this.#commandQueue.shift();
- if (message[0] === "2") {
- cmd.resolve(message);
- } else if (message.match(/^[45]/)) {
- cmd.reject(new TorError(cmd.commandString, message));
- } else {
- // This should never happen, as the dispatcher should filter the messages
- // already.
- cmd.reject(
- new Error(`Received unexpected message:\n----\n${message}\n----`)
- );
- }
-
- // send next command if one is available
- if (this.#commandQueue.length) {
- this.#writeNextCommand();
- }
- }
-
- /**
- * Re-route an event message to the notification dispatcher.
- * This function should be used only as a callback for the main dispatcher.
+ * Send a simple command whose response is expected to be simply a "250 OK".
+ * The function will not return a reply, but will throw if an unexpected one
+ * is received.
*
- * @param {string} message The message received on the control port
+ * @param {string} command The command to send
*/
- #handleNotification(message) {
- try {
- this.#notificationDispatcher.pushMessage(message);
- } catch (e) {
- console.error("An event watcher threw", e);
+ async #sendCommandSimple(command) {
+ const reply = await this.#sendCommand(command);
+ if (!/^250 OK\s*$/i.test(reply)) {
+ throw new TorError(command, reply);
}
}
@@ -581,6 +598,7 @@ class ControlSocket {
* rejection reason to the commands that are still queued.
*/
#close(reason) {
+ logger.info("Closing the control port", reason);
const error = new Error(
"The control socket has been closed" +
(reason ? `: ${reason.message}` : "")
@@ -604,98 +622,29 @@ class ControlSocket {
this.#close(null);
}
- /**
- * Register an event watcher.
- *
- * @param {RegExp} regex The regex to filter on messages to receive
- * @param {MessageCallback} callback The callback for the messages
- */
- addNotificationCallback(regex, callback) {
- this.#notificationDispatcher.addCallback(regex, callback);
- }
-
/**
* Tells whether the underlying socket is still open.
*/
get isOpen() {
return !!this.#socket;
}
-}
-
-class TorController {
- /**
- * The control socket
- *
- * @type {ControlSocket}
- */
- #socket;
-
- /**
- * Builds a new TorController.
- *
- * @param {AsyncSocket} socket The socket to communicate to the control port
- */
- constructor(socket) {
- this.#socket = new ControlSocket(socket);
- }
-
- /**
- * Tells whether the underlying socket is open.
- *
- * @returns {boolean}
- */
- get isOpen() {
- return this.#socket.isOpen;
- }
-
- /**
- * Close the underlying socket.
- */
- close() {
- this.#socket.close();
- }
-
- /**
- * Send a command over the control port.
- * TODO: Make this function private, and force the operations to go through
- * specialized methods.
- *
- * @param {string} cmd The command to send
- * @returns {Promise<string>} A 2xx response obtained from the control port.
- * For other codes, this function will throw. The returned string will never
- * be empty.
- */
- async sendCommand(cmd) {
- return this.#socket.sendCommand(cmd);
- }
-
- /**
- * Send a simple command whose response is expected to be simply a "250 OK".
- * The function will not return a reply, but will throw if an unexpected one
- * is received.
- *
- * @param {string} command The command to send
- */
- async #sendCommandSimple(command) {
- const reply = await this.sendCommand(command);
- if (!/^250 OK\s*$/i.test(reply)) {
- throw new TorError(command, reply);
- }
- }
/**
* Authenticate to the tor daemon.
* Notice that a failure in the authentication makes the connection close.
*
- * @param {string} password The password for the control port.
+ * @param {Uint8Array} password The password for the control port, as an array
+ * of bytes
*/
async authenticate(password) {
- if (password) {
- this.#expectString(password, "password");
- }
- await this.#sendCommandSimple(`authenticate ${password || ""}`);
+ const passwordString = Array.from(password ?? [], b =>
+ b.toString(16).padStart(2, "0")
+ ).join("");
+ await this.#sendCommandSimple(`authenticate ${passwordString}`);
}
+ // Information
+
/**
* Sends a GETINFO for a single key.
* control-spec.txt says "one ReplyLine is sent for each requested value", so,
@@ -713,10 +662,10 @@ class TorController {
async #getInfo(key) {
this.#expectString(key);
const cmd = `GETINFO ${key}`;
- const reply = await this.sendCommand(cmd);
+ const reply = await this.#sendCommand(cmd);
const match =
reply.match(/^250-([^=]+)=(.*)$/m) ||
- reply.match(/^250\+([^=]+)=([\s\S]*?)^\.\r?\n^250 OK\s*$/m);
+ reply.match(/^250\+([^=]+)=\r?\n(.*?)\r?\n^\.\r?\n^250 OK\s*$/ms);
if (!match || match[1] !== key) {
throw new TorError(cmd, reply);
}
@@ -777,6 +726,17 @@ class TorController {
return this.#getInfo(`ip-to-country/${ip}`);
}
+ /**
+ * Ask Tor a list of circuits.
+ *
+ * @returns {string[]} An array with a string for each line
+ */
+ async getCircuits() {
+ const circuits = await this.#getInfo("circuit-status");
+ // TODO: Do more parsing once we move the event parsing to this class!
+ return circuits.split(/\r?\n/);
+ }
+
// Configuration
/**
@@ -805,7 +765,7 @@ class TorController {
throw new Error("The key can be composed only of letters and numbers.");
}
const cmd = `GETCONF ${key}`;
- const reply = await this.sendCommand(cmd);
+ const reply = await this.#sendCommand(cmd);
// From control-spec.txt: a 'default' value semantically different from an
// empty string will not have an equal sign, just `250 $key`.
const defaultRe = new RegExp(`^250[-\\s]${key}$`, "gim");
@@ -924,7 +884,7 @@ class TorController {
*/
async onionAuthViewKeys() {
const cmd = "onion_client_auth_view";
- const message = await this.sendCommand(cmd);
+ const message = await this.#sendCommand(cmd);
// Either `250-CLIENT`, or `250 OK` if no keys are available.
if (!message.startsWith("250")) {
throw new TorError(cmd, message);
@@ -964,7 +924,7 @@ class TorController {
if (isPermanent) {
cmd += " Flags=Permanent";
}
- const reply = await this.sendCommand(cmd);
+ const reply = await this.#sendCommand(cmd);
const status = reply.substring(0, 3);
if (status !== "250" && status !== "251" && status !== "252") {
throw new TorError(cmd, reply);
@@ -980,7 +940,7 @@ class TorController {
async onionAuthRemove(address) {
this.#expectString(address, "address");
const cmd = `onion_client_auth_remove ${address}`;
- const reply = await this.sendCommand(cmd);
+ const reply = await this.#sendCommand(cmd);
const status = reply.substring(0, 3);
if (status !== "250" && status !== "251") {
throw new TorError(cmd, reply);
@@ -1035,19 +995,77 @@ class TorController {
}
/**
- * Watches for a particular type of asynchronous event.
- * Notice: we only observe `"650" SP...` events, currently (no `650+...` or
- * `650-...` events).
- * Also, you need to enable the events in the control port with SETEVENTS,
- * first.
+ * Parse an asynchronous event and pass the data to the relative handler.
+ * Only single-line messages are currently supported.
*
- * @param {string} type The event type to catch
- * @param {EventCallback} callback The callback that will handle the event
+ * @param {string} message The message received on the control port. It should
+ * starts with `"650" SP`.
*/
- watchEvent(type, callback) {
- this.#expectString(type, "type");
- const start = `650 ${type}`;
- this.#socket.addNotificationCallback(new RegExp(`^${start}`), callback);
+ #handleNotification(message) {
+ if (!this.#eventHandler) {
+ return;
+ }
+ const data = message.match(/^650\s+(?<type>\S+)\s*(?<data>.*)?/);
+ if (!data) {
+ return;
+ }
+ switch (data.groups.type) {
+ case "STATUS_CLIENT":
+ let status;
+ try {
+ status = this.#parseBootstrapStatus(data.groups.data);
+ } catch (e) {
+ // Probably, a non bootstrap client status
+ logger.debug(`Failed to parse STATUS_CLIENT: ${data.groups.data}`, e);
+ break;
+ }
+ this.#eventHandler.onBootstrapStatus(status);
+ break;
+ case "CIRC":
+ const builtEvent =
+ /^(?<ID>[a-zA-Z0-9]{1,16})\sBUILT\s(?<Path>(,?\$([0-9a-fA-F]{40})(?:~[a-zA-Z0-9]{1,19})?)+)/.exec(
+ data.groups.data
+ );
+ const closedEvent = /^(?<ID>[a-zA-Z0-9]{1,16})\sCLOSED/.exec(
+ data.groups.data
+ );
+ if (builtEvent) {
+ const fp = /\$([0-9a-fA-F]{40})/g;
+ const nodes = Array.from(builtEvent.groups.Path.matchAll(fp), g =>
+ g[1].toUpperCase()
+ );
+ // In some cases, we might already receive SOCKS credentials in the
+ // line. However, this might be a problem with onion services: we get
+ // also a 4-hop circuit that we likely do not want to show to the
+ // user, especially because it is used only temporarily, and it would
+ // need a technical explaination.
+ // const credentials = this.#parseCredentials(data.groups.data);
+ this.#eventHandler.onCircuitBuilt(builtEvent.groups.ID, nodes);
+ } else if (closedEvent) {
+ this.#eventHandler.onCircuitClosed(closedEvent.groups.ID);
+ }
+ break;
+ case "STREAM":
+ const succeeedEvent =
+ /^(?<StreamID>[a-zA-Z0-9]{1,16})\sSUCCEEDED\s(?<CircuitID>[a-zA-Z0-9]{1,16})/.exec(
+ data.groups.data
+ );
+ if (succeeedEvent) {
+ const credentials = this.#parseCredentials(data.groups.data);
+ this.#eventHandler.onStreamSucceeded(
+ succeeedEvent.groups.StreamID,
+ succeeedEvent.groups.CircuitID,
+ credentials?.username ?? null,
+ credentials?.password ?? null
+ );
+ }
+ break;
+ case "NOTICE":
+ case "WARN":
+ case "ERR":
+ this.#eventHandler.onLogMessage(data.groups.type, data.groups.data);
+ break;
+ }
}
// Other helpers
@@ -1092,6 +1110,24 @@ class TorController {
}
}
+ /**
+ * Check if a STREAM or CIRC response line contains SOCKS_USERNAME and
+ * SOCKS_PASSWORD.
+ *
+ * @param {string} line The circ or stream line to check
+ * @returns {object?} The credentials, or null if not found
+ */
+ #parseCredentials(line) {
+ const username = /SOCKS_USERNAME=("(?:[^"\\]|\\.)*")/.exec(line);
+ const password = /SOCKS_PASSWORD=("(?:[^"\\]|\\.)*")/.exec(line);
+ return username && password
+ ? {
+ username: TorParsers.unescapeString(username[1]),
+ password: TorParsers.unescapeString(password[1]),
+ }
+ : null;
+ }
+
/**
* Return an object with all the matches that are in the form `key="value"` or
* `key=value`. The values will be unescaped, but no additional parsing will
@@ -1112,67 +1148,54 @@ class TorController {
}
}
-const controlPortInfo = {};
-
/**
- * Sets Tor control port connection parameters to be used in future calls to
- * the controller() function.
+ * @typedef {object} TorEventHandler
+ * The event handler interface.
+ * The controller owner can implement this methods to receive asynchronous
+ * notifications from the controller.
*
- * Example:
- * configureControlPortModule(undefined, "127.0.0.1", 9151, "MyPassw0rd");
+ * @property {OnBootstrapStatus} onBootstrapStatus Called when a bootstrap
+ * status is received (i.e., a STATUS_CLIENT event with a BOOTSTRAP action)
+ * @property {OnLogMessage} onLogMessage Called when a log message is received
+ * (i.e., a NOTICE, WARN or ERR notification)
+ * @property {OnCircuitBuilt} onCircuitBuilt Called when a circuit is built
+ * (i.e., a CIRC event with a BUILT status)
+ * @property {OnCircuitClosed} onCircuitClosed Called when a circuit is closed
+ * (i.e., a CIRC event with a CLOSED status)
+ * @property {OnStreamSucceeded} onStreamSucceeded Called when a stream receives
+ * a reply (i.e., a STREAM event with a SUCCEEDED status)
+ */
+/**
+ * @callback OnBootstrapStatus
*
- * @param {nsIFile?} ipcFile An optional file to use to communicate to the
- * control port on Unix platforms
- * @param {string?} host The hostname to connect to the control port. Mutually
- * exclusive with ipcFile
- * @param {integer?} port The port number of the control port. To be used only
- * with host. The default is 9151.
- * @param {string} password The password of the control port in clear text.
+ * @param {object} status An object with the bootstrap information. Its keys
+ * depend on what the arguments sent by the tor daemon
*/
-export function configureControlPortModule(ipcFile, host, port, password) {
- controlPortInfo.ipcFile = ipcFile;
- controlPortInfo.host = host;
- controlPortInfo.port = port || 9151;
- controlPortInfo.password = password;
-}
-
/**
- * Instantiates and returns a controller object that is connected and
- * authenticated to a Tor ControlPort using the connection parameters
- * provided in the most recent call to configureControlPortModule().
+ * @callback OnLogMessage
*
- * Example:
- * // Get a new controller
- * let c = await controller();
- * // Send command and receive a `250` reply or an error message:
- * let replyPromise = await c.getInfo("ip-to-country/16.16.16.16");
- * // Close the controller permanently
- * c.close();
+ * @param {string} type The type of message (NOTICE, WARNING, ERR, etc...)
+ * @param {string} message The actual log message
+ */
+/**
+ * @callback OnCircuitBuilt
+ *
+ * @param {CircuitID} id The id of the circuit that has been built
+ * @param {NodeFingerprint[]} nodes The onion routers composing the circuit
+ */
+/**
+ * @callback OnCircuitClosed
+ *
+ * @param {CircuitID} id The id of the circuit that has been closed
+ */
+/**
+ * @callback OnStreamSucceeded
+ *
+ * @param {StreamID} streamId The id of the stream that switched to the succeeded
+ * state
+ * @param {CircuitID} circuitId The id of the circuit the stream is using
+ * @param {string?} username The SOCKS username associated to the stream, or
+ * null if not available
+ * @param {string?} username The SOCKS password associated to the stream, or
+ * null if not available
*/
-export async function controller() {
- if (!controlPortInfo.ipcFile && !controlPortInfo.host) {
- throw new Error("Please call configureControlPortModule first");
- }
- let socket;
- if (controlPortInfo.ipcFile) {
- socket = AsyncSocket.fromIpcFile(controlPortInfo.ipcFile);
- } else {
- socket = AsyncSocket.fromSocketAddress(
- controlPortInfo.host,
- controlPortInfo.port
- );
- }
- const controller = new TorController(socket);
- try {
- await controller.authenticate(controlPortInfo.password);
- } catch (e) {
- try {
- controller.close();
- } catch (ec) {
- // TODO: Use a custom logger?
- console.error("Cannot close the socket", ec);
- }
- throw e;
- }
- return controller;
-}
=====================================
toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs
=====================================
@@ -136,8 +136,11 @@ class TorDomainIsolatorImpl {
init() {
logger.info("Setup circuit isolation by domain and user context");
- if (Services.prefs.getBoolPref(NON_TOR_PROXY_PREF)) {
+ if (Services.prefs.getBoolPref(NON_TOR_PROXY_PREF, false)) {
this.#isolationEnabled = false;
+ logger.info(
+ `The domain isolation will not be enabled because of ${NON_TOR_PROXY_PREF}.`
+ );
}
this.#setupProxyFilter();
@@ -257,7 +260,8 @@ class TorDomainIsolatorImpl {
);
this.clearIsolation();
try {
- await lazy.TorProviderBuilder.build().newnym();
+ const provider = await lazy.TorProviderBuilder.build();
+ await provider.newnym();
} catch (e) {
logger.error("Could not send the newnym command", e);
// TODO: What UX to use here? See tor-browser#41708
@@ -305,7 +309,9 @@ class TorDomainIsolatorImpl {
try {
const searchParams = new URLSearchParams(loadingPrincipalURI.query);
if (searchParams.has("url")) {
- firstPartyDomain = Services.eTLD.getSchemelessSite(Services.io.newURI(searchParams.get("url")));
+ firstPartyDomain = Services.eTLD.getSchemelessSite(
+ Services.io.newURI(searchParams.get("url"))
+ );
}
} catch (e) {
logger.error("Failed to get first party domain for about:reader", e);
@@ -562,10 +568,9 @@ class TorDomainIsolatorImpl {
return;
}
+ const provider = await lazy.TorProviderBuilder.build();
data = await Promise.all(
- circuit.map(fingerprint =>
- lazy.TorProviderBuilder.build().getNodeInfo(fingerprint)
- )
+ circuit.map(fingerprint => provider.getNodeInfo(fingerprint))
);
this.#knownCircuits.set(id, data);
// We know that something changed, but we cannot know if anyone is
@@ -673,7 +678,9 @@ function getDomainForBrowser(browser) {
try {
const searchParams = new URLSearchParams(documentURI.query);
if (searchParams.has("url")) {
- fpd = Services.eTLD.getSchemelessSite(Services.io.newURI(searchParams.get("url")));
+ fpd = Services.eTLD.getSchemelessSite(
+ Services.io.newURI(searchParams.get("url"))
+ );
}
} catch (e) {
logger.error("Failed to get first party domain for about:reader", e);
=====================================
toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs
=====================================
@@ -366,6 +366,38 @@ export const TorLauncherUtil = Object.freeze({
return btnIndex === 0;
},
+ /**
+ * Ask the user whether they desire to restart tor.
+ *
+ * @param {boolean} initError If we could connect to the control port at
+ * least once and we are showing this prompt because the tor process exited
+ * suddenly, we will display a different message
+ * @returns {boolean} true if the user asked to restart tor
+ */
+ showRestartPrompt(initError) {
+ let s;
+ if (initError) {
+ const key = "tor_exited_during_startup";
+ s = this.getLocalizedString(key);
+ } else {
+ // tor exited suddenly, so configuration should be okay
+ s =
+ this.getLocalizedString("tor_exited") +
+ "\n\n" +
+ this.getLocalizedString("tor_exited2");
+ }
+ const defaultBtnLabel = this.getLocalizedString("restart_tor");
+ let cancelBtnLabel = "OK";
+ try {
+ const kSysBundleURI = "chrome://global/locale/commonDialogs.properties";
+ const sysBundle = Services.strings.createBundle(kSysBundleURI);
+ cancelBtnLabel = sysBundle.GetStringFromName(cancelBtnLabel);
+ } catch (e) {
+ console.warn("Could not localize the cancel button", e);
+ }
+ return this.showConfirm(null, s, defaultBtnLabel, cancelBtnLabel);
+ },
+
// Localized Strings
// TODO: Switch to fluent also these ones.
@@ -503,10 +535,6 @@ export const TorLauncherUtil = Object.freeze({
*/
getPreferredSocksConfiguration() {
if (Services.env.exists("TOR_TRANSPROXY")) {
- Services.prefs.setBoolPref("network.proxy.socks_remote_dns", false);
- Services.prefs.setIntPref("network.proxy.type", 0);
- Services.prefs.setIntPref("network.proxy.socks_port", 0);
- Services.prefs.setCharPref("network.proxy.socks", "");
return { transproxy: true };
}
@@ -576,6 +604,10 @@ export const TorLauncherUtil = Object.freeze({
setProxyConfiguration(socksPortInfo) {
if (socksPortInfo.transproxy) {
+ Services.prefs.setBoolPref("network.proxy.socks_remote_dns", false);
+ Services.prefs.setIntPref("network.proxy.type", 0);
+ Services.prefs.setIntPref("network.proxy.socks_port", 0);
+ Services.prefs.setCharPref("network.proxy.socks", "");
return;
}
=====================================
toolkit/components/tor-launcher/TorParsers.sys.mjs
=====================================
@@ -6,171 +6,6 @@ export const TorStatuses = Object.freeze({
});
export const TorParsers = Object.freeze({
- commandSucceeded(aReply) {
- return aReply?.statusCode === TorStatuses.OK;
- },
-
- // parseReply() understands simple GETCONF and GETINFO replies.
- parseReply(aCmd, aKey, aReply) {
- if (!aCmd || !aKey || !aReply || !aReply.lineArray?.length) {
- return [];
- }
-
- const lcKey = aKey.toLowerCase();
- const prefix = lcKey + "=";
- const prefixLen = prefix.length;
- const tmpArray = [];
- for (const line of aReply.lineArray) {
- var lcLine = line.toLowerCase();
- if (lcLine === lcKey) {
- tmpArray.push("");
- } else if (lcLine.indexOf(prefix) !== 0) {
- console.warn(`Unexpected ${aCmd} response: ${line}`);
- } else {
- try {
- let s = this.unescapeString(line.substring(prefixLen));
- tmpArray.push(s);
- } catch (e) {
- console.warn(
- `Error while unescaping the response of ${aCmd}: ${line}`,
- e
- );
- }
- }
- }
-
- return tmpArray;
- },
-
- // Returns false if more lines are needed. The first time, callers
- // should pass an empty aReplyObj.
- // Parsing errors are indicated by aReplyObj._parseError = true.
- parseReplyLine(aLine, aReplyObj) {
- if (!aLine || !aReplyObj) {
- return false;
- }
-
- if (!("_parseError" in aReplyObj)) {
- aReplyObj.statusCode = 0;
- aReplyObj.lineArray = [];
- aReplyObj._parseError = false;
- }
-
- if (aLine.length < 4) {
- console.error("Unexpected response: ", aLine);
- aReplyObj._parseError = true;
- return true;
- }
-
- // TODO: handle + separators (data)
- aReplyObj.statusCode = parseInt(aLine.substring(0, 3), 10);
- const s = aLine.length < 5 ? "" : aLine.substring(4);
- // Include all lines except simple "250 OK" ones.
- if (aReplyObj.statusCode !== TorStatuses.OK || s !== "OK") {
- aReplyObj.lineArray.push(s);
- }
-
- return aLine.charAt(3) === " ";
- },
-
- // Split aStr at spaces, accounting for quoted values.
- // Returns an array of strings.
- splitReplyLine(aStr) {
- // Notice: the original function did not check for escaped quotes.
- return aStr
- .split('"')
- .flatMap((token, index) => {
- const inQuotedStr = index % 2 === 1;
- return inQuotedStr ? `"${token}"` : token.split(" ");
- })
- .filter(s => s);
- },
-
- // Helper function for converting a raw controller response into a parsed object.
- parseCommandResponse(reply) {
- if (!reply) {
- return {};
- }
- const lines = reply.split("\r\n");
- const rv = {};
- for (const line of lines) {
- if (this.parseReplyLine(line, rv) || rv._parseError) {
- break;
- }
- }
- return rv;
- },
-
- // If successful, returns a JS object with these fields:
- // status.TYPE -- "NOTICE" or "WARN"
- // status.PROGRESS -- integer
- // status.TAG -- string
- // status.SUMMARY -- string
- // status.WARNING -- string (optional)
- // status.REASON -- string (optional)
- // status.COUNT -- integer (optional)
- // status.RECOMMENDATION -- string (optional)
- // status.HOSTADDR -- string (optional)
- // Returns null upon failure.
- parseBootstrapStatus(aStatusMsg) {
- if (!aStatusMsg || !aStatusMsg.length) {
- return null;
- }
-
- let sawBootstrap = false;
- const statusObj = {};
- statusObj.TYPE = "NOTICE";
-
- // The following code assumes that this is a one-line response.
- for (const tokenAndVal of this.splitReplyLine(aStatusMsg)) {
- let token, val;
- const idx = tokenAndVal.indexOf("=");
- if (idx < 0) {
- token = tokenAndVal;
- } else {
- token = tokenAndVal.substring(0, idx);
- try {
- val = TorParsers.unescapeString(tokenAndVal.substring(idx + 1));
- } catch (e) {
- console.debug("Could not parse the token value", e);
- }
- if (!val) {
- // skip this token/value pair.
- continue;
- }
- }
-
- switch (token) {
- case "BOOTSTRAP":
- sawBootstrap = true;
- break;
- case "WARN":
- case "NOTICE":
- case "ERR":
- statusObj.TYPE = token;
- break;
- case "COUNT":
- case "PROGRESS":
- statusObj[token] = parseInt(val, 10);
- break;
- default:
- statusObj[token] = val;
- break;
- }
- }
-
- if (!sawBootstrap) {
- if (statusObj.TYPE === "NOTICE") {
- console.info(aStatusMsg);
- } else {
- console.warn(aStatusMsg);
- }
- return null;
- }
-
- return statusObj;
- },
-
// Escape non-ASCII characters for use within the Tor Control protocol.
// Based on Vidalia's src/common/stringutil.cpp:string_escape().
// Returns the new string.
=====================================
toolkit/components/tor-launcher/TorProcess.sys.mjs
=====================================
@@ -37,12 +37,11 @@ export class TorProcess {
#didConnectToTorControlPort = false;
onExit = exitCode => {};
- onRestart = () => {};
constructor(controlSettings, socksSettings) {
if (
controlSettings &&
- !controlSettings.password &&
+ !controlSettings.password?.length &&
!controlSettings.cookieFilePath
) {
throw new Error("Unauthenticated control port is not supported");
@@ -204,43 +203,22 @@ export class TorProcess {
#processExitedUnexpectedly(exitCode) {
this.#subprocess = null;
this.#status = TorProcessStatus.Exited;
-
- // TODO: Move this logic somewhere else?
- let s;
+ // FIXME: We can probably drop #didConnectToTorControlPort and use only one
+ // callback. Then we can let the provider actually distinguish between the
+ // cases.
if (!this.#didConnectToTorControlPort) {
- // tor might be misconfigured, becauser we could never connect to it
- const key = "tor_exited_during_startup";
- s = lazy.TorLauncherUtil.getLocalizedString(key);
- } else {
- // tor exited suddenly, so configuration should be okay
- s =
- lazy.TorLauncherUtil.getLocalizedString("tor_exited") +
- "\n\n" +
- lazy.TorLauncherUtil.getLocalizedString("tor_exited2");
- }
- logger.info(s);
- const defaultBtnLabel =
- lazy.TorLauncherUtil.getLocalizedString("restart_tor");
- let cancelBtnLabel = "OK";
- try {
- const kSysBundleURI = "chrome://global/locale/commonDialogs.properties";
- const sysBundle = Services.strings.createBundle(kSysBundleURI);
- cancelBtnLabel = sysBundle.GetStringFromName(cancelBtnLabel);
- } catch (e) {
- logger.warn("Could not localize the cancel button", e);
- }
-
- const restart = lazy.TorLauncherUtil.showConfirm(
- null,
- s,
- defaultBtnLabel,
- cancelBtnLabel
- );
- if (restart) {
- this.start().then(this.onRestart);
- } else {
+ logger.warn("Tor exited before we could connect to its control port.");
+ // tor might be misconfigured, because we could never connect to it.
+ // Two instances of Tor Browser trying to use the same port numbers is
+ // also a typical scenario for this.
+ // This might happen very early, before the browser UI is actually
+ // available. So, we will tell the process owner that the process exited,
+ // without trying to restart it.
this.onExit(exitCode);
+ return;
}
+ logger.warn("Tor exited suddenly.");
+ this.onExit(exitCode);
}
#makeArgs() {
@@ -318,7 +296,7 @@ export class TorProcess {
this.#args.push("+__ControlPort", controlPortArg);
}
- if (this.#controlSettings.password) {
+ if (this.#controlSettings.password?.length) {
this.#args.push(
"HashedControlPassword",
this.#hashPassword(this.#controlSettings.password)
@@ -357,36 +335,43 @@ export class TorProcess {
}
}
- // Based on Vidalia's TorSettings::hashPassword().
- #hashPassword(aHexPassword) {
- if (!aHexPassword) {
- return null;
- }
+ /**
+ * Hash a password to then pass it to Tor as a command line argument.
+ * Based on Vidalia's TorSettings::hashPassword().
+ *
+ * @param {Uint8Array} password The password, as an array of bytes
+ */
+ #hashPassword(password) {
+ // The password has already been checked by the caller.
// Generate a random, 8 byte salt value.
const salt = Array.from(crypto.getRandomValues(new Uint8Array(8)));
- // Convert hex-encoded password to an array of bytes.
- const password = [];
- for (let i = 0; i < aHexPassword.length; i += 2) {
- password.push(parseInt(aHexPassword.substring(i, i + 2), 16));
- }
-
// Run through the S2K algorithm and convert to a string.
const toHex = v => v.toString(16).padStart(2, "0");
const arrayToHex = aArray => aArray.map(toHex).join("");
const kCodedCount = 96;
- const hashVal = this.#cryptoSecretToKey(password, salt, kCodedCount);
+ const hashVal = this.#cryptoSecretToKey(
+ Array.from(password),
+ salt,
+ kCodedCount
+ );
return "16:" + arrayToHex(salt) + toHex(kCodedCount) + arrayToHex(hashVal);
}
- // #cryptoSecretToKey() is similar to Vidalia's crypto_secret_to_key().
- // It generates and returns a hash of aPassword by following the iterated
- // and salted S2K algorithm (see RFC 2440 section 3.6.1.3).
- // See also https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/control-spec.txt….
- // Returns an array of bytes.
- #cryptoSecretToKey(aPassword, aSalt, aCodedCount) {
- const inputArray = aSalt.concat(aPassword);
+ /**
+ * Generates and return a hash of a password by following the iterated and
+ * salted S2K algorithm (see RFC 2440 section 3.6.1.3).
+ * See also https://gitlab.torproject.org/tpo/core/torspec/-/blob/main/control-spec.txt….
+ * #cryptoSecretToKey() is similar to Vidalia's crypto_secret_to_key().
+ *
+ * @param {Array} password The password to hash, as an array of bytes
+ * @param {Array} salt The salt to use for the hash, as an array of bytes
+ * @param {number} codedCount The counter, coded as specified in RFC 2440
+ * @returns {Array} The hash of the password, as an array of bytes
+ */
+ #cryptoSecretToKey(password, salt, codedCount) {
+ const inputArray = salt.concat(password);
// Subtle crypto only has the final digest, and does not allow incremental
// updates.
@@ -395,7 +380,7 @@ export class TorProcess {
);
hasher.init(hasher.SHA1);
const kEXPBIAS = 6;
- let count = (16 + (aCodedCount & 15)) << ((aCodedCount >> 4) + kEXPBIAS);
+ let count = (16 + (codedCount & 15)) << ((codedCount >> 4) + kEXPBIAS);
while (count > 0) {
if (count > inputArray.length) {
hasher.update(inputArray, inputArray.length);
=====================================
toolkit/components/tor-launcher/TorProvider.sys.mjs
=====================================
@@ -2,21 +2,17 @@
* 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/. */
-import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs";
+import { clearTimeout, setTimeout } from "resource://gre/modules/Timer.sys.mjs";
import { ConsoleAPI } from "resource://gre/modules/Console.sys.mjs";
import { TorLauncherUtil } from "resource://gre/modules/TorLauncherUtil.sys.mjs";
-import {
- TorParsers,
- TorStatuses,
-} from "resource://gre/modules/TorParsers.sys.mjs";
+import { TorParsers } from "resource://gre/modules/TorParsers.sys.mjs";
import { TorProviderTopics } from "resource://gre/modules/TorProviderBuilder.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
- controller: "resource://gre/modules/TorControlPort.sys.mjs",
- configureControlPortModule: "resource://gre/modules/TorControlPort.sys.mjs",
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ TorController: "resource://gre/modules/TorControlPort.sys.mjs",
TorProcess: "resource://gre/modules/TorProcess.sys.mjs",
});
@@ -27,20 +23,23 @@ const logger = new ConsoleAPI({
});
/**
- * From control-spec.txt:
- * CircuitID = 1*16 IDChar
- * IDChar = ALPHA / DIGIT
- * Currently, Tor only uses digits, but this may change.
- *
- * @typedef {string} CircuitID
+ * @typedef {object} ControlPortSettings An object with the settings to use for
+ * the control port. All the entries are optional, but an authentication
+ * mechanism and a communication method must be specified.
+ * @property {Uint8Array=} password The clear text password as an array of
+ * bytes. It must always be defined, unless cookieFilePath is
+ * @property {string=} cookieFilePath The path to the cookie file to use for
+ * authentication
+ * @property {nsIFile=} ipcFile The nsIFile object with the path to a Unix
+ * socket to use for control socket
+ * @property {string=} host The host to connect for a TCP control port
+ * @property {number=} port The port number to use for a TCP control port
*/
/**
- * The fingerprint of a node.
- * From control-spec.txt:
- * Fingerprint = "$" 40*HEXDIG
- * However, we do not keep the $ in our structures.
- *
- * @typedef {string} NodeFingerprint
+ * @typedef {object} LogEntry An object with a log message
+ * @property {Date} date The date at which we received the message
+ * @property {string} type The message level
+ * @property {string} msg The message
*/
/**
* Stores the data associated with a circuit node.
@@ -57,15 +56,13 @@ const logger = new ConsoleAPI({
*/
const Preferences = Object.freeze({
+ ControlUseIpc: "extensions.torlauncher.control_port_use_ipc",
+ ControlHost: "extensions.torlauncher.control_host",
+ ControlPort: "extensions.torlauncher.control_port",
+ MaxLogEntries: "extensions.torlauncher.max_tor_log_entries",
PromptAtStartup: "extensions.torlauncher.prompt_at_startup",
});
-const ControlConnTimings = Object.freeze({
- initialDelayMS: 25, // Wait 25ms after the process has started, before trying to connect
- maxRetryMS: 10000, // Retry at most every 10 seconds
- timeoutMS: 5 * 60 * 1000, // Wait at most 5 minutes for tor to start
-});
-
/**
* This is a Tor provider for the C Tor daemon.
*
@@ -73,61 +70,169 @@ const ControlConnTimings = Object.freeze({
* In the former case, it also takes its ownership by default.
*/
export class TorProvider {
- #inited = false;
+ /**
+ * The control port settings.
+ *
+ * @type {ControlPortSettings?}
+ */
+ #controlPortSettings = null;
+ /**
+ * An instance of the tor controller.
+ * We take for granted that if it is not null, we connected to it and managed
+ * to authenticate.
+ * Public methods can use the #controller getter, which will throw an
+ * exception whenever the control port is not open.
+ *
+ * @type {TorController?}
+ */
+ #controlConnection = null;
+ /**
+ * A helper that can be used to get the control port connection and assert it
+ * is open and it can be used.
+ * If this is not the case, this getter will throw.
+ *
+ * @returns {TorController}
+ */
+ get #controller() {
+ if (!this.#controlConnection?.isOpen) {
+ throw new Error("Control port connection not available.");
+ }
+ return this.#controlConnection;
+ }
+ /**
+ * A function that can be called to cancel the current connection attempt.
+ */
+ #cancelConnection = () => {};
- // Maintain a map of tor settings set by Tor Browser so that we don't
- // repeatedly set the same key/values over and over.
- // This map contains string keys to primitives or array values.
- #settingsCache = new Map();
+ /**
+ * The tor process we launched.
+ *
+ * @type {TorProcess}
+ */
+ #torProcess = null;
- #controlPort = null;
- #controlHost = null;
- #controlIPCFile = null; // An nsIFile if using IPC for control port.
- #controlPassword = null; // JS string that contains hex-encoded password.
- #SOCKSPortInfo = null; // An object that contains ipcFile, host, port.
+ /**
+ * The logs we received over the control port.
+ * We store a finite number of log entries which can be configured with
+ * extensions.torlauncher.max_tor_log_entries.
+ *
+ * @type {LogEntry[]}
+ */
+ #logs = [];
- #controlConnection = null; // This is cached and reused.
+ #isBootstrapDone = false;
+ /**
+ * Keep the last warning to avoid broadcasting an async warning if it is the
+ * same one as the last broadcast.
+ */
+ #lastWarning = {};
- // Public methods
+ /**
+ * Stores the nodes of a circuit. Keys are cicuit IDs, and values are the node
+ * fingerprints.
+ *
+ * Theoretically, we could hook this map up to the new identity notification,
+ * but in practice it does not work. Tor pre-builds circuits, and the NEWNYM
+ * signal does not affect them. So, we might end up using a circuit that was
+ * built before the new identity but not yet used. If we cleaned the map, we
+ * risked of not having the data about it.
+ *
+ * @type {Map<CircuitID, NodeFingerprint[]>}
+ */
+ #circuits = new Map();
+ /**
+ * The last used bridge, or null if bridges are not in use or if it was not
+ * possible to detect the bridge. This needs the user to have specified bridge
+ * lines with fingerprints to work.
+ *
+ * @type {NodeFingerprint?}
+ */
+ #currentBridge = null;
+ /**
+ * Maintain a map of tor settings set by Tor Browser so that we don't
+ * repeatedly set the same key/values over and over.
+ * This map contains string keys to primitives or array values.
+ *
+ * @type {Map<string, any>}
+ */
+ #settingsCache = new Map();
+
+ /**
+ * Starts a new tor process and connect to its control port, or connect to the
+ * control port of an existing tor daemon.
+ */
async init() {
- if (this.#inited) {
- return;
+ logger.debug("Initializing the Tor provider.");
+
+ const socksSettings = TorLauncherUtil.getPreferredSocksConfiguration();
+ logger.debug("Requested SOCKS configuration", socksSettings);
+
+ try {
+ await this.#setControlPortConfiguration();
+ } catch (e) {
+ logger.error("We do not have a control port configuration", e);
+ throw e;
}
- this.#inited = true;
- Services.obs.addObserver(this, TorProviderTopics.ProcessExited);
- Services.obs.addObserver(this, TorProviderTopics.ProcessRestarted);
+ if (socksSettings.transproxy) {
+ logger.info("Transparent proxy required, not starting a Tor daemon.");
+ } else if (this.ownsTorDaemon) {
+ try {
+ await this.#startDaemon(socksSettings);
+ } catch (e) {
+ logger.error("Failed to start the tor daemon", e);
+ throw e;
+ }
+ } else {
+ logger.debug(
+ "Not starting a tor daemon because we were requested not to."
+ );
+ }
+
+ try {
+ await this.#firstConnection();
+ } catch (e) {
+ logger.error("Cannot connect to the control port", e);
+ throw e;
+ }
- await this.#setSockets();
+ // We do not customize SOCKS settings, at least for now.
+ TorLauncherUtil.setProxyConfiguration(socksSettings);
- this._monitorInit();
+ logger.info("The Tor provider is ready.");
- logger.debug("TorProvider initialized");
+ logger.debug(`Notifying ${TorProviderTopics.ProcessIsReady}`);
+ Services.obs.notifyObservers(null, TorProviderTopics.ProcessIsReady);
}
+ /**
+ * Close the connection to the tor daemon.
+ * When Tor is started by Tor Browser, it is configured to exit when the
+ * control connection is closed. Therefore, as a matter of facts, calling this
+ * function also makes the child Tor instance stop.
+ */
uninit() {
- Services.obs.removeObserver(this, TorProviderTopics.ProcessExited);
- Services.obs.removeObserver(this, TorProviderTopics.ProcessRestarted);
- this.#closeConnection();
- this._monitorUninit();
- }
+ logger.debug("Uninitializing the Tor provider.");
- observe(subject, topic, data) {
- if (topic === TorProviderTopics.ProcessExited) {
- this.#closeConnection();
- } else if (topic === TorProviderTopics.ProcessRestarted) {
- this.#reconnect();
+ if (this.#torProcess) {
+ this.#torProcess.forget();
+ this.#torProcess.onExit = () => {};
+ this.#torProcess = null;
}
+
+ this.#closeConnection("Uninitializing the provider.");
}
- // takes a Map containing tor settings
- // throws on error
- async writeSettings(aSettingsObj) {
+ // Provider API
+
+ async writeSettings(settingsObj) {
+ // TODO: Move the translation from settings object to settings understood by
+ // tor here.
const entries =
- aSettingsObj instanceof Map
- ? Array.from(aSettingsObj.entries())
- : Object.entries(aSettingsObj);
+ settingsObj instanceof Map
+ ? Array.from(settingsObj.entries())
+ : Object.entries(settingsObj);
// only write settings that have changed
const newSettings = entries.filter(([setting, value]) => {
if (!this.#settingsCache.has(setting)) {
@@ -150,8 +255,7 @@ export class TorProvider {
// only write if new setting to save
if (newSettings.length) {
- const conn = await this.#getConnection();
- await conn.setConf(Object.fromEntries(newSettings));
+ await this.#controller.setConf(Object.fromEntries(newSettings));
// save settings to cache after successfully writing to Tor
for (const [setting, value] of newSettings) {
@@ -160,49 +264,76 @@ export class TorProvider {
}
}
- // writes current tor settings to disk
async flushSettings() {
- const conn = await this.#getConnection();
- await conn.flushSettings();
+ await this.#controller.flushSettings();
}
+ /**
+ * Start the bootstrap process.
+ */
async connect() {
- const conn = await this.#getConnection();
- await conn.setNetworkEnabled(true);
- this.clearBootstrapError();
+ await this.#controller.setNetworkEnabled(true);
+ this.#lastWarning = {};
this.retrieveBootstrapStatus();
}
+ /**
+ * Stop the bootstrap process.
+ */
async stopBootstrap() {
- // Tell tor to disable use of the network; this should stop the bootstrap
- // process.
- const conn = await this.#getConnection();
- await conn.setNetworkEnabled(false);
+ // Tell tor to disable use of the network; this should stop the bootstrap.
+ await this.#controller.setNetworkEnabled(false);
// We are not interested in waiting for this, nor in **catching its error**,
// so we do not await this. We just want to be notified when the bootstrap
// status is actually updated through observers.
this.retrieveBootstrapStatus();
}
+ /**
+ * Ask Tor to swtich to new circuits and clear the DNS cache.
+ */
async newnym() {
- const conn = await this.#getConnection();
- await conn.newnym();
+ await this.#controller.newnym();
}
+ /**
+ * Get the bridges Tor has been configured with.
+ *
+ * @returns {Bridge[]} The configured bridges
+ */
async getBridges() {
- const conn = await this.#getConnection();
// Ideally, we would not need this function, because we should be the one
// setting them with TorSettings. However, TorSettings is not notified of
// change of settings. So, asking tor directly with the control connection
// is the most reliable way of getting the configured bridges, at the
// moment. Also, we are using this for the circuit display, which should
// work also when we are not configuring the tor daemon, but just using it.
- return conn.getBridges();
+ return this.#controller.getBridges();
}
+ /**
+ * Get the configured pluggable transports.
+ *
+ * @returns {PTInfo[]} An array with the info of all the configured pluggable
+ * transports.
+ */
async getPluggableTransports() {
- const conn = await this.#getConnection();
- return conn.getPluggableTransports();
+ return this.#controller.getPluggableTransports();
+ }
+
+ /**
+ * Ask Tor its bootstrap phase.
+ * This function will also update the internal state when using an external
+ * tor daemon.
+ *
+ * @returns {object} An object with the bootstrap information received from
+ * Tor. Its keys might vary, depending on the input
+ */
+ async retrieveBootstrapStatus() {
+ this.#processBootstrapStatus(
+ await this.#controller.getBootstrapPhase(),
+ false
+ );
}
/**
@@ -212,14 +343,13 @@ export class TorProvider {
* @returns {Promise<NodeData>}
*/
async getNodeInfo(id) {
- const conn = await this.#getConnection();
const node = {
fingerprint: id,
ipAddrs: [],
bridgeType: null,
regionCode: null,
};
- const bridge = (await conn.getBridges())?.find(
+ const bridge = (await this.#controller.getBridges())?.find(
foundBridge => foundBridge.id?.toUpperCase() === id.toUpperCase()
);
if (bridge) {
@@ -230,14 +360,14 @@ export class TorProvider {
node.ipAddrs.push(ip);
}
} else {
- node.ipAddrs = await conn.getNodeAddresses(id);
+ node.ipAddrs = await this.#controller.getNodeAddresses(id);
}
if (node.ipAddrs.length) {
// Get the country code for the node's IP address.
try {
// Expect a 2-letter ISO3166-1 code, which should also be a valid
// BCP47 Region subtag.
- const regionCode = await conn.getIPCountry(node.ipAddrs[0]);
+ const regionCode = await this.#controller.getIPCountry(node.ipAddrs[0]);
if (regionCode && regionCode !== "??") {
node.regionCode = regionCode.toUpperCase();
}
@@ -248,301 +378,40 @@ export class TorProvider {
return node;
}
+ /**
+ * Add a private key to the Tor configuration.
+ *
+ * @param {string} address The address of the onion service
+ * @param {string} b64PrivateKey The private key of the service, in base64
+ * @param {boolean} isPermanent Tell whether the key should be saved forever
+ */
async onionAuthAdd(address, b64PrivateKey, isPermanent) {
- const conn = await this.#getConnection();
- return conn.onionAuthAdd(address, b64PrivateKey, isPermanent);
- }
-
- async onionAuthRemove(address) {
- const conn = await this.#getConnection();
- return conn.onionAuthRemove(address);
+ return this.#controller.onionAuthAdd(address, b64PrivateKey, isPermanent);
}
- async onionAuthViewKeys() {
- const conn = await this.#getConnection();
- return conn.onionAuthViewKeys();
- }
-
- // TODO: transform the following 4 functions in getters.
-
- // Returns Tor password string or null if an error occurs.
- torGetPassword() {
- return this.#controlPassword;
- }
-
- torGetControlIPCFile() {
- return this.#controlIPCFile?.clone();
- }
-
- torGetControlPort() {
- return this.#controlPort;
- }
-
- torGetSOCKSPortInfo() {
- return this.#SOCKSPortInfo;
- }
-
- get torControlPortInfo() {
- const info = {
- password: this.#controlPassword,
- };
- if (this.#controlIPCFile) {
- info.ipcFile = this.#controlIPCFile?.clone();
- }
- if (this.#controlPort) {
- info.host = this.#controlHost;
- info.port = this.#controlPort;
- }
- return info;
- }
-
- get torSOCKSPortInfo() {
- return this.#SOCKSPortInfo;
- }
-
- async #setSockets() {
- try {
- const isWindows = TorLauncherUtil.isWindows;
- // Determine how Tor Launcher will connect to the Tor control port.
- // Environment variables get top priority followed by preferences.
- if (!isWindows && Services.env.exists("TOR_CONTROL_IPC_PATH")) {
- const ipcPath = Services.env.get("TOR_CONTROL_IPC_PATH");
- this.#controlIPCFile = new lazy.FileUtils.File(ipcPath);
- } else {
- // Check for TCP host and port environment variables.
- if (Services.env.exists("TOR_CONTROL_HOST")) {
- this.#controlHost = Services.env.get("TOR_CONTROL_HOST");
- }
- if (Services.env.exists("TOR_CONTROL_PORT")) {
- this.#controlPort = parseInt(
- Services.env.get("TOR_CONTROL_PORT"),
- 10
- );
- }
-
- const useIPC =
- !isWindows &&
- Services.prefs.getBoolPref(
- "extensions.torlauncher.control_port_use_ipc",
- false
- );
- if (!this.#controlHost && !this.#controlPort && useIPC) {
- this.#controlIPCFile = TorLauncherUtil.getTorFile(
- "control_ipc",
- false
- );
- } else {
- if (!this.#controlHost) {
- this.#controlHost = Services.prefs.getCharPref(
- "extensions.torlauncher.control_host",
- "127.0.0.1"
- );
- }
- if (!this.#controlPort) {
- this.#controlPort = Services.prefs.getIntPref(
- "extensions.torlauncher.control_port",
- 9151
- );
- }
- }
- }
-
- // Populate _controlPassword so it is available when starting tor.
- if (Services.env.exists("TOR_CONTROL_PASSWD")) {
- this.#controlPassword = Services.env.get("TOR_CONTROL_PASSWD");
- } else if (Services.env.exists("TOR_CONTROL_COOKIE_AUTH_FILE")) {
- // TODO: test this code path (TOR_CONTROL_COOKIE_AUTH_FILE).
- const cookiePath = Services.env.get("TOR_CONTROL_COOKIE_AUTH_FILE");
- if (cookiePath) {
- this.#controlPassword = await this.#readAuthenticationCookie(
- cookiePath
- );
- }
- }
- if (!this.#controlPassword) {
- this.#controlPassword = this.#generateRandomPassword();
- }
-
- this.#SOCKSPortInfo = TorLauncherUtil.getPreferredSocksConfiguration();
- TorLauncherUtil.setProxyConfiguration(this.#SOCKSPortInfo);
-
- // Set the global control port info parameters.
- lazy.configureControlPortModule(
- this.#controlIPCFile,
- this.#controlHost,
- this.#controlPort,
- this.#controlPassword
- );
- } catch (e) {
- logger.error("Failed to get environment variables", e);
- }
- }
-
- async #getConnection() {
- if (!this.#controlConnection?.isOpen) {
- this.#controlConnection = await lazy.controller();
- }
- return this.#controlConnection;
- }
-
- #closeConnection() {
- if (this.#controlConnection) {
- logger.info("Closing the control connection");
- this.#controlConnection.close();
- this.#controlConnection = null;
- }
- }
-
- async #reconnect() {
- this.#closeConnection();
- await this.#getConnection();
- }
-
- async #readAuthenticationCookie(aPath) {
- const bytes = await IOUtils.read(aPath);
- return Array.from(bytes, b => this.#toHex(b, 2)).join("");
- }
-
- // Returns a random 16 character password, hex-encoded.
- #generateRandomPassword() {
- // Similar to Vidalia's crypto_rand_string().
- const kPasswordLen = 16;
- const kMinCharCode = "!".charCodeAt(0);
- const kMaxCharCode = "~".charCodeAt(0);
- let pwd = "";
- for (let i = 0; i < kPasswordLen; ++i) {
- const val = this.#cryptoRandInt(kMaxCharCode - kMinCharCode + 1);
- if (val < 0) {
- logger.error("_cryptoRandInt() failed");
- return null;
- }
- pwd += this.#toHex(kMinCharCode + val, 2);
- }
-
- return pwd;
- }
-
- // Returns -1 upon failure.
- #cryptoRandInt(aMax) {
- // Based on tor's crypto_rand_int().
- const maxUInt = 0xffffffff;
- if (aMax <= 0 || aMax > maxUInt) {
- return -1;
- }
-
- const cutoff = maxUInt - (maxUInt % aMax);
- let val = cutoff;
- while (val >= cutoff) {
- const uint32 = new Uint32Array(1);
- crypto.getRandomValues(uint32);
- val = uint32[0];
- }
- return val % aMax;
- }
-
- #toHex(aValue, aMinLen) {
- return aValue.toString(16).padStart(aMinLen, "0");
- }
-
- // Former TorMonitorService implementation.
- // FIXME: Refactor and integrate more with the rest of the class.
-
- _connection = null;
- _eventHandlers = {};
- _torLog = []; // Array of objects with date, type, and msg properties
- _startTimeout = null;
-
- _isBootstrapDone = false;
- _lastWarningPhase = null;
- _lastWarningReason = null;
-
- _torProcess = null;
-
- _inited = false;
-
/**
- * Stores the nodes of a circuit. Keys are cicuit IDs, and values are the node
- * fingerprints.
+ * Remove a private key from the Tor configuration.
*
- * Theoretically, we could hook this map up to the new identity notification,
- * but in practice it does not work. Tor pre-builds circuits, and the NEWNYM
- * signal does not affect them. So, we might end up using a circuit that was
- * built before the new identity but not yet used. If we cleaned the map, we
- * risked of not having the data about it.
- *
- * @type {Map<CircuitID, NodeFingerprint[]>}
+ * @param {string} address The address of the onion service
*/
- _circuits = new Map();
+ async onionAuthRemove(address) {
+ return this.#controller.onionAuthRemove(address);
+ }
+
/**
- * The last used bridge, or null if bridges are not in use or if it was not
- * possible to detect the bridge. This needs the user to have specified bridge
- * lines with fingerprints to work.
+ * Retrieve the list of private keys.
*
- * @type {NodeFingerprint?}
+ * @returns {OnionAuthKeyInfo[]}
*/
- _currentBridge = null;
-
- // Public methods
-
- // Starts Tor, if needed, and starts monitoring for events
- _monitorInit() {
- if (this._inited) {
- return;
- }
- this._inited = true;
-
- // We always liten to these events, because they are needed for the circuit
- // display.
- this._eventHandlers = new Map([
- ["CIRC", this._processCircEvent.bind(this)],
- ["STREAM", this._processStreamEvent.bind(this)],
- ]);
-
- if (this.ownsTorDaemon) {
- // When we own the tor daemon, we listen to more events, that are used
- // for about:torconnect or for showing the logs in the settings page.
- this._eventHandlers.set(
- "STATUS_CLIENT",
- this._processStatusClient.bind(this)
- );
- this._eventHandlers.set("NOTICE", this._processLog.bind(this));
- this._eventHandlers.set("WARN", this._processLog.bind(this));
- this._eventHandlers.set("ERR", this._processLog.bind(this));
- this._controlTor();
- } else {
- this._startEventMonitor();
- }
- logger.info("TorMonitorService initialized");
- }
-
- // Closes the connection that monitors for events.
- // When Tor is started by Tor Browser, it is configured to exit when the
- // control connection is closed. Therefore, as a matter of facts, calling this
- // function also makes the child Tor instance stop.
- _monitorUninit() {
- if (this._torProcess) {
- this._torProcess.forget();
- this._torProcess.onExit = null;
- this._torProcess.onRestart = null;
- this._torProcess = null;
- }
- this._shutDownEventMonitor();
- }
-
- async retrieveBootstrapStatus() {
- if (!this._connection) {
- throw new Error("Event monitor connection not available");
- }
-
- this._processBootstrapStatus(
- await this._connection.getBootstrapPhase(),
- true
- );
+ async onionAuthViewKeys() {
+ return this.#controller.onionAuthViewKeys();
}
- // Returns captured log message as a text string (one message per line).
+ /**
+ * Returns captured log message as a text string (one message per line).
+ */
getLog() {
- return this._torLog
+ return this.#logs
.map(logObj => {
const timeStr = logObj.date
.toISOString()
@@ -553,22 +422,27 @@ export class TorProvider {
.join(TorLauncherUtil.isWindows ? "\r\n" : "\n");
}
- // true if we launched and control tor, false if using system tor
+ /**
+ * @returns {boolean} true if we launched and control tor, false if we are
+ * using system tor.
+ */
get ownsTorDaemon() {
return TorLauncherUtil.shouldStartAndOwnTor;
}
get isBootstrapDone() {
- return this._isBootstrapDone;
- }
-
- clearBootstrapError() {
- this._lastWarningPhase = null;
- this._lastWarningReason = null;
+ return this.#isBootstrapDone;
}
+ /**
+ * TODO: Rename to isReady once we remove finish the migration.
+ *
+ * @returns {boolean} true if we currently have a connection to the control
+ * port. We take for granted that if we have one, we authenticated to it, and
+ * so we have already verified we can send and receive data.
+ */
get isRunning() {
- return !!this._connection;
+ return this.#controlConnection?.isOpen ?? false;
}
/**
@@ -580,258 +454,380 @@ export class TorProvider {
* is not a bridge, or no circuit has been opened, yet.
*/
get currentBridge() {
- return this._currentBridge;
+ return this.#currentBridge;
}
- // Private methods
+ // Process management
- async _startProcess() {
+ async #startDaemon(socksSettings) {
// TorProcess should be instanced once, then always reused and restarted
// only through the prompt it exposes when the controlled process dies.
- if (!this._torProcess) {
- this._torProcess = new lazy.TorProcess(
- this.torControlPortInfo,
- this.torSOCKSPortInfo
+ if (this.#torProcess) {
+ logger.warn(
+ "Ignoring a request to start a tor daemon because one is already running."
);
- this._torProcess.onExit = () => {
- this._shutDownEventMonitor();
- Services.obs.notifyObservers(null, TorProviderTopics.ProcessExited);
- };
- this._torProcess.onRestart = async () => {
- this._shutDownEventMonitor();
- await this._controlTor();
- Services.obs.notifyObservers(null, TorProviderTopics.ProcessRestarted);
- };
+ return;
}
- // Already running, but we did not start it
- if (this._torProcess.isRunning) {
- return false;
- }
+ this.#torProcess = new lazy.TorProcess(
+ this.#controlPortSettings,
+ socksSettings
+ );
+ // Use a closure instead of bind because we reassign #cancelConnection.
+ // Also, we now assign an exit handler that cancels the first connection,
+ // so that a sudden exit before the first connection is completed might
+ // still be handled as an initialization failure.
+ // But after the first connection is created successfully, we will change
+ // the exit handler to broadcast a notification instead.
+ this.#torProcess.onExit = () => {
+ this.#cancelConnection(
+ "The tor process exited before the first connection"
+ );
+ };
- try {
- await this._torProcess.start();
- if (this._torProcess.isRunning) {
- logger.info("tor started");
- this._torProcessStartTime = Date.now();
- }
- } catch (e) {
- // TorProcess already logs the error.
- this._lastWarningPhase = "startup";
- this._lastWarningReason = e.toString();
- }
- return this._torProcess.isRunning;
+ logger.debug("Trying to start the tor process.");
+ await this.#torProcess.start();
+ logger.info("Started a tor process");
}
- async _controlTor() {
- if (!this._torProcess?.isRunning && !(await this._startProcess())) {
- logger.error("Tor not running, not starting to monitor it.");
- return;
- }
-
- let delayMS = ControlConnTimings.initialDelayMS;
- const callback = async () => {
- if (await this._startEventMonitor()) {
- this.retrieveBootstrapStatus().catch(e => {
- logger.warn("Could not get the initial bootstrap status", e);
- });
-
- // FIXME: TorProcess is misleading here. We should use a topic related
- // to having a control port connection, instead.
- logger.info(`Notifying ${TorProviderTopics.ProcessIsReady}`);
- Services.obs.notifyObservers(null, TorProviderTopics.ProcessIsReady);
+ // Control port setup and connection
- // We reset this here hoping that _shutDownEventMonitor can interrupt
- // the current monitor, either by calling clearTimeout and preventing it
- // from starting, or by closing the control port connection.
- if (this._startTimeout === null) {
- logger.warn("Someone else reset _startTimeout!");
- }
- this._startTimeout = null;
- } else if (
- Date.now() - this._torProcessStartTime >
- ControlConnTimings.timeoutMS
- ) {
- let s = TorLauncherUtil.getLocalizedString("tor_controlconn_failed");
- this._lastWarningPhase = "startup";
- this._lastWarningReason = s;
- logger.info(s);
- if (this._startTimeout === null) {
- logger.warn("Someone else reset _startTimeout!");
- }
- this._startTimeout = null;
- } else {
- delayMS *= 2;
- if (delayMS > ControlConnTimings.maxRetryMS) {
- delayMS = ControlConnTimings.maxRetryMS;
+ /**
+ * Read the control port settings from environment variables and from
+ * preferences.
+ */
+ async #setControlPortConfiguration() {
+ logger.debug("Reading the control port configuration");
+ const settings = {};
+
+ const isWindows = Services.appinfo.OS === "WINNT";
+ // Determine how Tor Launcher will connect to the Tor control port.
+ // Environment variables get top priority followed by preferences.
+ if (!isWindows && Services.env.exists("TOR_CONTROL_IPC_PATH")) {
+ const ipcPath = Services.env.get("TOR_CONTROL_IPC_PATH");
+ settings.ipcFile = new lazy.FileUtils.File(ipcPath);
+ } else {
+ // Check for TCP host and port environment variables.
+ if (Services.env.exists("TOR_CONTROL_HOST")) {
+ settings.host = Services.env.get("TOR_CONTROL_HOST");
+ }
+ if (Services.env.exists("TOR_CONTROL_PORT")) {
+ const port = parseInt(Services.env.get("TOR_CONTROL_PORT"), 10);
+ if (Number.isInteger(port) && port > 0 && port <= 65535) {
+ settings.port = port;
}
- this._startTimeout = setTimeout(() => {
- logger.debug(`Control port not ready, waiting ${delayMS / 1000}s.`);
- callback();
- }, delayMS);
}
- };
- // Check again, in the unfortunate case in which the execution was alrady
- // queued, but was waiting network code.
- if (this._startTimeout === null) {
- this._startTimeout = setTimeout(callback, delayMS);
- } else {
- logger.error("Possible race? Refusing to start the timeout again");
}
- }
- async _startEventMonitor() {
- if (this._connection) {
- return true;
+ const useIPC =
+ !isWindows &&
+ Services.prefs.getBoolPref(Preferences.ControlUseIpc, false);
+ if (!settings.host && !settings.port && useIPC) {
+ settings.ipcFile = TorLauncherUtil.getTorFile("control_ipc", false);
+ } else {
+ if (!settings.host) {
+ settings.host = Services.prefs.getCharPref(
+ Preferences.ControlHost,
+ "127.0.0.1"
+ );
+ }
+ if (!settings.port) {
+ settings.port = Services.prefs.getIntPref(
+ Preferences.ControlPort,
+ 9151
+ );
+ }
}
- let conn;
- try {
- conn = await lazy.controller();
- } catch (e) {
- logger.error("Cannot open a control port connection", e);
- if (conn) {
- try {
- conn.close();
- } catch (e) {
- logger.error(
- "Also, the connection is not null but cannot be closed",
- e
- );
+ if (Services.env.exists("TOR_CONTROL_PASSWD")) {
+ const password = Services.env.get("TOR_CONTROL_PASSWD");
+ // As per 3.5 of control-spec.txt, AUTHENTICATE can use either a quoted
+ // string, or a sequence of hex characters.
+ // However, the password is hashed byte by byte, so we need to convert the
+ // string to its character codes, or the hex digits to actual bytes.
+ // Notice that Tor requires at least one hex character, without an upper
+ // limit, but it does not explicitly tell how to pad an odd number of hex
+ // characters, so we require the user to hand an even number of hex
+ // digits.
+ // We also want to enforce the authentication if we start the daemon.
+ // So, if a password is not valid (not a hex sequence and not a quoted
+ // string), or if it is empty (including the quoted empty string), we
+ // force a random password.
+ if (
+ password.length >= 2 &&
+ password[0] === '"' &&
+ password[password.length - 1] === '"'
+ ) {
+ const encoder = new TextEncoder();
+ settings.password = encoder.encode(TorParsers.unescapeString(password));
+ } else if (/^([0-9a-fA-F]{2})+$/.test(password)) {
+ settings.password = new Uint8Array(password.length / 2);
+ for (let i = 0, j = 0; i < settings.password.length; i++, j += 2) {
+ settings.password[i] = parseInt(password.substring(j, j + 2), 16);
}
}
- return false;
- }
-
- // TODO: optionally monitor INFO and DEBUG log messages.
- try {
- await conn.setEvents(Array.from(this._eventHandlers.keys()));
- } catch (e) {
- logger.error("SETEVENTS failed", e);
- conn.close();
- return false;
- }
-
- if (this._torProcess) {
- this._torProcess.connectionWorked();
- }
- if (this.ownsTorDaemon && !TorLauncherUtil.shouldOnlyConfigureTor) {
- try {
- await this._takeTorOwnership(conn);
- } catch (e) {
- logger.warn("Could not take ownership of the Tor daemon", e);
+ if (password && !settings.password?.length) {
+ logger.warn(
+ "Invalid password specified at TOR_CONTROL_PASSWD. " +
+ "You should put it in double quotes, or it should be a hex-encoded sequence. " +
+ "The password cannot be empty. " +
+ "A random password will be used, instead."
+ );
+ }
+ } else if (Services.env.exists("TOR_CONTROL_COOKIE_AUTH_FILE")) {
+ const cookiePath = Services.env.get("TOR_CONTROL_COOKIE_AUTH_FILE");
+ if (cookiePath) {
+ settings.cookieFilePath = cookiePath;
}
}
-
- this._connection = conn;
-
- for (const [type, callback] of this._eventHandlers.entries()) {
- this._monitorEvent(type, callback);
+ if (
+ this.ownsTorDaemon &&
+ !settings.password?.length &&
+ !settings.cookieFilePath
+ ) {
+ settings.password = this.#generateRandomPassword();
}
+ this.#controlPortSettings = settings;
+ logger.debug("Control port configuration read");
+ }
- // Populate the circuit map already, in case we are connecting to an
- // external tor daemon.
- try {
- const reply = await this._connection.sendCommand(
- "GETINFO circuit-status"
- );
- const lines = reply.split(/\r?\n/);
- if (lines.shift() === "250+circuit-status=") {
- for (const line of lines) {
- if (line === ".") {
- break;
- }
- // _processCircEvent processes only one line at a time
- this._processCircEvent("CIRC", [line]);
+ /**
+ * Start the first connection to the Tor daemon.
+ * This function should be called only once during the initialization.
+ */
+ async #firstConnection() {
+ let canceled = false;
+ let timeout = 0;
+ const maxDelay = 10_000;
+ let delay = 5;
+ logger.debug("Connecting to the control port for the first time.");
+ this.#controlConnection = await new Promise((resolve, reject) => {
+ this.#cancelConnection = reason => {
+ canceled = true;
+ clearTimeout(timeout);
+ reject(new Error(reason));
+ };
+ const tryConnect = () => {
+ if (this.ownsTorDaemon && !this.#torProcess?.isRunning) {
+ reject(new Error("The controlled tor daemon is not running."));
+ return;
}
+ this.#openControlPort()
+ .then(controller => {
+ this.#torProcess?.connectionWorked();
+ this.#cancelConnection = () => {};
+ // The cancel function should have already called reject.
+ if (!canceled) {
+ logger.info("Connected to the control port.");
+ resolve(controller);
+ }
+ })
+ .catch(e => {
+ if (delay < maxDelay && !canceled) {
+ logger.info(
+ `Failed to connect to the control port. Trying again in ${delay}ms.`,
+ e
+ );
+ timeout = setTimeout(tryConnect, delay);
+ delay *= 2;
+ } else {
+ reject(e);
+ }
+ });
+ };
+ tryConnect();
+ });
+
+ // The following code will never throw, but we still want to wait for it
+ // before marking the provider as initialized.
+
+ if (this.ownsTorDaemon) {
+ // The first connection cannot be canceled anymore, and the rest of the
+ // code is supposed not to fail. If the tor process exits, from now on we
+ // can only close the connection and broadcast a notification.
+ this.#torProcess.onExit = exitCode => {
+ logger.info(`The tor process exited with code ${exitCode}`);
+ this.#closeConnection("The tor process exited suddenly");
+ Services.obs.notifyObservers(null, TorProviderTopics.ProcessExited);
+ };
+ if (!TorLauncherUtil.shouldOnlyConfigureTor) {
+ await this.#takeOwnership();
}
- } catch (e) {
- logger.warn("Could not populate the initial circuit map", e);
}
-
- return true;
+ await this.#setupEvents();
}
- // Try to become the primary controller (TAKEOWNERSHIP).
- async _takeTorOwnership(conn) {
+ /**
+ * Try to become the primary controller. This will make tor exit when our
+ * connection is closed.
+ * This function cannot fail or throw (any exception will be treated as a
+ * warning and just logged).
+ */
+ async #takeOwnership() {
+ logger.debug("Taking the ownership of the tor process.");
try {
- conn.takeOwnership();
+ await this.#controlConnection.takeOwnership();
} catch (e) {
logger.warn("Take ownership failed", e);
return;
}
try {
- conn.resetOwningControllerProcess();
+ await this.#controlConnection.resetOwningControllerProcess();
} catch (e) {
logger.warn("Clear owning controller process failed", e);
}
}
- _monitorEvent(type, callback) {
- logger.info(`Watching events of type ${type}.`);
- let replyObj = {};
- this._connection.watchEvent(type, line => {
- if (!line) {
- return;
- }
- logger.debug("Event response: ", line);
- const isComplete = TorParsers.parseReplyLine(line, replyObj);
- if (!isComplete || replyObj._parseError || !replyObj.lineArray.length) {
- return;
- }
- const reply = replyObj;
- replyObj = {};
- if (reply.statusCode !== TorStatuses.EventNotification) {
- logger.error("Unexpected event status code:", reply.statusCode);
- return;
+ /**
+ * Tells the Tor daemon which events we want to receive.
+ * This function will never throw. Any failure will be treated as a warning of
+ * a possibly degraded experience, not as an error.
+ */
+ async #setupEvents() {
+ // We always listen to these events, because they are needed for the circuit
+ // display.
+ const events = ["CIRC", "STREAM"];
+ if (this.ownsTorDaemon) {
+ events.push("STATUS_CLIENT", "NOTICE", "WARN", "ERR");
+ // Do not await on the first bootstrap status retrieval, and do not
+ // propagate its errors.
+ this.#controlConnection
+ .getBootstrapPhase()
+ .then(status => this.#processBootstrapStatus(status, false))
+ .catch(e =>
+ logger.error("Failed to get the first bootstrap status", e)
+ );
+ }
+ try {
+ logger.debug(`Setting events: ${events.join(" ")}`);
+ await this.#controlConnection.setEvents(events);
+ } catch (e) {
+ logger.error(
+ "We could not enable all the events we need. Tor Browser's functionalities might be reduced.",
+ e
+ );
+ }
+ }
+
+ /**
+ * Open a connection to the control port and authenticate to it.
+ * #setControlPortConfiguration must have been called before, as this function
+ * will follow the configuration set by it.
+ *
+ * @returns {Promise<TorController>} An authenticated TorController
+ */
+ async #openControlPort() {
+ let controlPort;
+ if (this.#controlPortSettings.ipcFile) {
+ controlPort = lazy.TorController.fromIpcFile(
+ this.#controlPortSettings.ipcFile,
+ this
+ );
+ } else {
+ controlPort = lazy.TorController.fromSocketAddress(
+ this.#controlPortSettings.host,
+ this.#controlPortSettings.port,
+ this
+ );
+ }
+ try {
+ let password = this.#controlPortSettings.password;
+ if (password === undefined && this.#controlPortSettings.cookieFilePath) {
+ password = await this.#readAuthenticationCookie(
+ this.#controlPortSettings.cookieFilePath
+ );
}
- if (!reply.lineArray[0].startsWith(`${type} `)) {
- logger.error("Wrong format for the first line:", reply.lineArray[0]);
- return;
+ await controlPort.authenticate(password);
+ } catch (e) {
+ try {
+ controlPort.close();
+ } catch (ec) {
+ // Tor already closes the control port when the authentication fails.
+ logger.debug(
+ "Expected exception when closing the control port for a failed authentication",
+ ec
+ );
}
- reply.lineArray[0] = reply.lineArray[0].substring(type.length + 1);
+ throw e;
+ }
+ return controlPort;
+ }
+
+ /**
+ * Close the connection to the control port.
+ *
+ * @param {string} reason The reason for which we are closing the connection
+ * (used for logging and in case this ends up canceling the current connection
+ * attempt)
+ */
+ #closeConnection(reason) {
+ this.#cancelConnection(reason);
+ if (this.#controlConnection) {
+ logger.info("Closing the control connection", reason);
try {
- callback(type, reply.lineArray);
+ this.#controlConnection.close();
} catch (e) {
- logger.error("Exception while handling an event", reply, e);
+ logger.error("Failed to close the control port connection", e);
}
- });
+ this.#controlConnection = null;
+ } else {
+ logger.trace(
+ "Requested to close an already closed control port connection"
+ );
+ }
+ this.#isBootstrapDone = false;
+ this.#lastWarning = {};
}
- _processLog(type, lines) {
- if (type === "WARN" || type === "ERR") {
- // Notify so that Copy Log can be enabled.
- Services.obs.notifyObservers(null, TorProviderTopics.HasWarnOrErr);
- }
+ // Authentication
- const date = new Date();
- const maxEntries = Services.prefs.getIntPref(
- "extensions.torlauncher.max_tor_log_entries",
- 1000
- );
- if (maxEntries > 0 && this._torLog.length >= maxEntries) {
- this._torLog.splice(0, 1);
- }
+ /**
+ * Read a cookie file to perform cookie-based authentication.
+ *
+ * @param {string} path The path to the cookie file
+ * @returns {Uint8Array} The content of the file in bytes
+ */
+ async #readAuthenticationCookie(path) {
+ return IOUtils.read(path);
+ }
- const msg = lines.join("\n");
- this._torLog.push({ date, type, msg });
- const logString = `Tor ${type}: ${msg}`;
- logger.info(logString);
+ /**
+ * @returns {Uint8Array} A random 16-byte password.
+ */
+ #generateRandomPassword() {
+ const kPasswordLen = 16;
+ return crypto.getRandomValues(new Uint8Array(kPasswordLen));
+ }
+
+ // Notification handlers
+
+ /**
+ * Receive and process a notification with the bootstrap status.
+ *
+ * @param {object} status The status object
+ */
+ onBootstrapStatus(status) {
+ this.#processBootstrapStatus(status, true);
}
- // Process a bootstrap status to update the current state, and broadcast it
- // to TorBootstrapStatus observers.
- // If aSuppressErrors is true, errors are ignored. This is used when we
- // are handling the response to a "GETINFO status/bootstrap-phase" command.
- _processBootstrapStatus(statusObj, suppressErrors) {
+ /**
+ * Process a bootstrap status to update the current state, and broadcast it
+ * to TorBootstrapStatus observers.
+ *
+ * @param {object} statusObj The status object that the controller returned.
+ * Its entries depend on what Tor sent to us.
+ * @param {boolean} isNotification We broadcast warnings only when we receive
+ * them through an asynchronous notification.
+ */
+ #processBootstrapStatus(statusObj, isNotification) {
// Notify observers
Services.obs.notifyObservers(
{ wrappedJSObject: statusObj },
- "TorBootstrapStatus"
+ TorProviderTopics.BootstrapStatus
);
if (statusObj.PROGRESS === 100) {
- this._isBootstrapDone = true;
+ this.#isBootstrapDone = true;
try {
Services.prefs.setBoolPref(Preferences.PromptAtStartup, false);
} catch (e) {
@@ -840,23 +836,29 @@ export class TorProvider {
return;
}
- this._isBootstrapDone = false;
+ this.#isBootstrapDone = false;
if (
+ isNotification &&
statusObj.TYPE === "WARN" &&
- statusObj.RECOMMENDATION !== "ignore" &&
- !suppressErrors
+ statusObj.RECOMMENDATION !== "ignore"
) {
- this._notifyBootstrapError(statusObj);
+ this.#notifyBootstrapError(statusObj);
}
}
- _notifyBootstrapError(statusObj) {
+ /**
+ * Broadcast a bootstrap warning or error.
+ *
+ * @param {object} statusObj The bootstrap status object with the error
+ */
+ #notifyBootstrapError(statusObj) {
try {
Services.prefs.setBoolPref(Preferences.PromptAtStartup, true);
} catch (e) {
logger.warn(`Cannot set ${Preferences.PromptAtStartup}`, e);
}
+ // TODO: Move l10n to the above layers?
const phase = TorLauncherUtil.getLocalizedBootstrapStatus(statusObj, "TAG");
const reason = TorLauncherUtil.getLocalizedBootstrapStatus(
statusObj,
@@ -872,11 +874,11 @@ export class TorProvider {
);
if (
- statusObj.TAG !== this._lastWarningPhase ||
- statusObj.REASON !== this._lastWarningReason
+ statusObj.TAG !== this.#lastWarning.phase ||
+ statusObj.REASON !== this.#lastWarning.reason
) {
- this._lastWarningPhase = statusObj.TAG;
- this._lastWarningReason = statusObj.REASON;
+ this.#lastWarning.phase = statusObj.TAG;
+ this.#lastWarning.reason = statusObj.REASON;
const message = TorLauncherUtil.getLocalizedString(
"tor_bootstrap_failed"
@@ -888,123 +890,122 @@ export class TorProvider {
}
}
- _processStatusClient(_type, lines) {
- const statusObj = TorParsers.parseBootstrapStatus(lines[0]);
- if (!statusObj) {
- // No `BOOTSTRAP` in the line
- return;
+ /**
+ * Handle a log message from the tor daemon. It will be added to the internal
+ * logs. If it is a warning or an error, a notification will be broadcast.
+ *
+ * @param {string} type The message type
+ * @param {string} msg The message
+ */
+ onLogMessage(type, msg) {
+ if (type === "WARN" || type === "ERR") {
+ // Notify so that Copy Log can be enabled.
+ Services.obs.notifyObservers(null, TorProviderTopics.HasWarnOrErr);
}
- this._processBootstrapStatus(statusObj, false);
- }
- async _processCircEvent(_type, lines) {
- const builtEvent =
- /^(?<CircuitID>[a-zA-Z0-9]{1,16})\sBUILT\s(?<Path>(?:,?\$[0-9a-fA-F]{40}(?:~[a-zA-Z0-9]{1,19})?)+)/.exec(
- lines[0]
- );
- const closedEvent = /^(?<ID>[a-zA-Z0-9]{1,16})\sCLOSED/.exec(lines[0]);
- if (builtEvent) {
- const fp = /\$([0-9a-fA-F]{40})/g;
- const nodes = Array.from(builtEvent.groups.Path.matchAll(fp), g =>
- g[1].toUpperCase()
- );
- this._circuits.set(builtEvent.groups.CircuitID, nodes);
- // Ignore circuits of length 1, that are used, for example, to probe
- // bridges. So, only store them, since we might see streams that use them,
- // but then early-return.
- if (nodes.length === 1) {
- return;
- }
- // In some cases, we might already receive SOCKS credentials in the line.
- // However, this might be a problem with onion services: we get also a
- // 4-hop circuit that we likely do not want to show to the user,
- // especially because it is used only temporarily, and it would need a
- // technical explaination.
- // this._checkCredentials(lines[0], nodes);
- if (this._currentBridge?.fingerprint !== nodes[0]) {
- const nodeInfo = await this.getNodeInfo(nodes[0]);
- let notify = false;
- if (nodeInfo?.bridgeType) {
- logger.info(`Bridge changed to ${nodes[0]}`);
- this._currentBridge = nodeInfo;
- notify = true;
- } else if (this._currentBridge) {
- logger.info("Bridges disabled");
- this._currentBridge = null;
- notify = true;
- }
- if (notify) {
- Services.obs.notifyObservers(
- null,
- TorProviderTopics.BridgeChanged,
- this._currentBridge
- );
- }
- }
- } else if (closedEvent) {
- this._circuits.delete(closedEvent.groups.ID);
+ const date = new Date();
+ const maxEntries = Services.prefs.getIntPref(
+ Preferences.MaxLogEntries,
+ 1000
+ );
+ if (maxEntries > 0 && this.#logs.length >= maxEntries) {
+ this.#logs.splice(0, 1);
+ }
+
+ this.#logs.push({ date, type, msg });
+ switch (type) {
+ case "ERR":
+ logger.error(`[Tor error] ${msg}`);
+ break;
+ case "WARN":
+ logger.warn(`[Tor warning] ${msg}`);
+ break;
+ default:
+ logger.info(`[Tor ${type.toLowerCase()}] ${msg}`);
}
}
- _processStreamEvent(_type, lines) {
- // The first block is the stream ID, which we do not need at the moment.
- const succeeedEvent =
- /^[a-zA-Z0-9]{1,16}\sSUCCEEDED\s(?<CircuitID>[a-zA-Z0-9]{1,16})/.exec(
- lines[0]
- );
- if (!succeeedEvent) {
+ /**
+ * Handle a notification that a new circuit has been built.
+ * If a change of bridge is detected (including a change from bridge to a
+ * normal guard), a notification is broadcast.
+ *
+ * @param {CircuitID} id The circuit ID
+ * @param {NodeFingerprint[]} nodes The nodes that compose the circuit
+ */
+ async onCircuitBuilt(id, nodes) {
+ this.#circuits.set(id, nodes);
+ // Ignore circuits of length 1, that are used, for example, to probe
+ // bridges. So, only store them, since we might see streams that use them,
+ // but then early-return.
+ if (nodes.length === 1) {
return;
}
- const circuit = this._circuits.get(succeeedEvent.groups.CircuitID);
- if (!circuit) {
- logger.error(
- "Seen a STREAM SUCCEEDED with an unknown circuit. Not notifying observers.",
- lines[0]
- );
- return;
+
+ if (this.#currentBridge?.fingerprint !== nodes[0]) {
+ const nodeInfo = await this.getNodeInfo(nodes[0]);
+ let notify = false;
+ if (nodeInfo?.bridgeType) {
+ logger.info(`Bridge changed to ${nodes[0]}`);
+ this.#currentBridge = nodeInfo;
+ notify = true;
+ } else if (this.#currentBridge) {
+ logger.info("Bridges disabled");
+ this.#currentBridge = null;
+ notify = true;
+ }
+ if (notify) {
+ Services.obs.notifyObservers(
+ null,
+ TorProviderTopics.BridgeChanged,
+ this.#currentBridge
+ );
+ }
}
- this._checkCredentials(lines[0], circuit);
}
/**
- * Check if a STREAM or CIRC response line contains SOCKS_USERNAME and
- * SOCKS_PASSWORD. In case, notify observers that we could associate a certain
- * circuit to these credentials.
+ * Handle a notification of a circuit being closed. We use it to clean the
+ * internal data.
+ *
+ * @param {CircuitID} id The circuit id
+ */
+ onCircuitClosed(id) {
+ logger.debug("Circuit closed event", id);
+ this.#circuits.delete(id);
+ }
+
+ /**
+ * Handle a notification about a stream switching to the succeeded state.
*
- * @param {string} line The circ or stream line to check
- * @param {NodeFingerprint[]} circuit The fingerprints of the nodes in the
- * circuit.
+ * @param {StreamID} streamId The ID of the stream that switched to the
+ * succeeded state.
+ * @param {CircuitID} circuitId The ID of the circuit used by the stream
+ * @param {string} username The SOCKS username
+ * @param {string} password The SOCKS password
+ * @returns
*/
- _checkCredentials(line, circuit) {
- const username = /SOCKS_USERNAME=("(?:[^"\\]|\\.)*")/.exec(line);
- const password = /SOCKS_PASSWORD=("(?:[^"\\]|\\.)*")/.exec(line);
+ onStreamSucceeded(streamId, circuitId, username, password) {
if (!username || !password) {
return;
}
+ logger.debug("Stream succeeded event", username, password, circuitId);
+ const circuit = this.#circuits.get(circuitId);
+ if (!circuit) {
+ logger.error(
+ "Seen a STREAM SUCCEEDED with an unknown circuit. Not notifying observers."
+ );
+ return;
+ }
Services.obs.notifyObservers(
{
wrappedJSObject: {
- username: TorParsers.unescapeString(username[1]),
- password: TorParsers.unescapeString(password[1]),
+ username,
+ password,
circuit,
},
},
TorProviderTopics.StreamSucceeded
);
}
-
- _shutDownEventMonitor() {
- try {
- this._connection?.close();
- } catch (e) {
- logger.error("Could not close the connection to the control port", e);
- }
- this._connection = null;
- if (this._startTimeout !== null) {
- clearTimeout(this._startTimeout);
- this._startTimeout = null;
- }
- this._isBootstrapDone = false;
- this.clearBootstrapError();
- }
}
=====================================
toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs
=====================================
@@ -4,13 +4,13 @@
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs",
TorProvider: "resource://gre/modules/TorProvider.sys.mjs",
});
export const TorProviderTopics = Object.freeze({
ProcessIsReady: "TorProcessIsReady",
ProcessExited: "TorProcessExited",
- ProcessRestarted: "TorProcessRestarted",
BootstrapStatus: "TorBootstrapStatus",
BootstrapError: "TorBootstrapError",
HasWarnOrErr: "TorLogHasWarnOrErr",
@@ -18,26 +18,141 @@ export const TorProviderTopics = Object.freeze({
StreamSucceeded: "TorStreamSucceeded",
});
+/**
+ * The factory to get a Tor provider.
+ * Currently we support only TorProvider, i.e., the one that interacts with
+ * C-tor through the control port protocol.
+ */
export class TorProviderBuilder {
+ /**
+ * A promise with the instance of the provider that we are using.
+ *
+ * @type {Promise<TorProvider>?}
+ */
static #provider = null;
+ /**
+ * The observer that checks when the tor process exits, and reinitializes the
+ * provider.
+ *
+ * @type {nsIObserver?}
+ */
+ static #observer = null;
+
+ /**
+ * Tell whether the browser UI is ready.
+ * We ignore any errors until it is because we cannot show them.
+ *
+ * @type {boolean}
+ */
+ static #uiReady = false;
+
+ /**
+ * Initialize the provider of choice.
+ * Even though initialization is asynchronous, we do not expect the caller to
+ * await this method. The reason is that any call to build() will wait the
+ * initialization anyway (and re-throw any initialization error).
+ */
static async init() {
- const provider = new lazy.TorProvider();
- await provider.init();
- // Assign it only when initialization succeeds.
- TorProviderBuilder.#provider = provider;
+ this.#observer = {
+ observe(subject, topic, data) {
+ if (topic !== TorProviderTopics.ProcessExited) {
+ return;
+ }
+ if (!TorProviderBuilder.#uiReady) {
+ console.warn(
+ `Seen ${TorProviderTopics.ProcessExited}, but not doing anything because the UI is not ready yet.`
+ );
+ return;
+ }
+ TorProviderBuilder.#torExited();
+ },
+ };
+ Services.obs.addObserver(this.#observer, TorProviderTopics.ProcessExited);
+ await this.#initProvider();
+ }
+
+ static async #initProvider() {
+ try {
+ const old = await this.#provider;
+ old?.uninit();
+ } catch {}
+ this.#provider = new Promise((resolve, reject) => {
+ const provider = new lazy.TorProvider();
+ provider
+ .init()
+ .then(() => resolve(provider))
+ .catch(reject);
+ });
+ await this.#provider;
}
static uninit() {
- TorProviderBuilder.#provider.uninit();
- TorProviderBuilder.#provider = null;
+ this.#provider?.then(provider => {
+ provider.uninit();
+ this.#provider = null;
+ });
+ if (this.#observer) {
+ Services.obs.removeObserver(
+ this.#observer,
+ TorProviderTopics.ProcessExited
+ );
+ this.#observer = null;
+ }
+ }
+
+ /**
+ * Build a provider.
+ * This method will wait for the system to be initialized, and allows you to
+ * catch also any initialization errors.
+ */
+ static async build() {
+ if (!this.#provider) {
+ throw new Error(
+ "The provider has not been initialized or already uninitialized."
+ );
+ }
+ return this.#provider;
+ }
+
+ /**
+ * Check if the provider has been succesfully initialized when the first
+ * browser window is shown.
+ * This is a workaround we need because ideally we would like the tor process
+ * to start as soon as possible, to avoid delays in the about:torconnect page,
+ * but we should modify TorConnect and about:torconnect to handle this case
+ * there with a better UX.
+ */
+ static async firstWindowLoaded() {
+ // FIXME: Just integrate this with the about:torconnect or about:tor UI.
+ let running = false;
+ try {
+ const provider = await this.#provider;
+ // The initialization might have succeeded, but so far we have ignored any
+ // error notification. So, check that the process has not exited after the
+ // provider has been initialized successfully, but the UI was not ready
+ // yet.
+ running = provider.isRunning;
+ } catch {
+ // Not even initialized, running is already false.
+ }
+ while (!running && lazy.TorLauncherUtil.showRestartPrompt(true)) {
+ try {
+ await this.#initProvider();
+ running = true;
+ } catch {}
+ }
+ // The user might have canceled the restart, but at this point the UI is
+ // ready in any case.
+ this.#uiReady = true;
}
- // TODO: Switch to an async build?
- static build() {
- if (!TorProviderBuilder.#provider) {
- throw new Error("TorProviderBuilder has not been initialized yet.");
+ static async #torExited() {
+ while (lazy.TorLauncherUtil.showRestartPrompt(false)) {
+ try {
+ await this.#initProvider();
+ break;
+ } catch {}
}
- return TorProviderBuilder.#provider;
}
}
=====================================
toolkit/components/tor-launcher/TorStartupService.sys.mjs
=====================================
@@ -34,9 +34,12 @@ export class TorStartupService {
async #init() {
Services.obs.addObserver(this, BrowserTopics.QuitApplicationGranted);
- await lazy.TorProviderBuilder.init();
+ // Do not await on this init. build() is expected to await the
+ // initialization, so anything that should need the Tor Provider should
+ // block there, instead.
+ lazy.TorProviderBuilder.init();
- lazy.TorSettings.init();
+ await lazy.TorSettings.init();
lazy.TorConnect.init();
lazy.TorDomainIsolator.init();
=====================================
toolkit/mozapps/update/UpdateService.sys.mjs
=====================================
@@ -388,13 +388,13 @@ XPCOMUtils.defineLazyGetter(
}
);
-function _shouldRegisterBootstrapObserver(errorCode) {
- const provider = lazy.TorProviderBuilder.build();
- return (
- errorCode == PROXY_SERVER_CONNECTION_REFUSED &&
- !provider.isBootstrapDone &&
- provider.ownsTorDaemon
- );
+async function _shouldRegisterBootstrapObserver(errorCode) {
+ try {
+ const provider = await lazy.TorProviderBuilder.build();
+ return !provider.isBootstrapDone && provider.ownsTorDaemon;
+ } catch {
+ return false;
+ }
}
/**
@@ -3338,7 +3338,10 @@ UpdateService.prototype = {
AUSTLMY.pingCheckCode(this._pingSuffix, AUSTLMY.CHK_OFFLINE);
}
return;
- } else if (_shouldRegisterBootstrapObserver(update.errorCode)) {
+ } else if (
+ update.errorCode === PROXY_SERVER_CONNECTION_REFUSED &&
+ (await _shouldRegisterBootstrapObserver())
+ ) {
// Register boostrap observer to try again, but only when we own the
// tor process.
this._registerBootstrapObserver();
@@ -6735,7 +6738,10 @@ Downloader.prototype = {
);
shouldRegisterOnlineObserver = true;
deleteActiveUpdate = false;
- } else if (_shouldRegisterBootstrapObserver(status)) {
+ } else if (
+ status === PROXY_SERVER_CONNECTION_REFUSED &&
+ (await _shouldRegisterBootstrapObserver())
+ ) {
// Register a bootstrap observer to try again.
// The bootstrap observer will continue the incremental download by
// calling downloadUpdate on the active update which continues
=====================================
toolkit/torbutton/chrome/locale/en-US/torlauncher.properties
=====================================
@@ -9,7 +9,6 @@ torlauncher.tor_exited_during_startup=Tor exited during startup. This might be d
torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, Tor Browser will not be able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
torlauncher.restart_tor=Restart Tor
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -60,3 +59,7 @@ torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+
+## 12.5-only strings that can be removed once it goes EOL.
+
+torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/47de2a…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/47de2a…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 13.0a4
by richard (@richard) 14 Sep '23
by richard (@richard) 14 Sep '23
14 Sep '23
richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses
Commits:
3bd814cb by Richard Pospesel at 2023-09-14T16:58:58+00:00
alpha: new version, 13.0a4
- - - - -
30 changed files:
- update_3/alpha/.htaccess
- + update_3/alpha/13.0a1-13.0a4-linux-i686-ALL.xml
- + update_3/alpha/13.0a1-13.0a4-linux-x86_64-ALL.xml
- + update_3/alpha/13.0a1-13.0a4-macos-ALL.xml
- + update_3/alpha/13.0a1-13.0a4-windows-i686-ALL.xml
- + update_3/alpha/13.0a1-13.0a4-windows-x86_64-ALL.xml
- + update_3/alpha/13.0a2-13.0a4-linux-i686-ALL.xml
- + update_3/alpha/13.0a2-13.0a4-linux-x86_64-ALL.xml
- + update_3/alpha/13.0a2-13.0a4-macos-ALL.xml
- + update_3/alpha/13.0a2-13.0a4-windows-i686-ALL.xml
- + update_3/alpha/13.0a2-13.0a4-windows-x86_64-ALL.xml
- + update_3/alpha/13.0a3-13.0a4-linux-i686-ALL.xml
- + update_3/alpha/13.0a3-13.0a4-linux-x86_64-ALL.xml
- + update_3/alpha/13.0a3-13.0a4-macos-ALL.xml
- + update_3/alpha/13.0a3-13.0a4-windows-i686-ALL.xml
- + update_3/alpha/13.0a3-13.0a4-windows-x86_64-ALL.xml
- − update_3/alpha/13.0a3-linux-i686-ALL.xml
- − update_3/alpha/13.0a3-linux-x86_64-ALL.xml
- − update_3/alpha/13.0a3-macos-ALL.xml
- − update_3/alpha/13.0a3-windows-i686-ALL.xml
- − update_3/alpha/13.0a3-windows-x86_64-ALL.xml
- + update_3/alpha/13.0a4-linux-i686-ALL.xml
- + update_3/alpha/13.0a4-linux-x86_64-ALL.xml
- + update_3/alpha/13.0a4-macos-ALL.xml
- + update_3/alpha/13.0a4-windows-i686-ALL.xml
- + update_3/alpha/13.0a4-windows-x86_64-ALL.xml
- update_3/alpha/download-android-aarch64.json
- update_3/alpha/download-android-armv7.json
- update_3/alpha/download-android-x86.json
- update_3/alpha/download-android-x86_64.json
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.0a4-build1
by richard (@richard) 14 Sep '23
by richard (@richard) 14 Sep '23
14 Sep '23
richard pushed new tag mb-13.0a4-build1 at The Tor Project / Applications / tor-browser-build
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.0a4-build1
by richard (@richard) 14 Sep '23
by richard (@richard) 14 Sep '23
14 Sep '23
richard pushed new tag tbb-13.0a4-build1 at The Tor Project / Applications / tor-browser-build
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Bug 40927, 40902: Prepare Tor+Mullvad Browser Alpha 13.0a4
by richard (@richard) 14 Sep '23
by richard (@richard) 14 Sep '23
14 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
6c255fa1 by Richard Pospesel at 2023-09-13T16:01:05+00:00
Bug 40927, 40902: Prepare Tor+Mullvad Browser Alpha 13.0a4
- - - - -
13 changed files:
- projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
- projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
- projects/browser/allowed_addons.json
- projects/browser/config
- projects/firefox-android/build
- projects/firefox-android/config
- projects/firefox/config
- projects/geckoview/config
- projects/go/config
- projects/snowflake/config
- projects/tor/config
- projects/translation/config
- rbm.conf
Changes:
=====================================
projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
=====================================
@@ -1,3 +1,62 @@
+Mullvad Browser 13.0a4 - September 12 2023
+ * All Platforms
+ * Updated Firefox to 115.2.1esr
+ * Updated Translations
+ * Updated NoScript to 11.4.27
+ * Bug 211: Change "Mullvad Browser Home" to "New tab" [mullvad-browser]
+ * Bug 231: Fix the Security Level "read more" link in popup/settings panel [mullvad-browser]
+ * Bug 236: Rebase alpha onto 115.2.1 [mullvad-browser]
+ * Bug 40149: Remove patching of nightly update URL [tor-browser-build]
+ * Bug 40937: First window after update should go to the user-friendly release page on GitHub [tor-browser-build]
+ * Bug 41528: Hard-coded English "based on Mozilla Firefox" appears in version in "About" dialog [tor-browser]
+ * Bug 41675: ESR115: decide on large array buffers [tor-browser]
+ * Bug 41739: Remove "Website appearance" [tor-browser]
+ * Bug 41740: ESR115: change devicePixelRatio spoof to 2 in alpha for testing [tor-browser]
+ * Bug 41774: Hide the new "Switching to a new device" help menu item [tor-browser]
+ * Bug 41797: Lock RFP in release builds [tor-browser]
+ * Bug 41876: Remove firefox view from title bar [tor-browser]
+ * Bug 41881: Developer tools/Network/New Request remembers requests [tor-browser]
+ * Bug 42027: Create a Base Browser version of migrateUI [tor-browser]
+ * Bug 42043: Disable gUM: media.devices.enumerate.legacy.enabled [tor-browser]
+ * Bug 42046: Remove XUL layout hacks from base browser [tor-browser]
+ * Bug 42050: Bring back Save As... dialog as default [tor-browser]
+ * Bug 42061: Move the alpha update channel creation to a commit on its own [tor-browser]
+ * Bug 42084: Race condition with language preferences may make spoof_english ineffective [tor-browser]
+ * Windows
+ * Bug 40930: Update zlib to 1.3 after 13.0a3 [tor-browser-build]
+ * macOS
+ * Bug 42057: Disable Platform text-recognition functionality [tor-browser]
+ * Build System
+ * All Platforms
+ * Bug 40857: Mullvad Browser generated downloads.json references tbb-* build tag rather than mb-* [tor-browser-build]
+ * Bug 40932: Remove appname_bundle_android, appname_bundle_macos, appname_bundle_linux, appname_bundle_win32, appname_bundle_win64 from projects/release/update_responses_config.yml [tor-browser-build]
+ * Bug 40933: Fix generating incrementals between 12.5.x and 13.0 [tor-browser-build]
+ * Bug 40935: Fix fallout from build target rename in signing scripts [tor-browser-build]
+ * Bug 40942: Use the branch to build Base Browser [tor-browser-build]
+ * Bug 40946: override_updater_url does not work for Mullvad Browser [tor-browser-build]
+ * macOS
+ * Bug 40943: Update libdmg-hfsplus to include our uplifted patch [tor-browser-build]
+
+Mullvad Browser 12.5.4 - September 12 2023
+ * All Platforms
+ * Updated Firefox to 102.15.1esr
+ * Updated Translations
+ * Bug 235: Rebase release onto 102.15.1 ESR [mullvad-browser]
+ * Bug 42084: Race condition with language preferences may make spoof_english ineffective [tor-browser]
+
+Mullvad Browser 12.5.3 - August 28 2023
+ * All Platforms
+ * Updated Translations
+ * Updated Firefox to 102.15.0esr
+ * Bug 232: Rebase Mullvad Browser stable onto 102.15 [mullvad-browser]
+ * Bug 42053: Backport security fixes from Firefox 117 to ESR 102.15 - based Tor Browser [tor-browser]
+ * Bug 40937: First window after update should go to the user-friendly release page on GitHub [tor-browser-build]
+ * Build System
+ * All Platforms
+ * Bug 40857: Mullvad Browser generated downloads.json references tbb-* build tag rather than mb-* [tor-browser-build]
+ * Bug 40913: add boklm back to list of taggers in relevant projects [tor-browser-build]
+ * Bug 40921: staticiforme-prepare-cdn-dist-upload uses hardcoded torbrowser path for .htacess file generation [tor-browser-build]
+
Mullvad Browser 13.0a3 - August 21 2023
* All Platforms
* Updated Translations
=====================================
projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
=====================================
@@ -1,3 +1,117 @@
+Tor Browser 13.0a4 - September 12 2023
+ * All Platforms
+ * Updated Translations
+ * Updated NoScript to 11.4.27
+ * Updated tor to 0.4.8.5
+ * Updated Snowflake to 2.6.1
+ * Bug 40951: Firefox fails to build for macos after #40938 [tor-browser-build]
+ * Bug 41675: ESR115: decide on large array buffers [tor-browser]
+ * Bug 41740: ESR115: change devicePixelRatio spoof to 2 in alpha for testing [tor-browser]
+ * Bug 41797: Lock RFP in release builds [tor-browser]
+ * Bug 41934: Websocket raises DOMException on http onions in 13.0a1 [tor-browser]
+ * Bug 42034: aboutTBUpdate.dtd is duplicated [tor-browser]
+ * Bug 42043: Disable gUM: media.devices.enumerate.legacy.enabled [tor-browser]
+ * Bug 42061: Move the alpha update channel creation to a commit on its own [tor-browser]
+ * Bug 42084: Race condition with language preferences may make spoof_english ineffective [tor-browser]
+ * Bug 42093: Rebase alpha onto 115.2.1esr [tor-browser]
+ * Windows + macOS + Linux
+ * Updated Firefox to 115.2.1esr
+ * Bug 40149: Remove patching of nightly update URL [tor-browser-build]
+ * Bug 40821: The update details URL is wrong in alphas [tor-browser-build]
+ * Bug 40938: Copy the new tor-browser.ftl file to the appropriate directory [tor-browser-build]
+ * Bug 41333: Modernize Tor Browser's new-tab page (about:tor) [tor-browser]
+ * Bug 41528: Hard-coded English "based on Mozilla Firefox" appears in version in "About" dialog [tor-browser]
+ * Bug 41651: Use moz-toggle in connection preferences [tor-browser]
+ * Bug 41739: Remove "Website appearance" [tor-browser]
+ * Bug 41774: Hide the new "Switching to a new device" help menu item [tor-browser]
+ * Bug 41821: Fix the proxy type in the proxy modal of about:preferences in 13.0 [tor-browser]
+ * Bug 41865: Use --text-color-deemphasized rather than --panel-description-color [tor-browser]
+ * Bug 41876: Remove firefox view from title bar [tor-browser]
+ * Bug 41881: Developer tools/Network/New Request remembers requests [tor-browser]
+ * Bug 41886: Downloads drop-down panel has new-line/line-break between every word in the 'Be careful opening downloads' warning [tor-browser]
+ * Bug 41904: The log textarea doesn't resize anymore [tor-browser]
+ * BUg 41906: hide about:preferences#privacy > DNS over HTTPS section [tor-browser]
+ * Bug 41971: Update Tails URL in downloads warning [tor-browser]
+ * Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha [tor-browser]
+ * Bug 41977: Hide the "Learn more" link in bridge cards [tor-browser]
+ * Bug 41980: Circuit display headline is misaligned in 13.0 alpha [tor-browser]
+ * Bug 42027: Create a Base Browser version of migrateUI [tor-browser]
+ * Bug 42045: Circuit panel overflows with long ipv6 addresses [tor-browser]
+ * Bug 42046: Remove XUL layout hacks from base browser [tor-browser]
+ * Bug 42047: Remove layout hacks from tor browser preferences [tor-browser]
+ * Bug 42050: Bring back Save As... dialog as default [tor-browser]
+ * Bug 42075: Fix link spacing and underline on new homepage [tor-browser]
+ * Windows + Android
+ * Updated zlib to 1.3
+ * Bug 40930: Update zlib to 1.3 after 13.0a3 [tor-browser-build]
+ * macOS
+ * Bug 42057: Disable Platform text-recognition functionality [tor-browser]
+ * Linux
+ * Bug 41509: After update, KDE Plasma identifies Tor Browser Nightly window group as "firefox-nightly" [tor-browser]
+ * Android
+ * Updated GeckoView to 115.2.1esr
+ * Bug 40941: Remove PT process options on Android [tor-browser-build]
+ * Bug 41878: firefox-mobile: refactor tor bootstrap off deleted onboarding path [tor-browser]
+ * Bug 41879: firefox-android: Add Tor integration and UI commit is too big, needs to be split up [tor-browser]
+ * Bug 41882: Update DuckDuckGo icons [tor-browser]
+ * Bug 41987: Tor Browser Android Onboarding Plan [tor-browser]
+ * Bug 42001: Hide 'Open links in external app' settings option and force defaults [tor-browser]
+ * Bug 42038: TBA Alpha - inscriptions Tor Browser Alpha and FireFox Browser simultaneously on the start screen [tor-browser]
+ * Bug 42076: Theme is visable in options, but shouldn't be [tor-browser]
+ * Build System
+ * All Platforms
+ * Updated Go to 1.21.1
+ * Bug 40929: Update go to 1.21 series after 13.0a3 [tor-browser-build]
+ * Bug 40932: Remove appname_bundle_android, appname_bundle_macos, appname_bundle_linux, appname_bundle_win32, appname_bundle_win64 from projects/release/update_responses_config.yml [tor-browser-build]
+ * Bug 40935: Fix fallout from build target rename in signing scripts [tor-browser-build]
+ * Bug 40948: Remove lyrebird-vendor sha256sum in nightly [tor-browser-build]
+ * Windows + macOS + Linux
+ * Bug 40786: deploy_update_responses-*.sh requires +r permissions to run [tor-browser-build]
+ * Bug 40931: Fix incrementals after tor-browser-build#40829 [tor-browser-build]
+ * Bug 40933: Fix generating incrementals between 12.5.x and 13.0 [tor-browser-build]
+ * Bug 40942: Use the branch to build Base Browser [tor-browser-build]
+ * Bug 40944: After #40931, updates_responses is using incremental.mar files as if they were non-incremental mar files [tor-browser-build]
+ * Bug 40946: override_updater_url does not work for Mullvad Browser [tor-browser-build]
+ * Bug 40947: Remove migrate_langs from tools/signing/nightly/update-responses-base-config.yml [tor-browser-build]
+ * macOS
+ * Bug 40943: Update libdmg-hfsplus to include our uplifted patch [tor-browser-build]
+ * Bug 42035: Update tools/torbrowser/ scripts to support macOS dev environment [tor-browser]
+ * Linux
+ * Bug 42071: tor-browser deployed format changed breaking fetch.sh [tor-browser]
+
+Tor Browser 12.5.4 - September 12 2023
+ * All Platforms
+ * Updated Translations
+ * Updated OpenSSL to 1.1.1w
+ * Bug 42084: Race condition with language preferences may make spoof_english ineffective [tor-browser]
+ * Bug 42090: Rebase release onto 102.15.1esr [tor-browser]
+ * Windows + macOS + Linux
+ * Updated Firefox to 102.15.1esr
+ * Android
+ * Updated GeckoView to 102.15.1esr
+ * Build System
+ * All Platforms
+ * Updated Go to 1.20.8
+
+Tor Browser 12.5.3 - August 28 2023
+ * All Platforms
+ * Updated Translations
+ * Updated OpenSSL to 1.1.1v
+ * Bug 42033: Rebase the releases onto 102.15.0esr [tor-browser]
+ * Bug 42053: Backport security fixes from Firefox 117 to ESR 102.15 - based Tor Browser [tor-browser]
+ * Windows + macOS + Linux
+ * Updated Firefox to 102.15.0esr
+ * Android
+ * Updated GeckoView to 102.15.0esr
+ * Build System
+ * All Platforms
+ * Updated Go to 1.20.7
+ * Bug 40740: Tor Browser for Android's snowflake ClientTransportPlugin seems to be out of date [tor-browser-build]
+ * Bug 40786: deploy_update_responses-*.sh requires +r permissions to run [tor-browser-build]
+ * Bug 40905: Go vendor archives ignore the nightly version override on testbuilds [tor-browser-build]
+ * Bug 40913: add boklm back to list of taggers in relevant projects [tor-browser-build]
+ * Bug 40921: staticiforme-prepare-cdn-dist-upload uses hardcoded torbrowser path for .htacess file generation [tor-browser-build]
+
Tor Browser 13.0a3 - August 21 2023
* All Platforms
* Updated Translations
=====================================
projects/browser/allowed_addons.json
=====================================
@@ -17,7 +17,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…"
}
],
- "average_daily_users": 962524,
+ "average_daily_users": 998920,
"categories": {
"android": [
"experimental",
@@ -221,10 +221,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.5571,
- "bayesian_average": 4.555944276544156,
- "count": 5116,
- "text_count": 1611
+ "average": 4.554,
+ "bayesian_average": 4.552847296253503,
+ "count": 5146,
+ "text_count": 1620
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/",
"requires_payment": false,
@@ -321,7 +321,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/",
- "weekly_downloads": 24008
+ "weekly_downloads": 25970
},
"notes": null
},
@@ -337,7 +337,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…"
}
],
- "average_daily_users": 247179,
+ "average_daily_users": 254948,
"categories": {
"android": [
"security-privacy"
@@ -349,7 +349,7 @@
"contributions_url": "",
"created": "2014-06-10T05:46:02Z",
"current_version": {
- "id": 5357809,
+ "id": 5613891,
"compatibility": {
"firefox": {
"min": "56.0a1",
@@ -360,7 +360,7 @@
"max": "*"
}
},
- "edit_url": "https://addons.mozilla.org/en-US/developers/addon/decentraleyes/versions/53…",
+ "edit_url": "https://addons.mozilla.org/en-US/developers/addon/decentraleyes/versions/56…",
"is_strict_compatibility_enabled": false,
"license": {
"id": 3338,
@@ -371,22 +371,22 @@
"url": "http://www.mozilla.org/MPL/2.0/"
},
"release_notes": {
- "en-US": "<i>New languages:</i>\n\n- Added support for the Vietnamese language.\n\n<i>Enhancements:</i>\n\n- Improved popup panel display logic.\n\n<i>Bugfixes:</i>\n\n- Restored support for older versions of Firefox.\n\n<i>Other changes:</i>\n\n- Improved and extended various existing localizations.\n- Applied a minor design-related change to the options page.\n- Replaced remaining calls to a deprecated function."
+ "en-US": "<i>Enhancements:</i>\n\n- Improved object property evaluation logic.\n\n<i>Other changes:</i>\n\n- Applied various performance optimizations and stability improvements.\n- Updated resource audit tool dependencies."
},
- "reviewed": "2022-01-31T20:45:40Z",
- "version": "2.0.17",
+ "reviewed": "2023-08-30T12:55:12Z",
+ "version": "2.0.18",
"files": [
{
- "id": 3902154,
- "created": "2022-01-30T20:08:38Z",
- "hash": "sha256:e7f16ddc458eb2bc5bea75832305895553fca53c2565b6f1d07d5d9620edaff1",
+ "id": 4158232,
+ "created": "2023-08-24T20:38:03Z",
+ "hash": "sha256:f8f031ef91c02a1cb1a6552acd02b8f488693400656b4047d68f03ba0a1078d9",
"is_restart_required": false,
"is_webextension": true,
"is_mozilla_signed_extension": false,
"platform": "all",
- "size": 6941339,
+ "size": 6951879,
"status": "public",
- "url": "https://addons.mozilla.org/firefox/downloads/file/3902154/decentraleyes-2.0…",
+ "url": "https://addons.mozilla.org/firefox/downloads/file/4158232/decentraleyes-2.0…",
"permissions": [
"*://*/*",
"privacy",
@@ -476,7 +476,7 @@
},
"is_disabled": false,
"is_experimental": false,
- "last_updated": "2022-01-31T20:45:40Z",
+ "last_updated": "2023-08-30T12:55:12Z",
"name": {
"ar": "Decentraleyes",
"bg": "Decentraleyes",
@@ -553,10 +553,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.8153,
- "bayesian_average": 4.810656818463578,
- "count": 1359,
- "text_count": 239
+ "average": 4.8125,
+ "bayesian_average": 4.807850481587009,
+ "count": 1360,
+ "text_count": 240
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/",
"requires_payment": false,
@@ -641,7 +641,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/",
- "weekly_downloads": 3402
+ "weekly_downloads": 3376
},
"notes": null
},
@@ -657,7 +657,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…"
}
],
- "average_daily_users": 1063750,
+ "average_daily_users": 1104333,
"categories": {
"android": [
"security-privacy"
@@ -1180,10 +1180,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.8013,
- "bayesian_average": 4.798528563346096,
- "count": 2270,
- "text_count": 431
+ "average": 4.8007,
+ "bayesian_average": 4.797939512443901,
+ "count": 2288,
+ "text_count": 436
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/",
"requires_payment": false,
@@ -1207,7 +1207,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/",
- "weekly_downloads": 17673
+ "weekly_downloads": 18205
},
"notes": null
},
@@ -1223,7 +1223,7 @@
"picture_url": null
}
],
- "average_daily_users": 6171541,
+ "average_daily_users": 6484239,
"categories": {
"android": [
"security-privacy"
@@ -1388,7 +1388,7 @@
},
"is_disabled": false,
"is_experimental": false,
- "last_updated": "2023-08-20T17:20:27Z",
+ "last_updated": "2023-09-13T00:40:42Z",
"name": {
"ar": "uBlock Origin",
"bg": "uBlock Origin",
@@ -1533,10 +1533,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.7845,
- "bayesian_average": 4.784104875047849,
- "count": 15865,
- "text_count": 4114
+ "average": 4.7828,
+ "bayesian_average": 4.782406452276442,
+ "count": 15987,
+ "text_count": 4147
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/",
"requires_payment": false,
@@ -1598,7 +1598,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/",
- "weekly_downloads": 134237
+ "weekly_downloads": 142541
},
"notes": null
},
@@ -1614,7 +1614,7 @@
"picture_url": null
}
],
- "average_daily_users": 169092,
+ "average_daily_users": 170891,
"categories": {
"android": [
"photos-media"
@@ -1713,10 +1713,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.4938,
- "bayesian_average": 4.488680120012364,
- "count": 1134,
- "text_count": 423
+ "average": 4.4934,
+ "bayesian_average": 4.488285425448023,
+ "count": 1139,
+ "text_count": 425
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…",
"requires_payment": false,
@@ -1738,7 +1738,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…",
- "weekly_downloads": 371
+ "weekly_downloads": 401
},
"notes": null
},
@@ -1754,7 +1754,7 @@
"picture_url": null
}
],
- "average_daily_users": 84181,
+ "average_daily_users": 85953,
"categories": {
"android": [
"experimental",
@@ -1892,7 +1892,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/",
- "weekly_downloads": 1090
+ "weekly_downloads": 670
},
"notes": null
},
@@ -1908,7 +1908,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…"
}
],
- "average_daily_users": 257425,
+ "average_daily_users": 265417,
"categories": {
"android": [
"photos-media",
@@ -2127,10 +2127,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.6544,
- "bayesian_average": 4.6497676877016945,
- "count": 1308,
- "text_count": 252
+ "average": 4.6523,
+ "bayesian_average": 4.647695702345138,
+ "count": 1320,
+ "text_count": 254
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/",
"requires_payment": false,
@@ -2151,7 +2151,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/",
- "weekly_downloads": 4018
+ "weekly_downloads": 3986
},
"notes": null
},
@@ -2174,7 +2174,7 @@
"picture_url": null
}
],
- "average_daily_users": 111536,
+ "average_daily_users": 111888,
"categories": {
"android": [
"other"
@@ -2457,10 +2457,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.4024,
- "bayesian_average": 4.397830651353168,
- "count": 1240,
- "text_count": 339
+ "average": 4.3834,
+ "bayesian_average": 4.378879936387472,
+ "count": 1252,
+ "text_count": 346
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/",
"requires_payment": false,
@@ -2480,7 +2480,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/",
- "weekly_downloads": 39
+ "weekly_downloads": 49
},
"notes": null
},
@@ -2496,7 +2496,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…"
}
],
- "average_daily_users": 296794,
+ "average_daily_users": 304718,
"categories": {
"android": [
"performance",
@@ -2510,7 +2510,7 @@
"contributions_url": "https://www.paypal.com/donate/?hosted_button_id=9ERKTU5MBH4EW&utm_content=p…",
"created": "2005-05-13T10:51:32Z",
"current_version": {
- "id": 5597003,
+ "id": 5620645,
"compatibility": {
"firefox": {
"min": "59.0",
@@ -2521,7 +2521,7 @@
"max": "*"
}
},
- "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5597003",
+ "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5620645",
"is_strict_compatibility_enabled": false,
"license": {
"id": 13,
@@ -2532,22 +2532,22 @@
"url": "http://www.gnu.org/licenses/gpl-2.0.html"
},
"release_notes": {
- "en-US": "v 11.4.26\n============================================================\nx [Android] Fixed regression preventing NoScript prompts\n from being shown\nx [XSS] Fallback to execute most demanding regular\n expressions asynchronously\nx [XSS] Removed obsolete Flash-related checks\nx [XSS] Make InjectionChecker's regular expressions easier\n to debug\nx [XSS] Updated OpenID regexp"
+ "en-US": "v 11.4.27\n============================================================\nx [XSS] Better specificity of HTML elements preliminary\n checks\nx [XSS] Better specificity of potential fragmented injection\n through framework syntax detection (thanks Rom623, barbaz\n et al)\nx [nscl] RegExp.combo(): RegExp creation by combination for\n better readability and comments\nx [nscl] Replaced lib/sha256.js with web platform native\n implementation (thanks Martin for suggested patch)\nx [nscl] Fixed property/function mismatch (thanks Alex)\nx Fixed operators precedence issue #312 (thanks Alex)\nx [nscl] Prevent dead object access on BF cache (thanks\n jamhubub and mriehm)"
},
- "reviewed": "2023-07-25T09:58:54Z",
- "version": "11.4.26",
+ "reviewed": "2023-09-13T06:54:08Z",
+ "version": "11.4.27",
"files": [
{
- "id": 4141345,
- "created": "2023-07-20T07:16:01Z",
- "hash": "sha256:283db0eaebbd2888c1a852f5acabaa8e0225ff1eb1a97a25bceaedfd14d9f44c",
+ "id": 4164985,
+ "created": "2023-09-08T14:50:57Z",
+ "hash": "sha256:6b57d9afce663f801177b7492fe7f00967ee3e66b6351b2cf3ff2a6c3ca99637",
"is_restart_required": false,
"is_webextension": true,
"is_mozilla_signed_extension": false,
"platform": "all",
- "size": 952442,
+ "size": 950105,
"status": "public",
- "url": "https://addons.mozilla.org/firefox/downloads/file/4141345/noscript-11.4.26.…",
+ "url": "https://addons.mozilla.org/firefox/downloads/file/4164985/noscript-11.4.27.…",
"permissions": [
"contextMenus",
"storage",
@@ -2614,7 +2614,7 @@
},
"is_disabled": false,
"is_experimental": false,
- "last_updated": "2023-08-09T15:50:38Z",
+ "last_updated": "2023-09-13T06:54:08Z",
"name": {
"de": "NoScript",
"el": "NoScript",
@@ -2686,10 +2686,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.4025,
- "bayesian_average": 4.399796585802099,
- "count": 2097,
- "text_count": 813
+ "average": 4.3969,
+ "bayesian_average": 4.3942052905947815,
+ "count": 2109,
+ "text_count": 815
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/",
"requires_payment": false,
@@ -2733,7 +2733,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/",
- "weekly_downloads": 7446
+ "weekly_downloads": 7325
},
"notes": null
},
@@ -2749,7 +2749,7 @@
"picture_url": null
}
],
- "average_daily_users": 150070,
+ "average_daily_users": 153133,
"categories": {
"android": [
"performance",
@@ -2864,10 +2864,10 @@
"category": "recommended"
},
"ratings": {
- "average": 3.8994,
- "bayesian_average": 3.895166058088759,
- "count": 1153,
- "text_count": 408
+ "average": 3.8981,
+ "bayesian_average": 3.8938714538391337,
+ "count": 1158,
+ "text_count": 410
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…",
"requires_payment": false,
@@ -2886,7 +2886,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…",
- "weekly_downloads": 1749
+ "weekly_downloads": 1939
},
"notes": null
}
=====================================
projects/browser/config
=====================================
@@ -84,9 +84,9 @@ input_files:
enable: '[% ! c("var/android") %]'
- filename: Bundle-Data
enable: '[% ! c("var/android") %]'
- - URL: https://addons.mozilla.org/firefox/downloads/file/4141345/noscript-11.4.26.…
+ - URL: https://addons.mozilla.org/firefox/downloads/file/4164985/noscript-11.4.27.…
name: noscript
- sha256sum: 283db0eaebbd2888c1a852f5acabaa8e0225ff1eb1a97a25bceaedfd14d9f44c
+ sha256sum: 6b57d9afce663f801177b7492fe7f00967ee3e66b6351b2cf3ff2a6c3ca99637
- URL: https://addons.mozilla.org/firefox/downloads/file/4141256/ublock_origin-1.5…
name: ublock-origin
sha256sum: 8b73468bc233a11dd2895219466381783d19123857dd0b6fd16a01820fca4834
=====================================
projects/firefox-android/build
=====================================
@@ -53,7 +53,7 @@ cd $builddir-[% c('version') %]
patch -p1 < $rootdir/repos.diff
sed -i 's|^\(val VERSION = \).*|\1"[% c("var/as_version") %]"|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
sed -i 's|^\(val CHANNEL = \).*|\1ApplicationServicesChannel.RELEASE|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
-gv_version="$(echo [% c('var/geckoview_version') %] | awk -F. '{print $1 "." $2}').[% c('var/geckoview_buildid') %]"
+gv_version=$(find "$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni" -mindepth 1 -maxdepth 1 -type d -printf '%f\n')
sed -i "s|\(\s*const val version = \).*|\1\"$gv_version\"|" android-components/plugins/dependencies/src/main/java/Gecko.kt
sed -i 's|\(\s*val channel = \).*|\1GeckoChannel.[% c("var/variant") FILTER upper %]|' android-components/plugins/dependencies/src/main/java/Gecko.kt
=====================================
projects/firefox-android/config
=====================================
@@ -16,14 +16,12 @@ container:
var:
fenix_version: 115.2.1
browser_branch: 13.0-1
- browser_build: 1
+ browser_build: 2
variant: Beta
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 1
gradle_version: 7.6.1
glean_parser: 7.1.0
- geckoview_version: '[% pc("geckoview", "var/geckoview_version") %]'
- geckoview_buildid: '[% pc("geckoview", "var_p/MOZ_BUILD_DATE") %]'
as_version: '[% pc("application-services", "version") %]'
targets:
=====================================
projects/firefox/config
=====================================
@@ -14,7 +14,7 @@ container:
use_container: 1
var:
- firefox_platform_version: 115.2.0
+ firefox_platform_version: 115.2.1
firefox_version: '[% c("var/firefox_platform_version") %]esr'
browser_series: '13.0'
browser_branch: '[% c("var/browser_series") %]-1'
@@ -87,6 +87,7 @@ targets:
mullvadbrowser:
git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
var:
+ browser_build: 1
branding_directory_prefix: 'mb'
gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/'
=====================================
projects/geckoview/config
=====================================
@@ -14,7 +14,7 @@ container:
use_container: 1
var:
- geckoview_version: 115.2.0esr
+ geckoview_version: 115.2.1esr
browser_branch: 13.0-1
browser_build: 2
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
=====================================
projects/go/config
=====================================
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 1.21.0
+version: 1.21.1
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
container:
use_container: 1
@@ -119,7 +119,7 @@ input_files:
enable: '[% ! c("var/linux") %]'
- URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
name: go
- sha256sum: 818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
+ sha256sum: bfa36bf75e9a1e9cbbdb9abcf9d1707e479bd3a07880a8ae3564caee5711cb99
- project: go-bootstrap
name: go-bootstrap
target_replace:
=====================================
projects/snowflake/config
=====================================
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…
-git_hash: 08d1c6d6551464d526d4bbe608384b8e7dec32ee #v2.6.0
+git_hash: b5d702f48315ee7dc718496dc6996f266e0ba047 #v2.6.1
container:
use_container: 1
@@ -20,6 +20,6 @@ steps:
pkg_type: go_vendor
project: snowflake
norec:
- sha256sum: 62f9065881f5a3cbe5ea5a9802e961e1821d9e468cb2a85ebab1e8afcc0cc953
+ sha256sum: 47ba1520df228ecffcf48ea4d826a365f39f31d9122200dd993c437cf347dc09
target_replace:
'^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64'
=====================================
projects/tor/config
=====================================
@@ -1,6 +1,6 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
-version: 0.4.8.3-rc
+version: 0.4.8.5
git_hash: 'tor-[% c("version") %]'
git_url: https://gitlab.torproject.org/tpo/core/tor.git
git_submodule: 1
=====================================
projects/translation/config
=====================================
@@ -12,13 +12,13 @@ compress_tar: 'gz'
steps:
base-browser:
base-browser: '[% INCLUDE build %]'
- git_hash: 6544f03cf00e87e9b10eb20efa176b3cb97bc201
+ git_hash: f91c2d76b73fb0d8d4429d6ec76c4e6ab622fc8e
targets:
nightly:
git_hash: 'base-browser'
tor-browser:
tor-browser: '[% INCLUDE build %]'
- git_hash: 20f254a961574996496db5897aa06723bb79bce7
+ git_hash: f083661b479d9b456e8e3ad894f1ea1131f95ca6
targets:
nightly:
git_hash: 'tor-browser'
@@ -32,7 +32,7 @@ steps:
fenix: '[% INCLUDE build %]'
# We need to bump the commit before releasing but just pointing to a branch
# might cause too much rebuidling of the Firefox part.
- git_hash: 46dc5bacb64aba3b170ce87cf07af414faa7c35a
+ git_hash: 8a98bcc4f466a6cd61c121c502898affc5b96141
compress_tar: 'zst'
targets:
nightly:
=====================================
rbm.conf
=====================================
@@ -81,11 +81,12 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '13.0a3'
+ torbrowser_version: '13.0a4'
torbrowser_build: 'build1'
torbrowser_incremental_from:
- '13.0a1'
- '13.0a2'
+ - '13.0a3'
updater_enabled: 1
build_mar: 1
mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 42072: 2023 year end campaign for about:tor.
by Pier Angelo Vendrame (@pierov) 14 Sep '23
by Pier Angelo Vendrame (@pierov) 14 Sep '23
14 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
47de2a69 by Henry Wilkes at 2023-09-14T10:34:37+01:00
fixup! Bug 42072: 2023 year end campaign for about:tor.
- - - - -
1 changed file:
- browser/locales/en-US/browser/tor-browser.ftl
Changes:
=====================================
browser/locales/en-US/browser/tor-browser.ftl
=====================================
@@ -53,7 +53,7 @@ yec-2023-please-donate = <span data-l10n-name="attention">This is possible becau
# NOTE: The amount should be shown as USD (United States dollar) currency. In the original English string, the first "$" is the literal USD currency symbol, and this can be changed or removed when translating to whatever is most appropriate for USD currency in the locale. In contrast, the "$" at the start of "$amount" is part of the Fluent format's syntax and should not be changed when translating.
# For example, "${ $amount }" for English would eventually be shown as "$5,000", whilst "{ $amount } US$" for Arabic would be shown as "٥٬٠٠٠ US$".
# Translators: If you need any help or clarification, feel free to ask a question on weblate or in IRC (#tor-l10n).
-yec-2023-matched-donation = From now until December 31, your gift will be matched one-to-one, up to ${ $amount }!
+yec-2023-matched-donation = From now until December 31, donations to the Tor Project will be matched one-to-one, up to ${ $amount }!
yec-2023-close-button =
.title = Close
yec-2023-donate-button = Donate now
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47de2a6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47de2a6…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 12.5.4
by richard (@richard) 13 Sep '23
by richard (@richard) 13 Sep '23
13 Sep '23
richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses
Commits:
4fd7a3d4 by Richard Pospesel at 2023-09-13T18:32:59+00:00
release: new version, 12.5.4
- - - - -
30 changed files:
- update_3/release/.htaccess
- − update_3/release/12.5-12.5.3-linux32-ALL.xml
- − update_3/release/12.5-12.5.3-linux64-ALL.xml
- − update_3/release/12.5-12.5.3-macos-ALL.xml
- − update_3/release/12.5-12.5.3-win32-ALL.xml
- − update_3/release/12.5-12.5.3-win64-ALL.xml
- − update_3/release/12.5.1-12.5.3-linux32-ALL.xml
- − update_3/release/12.5.1-12.5.3-linux64-ALL.xml
- − update_3/release/12.5.1-12.5.3-macos-ALL.xml
- − update_3/release/12.5.1-12.5.3-win32-ALL.xml
- − update_3/release/12.5.1-12.5.3-win64-ALL.xml
- + update_3/release/12.5.1-12.5.4-linux32-ALL.xml
- + update_3/release/12.5.1-12.5.4-linux64-ALL.xml
- + update_3/release/12.5.1-12.5.4-macos-ALL.xml
- + update_3/release/12.5.1-12.5.4-win32-ALL.xml
- + update_3/release/12.5.1-12.5.4-win64-ALL.xml
- − update_3/release/12.5.2-12.5.3-linux32-ALL.xml
- − update_3/release/12.5.2-12.5.3-linux64-ALL.xml
- − update_3/release/12.5.2-12.5.3-macos-ALL.xml
- − update_3/release/12.5.2-12.5.3-win32-ALL.xml
- − update_3/release/12.5.2-12.5.3-win64-ALL.xml
- + update_3/release/12.5.2-12.5.4-linux32-ALL.xml
- + update_3/release/12.5.2-12.5.4-linux64-ALL.xml
- + update_3/release/12.5.2-12.5.4-macos-ALL.xml
- + update_3/release/12.5.2-12.5.4-win32-ALL.xml
- + update_3/release/12.5.2-12.5.4-win64-ALL.xml
- + update_3/release/12.5.3-12.5.4-linux32-ALL.xml
- + update_3/release/12.5.3-12.5.4-linux64-ALL.xml
- + update_3/release/12.5.3-12.5.4-macos-ALL.xml
- + update_3/release/12.5.3-12.5.4-win32-ALL.xml
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.2.1esr-13.0-1-build2
by Pier Angelo Vendrame (@pierov) 13 Sep '23
by Pier Angelo Vendrame (@pierov) 13 Sep '23
13 Sep '23
Pier Angelo Vendrame pushed new tag tor-browser-115.2.1esr-13.0-1-build2 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.2.1esr-13.0-1] fixup! Bug 42019: Empty browser's clipboard on browser shutdown
by Pier Angelo Vendrame (@pierov) 13 Sep '23
by Pier Angelo Vendrame (@pierov) 13 Sep '23
13 Sep '23
Pier Angelo Vendrame pushed to branch base-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
2d9a45a6 by Henry Wilkes at 2023-09-13T17:13:18+02:00
fixup! Bug 42019: Empty browser's clipboard on browser shutdown
Bug 42097: Add comma.
- - - - -
1 changed file:
- browser/components/BrowserGlue.sys.mjs
Changes:
=====================================
browser/components/BrowserGlue.sys.mjs
=====================================
@@ -1912,7 +1912,7 @@ BrowserGlue.prototype = {
lazy.UpdateListener.reset();
}
},
- () => Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard) // tor-browser#42019
+ () => Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard), // tor-browser#42019
];
for (let task of tasks) {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2d9a45a…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2d9a45a…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 42019: Empty browser's clipboard on browser shutdown
by Pier Angelo Vendrame (@pierov) 13 Sep '23
by Pier Angelo Vendrame (@pierov) 13 Sep '23
13 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
74c4bbd7 by Henry Wilkes at 2023-09-13T16:07:05+01:00
fixup! Bug 42019: Empty browser's clipboard on browser shutdown
Bug 42097: Add comma.
- - - - -
1 changed file:
- browser/components/BrowserGlue.sys.mjs
Changes:
=====================================
browser/components/BrowserGlue.sys.mjs
=====================================
@@ -2010,7 +2010,7 @@ BrowserGlue.prototype = {
lazy.UpdateListener.reset();
}
},
- () => Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard) // tor-browser#42019
+ () => Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard), // tor-browser#42019
() => lazy.OnionAliasStore.uninit(),
];
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/74c4bbd…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/74c4bbd…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] 2 commits: fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
by Pier Angelo Vendrame (@pierov) 13 Sep '23
by Pier Angelo Vendrame (@pierov) 13 Sep '23
13 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
e18a0457 by Henry Wilkes at 2023-09-13T12:58:06+01:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Bug 41906: Lock network.trr.mode to be explicitly off.
- - - - -
22685798 by Henry Wilkes at 2023-09-13T12:58:06+01:00
Bug 41906: Hide DNS over HTTPS preferences.
- - - - -
2 changed files:
- browser/app/profile/000-tor-browser.js
- browser/components/preferences/privacy.inc.xhtml
Changes:
=====================================
browser/app/profile/000-tor-browser.js
=====================================
@@ -29,6 +29,9 @@ pref("network.proxy.failover_direct", false);
pref("network.security.ports.banned", "", locked);
pref("network.dns.disabled", true); // This should cover the #5741 patch for DNS leaks
pref("network.http.max-persistent-connections-per-proxy", 256);
+// Disable DNS over HTTPS. Set to explicitly off MODE_TRROFF = 5.
+// See tor-browser#41906.
+pref("network.trr.mode", 5, locked);
// Treat .onions as secure
pref("dom.securecontext.allowlist_onions", true);
=====================================
browser/components/preferences/privacy.inc.xhtml
=====================================
@@ -1193,11 +1193,12 @@
<hbox id="DoHCategory"
class="subcategory"
hidden="true"
- data-category="panePrivacy">
+ data-category="panePrivacy"
+ data-hidden-from-search="true">
<html:h1 data-l10n-id="preferences-doh-header"/>
</hbox>
-<groupbox id="dohBox" data-category="panePrivacy" data-subcategory="doh" hidden="true" class="highlighting-group">
+<groupbox id="dohBox" data-category="panePrivacy" data-subcategory="doh" data-hidden-from-search="true" hidden="true" class="highlighting-group">
<label class="search-header" searchkeywords="doh trr" hidden="true"><html:h2 data-l10n-id="preferences-doh-header"/></label>
<vbox flex="1">
<html:span id="dohDescription" class="tail-with-learn-more" data-l10n-id="preferences-doh-description"></html:span>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/faeaeb…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/faeaeb…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-12.5.4-build1
by Pier Angelo Vendrame (@pierov) 13 Sep '23
by Pier Angelo Vendrame (@pierov) 13 Sep '23
13 Sep '23
Pier Angelo Vendrame pushed new tag mb-12.5.4-build1 at The Tor Project / Applications / tor-browser-build
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.5.4-build1
by Pier Angelo Vendrame (@pierov) 13 Sep '23
by Pier Angelo Vendrame (@pierov) 13 Sep '23
13 Sep '23
Pier Angelo Vendrame pushed new tag tbb-12.5.4-build1 at The Tor Project / Applications / tor-browser-build
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][maint-12.5] Bug 40952&40953: Tor Browser and Mullvad Browser 12.5.4.
by Pier Angelo Vendrame (@pierov) 13 Sep '23
by Pier Angelo Vendrame (@pierov) 13 Sep '23
13 Sep '23
Pier Angelo Vendrame pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build
Commits:
1d028bd3 by Pier Angelo Vendrame at 2023-09-12T12:46:55+02:00
Bug 40952&40953: Tor Browser and Mullvad Browser 12.5.4.
- - - - -
10 changed files:
- projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
- projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
- projects/browser/allowed_addons.json
- projects/firefox/config
- projects/geckoview/config
- projects/go/config
- projects/manual/config
- projects/openssl/config
- projects/translation/config
- rbm.conf
Changes:
=====================================
projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
=====================================
@@ -1,3 +1,10 @@
+Mullvad Browser 12.5.4 - September 12 2023
+ * All Platforms
+ * Updated Firefox to 102.15.1esr
+ * Updated Translations
+ * Bug 235: Rebase release onto 102.15.1 ESR [mullvad-browser]
+ * Bug 42084: Race condition with language preferences may make spoof_english ineffective [tor-browser]
+
Mullvad Browser 12.5.3 - August 28 2023
* All Platforms
* Updated Translations
=====================================
projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
=====================================
@@ -1,3 +1,17 @@
+Tor Browser 12.5.4 - September 12 2023
+ * All Platforms
+ * Updated Translations
+ * Updated OpenSSL to 1.1.1w
+ * Bug 42084: Race condition with language preferences may make spoof_english ineffective [tor-browser]
+ * Bug 42090: Rebase release onto 102.15.1esr [tor-browser]
+ * Windows + macOS + Linux
+ * Updated Firefox to 102.15.1esr
+ * Android
+ * Updated GeckoView to 102.15.1esr
+ * Build System
+ * All Platforms
+ * Updated Go to 1.20.8
+
Tor Browser 12.5.3 - August 28 2023
* All Platforms
* Updated Translations
=====================================
projects/browser/allowed_addons.json
=====================================
@@ -17,7 +17,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…"
}
],
- "average_daily_users": 978882,
+ "average_daily_users": 997396,
"categories": {
"android": [
"experimental",
@@ -221,10 +221,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.5556,
- "bayesian_average": 4.5544452547554215,
- "count": 5126,
- "text_count": 1613
+ "average": 4.5546,
+ "bayesian_average": 4.553446665437272,
+ "count": 5144,
+ "text_count": 1618
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/",
"requires_payment": false,
@@ -321,7 +321,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/",
- "weekly_downloads": 24035
+ "weekly_downloads": 25493
},
"notes": null
},
@@ -337,7 +337,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…"
}
],
- "average_daily_users": 250313,
+ "average_daily_users": 254833,
"categories": {
"android": [
"security-privacy"
@@ -349,7 +349,7 @@
"contributions_url": "",
"created": "2014-06-10T05:46:02Z",
"current_version": {
- "id": 5357809,
+ "id": 5613891,
"compatibility": {
"firefox": {
"min": "56.0a1",
@@ -360,7 +360,7 @@
"max": "*"
}
},
- "edit_url": "https://addons.mozilla.org/en-US/developers/addon/decentraleyes/versions/53…",
+ "edit_url": "https://addons.mozilla.org/en-US/developers/addon/decentraleyes/versions/56…",
"is_strict_compatibility_enabled": false,
"license": {
"id": 3338,
@@ -371,22 +371,22 @@
"url": "http://www.mozilla.org/MPL/2.0/"
},
"release_notes": {
- "en-US": "<i>New languages:</i>\n\n- Added support for the Vietnamese language.\n\n<i>Enhancements:</i>\n\n- Improved popup panel display logic.\n\n<i>Bugfixes:</i>\n\n- Restored support for older versions of Firefox.\n\n<i>Other changes:</i>\n\n- Improved and extended various existing localizations.\n- Applied a minor design-related change to the options page.\n- Replaced remaining calls to a deprecated function."
+ "en-US": "<i>Enhancements:</i>\n\n- Improved object property evaluation logic.\n\n<i>Other changes:</i>\n\n- Applied various performance optimizations and stability improvements.\n- Updated resource audit tool dependencies."
},
- "reviewed": "2022-01-31T20:45:40Z",
- "version": "2.0.17",
+ "reviewed": "2023-08-30T12:55:12Z",
+ "version": "2.0.18",
"files": [
{
- "id": 3902154,
- "created": "2022-01-30T20:08:38Z",
- "hash": "sha256:e7f16ddc458eb2bc5bea75832305895553fca53c2565b6f1d07d5d9620edaff1",
+ "id": 4158232,
+ "created": "2023-08-24T20:38:03Z",
+ "hash": "sha256:f8f031ef91c02a1cb1a6552acd02b8f488693400656b4047d68f03ba0a1078d9",
"is_restart_required": false,
"is_webextension": true,
"is_mozilla_signed_extension": false,
"platform": "all",
- "size": 6941339,
+ "size": 6951879,
"status": "public",
- "url": "https://addons.mozilla.org/firefox/downloads/file/3902154/decentraleyes-2.0…",
+ "url": "https://addons.mozilla.org/firefox/downloads/file/4158232/decentraleyes-2.0…",
"permissions": [
"*://*/*",
"privacy",
@@ -476,7 +476,7 @@
},
"is_disabled": false,
"is_experimental": false,
- "last_updated": "2022-01-31T20:45:40Z",
+ "last_updated": "2023-08-30T12:55:12Z",
"name": {
"ar": "Decentraleyes",
"bg": "Decentraleyes",
@@ -553,10 +553,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.8128,
- "bayesian_average": 4.80816287856244,
- "count": 1362,
- "text_count": 241
+ "average": 4.8125,
+ "bayesian_average": 4.807850481587009,
+ "count": 1360,
+ "text_count": 240
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/",
"requires_payment": false,
@@ -641,7 +641,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/",
- "weekly_downloads": 3339
+ "weekly_downloads": 3381
},
"notes": null
},
@@ -657,7 +657,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…"
}
],
- "average_daily_users": 1081849,
+ "average_daily_users": 1103209,
"categories": {
"android": [
"security-privacy"
@@ -1180,10 +1180,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.8002,
- "bayesian_average": 4.797433644849106,
- "count": 2277,
- "text_count": 434
+ "average": 4.8008,
+ "bayesian_average": 4.798040649165502,
+ "count": 2289,
+ "text_count": 436
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/",
"requires_payment": false,
@@ -1207,7 +1207,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/",
- "weekly_downloads": 16917
+ "weekly_downloads": 18054
},
"notes": null
},
@@ -1223,7 +1223,7 @@
"picture_url": null
}
],
- "average_daily_users": 6301759,
+ "average_daily_users": 6472388,
"categories": {
"android": [
"security-privacy"
@@ -1388,7 +1388,7 @@
},
"is_disabled": false,
"is_experimental": false,
- "last_updated": "2023-08-25T11:45:20Z",
+ "last_updated": "2023-09-11T16:45:44Z",
"name": {
"ar": "uBlock Origin",
"bg": "uBlock Origin",
@@ -1533,10 +1533,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.7846,
- "bayesian_average": 4.784204963469926,
- "count": 15893,
- "text_count": 4119
+ "average": 4.7827,
+ "bayesian_average": 4.782306388225343,
+ "count": 15984,
+ "text_count": 4147
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/",
"requires_payment": false,
@@ -1598,7 +1598,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/",
- "weekly_downloads": 132922
+ "weekly_downloads": 141824
},
"notes": null
},
@@ -1614,7 +1614,7 @@
"picture_url": null
}
],
- "average_daily_users": 169487,
+ "average_daily_users": 170796,
"categories": {
"android": [
"photos-media"
@@ -1713,10 +1713,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.4938,
- "bayesian_average": 4.488680120012364,
- "count": 1134,
- "text_count": 423
+ "average": 4.4934,
+ "bayesian_average": 4.488285425448023,
+ "count": 1139,
+ "text_count": 425
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…",
"requires_payment": false,
@@ -1738,7 +1738,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…",
- "weekly_downloads": 360
+ "weekly_downloads": 408
},
"notes": null
},
@@ -1754,7 +1754,7 @@
"picture_url": null
}
],
- "average_daily_users": 84699,
+ "average_daily_users": 85891,
"categories": {
"android": [
"experimental",
@@ -1892,7 +1892,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/",
- "weekly_downloads": 780
+ "weekly_downloads": 720
},
"notes": null
},
@@ -1908,7 +1908,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…"
}
],
- "average_daily_users": 260726,
+ "average_daily_users": 265122,
"categories": {
"android": [
"photos-media",
@@ -2127,10 +2127,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.654,
- "bayesian_average": 4.649385850356977,
- "count": 1315,
- "text_count": 253
+ "average": 4.6523,
+ "bayesian_average": 4.647695702345138,
+ "count": 1320,
+ "text_count": 254
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/",
"requires_payment": false,
@@ -2151,7 +2151,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/",
- "weekly_downloads": 4084
+ "weekly_downloads": 3992
},
"notes": null
},
@@ -2174,7 +2174,7 @@
"picture_url": null
}
],
- "average_daily_users": 111599,
+ "average_daily_users": 111829,
"categories": {
"android": [
"other"
@@ -2457,10 +2457,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.3994,
- "bayesian_average": 4.394834968432194,
- "count": 1242,
- "text_count": 340
+ "average": 4.3834,
+ "bayesian_average": 4.378879936387472,
+ "count": 1252,
+ "text_count": 346
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/",
"requires_payment": false,
@@ -2480,7 +2480,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/",
- "weekly_downloads": 40
+ "weekly_downloads": 48
},
"notes": null
},
@@ -2496,7 +2496,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…"
}
],
- "average_daily_users": 300584,
+ "average_daily_users": 304519,
"categories": {
"android": [
"performance",
@@ -2614,7 +2614,7 @@
},
"is_disabled": false,
"is_experimental": false,
- "last_updated": "2023-08-09T15:50:38Z",
+ "last_updated": "2023-09-08T14:26:13Z",
"name": {
"de": "NoScript",
"el": "NoScript",
@@ -2686,10 +2686,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.4003,
- "bayesian_average": 4.39760012930889,
- "count": 2101,
- "text_count": 813
+ "average": 4.3969,
+ "bayesian_average": 4.394206528489455,
+ "count": 2109,
+ "text_count": 816
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/",
"requires_payment": false,
@@ -2733,7 +2733,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/",
- "weekly_downloads": 7412
+ "weekly_downloads": 7314
},
"notes": null
},
@@ -2749,7 +2749,7 @@
"picture_url": null
}
],
- "average_daily_users": 151037,
+ "average_daily_users": 153051,
"categories": {
"android": [
"performance",
@@ -2864,10 +2864,10 @@
"category": "recommended"
},
"ratings": {
- "average": 3.9019,
- "bayesian_average": 3.8976528443875473,
- "count": 1152,
- "text_count": 407
+ "average": 3.8981,
+ "bayesian_average": 3.8938714538391337,
+ "count": 1158,
+ "text_count": 410
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…",
"requires_payment": false,
@@ -2886,7 +2886,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…",
- "weekly_downloads": 1636
+ "weekly_downloads": 1907
},
"notes": null
}
=====================================
projects/firefox/config
=====================================
@@ -14,11 +14,11 @@ container:
use_container: 1
var:
- firefox_platform_version: 102.15.0
+ firefox_platform_version: 102.15.1
firefox_version: '[% c("var/firefox_platform_version") %]esr'
browser_series: '12.5'
browser_branch: '[% c("var/browser_series") %]-1'
- browser_build: 2
+ browser_build: 1
branding_directory_prefix: 'tb'
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
@@ -88,7 +88,7 @@ targets:
git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
var:
branding_directory_prefix: 'mb'
- browser_build: 2
+ browser_build: 1
gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
linux-x86_64:
=====================================
projects/geckoview/config
=====================================
@@ -14,9 +14,9 @@ container:
use_container: 1
var:
- geckoview_version: 102.15.0esr
+ geckoview_version: 102.15.1esr
browser_branch: 12.5-1
- browser_build: 2
+ browser_build: 1
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
git_commit: '[% exec("git rev-parse HEAD") %]'
=====================================
projects/go/config
=====================================
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 1.20.7
+version: 1.20.8
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
container:
use_container: 1
@@ -119,7 +119,7 @@ input_files:
enable: '[% ! c("var/linux") %]'
- URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
name: go
- sha256sum: 2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+ sha256sum: 38d71714fa5279f97240451956d8e47e3c1b6a5de7cb84137949d62b5dd3182e
- project: go-bootstrap
name: go-bootstrap
target_replace:
=====================================
projects/manual/config
=====================================
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
# To update, see doc/how-to-update-the-manual.txt
# Remember to update also the package's hash, with the version!
-version: 88998
+version: 102408
filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz'
container:
use_container: 1
@@ -17,8 +17,8 @@ var:
input_files:
- project: container-image
- - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip'
+ - URL: 'https://build-sources.tbb.torproject.org/manual_[% c("version") %].zip'
name: manual
- sha256sum: 1be6cf35a3c9f243998b7611e9531d4a99591cc257cb55f3924f504b9ead71a7
+ sha256sum: f9c24f300f188276ee6ec7b8eb2f7e000ec49c9bb3651b4bd4468075885a9eef
- filename: packagemanual.py
name: package_script
=====================================
projects/openssl/config
=====================================
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 1.1.1v
+version: 1.1.1w
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
container:
use_container: 1
@@ -34,4 +34,4 @@ input_files:
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
- URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
- sha256sum: d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0
+ sha256sum: cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
=====================================
projects/translation/config
=====================================
@@ -6,7 +6,7 @@ version: '[% c("abbrev") %]'
steps:
base-browser:
base-browser: '[% INCLUDE build %]'
- git_hash: 6544f03cf00e87e9b10eb20efa176b3cb97bc201
+ git_hash: 566b80ceb253add31128e6bde62a6c0224afeeb9
targets:
nightly:
git_hash: 'base-browser'
@@ -18,7 +18,7 @@ steps:
git_hash: 'basebrowser-newidentityftl'
tor-browser:
tor-browser: '[% INCLUDE build %]'
- git_hash: cb5b568d713c4c9b97e2373b9891490abc35d77e
+ git_hash: c4e6b2794f42ab85025fdf61cdb9ed4cc0fbab05
targets:
nightly:
git_hash: 'tor-browser'
@@ -26,7 +26,7 @@ steps:
fenix: '[% INCLUDE build %]'
# We need to bump the commit before releasing but just pointing to a branch
# might cause too much rebuidling of the Firefox part.
- git_hash: 46dc5bacb64aba3b170ce87cf07af414faa7c35a
+ git_hash: 8a98bcc4f466a6cd61c121c502898affc5b96141
targets:
nightly:
git_hash: 'fenix-torbrowserstringsxml'
=====================================
rbm.conf
=====================================
@@ -94,12 +94,12 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '12.5.3'
+ torbrowser_version: '12.5.4'
torbrowser_build: 'build1'
torbrowser_incremental_from:
+ - 12.5.3
- 12.5.2
- 12.5.1
- - 12.5
updater_enabled: 1
build_mar: 1
mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Bug 40941: Remove Snowflake arguments from Android
by richard (@richard) 12 Sep '23
by richard (@richard) 12 Sep '23
12 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
acbcf5cf by Pier Angelo Vendrame at 2023-09-12T20:20:34+00:00
Bug 40941: Remove Snowflake arguments from Android
On desktop we removed the Snowflake parameters that are passed to the
binary a long while ago, but they remained on Android.
However, they are not needed, and need to stay outdated, so with this
commit we remove them also from Android.
- - - - -
3 changed files:
- projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch
- projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch
- projects/tor-onion-proxy-library/0001-Bug-41361-Add-conjure-support.patch
Changes:
=====================================
projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch
=====================================
@@ -71,7 +71,7 @@ index 2405097..bcb6a37 100644
- buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n');
+ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) {
+ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n');
-+ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n");
++ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append('\n');
return this;
}
=====================================
projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch
=====================================
@@ -63,7 +63,7 @@ index b87993d..5e6d6c5 100644
- public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) {
+ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath, String webtunnelPath) {
buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n');
- buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n");
+ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append('\n');
buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n");
+ buffer.append("ClientTransportPlugin webtunnel exec ").append(webtunnelPath).append('\n');
return this;
=====================================
projects/tor-onion-proxy-library/0001-Bug-41361-Add-conjure-support.patch
=====================================
@@ -70,7 +70,7 @@ index cc10783..c7e20c0 100644
- public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) {
+ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) {
buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n');
- buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n");
+ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append('\n');
+ buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n");
return this;
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.2.1esr-13.0-1-build1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new tag tor-browser-115.2.1esr-13.0-1-build1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.2.1esr-13.0-1-build1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new tag base-browser-115.2.1esr-13.0-1-build1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.2.1esr-13.0-1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new branch base-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] 168 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
1f2ef2be by Eitan Isaacson at 2023-09-12T19:23:43+02:00
Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
Differential Revision: https://phabricator.services.mozilla.com/D179737
- - - - -
9c6f30fb by Pier Angelo Vendrame at 2023-09-12T19:23:46+02:00
Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized
Allow using NSS for checking MAR signatures also in platforms where
OS-native APIs are used by default, i.e., macOS and Windows.
Differential Revision: https://phabricator.services.mozilla.com/D177743
- - - - -
2d20f886 by Pier Angelo Vendrame at 2023-09-12T19:29:27+02:00
Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8
Differential Revision: https://phabricator.services.mozilla.com/D186456
- - - - -
2b66a03f by Henry Wilkes at 2023-09-12T19:29:28+02:00
Bug 41454: Move focus after calling openPreferences for a sub-category.
Temporary fix until mozilla bug 1799153 gets a patch upstream.
- - - - -
b8a8eaeb by Henry Wilkes at 2023-09-12T19:29:29+02:00
Bug 41483: Remove the firefox override for appstrings.properties
Remove this patch after upstream bugzilla bug 1790187
- - - - -
4e1d4326 by Pier Angelo Vendrame at 2023-09-12T19:29:29+02:00
Bug 41116: Normalize system fonts.
System fonts are an enormous fingerprinting vector.
Even with font allow lists and with our custom configuration on Linux,
which counter metrics measurements, getComputedStyle leaks several
details.
This patch counters both these kinds of attacks.
- - - - -
ef3c53bb by Marco Simonelli at 2023-09-12T19:29:30+02:00
Bug 41459: WebRTC fails to build under mingw (Part 1)
- properly define NOMINMAX for just MSVC builds
- - - - -
249a3a7f by Marco Simonelli at 2023-09-12T19:29:30+02:00
Bug 41459: WebRTC fails to build under mingw (Part 2)
- fixes required to build third_party/libwebrtc
- - - - -
5306feb9 by Marco Simonelli at 2023-09-12T19:29:31+02:00
Bug 41459: WebRTC fails to build under mingw (Part 3)
- fixes required to build third_party/sipcc
- - - - -
e57f8eec by Marco Simonelli at 2023-09-12T19:29:31+02:00
Bug 41459: WebRTC fails to build under mingw (Part 4)
- fixes requried to build netwerk/sctp
- - - - -
ec601c13 by Marco Simonelli at 2023-09-12T19:29:32+02:00
Bug 41459: WebRTC fails to build under mingw (Part 5)
- fixes required to build dom/media/webrtc
- - - - -
5bff8e77 by Marco Simonelli at 2023-09-12T19:29:32+02:00
Bug 41459: WebRTC fails to build under mingw (Part 6)
- fixes required to build dom/media/systemservices
- - - - -
07899f8b by hackademix at 2023-09-12T19:29:32+02:00
Bug 41854: Allow overriding download spam protection.
- - - - -
2c9bedcc by Gaba at 2023-09-12T19:29:33+02:00
Adding issue and merge request templates
- - - - -
f7fe4f74 by Pier Angelo Vendrame at 2023-09-12T19:29:33+02:00
Base Browser's .mozconfigs.
Bug 17858: Cannot create incremental MARs for hardened builds.
Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
(which is part of mar-tools and is not distributed to end-users) with
ASan.
Bug 21849: Don't allow SSL key logging.
Bug 25741 - TBA: Disable features at compile-time
Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION
Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds
This fixes a problem where some preferences had the wrong default value.
Also see bug 27472 where we made a similar fix for Android.
Bug 29859: Disable HLS support for now
Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
Bug 33734: Set MOZ_NORMANDY to False
Bug 33851: Omit Parental Controls.
Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files
Bug 41584: Move some configuration options to base-browser level
- - - - -
29cf4aba by clairehurst at 2023-09-12T19:54:34+02:00
fixup! Base Browser's .mozconfigs.
Bug 42035: Update mozconfig for macos development
- - - - -
0f802748 by Pier Angelo Vendrame at 2023-09-12T19:54:37+02:00
Tweaks to the build system
Bug 40857: Modified the fat .aar creation file
This is a workaround to build fat .aars with the compiling enviornment
disabled.
Mozilla does not use a similar configuration, but either runs a Firefox
build and discards its output, or uses artifacts build.
We might switch to artifact builds too, and drop this patch, or write a
better one to upstream. But until then we need this patch.
See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770.
Bug 41458: Prevent `mach package-multi-locale` from actually creating a package
macOS builds need some files to be moved around with
./mach package-multi-locale to create multi-locale packages.
The required command isn't exposed through any other mach command.
So, we patch package-multi-locale both to prevent it from failing when
doing official builds and to detect any future changes on it.
- - - - -
ac407e84 by Pier Angelo Vendrame at 2023-09-12T19:54:38+02:00
Bug 41108: Remove privileged macOS installation from 102
- - - - -
f37b925f by Dan Ballard at 2023-09-12T19:54:39+02:00
Bug 41149: Re-enable DLL injection protection in all builds not just nightlies
- - - - -
c661a0c0 by Matthew Finkel at 2023-09-12T19:54:40+02:00
Bug 24796: Comment out excess permissions from GeckoView
The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's
manifest, so we can't use the ifdef preprocessor guards around the
permissions we do not want. Commenting the permissions is the
next-best-thing.
- - - - -
f595ec6c by Matthew Finkel at 2023-09-12T19:54:40+02:00
Bug 28125: Prevent non-Necko network connections
- - - - -
6418640e by Mike Perry at 2023-09-12T19:54:41+02:00
Bug 12974: Disable NTLM and Negotiate HTTP Auth
The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421,
https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602
- - - - -
06d1c80a by Alex Catarineu at 2023-09-12T19:54:42+02:00
Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899
- - - - -
74cab453 by Georg Koppen at 2023-09-12T19:54:43+02:00
Bug 16285: Exclude ClearKey system for now
In the past the ClearKey system had not been compiled when specifying
--disable-eme. But that changed and it is even bundled nowadays (see:
Mozilla's bug 1300654). We don't want to ship it right now as the use
case for it is not really visible while the code had security
vulnerabilities in the past.
- - - - -
1f2df7c8 by Kathy Brade at 2023-09-12T19:54:44+02:00
Bug 21431: Clean-up system extensions shipped in Firefox
Only ship the pdfjs extension.
- - - - -
705d6cb4 by Kathy Brade at 2023-09-12T19:54:44+02:00
Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
Hide elements on about:logins that mention sync, "Firefox LockWise", and
Mozilla's LockWise mobile apps.
Disable the "Create New Login" button when security.nocertdb is true.
- - - - -
612c9305 by Alex Catarineu at 2023-09-12T19:54:45+02:00
Bug 41457: Remove Mozilla permissions
Bug 40025: Remove Mozilla add-on install permissions
- - - - -
8b20d375 by Kathy Brade at 2023-09-12T19:54:46+02:00
Bug 40002: Remove about:ion
Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people
volunteer to participate in studies that collect detailed, sensitive data about
how they use their browser.
Bug 41662: Disable about:sync-logs
Even though we disable sync by default with
`identity.fxaccounts.enabled`, this about: page is still avilable.
We could throw an exception on the constructor of the related
component, but it would result only in an error in the console, without
a visible "this address does not look right" error page.
If we fix the issues with MOZ_SERVICES_SYNC, we can restore the
component.
- - - - -
de919a01 by Arthur Edelstein at 2023-09-12T19:54:47+02:00
Bug 26353: Prevent speculative connect that violated FPI.
Connections were observed in the catch-all circuit when
the user entered an https or http URL in the URL bar, or
typed a search term.
- - - - -
764eedf3 by Alex Catarineu at 2023-09-12T19:54:47+02:00
Bug 31740: Remove some unnecessary RemoteSettings instances
More concretely, SearchService.jsm 'hijack-blocklists' and
url-classifier-skip-urls.
Avoid creating instance for 'anti-tracking-url-decoration'.
If prefs are disabling their usage, avoid creating instances for
'cert-revocations' and 'intermediates'.
Do not ship JSON dumps for collections we do not expect to need. For
the ones in the 'main' bucket, this prevents them from being synced
unnecessarily (the code in remote-settings does so for collections
in the main bucket for which a dump or local data exists). For the
collections in the other buckets, we just save some size by not
shipping their dumps.
We also clear the collections database on the v2 -> v3 migration.
- - - - -
03d4bb78 by cypherpunks1 at 2023-09-12T19:54:48+02:00
Bug 41092: Add a RemoteSettings JSON dump for query-stripping
- - - - -
56b61952 by Pier Angelo Vendrame at 2023-09-12T19:54:49+02:00
Bug 41635: Disable the Normandy component
Do not include Normandy at all whenever MOZ_NORMANDY is False.
- - - - -
622316aa by Georg Koppen at 2023-09-12T19:54:50+02:00
Bug 30541: Disable WebGL readPixel() for web content
Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034
- - - - -
03361822 by Alex Catarineu at 2023-09-12T19:54:50+02:00
Bug 28369: Stop shipping pingsender executable
- - - - -
9ff5348e by cypherpunks1 at 2023-09-12T19:54:51+02:00
Bug 41568: Disable LaterRun
- - - - -
259a7c62 by cypherpunks1 at 2023-09-12T19:54:54+02:00
Bug 40717: Hide Windows SSO in settings
- - - - -
0b6f555f by Pier Angelo Vendrame at 2023-09-12T19:54:55+02:00
Bug 41599: Always return an empty string as network ID
Firefox computes an internal network ID used to detect network changes
and act consequently (e.g., to improve WebSocket UX).
However, there are a few ways to get this internal network ID, so we
patch them out, to be sure any new code will not be able to use them and
possibly link users.
We also sent a patch to Mozilla to seed the internal network ID, to
prevent any accidental leak in the future.
Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756
- - - - -
9b50ac3f by cypherpunks1 at 2023-09-12T19:54:56+02:00
Bug 40175: Add origin attributes to about:reader top-level requests
- - - - -
64159f8e by Mike Perry at 2023-09-12T19:54:56+02:00
Firefox preference overrides.
This hack directly includes our preference changes in omni.ja.
Bug 18292: Staged updates fail on Windows
Temporarily disable staged updates on Windows.
Bug 18297: Use separate Noto JP,KR,SC,TC fonts
Bug 23404: Add Noto Sans Buginese to the macOS whitelist
Bug 23745: Set dom.indexedDB.enabled = true
Bug 13575: Disable randomised Firefox HTTP cache decay user tests.
(Fernando Fernandez Mancera <ffmancera(a)riseup.net>)
Bug 17252: Enable session identifiers with FPI
Session tickets and session identifiers were isolated
by OriginAttributes, so we can re-enable them by
allowing the default value (true) of
"security.ssl.disable_session_identifiers".
The pref "security.enable_tls_session_tickets" is obsolete
(removed in https://bugzilla.mozilla.org/917049)
Bug 14952: Enable http/2 and AltSvc
In Firefox, SPDY/HTTP2 now uses Origin Attributes for
isolation of connections, push streams, origin frames, etc.
That means we get first-party isolation provided
"privacy.firstparty.isolate" is true. So in this patch, we
stop overriding "network.http.spdy.enabled" and
"network.http.spdy.enabled.http2".
Alternate Services also use Origin Attributes for isolation.
So we stop overriding
"network.http.altsvc.enabled" and "network.http.altsvc.oe"
as well.
(All 4 of the abovementioned "network.http.*" prefs adopt
Firefox 60ESR's default value of true.)
However, we want to disable HTTP/2 push for now, so we
set "network.http.spdy.allow-push" to false.
"network.http.spdy.enabled.http2draft" was removed in Bug 1132357.
"network.http.sped.enabled.v2" was removed in Bug 912550.
"network.http.sped.enabled.v3" was removed in Bug 1097944.
"network.http.sped.enabled.v3-1" was removed in Bug 1248197.
Bug 26114: addons.mozilla.org is not special
* Don't expose navigator.mozAddonManager on any site
* Don't block NoScript from modifying addons.mozilla.org or other sites
Enable ReaderView mode again (#27281).
Bug 29916: Make sure enterprise policies are disabled
Bug 2874: Block Components.interfaces from content
Bug 26146: Spoof HTTP User-Agent header for desktop platforms
In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent
header and to JavaScript code via navigator.userAgent. To avoid
leaking the OS inside each HTTP request (which many web servers
log), always use the Windows 7 OS value in the desktop User-Agent
header. We continue to allow access to the actual OS via JavaScript,
since doing so improves compatibility with web applications such
as GitHub and Google Docs.
Bug 12885: Windows Jump Lists fail for Tor Browser
Jumplist entries are stored in a binary file in:
%APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\
and has a name in the form
[a-f0-9]+.customDestinations-ms
The hex at the front is unique per app, and is ultimately derived from
something called the 'App User Model ID' (AUMID) via some unknown
hashing method. The AUMID is provided as a key when programmatically
creating, updating, and deleting a jumplist. The default behaviour in
firefox is for the installer to define an AUMID for an app, and save it
in the registry so that the jumplist data can be removed by the
uninstaller.
However, the Tor Browser does not set this (or any other) regkey during
installation, so this codepath fails and the app's AUMID is left
undefined. As a result the app's AUMID ends up being defined by
windows, but unknowable by Tor Browser. This unknown AUMID is used to
create and modify the jumplist, but the delete API requires that we
provide the app's AUMID explicitly. Since we don't know what the AUMID
is (since the expected regkey where it is normally stored does not
exist) jumplist deletion will fail and we will leave behind a mostly
empty customDestinations-ms file. The name of the file is derived from
the binary path, so an enterprising person could reverse engineer how
that hex name is calculated, and generate the name for Tor Browser's
default Desktop installation path to determine whether a person had
used Tor Browser in the past.
The 'taskbar.grouping.useprofile' option that is enabled by this patch
works around this AUMID problem by having firefox.exe create it's own
AUMID based on the profile path (rather than looking for a regkey). This
way, if a user goes in and enables and disables jumplist entries, the
backing store is properly deleted.
Unfortunately, all windows users currently have this file lurking in
the above mentioned directory and this patch will not remove it since it
was created with an unknown AUMID. However, another patch could be
written which goes to that directory and deletes any item containing the
'Tor Browser' string. See bug 28996.
Bug 30845: Make sure default themes and other internal extensions are enabled
Bug 28896: Enable extensions in private browsing by default
Bug 31065: Explicitly allow proxying localhost
Bug 31598: Enable letterboxing
Disable Presentation API everywhere
Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer
security levels.
Bug 32321: Disable Mozilla's MitM pings
Bug 19890: Disable installation of system addons
By setting the URL to "" we make sure that already installed system
addons get deleted as well.
Bug 22548: Firefox downgrades VP9 videos to VP8.
On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor
Browser 7.0 all youtube videos are degraded to VP8.
This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0.
All clients will get better experience and lower traffic, beause TBB doesn't
use "Use hardware acceleration when available".
Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs
Bug 16441: Suppress "Reset Tor Browser" prompt.
Bug 29120: Use the in-memory media cache and increase its maximum size.
Bug 33697: use old search config based on list.json
Bug 33855: Ensure that site-specific browser mode is disabled.
Bug 30682: Disable Intermediate CA Preloading.
Bug 40061: Omit the Windows default browser agent from the build
Bug 40322: Consider disabling network.connectivity-service.enabled
Bug 40408: Disallow SVG Context Paint in all web content
Bug 40308: Disable network partitioning until we evaluate dFPI
Bug 40322: Consider disabling network.connectivity-service.enabled
Bug 40383: Disable dom.enable_event_timing
Bug 40423: Disable http/3
Bug 40177: Update prefs for Fx91esr
Bug 40700: Disable addons and features recommendations
Bug 40682: Disable network.proxy.allow_bypass
Bug 40736: Disable third-party cookies in PBM
Bug 19850: Enabled HTTPS-Only by default
Bug 40912: Hide the screenshot menu
Bug 41292: Disable moreFromMozilla in preferences page
Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector
Bug 24686: Set network.http.tailing.enabled to true
Bug 40183: Disable TLS ciphersuites using SHA-1
Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102
We reviewed all the preferences we set for 102, and remove a few old
ones. See the description of that issue to see all the preferences we
believed were still valid for 102, and some brief description for the
reasons to keep them.
- - - - -
eef65b78 by hackademix at 2023-09-12T19:54:57+02:00
fixup! Firefox preference overrides.
Bug 42029 - Defense-in-depth: disable non-proxied UDP WebRTC
- - - - -
526752a4 by cypherpunks1 at 2023-09-12T19:54:58+02:00
fixup! Firefox preference overrides.
Bug 41876: Disable the Firefox View tab
- - - - -
983f2646 by Pier Angelo Vendrame at 2023-09-12T19:54:58+02:00
fixup! Firefox preference overrides.
Bug 42043: Enable media.devices.enumerate.legacy.enabled.
- - - - -
a146767c by Richard Pospesel at 2023-09-12T19:54:59+02:00
fixup! Firefox preference overrides.
Bug 41774: Hide the 'Switching to a new device' hepl menu item
- - - - -
260af3d3 by Pier Angelo Vendrame at 2023-09-12T19:55:00+02:00
fixup! Firefox preference overrides.
Bug 41797: Lock RFP in release builds
- - - - -
165d99d9 by Richard Pospesel at 2023-09-12T19:55:01+02:00
fixup! Firefox preference overrides.
- - - - -
66d175ef by Richard Pospesel at 2023-09-12T19:55:01+02:00
fixup! Firefox preference overrides.
- - - - -
9b6bf168 by Pier Angelo Vendrame at 2023-09-12T19:55:02+02:00
fixup! Firefox preference overrides.
Bug 41675: Remove javascript.options.large_arraybuffers.
It has been removed with MozBug 1703508 in Firefox 110.
- - - - -
fd970af0 by Richard Pospesel at 2023-09-12T19:55:03+02:00
fixup! Firefox preference overrides.
Bug 42057: Disable GetIsTextRecognitionSupported by default
- - - - -
47214ee7 by Richard Pospesel at 2023-09-12T19:55:04+02:00
fixup! Firefox preference overrides.
- - - - -
c4a26dd6 by Richard Pospesel at 2023-09-12T19:55:04+02:00
Bug 41659: Add canonical color definitions to base-browser
- - - - -
e5db63d4 by Pier Angelo Vendrame at 2023-09-12T19:55:05+02:00
Bug 41043: Hardcode the UI font on Linux
The mechanism to choose the UI font does not play well with our
fontconfig configuration. As a result, the final criterion to choose
the font for the UI was its version.
Since we hardcode Arimo as a default sans-serif on preferences, we use
it also for the UI. FontConfig will fall back to some other font for
scripts Arimo does not cover as expected (we tested with Japanese).
- - - - -
a14a6aca by Alex Catarineu at 2023-09-12T19:55:06+02:00
Bug 30605: Honor privacy.spoof_english in Android
This checks `privacy.spoof_english` whenever `setLocales` is
called from Fenix side and sets `intl.accept_languages`
accordingly.
Bug 40198: Expose privacy.spoof_english pref in GeckoView
- - - - -
83045d09 by Alex Catarineu at 2023-09-12T19:55:07+02:00
Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView
- - - - -
392321c1 by Alex Catarineu at 2023-09-12T19:55:07+02:00
Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
- - - - -
b10db92d by Alex Catarineu at 2023-09-12T19:55:08+02:00
Bug 26345: Hide tracking protection UI
- - - - -
65c7f0ab by Pier Angelo Vendrame at 2023-09-12T19:55:13+02:00
Bug 9173: Change the default Firefox profile directory to be relative.
This commit makes Firefox look for the default profile directory in a
directory relative to the binary path.
The directory can be specified through the --with-relative-data-dir.
This is relative to the same directory as the firefox main binary for
Linux and Windows.
On macOS, we remove Contents/MacOS from it.
Or, in other words, the directory is relative to the application
bundle.
This behavior can be overriden at runtime, by placing a file called
system-install adjacent to the firefox main binary (also on macOS).
- - - - -
dcac7c04 by Alex Catarineu at 2023-09-12T19:55:14+02:00
Bug 27604: Fix addon issues when moving the profile directory
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838
- - - - -
d1853fcc by Mike Perry at 2023-09-12T19:55:14+02:00
Bug 13028: Prevent potential proxy bypass cases.
It looks like these cases should only be invoked in the NSS command line
tools, and not the browser, but I decided to patch them anyway because there
literally is a maze of network function pointers being passed around, and it's
very hard to tell if some random code might not pass in the proper proxied
versions of the networking code here by accident.
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509
- - - - -
e70be3d9 by Igor Oliveira at 2023-09-12T19:55:15+02:00
Bug 23104: Add a default line height compensation
Many fonts have issues with their vertical metrics. they
are used to influence the height of ascenders and depth
of descenders. Gecko uses it to calculate the line height
(font height + ascender + descender), however because of
that idiosyncratic behavior across multiple operating
systems, it can be used to identify the user's OS.
The solution proposed in the patch uses a default factor
to be multiplied with the font size, simulating the concept
of ascender and descender. This way all operating
systems will have the same line height.
- - - - -
449b1c5d by Pier Angelo Vendrame at 2023-09-12T19:55:16+02:00
Bug 40309: Avoid using regional OS locales
Avoid regional OS locales if the pref
`intl.regional_prefs.use_os_locales` is false but RFP is enabled.
- - - - -
7d357051 by Matthew Finkel at 2023-09-12T19:55:17+02:00
Bug 40432: Prevent probing installed applications
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084
- - - - -
ab7a844b by cypherpunks1 at 2023-09-12T19:55:17+02:00
Bug 33955: When copying an image only copy the image contents to the clipboard
- - - - -
99cf70ea by cypherpunks1 at 2023-09-12T19:55:18+02:00
Bug 41791: Omit the source URL when copying page contents to the clipboard
- - - - -
bd6de947 by Pier Angelo Vendrame at 2023-09-12T19:55:19+02:00
Base Browser strings
This commit adds all the strings needed by following Base Browser
patches.
- - - - -
23f9fc45 by Pier Angelo Vendrame at 2023-09-12T19:55:20+02:00
fixup! Base Browser strings
Bug 41528: Added the version string for the about dialog
- - - - -
7107925a by hackademix at 2023-09-12T19:55:20+02:00
Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs.
- - - - -
0f75d822 by hackademix at 2023-09-12T19:55:21+02:00
Bug 41434: Letterboxing, improve logging.
- - - - -
ded4dc09 by hackademix at 2023-09-12T19:55:22+02:00
Bug 31064: Letterboxing, exempt browser extensions.
- - - - -
15ce1e22 by hackademix at 2023-09-12T19:55:23+02:00
Bug 32411: Letterboxing, exempt view-source: URIs.
- - - - -
abd69149 by hackademix at 2023-09-12T19:55:24+02:00
Bug 32308: use direct browser sizing for letterboxing.
Bug 30556: align letterboxing with 200x100 new win width stepping
- - - - -
7aac7356 by hackademix at 2023-09-12T19:55:24+02:00
Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
- - - - -
c45cc7c5 by Pier Angelo Vendrame at 2023-09-12T19:55:25+02:00
Bug 41369: Improve Firefox language settings for multi-lingual packages
Change the language selector to be sorted by language code, rather than
name, and to display the language code to the user.
Bug 41372: Handle Japanese as a special case in preferences on macOS
Japanese is treated in a special way on macOS. However, seeing the
Japanese language tag could be confusing for users, and moreover the
language name is not localized correctly like other langs.
Bug 41378: Tell users that they can change their language at the first start
With multi-lingual builds, Tor Browser matches the user's system
language, but some users might want to change it.
So, we tell them that it is possible, but only once.
- - - - -
4de46bc4 by p13dz at 2023-09-12T19:55:26+02:00
Bug 40283: Workaround for the file upload bug
- - - - -
7be80ce7 by Arthur Edelstein at 2023-09-12T19:55:27+02:00
Bug 18905: Hide unwanted items from help menu
Bug 25660: Remove the "New Private Window" option
- - - - -
08577edc by cypherpunks1 at 2023-09-12T19:55:29+02:00
fixup! Bug 18905: Hide unwanted items from help menu
Bug 41642: Hide the new private window option only when autostart of PBM is enabled
- - - - -
7ed92084 by cypherpunks1 at 2023-09-12T19:55:30+02:00
Bug 41740: Change the RFP value of devicePixelRatio to 2
- - - - -
d4dd1d59 by Pier Angelo Vendrame at 2023-09-12T19:55:31+02:00
Bug 41739: Remove "Website appearance" from about:preferences.
It is ignored because of RFP and it is confusing for users.
- - - - -
7888e9b5 by cypherpunks1 at 2023-09-12T19:55:32+02:00
Bug 41881: Don't persist custom network requests on private windows
- - - - -
1faf9479 by hackademix at 2023-09-12T19:55:32+02:00
Bug 42019: Empty browser's clipboard on browser shutdown
- - - - -
7c73bbfd by hackademix at 2023-09-12T19:55:33+02:00
Bug 42084: Ensure English spoofing works even if preferences are set out of order.
- - - - -
a9214f2e by Pier Angelo Vendrame at 2023-09-12T19:55:34+02:00
Bug 41603: Customize the creation of MOZ_SOURCE_URL
MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and
MOZ_SOURCE_CHANGESET.
But the code takes for granted that it refers to a Hg instance, so it
combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`.
With this commit, we change this logic to combine them to create a URL
that is valid for GitLab.
$MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag.
If that is needed, we could use /-/tree/, instead of /-/commit/.
- - - - -
129f9e7e by Henry Wilkes at 2023-09-12T19:55:35+02:00
Bug 31575: Disable Firefox Home (Activity Stream)
Treat about:blank as the default home page and new tab page.
Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order
to avoid several network requests that we do not need.
Bug 41624: Disable about:pocket-* pages.
Bug 40144: Redirect about:privatebrowsing to the user's home
- - - - -
0ba9475c by Kathy Brade at 2023-09-12T19:55:35+02:00
Bug 4234: Use the Firefox Update Process for Base Browser.
Windows: disable "runas" code path in updater (15201).
Windows: avoid writing to the registry (16236).
Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406,
16014, 16909, 24476, and 25909.
Also fix bug 27221: purge the startup cache if the Base Browser
version changed (even if the Firefox version and build ID did
not change), e.g., after a minor Base Browser update.
Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality.
Bug 26048: potentially confusing "restart to update" message
Within the update doorhanger, remove the misleading message that mentions
that windows will be restored after an update is applied, and replace the
"Restart and Restore" button label with an existing
"Restart to update Tor Browser" string.
Bug 28885: notify users that update is downloading
Add a "Downloading Base Browser update" item which appears in the
hamburger (app) menu while the update service is downloading a MAR
file. Before this change, the browser did not indicate to the user
that an update was in progress, which is especially confusing in
Tor Browser because downloads often take some time. If the user
clicks on the new menu item, the about dialog is opened to allow
the user to see download progress.
As part of this fix, the update service was changed to always show
update-related messages in the hamburger menu, even if the update
was started in the foreground via the about dialog or via the
"Check for Tor Browser Update" toolbar menu item. This change is
consistent with the Tor Browser goal of making sure users are
informed about the update process.
Removed #28885 parts of this patch which have been uplifted to Firefox.
- - - - -
ecda6a80 by Pier Angelo Vendrame at 2023-09-12T19:55:36+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Bug 41528: Localized the version string in the about dialog
- - - - -
6b62b92c by Pier Angelo Vendrame at 2023-09-12T19:55:37+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Move the alpha channel creation to a commit on its own
- - - - -
68e130ca by Pier Angelo Vendrame at 2023-09-12T19:55:38+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Allow customizing the updater URL with config options.
With this, we will not need sed hacks on tor-browser-build anymore.
- - - - -
a74a55f9 by Pier Angelo Vendrame at 2023-09-12T19:56:39+02:00
Bug 42061: Create an alpha update channel.
- - - - -
18f58821 by Nicolas Vigier at 2023-09-12T19:56:40+02:00
Bug 41682: Add base-browser nightly mar signing key
- - - - -
fbfe9862 by hackademix at 2023-09-12T19:56:41+02:00
Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
- - - - -
78de64b6 by Pier Angelo Vendrame at 2023-09-12T19:56:42+02:00
Bug 41698: Reword the recommendation badges in about:addons
Firefox strings use { -brand-product-name }.
As a result, it seems that the fork is recommending extensions, whereas
AMO curators are doing that.
So, we replace the strings with custom ones that clarify that Mozilla is
recommending them.
We assign the strings with JS because our translation backend does not
support Fluent attributes, yet, but once it does, we should switch to
them, instead.
Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033
- - - - -
380c23d9 by Alex Catarineu at 2023-09-12T19:56:42+02:00
Bug 40069: Add helpers for message passing with extensions
- - - - -
42b6f1b7 by Matthew Finkel at 2023-09-12T19:56:43+02:00
Bug 41598: Prevent NoScript from being removed/disabled.
Bug 40253: Explicitly allow NoScript in Private Browsing mode.
- - - - -
211fb178 by hackademix at 2023-09-12T19:56:44+02:00
Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons
- - - - -
3633aeda by Pier Angelo Vendrame at 2023-09-12T19:56:45+02:00
Bug 40925: Implemented the Security Level component
This component adds a new Security Level toolbar button which visually
indicates the current global security level via icon (as defined by the
extensions.torbutton.security_slider pref), a drop-down hanger with a
short description of the current security level, and a new section in
the about:preferences#privacy page where users can change their current
security level. In addition, the hanger and the preferences page will
show a visual warning when the user has modified prefs associated with
the security level and provide a one-click 'Restore Defaults' button to
get the user back on recommended settings.
Bug 40125: Expose Security Level pref in GeckoView
- - - - -
52022732 by Henry Wilkes at 2023-09-12T19:56:45+02:00
fixup! Bug 40925: Implemented the Security Level component
Bug 42046: Clean up XUL layout hack in security level panel.
- - - - -
41ecfd6e by Pier Angelo Vendrame at 2023-09-12T19:56:46+02:00
Bug 40926: Implemented the New Identity feature
- - - - -
be304c72 by Henry Wilkes at 2023-09-12T19:56:47+02:00
Bug 41736: Customize toolbar for base-browser.
- - - - -
e26e8f16 by Pier Angelo Vendrame at 2023-09-12T19:56:48+02:00
Bug 42027: Base Browser migration procedures.
This commit implmenents the the Base Browser's version of _migrateUI.
- - - - -
3e8a9243 by Richard Pospesel at 2023-09-12T19:56:48+02:00
Bug 41649: Create rebase and security backport gitlab issue templates
- - - - -
aa1ae158 by Richard Pospesel at 2023-09-12T19:56:49+02:00
Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
- - - - -
f5190ac8 by clairehurst at 2023-09-12T19:56:50+02:00
fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
Bug 42035: Update tools/torbrowser/ scripts to support macOS dev environment
- - - - -
d94fabe6 by Henry Wilkes at 2023-09-12T19:56:51+02:00
Bug 41803: Add some developer tools for working on tor-browser.
- - - - -
7a1eb3d8 by Kathy Brade at 2023-09-12T19:56:51+02:00
Bug 11641: Disable remoting by default.
Unless the -osint command line flag is used, the browser now defaults
to the equivalent of -no-remote. There is a new -allow-remote flag that
may be used to restore the original (Firefox-like) default behavior.
- - - - -
e46ae778 by Alex Catarineu at 2023-09-12T19:56:52+02:00
Add TorStrings module for localization
- - - - -
527309da by Henry Wilkes at 2023-09-12T19:56:53+02:00
fixup! Add TorStrings module for localization
Bug 41333: Stop using aboutTor.dtd. No longer use aboutTBUpdate strings in about:tor.
- - - - -
ba24ca0b by Henry Wilkes at 2023-09-12T19:56:54+02:00
Tor Browser strings
This commit adds all the strings needed for Tor Browser patches.
- - - - -
441d82ff by Henry Wilkes at 2023-09-12T19:56:57+02:00
Tor Browser localization migration scripts.
- - - - -
94455e02 by Mike Perry at 2023-09-12T19:56:57+02:00
Bug 2176: Rebrand Firefox to TorBrowser
See also Bugs #5194, #7187, #8115, #8219.
This patch does some basic renaming of Firefox to TorBrowser. The rest of the
branding is done by images and icons.
Also fix bug 27905.
Bug 25702: Update Tor Browser icon to follow design guidelines
- Updated all of the branding in /browser/branding/official with new 'stable'
icon series.
- Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and
add the source svg in the same directory
- Copied /browser/branding/official over /browser/branding/nightly and the new
/browser/branding/alpha directories. Replaced content with 'nightly' and
'alpha' icon series.
Updated VisualElements_70.png and VisualElements_150.png with updated icons in
each branding directory (fixes #22654)
- Updated firefox.VisualElementsManfiest.xml with updated colors in each
branding directory
- Added firefox.svg to each branding directory from which all the other icons
are derived (apart from document.icns and document.ico)
- Added default256.png and default512.png icons
- Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed
original icon
- Use the Tor Browser icon within devtools/client/themes/images/.
Bug 30631: Blurry Tor Browser icon on macOS app switcher
It would seem the png2icns tool does not generate correct icns files and
so on macOS the larger icons were missing resulting in blurry icons in
the OS chrome. Regenerated the padded icons in a macOS VM using
iconutil.
Bug 28196: preparations for using torbutton tor-browser-brand.ftl
A small change to Fluent FileSource class is required so that we
can register a new source without its supported locales being
counted as available locales for the browser.
Bug 31803: Replaced about:debugging logo with flat version
Bug 21724: Make Firefox and Tor Browser distinct macOS apps
When macOS opens a document or selects a default browser, it sometimes
uses the CFBundleSignature. Changing from the Firefox MOZB signature to
a different signature TORB allows macOS to distinguish between Firefox
and Tor Browser.
Bug 32092: Fix Tor Browser Support link in preferences
For bug 40562, we moved onionPattern* from bug 27476 to here, as
about:tor needs these files but it is included earlier.
Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one
- - - - -
d04d6223 by Henry Wilkes at 2023-09-12T19:56:58+02:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41333: Add a branding svg logo.
Copied from branding/tb-<version>/firefox.svg.
- - - - -
226d4ffe by sanketh at 2023-09-12T19:56:59+02:00
Bug 40209: Implement Basic Crypto Safety
Adds a CryptoSafety actor which detects when you've copied a crypto
address from a HTTP webpage and shows a warning.
Closes #40209.
Bug 40428: Fix string attribute names
- - - - -
adbdd0a9 by Mike Perry at 2023-09-12T19:57:00+02:00
TB3: Tor Browser's official .mozconfigs.
Also:
Add an --enable-tor-browser-data-outside-app-dir configure option
Add --with-tor-browser-version configure option
Bug 31457: disable per-installation profiles
The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.
Bug 31935: Disable profile downgrade protection.
Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.
Add --enable-tor-browser-update build option
Bug 40793: moved Tor configuration options from old-configure.in to moz.configure
Bug 41584: Move some configuration options to base-browser level
- - - - -
11aae900 by clairehurst at 2023-09-12T19:57:00+02:00
fixup! TB3: Tor Browser's official .mozconfigs.
Bug 42035: update mozconfig for macos development
- - - - -
4513efda by Henry Wilkes at 2023-09-12T19:57:01+02:00
Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
tor-browser#41285: Enable fluent warnings.
- - - - -
4321a6a1 by Pier Angelo Vendrame at 2023-09-12T19:57:02+02:00
Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Before reordering patches, we used to keep the Tor-related patches
(torbutton and tor-launcher) at the beginning.
After that issue, we decided to move them towards the end.
In addition to that, we have decided to move Tor Browser-only
preferences there, too, to make Base Browser-only fixups easier to
apply.
- - - - -
a2269326 by Henry Wilkes at 2023-09-12T19:57:03+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Bug 41333: Remove TorCheckService.
- - - - -
e57fb406 by Richard Pospesel at 2023-09-12T19:57:04+02:00
fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
- - - - -
1b87bbe4 by Pier Angelo Vendrame at 2023-09-12T19:57:04+02:00
Bug 13252: Customize profile management on macOS
On macOS we allow both portable mode and system installation.
However, in the latter case, we customize Firefox's directories to
match the hierarchy we use for the portable mode.
Also, display an informative error message if the TorBrowser-Data
directory cannot be created due to an "access denied" or a
"read only volume" error.
- - - - -
983d580a by Pier Angelo Vendrame at 2023-09-12T19:57:05+02:00
Bug 40933: Add tor-launcher functionality
Bug 41926: Reimplement the control port
- - - - -
cf7c10ac by Henry Wilkes at 2023-09-12T19:57:06+02:00
fixup! fixup! Bug 40933: Add tor-launcher functionality
Bug 41333: Remove TorCheckService.
- - - - -
a709619f by Richard Pospesel at 2023-09-12T19:57:07+02:00
Bug 40597: Implement TorSettings module
- migrated in-page settings read/write implementation from about:preferences#tor
to the TorSettings module
- TorSettings initially loads settings from the tor daemon, and saves them to
firefox prefs
- TorSettings notifies observers when a setting has changed; currently only
QuickStart notification is implemented for parity with previous preference
notify logic in about:torconnect and about:preferences#tor
- about:preferences#tor, and about:torconnect now read and write settings
thorugh the TorSettings module
- all tor settings live in the torbrowser.settings.* preference branch
- removed unused pref modify permission for about:torconnect content page from
AsyncPrefs.jsm
Bug 40645: Migrate Moat APIs to Moat.jsm module
- - - - -
131e655b by Arthur Edelstein at 2023-09-12T19:57:07+02:00
Bug 3455: Add DomainIsolator, for isolating circuit by domain.
Add an XPCOM component that registers a ProtocolProxyChannelFilter
which sets the username/password for each web request according to
url bar domain.
Bug 9442: Add New Circuit button
Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ.
Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce.
Bug 19206: Clear out the domain isolator state on `New Identity`.
Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes
Bug 21745: Fix handling of catch-all circuit
Bug 41741: Refactor the domain isolator and new circuit
- - - - -
b71a67b8 by cypherpunks1 at 2023-09-12T19:57:08+02:00
fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.
Bug 40175: Use first-party isolation on reader view
- - - - -
ee40cd27 by Henry Wilkes at 2023-09-12T19:57:09+02:00
Bug 41600: Add a tor circuit display panel.
- - - - -
2796f78e by cypherpunks1 at 2023-09-12T19:57:10+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 40175: Support circuit display on about:reader
- - - - -
6285b0f4 by Richard Pospesel at 2023-09-12T19:57:10+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 41865: Use --text-color-deemphasized rather than --panel-description-color
- - - - -
5bb5782a by Henry Wilkes at 2023-09-12T19:57:14+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42045: Allow circuit panel to grow in width for long addresses.
- - - - -
5ebb774e by Henry Wilkes at 2023-09-12T19:57:15+02:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 41980: Center-align the circuit heading.
- - - - -
cfa0c9e5 by hackademix at 2023-09-12T19:57:16+02:00
Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop
Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs
- - - - -
b2ea00f0 by Amogh Pradeep at 2023-09-12T19:57:16+02:00
Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
See Bug 1357997 for partial uplift.
Also:
Bug 28051 - Use our Orbot for proxying our connections
Bug 31144 - ESR68 Network Code Review
- - - - -
9a4f9369 by Matthew Finkel at 2023-09-12T19:57:17+02:00
Bug 25741: TBA: Disable GeckoNetworkManager
The browser should not need information related to the network
interface or network state, tor should take care of that.
- - - - -
acf9af01 by Kathy Brade at 2023-09-12T19:57:18+02:00
Bug 14631: Improve profile access error messages.
Instead of always reporting that the profile is locked, display specific
messages for "access denied" and "read-only file system".
To allow for localization, get profile-related error strings from Torbutton.
Use app display name ("Tor Browser") in profile-related error alerts.
- - - - -
b47bb406 by Pier Angelo Vendrame at 2023-09-12T19:57:19+02:00
Bug 40807: Added QRCode.js to toolkit/modules
- - - - -
904d38b3 by Richard Pospesel at 2023-09-12T19:57:19+02:00
Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
This patch adds a new about:preferences#connection page which allows
modifying bridge, proxy, and firewall settings from within Tor Browser.
All of the functionality present in tor-launcher's Network
Configuration panel is present:
- Setting built-in bridges
- Requesting bridges from BridgeDB via moat
- Using user-provided bridges
- Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies
- Setting firewall ports
- Viewing and Copying Tor's logs
- The Networking Settings in General preferences has been removed
Bug 40774: Update about:preferences page to match new UI designs
- - - - -
3b6ca157 by Richard Pospesel at 2023-09-12T19:57:20+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41977: Hide the 'Learn more' link in bridge cards
- - - - -
6d436ea0 by Henry Wilkes at 2023-09-12T19:57:21+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41812: Stop using -moz-box-flex
Fixes:
Bug 41904: Connection settings now inputs at full width.
Bug 41821: Tor logs now expand with dialog.
- - - - -
77f29d5f by Henry Wilkes at 2023-09-12T19:57:22+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 42047: Remove sizing hacks for tor dialogs. We can just wait until
DOMContentLoaded to call _populateXUL. Then the subDialog code will take
care of the sizing for us.
- - - - -
6a5de6fb by Henry Wilkes at 2023-09-12T19:57:23+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41651: Use moz-toggle for enable-bridges switch.
- - - - -
f88c53d6 by Richard Pospesel at 2023-09-12T19:57:23+02:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha
- - - - -
8f639e67 by Richard Pospesel at 2023-09-12T19:57:24+02:00
Bug 27476: Implement about:torconnect captive portal within Tor Browser
- implements new about:torconnect page as tor-launcher replacement
- adds new torconnect component to browser
- tor process management functionality remains implemented in tor-launcher through the TorProtocolService module
- adds warning/error box to about:preferences#tor when not connected to tor
Bug 40773: Update the about:torconnect frontend page to match additional UI flows.
Bug 41608: Add a toolbar status button and a urlbar "Connect" button.
- - - - -
c3bf4af5 by Henry Wilkes at 2023-09-12T19:59:53+02:00
Bug 7494: Create local home page for TBB.
Bug 41333: Update about:tor to new design. Including:
+ make the favicon match the branding icon.
+ make the location bar show a search icon.
- - - - -
af781553 by Henry Wilkes at 2023-09-12T20:00:05+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 41333: Remove TorCheckService.
- - - - -
8dbe2e8e by Henry Wilkes at 2023-09-12T20:00:06+02:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42075: Increase inline margin for the message links in about:tor.
Also increase the end margin of the emoji icon.
- - - - -
472545da by Arthur Edelstein at 2023-09-12T20:00:06+02:00
Bug 12620: TorBrowser regression tests
Regression tests for Bug #2950: Make Permissions Manager memory-only
Regression tests for TB4: Tor Browser's Firefox preference overrides.
Note: many more functional tests could be made here
Regression tests for #2874: Block Components.interfaces from content
Bug 18923: Add a script to run all Tor Browser specific tests
Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt.
- - - - -
9b08b51a by Pier Angelo Vendrame at 2023-09-12T20:00:07+02:00
Bug 41668: Tweaks to the Base Browser updater for Tor Browser
This commit was once part of "Bug 4234: Use the Firefox Update Process
for Tor Browser.".
However, some parts of it were not needed for Base Browser and some
derivative browsers.
Therefore, we extracted from that commit the parts for Tor Browser
legacy, and we add them back to the patch set with this commit.
- - - - -
1cec9df1 by Kathy Brade at 2023-09-12T20:00:08+02:00
Bug 12647: Support symlinks in the updater.
- - - - -
2d5bb859 by Kathy Brade at 2023-09-12T20:00:08+02:00
Bug 19121: reinstate the update.xml hash check
This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122.
Revert most changes from Mozilla Bug 862173 "don't verify mar file hash
when using mar signing to verify the mar file (lessens main thread I/O)."
We kept the addition to the AppConstants API in case other JS code
references it in the future.
- - - - -
b39bda1d by Kathy Brade at 2023-09-12T20:00:09+02:00
Bug 16940: After update, load local change notes.
Add an about:tbupdate page that displays the first section from
TorBrowser/Docs/ChangeLog.txt and includes a link to the remote
post-update page (typically our blog entry for the release).
Always load about:tbupdate in a content process, but implement the
code that reads the file system (changelog) in the chrome process
for compatibility with future sandboxing efforts.
Also fix bug 29440. Now about:tbupdate is styled as a fairly simple
changelog page that is designed to be displayed via a link that is on
about:tor.
- - - - -
fe8de42e by Pier Angelo Vendrame at 2023-09-12T20:00:09+02:00
fixup! Bug 16940: After update, load local change notes.
Remove the doubled and unused aboutTBUpdate.dtd
- - - - -
8530db9d by Georg Koppen at 2023-09-12T20:00:10+02:00
Bug 32658: Create a new MAR signing key
It's time for our rotation again: Move the backup key in the front
position and add a new backup key.
Bug 33803: Move our primary nightly MAR signing key to tor-browser
Bug 33803: Add a secondary nightly MAR signing key
- - - - -
d1b18a08 by Mike Perry at 2023-09-12T20:00:10+02:00
Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
eBay and Amazon don't treat Tor users very well. Accounts often get locked and
payments reversed.
Also:
Bug 16322: Update DuckDuckGo search engine
We are replacing the clearnet URL with an onion service one (thanks to a
patch by a cypherpunk) and are removing the duplicated DDG search
engine. Duplicating DDG happend due to bug 1061736 where Mozilla
included DDG itself into Firefox. Interestingly, this caused breaking
the DDG search if JavaScript is disabled as the Mozilla engine, which
gets loaded earlier, does not use the html version of the search page.
Moreover, the Mozilla engine tracked where the users were searching from
by adding a respective parameter to the search query. We got rid of that
feature as well.
Also:
This fixes bug 20809: the DuckDuckGo team has changed its server-side
code in a way that lets users with JavaScript enabled use the default
landing page while those without JavaScript available get redirected
directly to the non-JS page. We adapt the search engine URLs
accordingly.
Also fixes bug 29798 by making sure we only specify the Google search
engine we actually ship an .xml file for.
Also regression tests.
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40494: Update Startpage search provider
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40438: Add Blockchair as a search engine
Bug 33342: Avoid disconnect search addon error after removal.
We removed the addon in #32767, but it was still being loaded
from addonStartup.json.lz4 and throwing an error on startup
because its resource: location is not available anymore.
- - - - -
c81f6e41 by Alex Catarineu at 2023-09-12T20:00:11+02:00
Bug 40073: Disable remote Public Suffix List fetching
In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented
fetching the Public Suffix List via RemoteSettings and replacing the default
one at runtime, which we do not want.
- - - - -
79ed1d1a by Richard Pospesel at 2023-09-12T20:00:12+02:00
Bug 23247: Communicating security expectations for .onion
Encrypting pages hosted on Onion Services with SSL/TLS is redundant
(in terms of hiding content) as all traffic within the Tor network is
already fully encrypted. Therefore, serving HTTP pages from an Onion
Service is more or less fine.
Prior to this patch, Tor Browser would mostly treat pages delivered
via Onion Services as well as pages delivered in the ordinary fashion
over the internet in the same way. This created some inconsistencies
in behaviour and misinformation presented to the user relating to the
security of pages delivered via Onion Services:
- HTTP Onion Service pages did not have any 'lock' icon indicating
the site was secure
- HTTP Onion Service pages would be marked as unencrypted in the Page
Info screen
- Mixed-mode content restrictions did not apply to HTTP Onion Service
pages embedding Non-Onion HTTP content
This patch fixes the above issues, and also adds several new 'Onion'
icons to the mix to indicate all of the various permutations of Onion
Services hosted HTTP or HTTPS pages with HTTP or HTTPS content.
Strings for Onion Service Page Info page are pulled from Torbutton's
localization strings.
- - - - -
46d798bd by cypherpunks1 at 2023-09-12T20:00:12+02:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 41934: Treat unencrypted websocket connections to onion services as secure
- - - - -
94ba430f by Kathy Brade at 2023-09-12T20:00:13+02:00
Bug 30237: Add v3 onion services client authentication prompt
When Tor informs the browser that client authentication is needed,
temporarily load about:blank instead of about:neterror and prompt
for the user's key.
If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD
control port command to add the key (via Torbutton's control port
module) and reload the page.
If the user cancels the prompt, display the standard about:neterror
"Unable to connect" page. This requires a small change to
browser/actors/NetErrorChild.jsm to account for the fact that the
docShell no longer has the failedChannel information. The failedChannel
is used to extract TLS-related error info, which is not applicable
in the case of a canceled .onion authentication prompt.
Add a leaveOpen option to PopupNotifications.show so we can display
error messages within the popup notification doorhanger without
closing the prompt.
Add support for onion services strings to the TorStrings module.
Add support for Tor extended SOCKS errors (Tor proposal 304) to the
socket transport and SOCKS layers. Improved display of all of these
errors will be implemented as part of bug 30025.
Also fixes bug 19757:
Add a "Remember this key" checkbox to the client auth prompt.
Add an "Onion Services Authentication" section within the
about:preferences "Privacy & Security section" to allow
viewing and removal of v3 onion client auth keys that have
been stored on disk.
Also fixes bug 19251: use enhanced error pages for onion service errors.
- - - - -
2a68fa33 by Alex Catarineu at 2023-09-12T20:00:13+02:00
Bug 21952: Implement Onion-Location
Whenever a valid Onion-Location HTTP header (or corresponding HTML
<meta> http-equiv attribute) is found in a document load, we either
redirect to it (if the user opted-in via preference) or notify the
presence of an onionsite alternative with a badge in the urlbar.
- - - - -
9461ffc6 by Pier Angelo Vendrame at 2023-09-12T20:00:14+02:00
Bug 40458: Implement .tor.onion aliases
We have enabled HTTPS-Only mode, therefore we do not need
HTTPS-Everywhere anymore.
However, we want to keep supporting .tor.onion aliases (especially for
securedrop).
Therefore, in this patch we implemented the parsing of HTTPS-Everywhere
rulesets, and the redirect of .tor.onion domains.
Actually, Tor Browser believes they are actual domains. We change them
on the fly on the SOCKS proxy requests to resolve the domain, and on
the code that verifies HTTPS certificates.
- - - - -
9a6e2288 by Richard Pospesel at 2023-09-12T20:00:14+02:00
fixup! Bug 40458: Implement .tor.onion aliases
Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha
- - - - -
fdbd270f by Pier Angelo Vendrame at 2023-09-12T20:00:15+02:00
Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
This patch associates the about:manual page to a translated page that
must be injected to browser/omni.ja after the build.
The content must be placed in chrome/browser/content/browser/manual/, so
that is then available at chrome://browser/content/manual/.
We preferred giving absolute freedom to the web team, rather than having
to change the patch in case of changes on the documentation.
- - - - -
82ef4de1 by Henry Wilkes at 2023-09-12T20:00:20+02:00
fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
Bug 41333: Use fluent for manual menu entry since we're no longer using aboutTor.dtd.
- - - - -
2f170f83 by Pier Angelo Vendrame at 2023-09-12T20:00:20+02:00
Bug 41435: Add a Tor Browser migration function
For now this function only deletes old language packs for which we are
already packaging the strings with the application.
- - - - -
539abcb9 by Dan Ballard at 2023-09-12T20:00:21+02:00
Bug 40701: Add security warning when downloading a file
Shown in the downloads panel, about:downloads and places.xhtml.
- - - - -
58aa0c80 by Richard Pospesel at 2023-09-12T20:00:21+02:00
fixup! Bug 40701: Add security warning when downloading a file
Bug 41971: Update Tails URL in downloads warning
- - - - -
c5c67e4d by Henry Wilkes at 2023-09-12T20:00:22+02:00
fixup! Bug 40701: Add security warning when downloading a file
Bug 41886: Fix downloads panel warning size.
- - - - -
3d7964d8 by Henry Wilkes at 2023-09-12T20:00:22+02:00
Bug 41736: Customize toolbar for tor-browser.
- - - - -
edd247f4 by hackademix at 2023-09-12T20:00:23+02:00
Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key
- - - - -
9554eaa9 by Henry Wilkes at 2023-09-12T20:00:23+02:00
Customize moz-toggle for tor-browser.
- - - - -
4786f6b5 by Henry Wilkes at 2023-09-12T20:00:24+02:00
fixup! Customize moz-toggle for tor-browser.
Bug 41651: Use moz-toggle for enable-bridges switch.
- - - - -
faeaeb02 by Henry Wilkes at 2023-09-12T20:03:09+02:00
Bug 42072: 2023 year end campaign for about:tor.
- - - - -
30 changed files:
- .eslintignore
- .gitignore
- + .gitlab/issue_templates/Backport Android Security Fixes.md
- + .gitlab/issue_templates/Rebase Browser - Alpha.md
- + .gitlab/issue_templates/Rebase Browser - Stable.md
- + .gitlab/issue_templates/UXBug.md
- + .gitlab/issue_templates/bug.md
- + .gitlab/merge_request_templates/default.md
- accessible/android/SessionAccessibility.cpp
- accessible/android/SessionAccessibility.h
- accessible/ipc/DocAccessibleParent.cpp
- accessible/ipc/DocAccessibleParent.h
- accessible/ipc/moz.build
- + browser/actors/AboutTBUpdateChild.jsm
- + browser/actors/AboutTBUpdateParent.jsm
- + browser/actors/CryptoSafetyChild.jsm
- + browser/actors/CryptoSafetyParent.jsm
- − browser/actors/RFPHelperChild.sys.mjs
- − browser/actors/RFPHelperParent.sys.mjs
- browser/actors/moz.build
- browser/app/Makefile.in
- browser/app/macbuild/Contents/Info.plist.in
- browser/app/macbuild/Contents/MacOS-files.in
- browser/app/permissions
- + browser/app/profile/000-tor-browser.js
- + browser/app/profile/001-base-profile.js
- browser/app/profile/firefox.js
- browser/base/content/aboutDialog-appUpdater.js
- browser/base/content/aboutDialog.js
- browser/base/content/aboutDialog.xhtml
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3948f8…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3948f8…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Updated gitlab alpha build prep templates
by richard (@richard) 12 Sep '23
by richard (@richard) 12 Sep '23
12 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
600cbac2 by Richard Pospesel at 2023-09-12T17:36:15+00:00
Updated gitlab alpha build prep templates
- fixed formatting
- updated email templates
- updated changelog steps
- updated the build+reproducibility veificaiton workflow
- added explicit list of valid taggers
- added assign step for signers
- added Sponsor 131 label for Mullvad Browser
- various work-flows to match reality
- - - - -
2 changed files:
- .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
- .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
Changes:
=====================================
.gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
=====================================
@@ -27,54 +27,79 @@
</details>
**NOTE** It is assumed that the `tor-browser` alpha rebase and security backport tasks have been completed
+**NOTE** This can/is often done in conjunction with the equivalent Tor Browser release prep issue
<details>
<summary>Building</summary>
-### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git
-Mullvad Browser Alpha (and Nightly) are on the `main` branch
-
-- [ ] Update `rbm.conf`
- - [ ] `var/torbrowser_version` : update to next version
- - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)`
- - [ ] `var/torbrowser_incremental_from` : update to previous Desktop version
- - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail
-- [ ] Update build configs
- - [ ] Update `projects/firefox/config`
- - [ ] `browser_build` : update to match `mullvad-browser` tag
- - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
- - [ ] Update `projects/translation/config`:
- - [ ] run `make list_translation_updates-alpha` to get updated hashes
- - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
- - [ ] `steps/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch
-- [ ] Update common build configs
- - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript
- - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config`
- - [ ] `URL`
- - [ ] `sha256sum`
- - [ ] Check for uBlock-origin updates here : https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/
- - [ ] ***(Optional)*** If new version available, update `ublock-origin` section of `input_files` in `projects/browser/config`
- - [ ] `URL`
- - [ ] `sha256sum`
- - [ ] Check for Mullvad Privacy Companion updates here : https://github.com/mullvad/browser-extension/releases
- - [ ] ***(Optional)*** If new version available, update `mullvad-extension` section of `input_files` in `projects/browser/config`
- - [ ] `URL`
- - [ ] `sha256sum`
-- [ ] Open MR with above changes
-- [ ] Merge
-- [ ] Sign/Tag commit: `make mullvadbrowser-signtag-alpha`
-- [ ] Push tag to `origin`
-- [ ] Begin build on `$(BUILD_SERVER)` (fix any issues in subsequent MRs)
-- [ ] **TODO** Submit build-tag to Mullvad build infra
-- [ ] Ensure builders have matching builds
+ ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git
+ Mullvad Browser Alpha (and Nightly) are on the `main` branch
+
+ - [ ] Update `rbm.conf`
+ - [ ] `var/torbrowser_version` : update to next version
+ - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)`
+ - [ ] `var/torbrowser_incremental_from` : update to previous Desktop version
+ - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update
+ - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail
+ - [ ] Update build configs
+ - [ ] Update `projects/firefox/config`
+ - [ ] `browser_build` : update to match `mullvad-browser` tag
+ - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
+ - [ ] Update `projects/translation/config`:
+ - [ ] run `make list_translation_updates-alpha` to get updated hashes
+ - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
+ - [ ] `steps/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch
+ - [ ] Update common build configs
+ - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript
+ - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config`
+ - [ ] `URL`
+ - [ ] `sha256sum`
+ - [ ] Check for uBlock-origin updates here : https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/
+ - [ ] ***(Optional)*** If new version available, update `ublock-origin` section of `input_files` in `projects/browser/config`
+ - [ ] `URL`
+ - [ ] `sha256sum`
+ - [ ] Check for Mullvad Privacy Companion updates here : https://github.com/mullvad/browser-extension/releases
+ - [ ] ***(Optional)*** If new version available, update `mullvad-extension` section of `input_files` in `projects/browser/config`
+ - [ ] `URL`
+ - [ ] `sha256sum`
+ - [ ] Update `ChangeLog-MB.txt`
+ - [ ] Ensure ChangeLog-MB.txt is sync'd between alpha and stable branches
+ - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones
+ - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'`
+ - Make sure you have `requests` installed (e.g., `apt install python3-requests`)
+ - The first time you run this script you will need to generate an access token; the script will guide you
+ - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and update its output
+ - [ ] Version
+ - [ ] Browser Name
+ - [ ] Release Date
+ - [ ] Under `All Platforms` include any version updates for:
+ - NoScript
+ - uBlock-origin
+ - Mullvad Browser Extension
+ - Firefox
+ - [ ] Open MR with above changes
+ - [ ] Build the MR after initial review on at least two of:
+ - [ ] Tor Project build machine
+ - [ ] Mullvad build machine
+ - [ ] Local developer machine
+ - [ ] Ensure builders have matching builds
+ - [ ] Merge
+ - [ ] Sign+Tag
+ - **NOTE** this must be done by one of:
+ - boklm
+ - dan
+ - ma1
+ - pierov
+ - richard
+ - [ ] Run: `make mullvadbrowser-signtag-alpha`
+ - [ ] Push tag to `origin`
</details>
<details>
<summary>QA</summary>
-### send the build
-
+ ### send the build
- [ ] Email Mullvad QA: support(a)mullvad.net, rui(a)mullvad.net
<details>
<summary>email template</summary>
@@ -83,7 +108,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (unsigned)
Body:
- unsigned builds: https://tb-build-05.torproject.org/~$(BUILDER)/builds/mullvadbrowser/releas…
+ unsigned builds: https://tb-build-05.torproject.org/~$(BUILDER)/builds/mullvadbrowser/alpha/…
changelog:
...
@@ -99,97 +124,106 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
<details>
<summary>Signing</summary>
-### signing
-- [ ] On `$(STAGING_SERVER)`, ensure updated:
- - [ ] `tor-browser-build/tools/signing/set-config.hosts`
- - `ssh_host_builder` : ssh hostname of machine with unsigned builds
- - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory)
- - `ssh_host_linux_signer` : ssh hostname of linux signing machine
- - `ssh_host_macos_signer` : ssh hostname of macOS signing machine
- - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization`
- - `macos_notarization_user` : the email login for a mullvad notariser Apple Developer account
- - [ ] `set-config.update-responses`
- - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/mullvad-browser-update-responses.git`
- - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
- - `tbb_version` : mullvad browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
- - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
- - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases
-- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script:
- - `cd tor-browser-build/tools/signing/`
- - `./macos-signer-proxy`
-- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050
-- [ ] run do-all-signing script:
- - `cd tor-browser-build/tools/signing/`
- - `./do-all-signing.mullvadbrowser`
-- **NOTE**: at this point the signed binaries should have been copied to `staticiforme`
-- [ ] Update `staticiforme.torproject.org`:
- - From `screen` session on `staticiforme.torproject.org`:
- - [ ] Static update components : `static-update-component dist.torproject.org`
- - [ ] Remove old release data from `/srv/dist-master.torproject.org/htdocs/mullvadbrowser`
- - [ ] Static update components (again) : `static-update-component dist.torproject.org`
+ ### signing
+ - [ ] Assign this issue to the signer, one of:
+ - boklm
+ - richard
+ - [ ] On `$(STAGING_SERVER)`, ensure updated:
+ - [ ] `tor-browser-build/tools/signing/set-config.hosts`
+ - `ssh_host_builder` : ssh hostname of machine with unsigned builds
+ - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory)
+ - `ssh_host_linux_signer` : ssh hostname of linux signing machine
+ - `ssh_host_macos_signer` : ssh hostname of macOS signing machine
+ - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization`
+ - `macos_notarization_user` : the email login for a mullvad notariser Apple Developer account
+ - [ ] `set-config.update-responses`
+ - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/mullvad-browser-update-responses.git`
+ - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
+ - `tbb_version` : mullvad browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
+ - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
+ - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases
+ - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script:
+ - `cd tor-browser-build/tools/signing/`
+ - `./macos-signer-proxy`
+ - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050
+ - [ ] run do-all-signing script:
+ - `cd tor-browser-build/tools/signing/`
+ - `./do-all-signing.mullvadbrowser`
+ - **NOTE**: at this point the signed binaries should have been copied to `staticiforme`
+ - [ ] Update `staticiforme.torproject.org`:
+ - From `screen` session on `staticiforme.torproject.org`:
+ - [ ] Static update components : `static-update-component dist.torproject.org`
+ - [ ] Remove old release data from `/srv/dist-master.torproject.org/htdocs/mullvadbrowser`
+ - [ ] Static update components (again) : `static-update-component dist.torproject.org`
</details>
<details>
<summary>Publishing</summary>
-### email
-
-- [ ] Email Mullvad with release information: support(a)mullvad.net, rui(a)mullvad.net
- <details>
- <summary>email template</summary>
-
- Subject:
- New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (signed)
-
- Body:
- signed builds: https://dist.torproject.org/mullvadbrowser/$(MULLVAD_BROWSER_VERSION)
+ ### mullvad-browser (github): https://github.com/mullvad/mullvad-browser/
+ - [ ] Assign this issue to someone with mullvad commit access, one of:
+ - richard
+ - [ ] Push this release's associated `mullvad-browser.git` branch to github
+ - [ ] Push this release's associated tags to github:
+ - [ ] Firefox ESR tag
+ - **example** : `FIREFOX_102_12_0esr_BUILD1,`
+ - [ ] `base-browser` tag
+ - **example** : `base-browser-102.12.0esr-12.0-1-build1`
+ - [ ] `mullvad-browser` tag
+ - **example** : `mullvad-browser-102.12.0esr-12.0-1-build1`
+ - [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build:
+ - **Tag**: `$(MULLVAD_BROWSER_VERSION)`
+ - **example** : `12.5a7`
+ - **Message**: `$(ESR_VERSION)esr-based $(MULLVAD_BROWSER_VERSION)`
+ - **example** : `102.12.0esr-based 12.5a7`
+ - [ ] Push tag to github
+
+ ### email
+ - [ ] Email Mullvad with release information: support(a)mullvad.net, rui(a)mullvad.net
+ <details>
+ <summary>email template</summary>
- update_response hashes: $(MULLVAD_UPDATE_RESPONSES_HASH)
+ Subject:
+ New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (signed)
- changelog:
- ...
+ Body:
+ signed builds: https://dist.torproject.org/mullvadbrowser/$(MULLVAD_BROWSER_VERSION)
- </details>
+ update_response hashes: $(MULLVAD_UPDATE_RESPONSES_HASH)
-### mullvad-browser (github): https://github.com/mullvad/mullvad-browser/
-- [ ] Push this release's associated `mullvad-browser.git` branch to github
-- [ ] Push this release's associated tags to github:
- - [ ] Firefox ESR tag
- - **example** : `FIREFOX_102_12_0esr_BUILD1,`
- - [ ] `base-browser` tag
- - **example** : `base-browser-102.12.0esr-12.0-1-build1`
- - [ ] `mullvad-browser` tag
- - **example** : `mullvad-browser-102.12.0esr-12.0-1-build1`
-- [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build:
- - **Tag**: `$(MULLVAD_BROWSER_VERSION)`
- - **example** : `12.5a7`
- - **Message**: `$(ESR_VERSION)esr-based $(MULLVAD_BROWSER_VERSION)`
- - **example** : `102.12.0esr-based 12.5a7`
- - [ ] Push tag to github
+ changelog:
+ ...
+ </details>
</details>
<details>
<summary>Downstream</summary>
-### notify packagers
+ ### notify packagers
+
+ - [ ] **(Optional, Once Mullvad Updates their Github Releases Page)** Email downstream consumers:
+ - **NOTE**: This is an optional step and only necessary close a major release/transition from alpha to stable, or if there are major packing changes these developers need to be aware of
+ <details>
+ <summary>email template</summary>
+
+ Hello!
-- [ ] **(Optional, Once Mullvad Updates their Github Releases Page)** Email downstream consumers:
- <details>
- <summary>email template</summary>
+ Mullvad-Browser $(MULLVAD_BROWSER_VERSION) packages are available, so you should all update your respective downstream packages.
- ...
+ Release builds can be found here:
- ...
+ - https://github.com/mullvad/mullvad-browser/releases/tag/$(MULLVAD_BROWSER_V…
- </details>
+ </details>
- - **NOTE**: This is an optional step and only necessary close a major release/transition from alpha to stable, or if there are major packing changes these developers need to be aware of
- - [ ] flathub package maintainer: proletarius101(a)protonmail.com
- - [ ] arch package maintainer: bootctl(a)gmail.com
- - [ ] nixOS package maintainer: dev(a)felschr.com
+ - flathub package maintainer: proletarius101(a)protonmail.com
+ - arch package maintainer: bootctl(a)gmail.com
+ - nixOS package maintainer: dev(a)felschr.com
</details>
/label ~"Release Prep"
+/label ~"Sponsor 131"
+
=====================================
.gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
=====================================
@@ -27,190 +27,208 @@
</details>
**NOTE** It is assumed that the `tor-browser` stable rebase and security backport tasks have been completed
+**NOTE** This can/is often done in conjunction with the equivalent Mullvad Browser release prep issue
<details>
<summary>Building</summary>
-### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git
-Tor Browser Alpha (and Nightly) are on the `main` branch
-
-- [ ] Update `rbm.conf`
- - [ ] `var/torbrowser_version` : update to next version
- - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)`
- - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version
- - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail
-- [ ] Update Desktop-specific build configs
- - [ ] Update `projects/firefox/config`
- - [ ] `browser_build` : update to match `tor-browser` tag
- - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
- - [ ] Update `projects/translation/config`:
- - [ ] run `make list_translation_updates-alpha` to get updated hashes
- - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
- - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch
- - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch
-- [ ] Update Android-specific build configs
- - [ ] Update `projects/geckoview/config`
- - [ ] `browser_build` : update to match `tor-browser` tag
- - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased
- - [ ] ***(Optional)*** Update `projects/tor-android-service/config`
- - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch
- - [ ] ***(Optional)*** Update `projects/application-services/config`:
- **NOTE** we don't currently have any of our own patches for this project
- - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)`
- - [ ] ***(Optional)*** Update `projects/firefox-android/config`:
- - [ ] `fenix_version` : update to match alpha `firefox-android` build tag
- - [ ] `browser_branch` : update to match alpha `firefox-android` build tag
- - [ ] Update allowed_addons.json by running (from `tor-browser-build` root):
- - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json`
-- [ ] Update common build configs
- - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript
- - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config`
- - [ ] `URL`
- - [ ] `sha256sum`
- - [ ] Check for OpenSSL updates here : https://www.openssl.org/source/
- - [ ] ***(Optional)*** If new 3.0.X version available, update `projects/openssl/config`
- - [ ] `version` : update to next 3.0.X version
- - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball
- - [ ] Check for zlib updates here: https://github.com/madler/zlib/releases
- - [ ] **(Optional)** If new tag available, update `projects/zlib/config`
- - [ ] `version` : update to next release tag
- - [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags
- - [ ] ***(Optional)*** Update `projects/tor/config`
- - [ ] `version` : update to latest `-alpha` tag or release tag if newer (ping dgoulet or ahf if unsure)
- - [ ] Check for go updates here : https://golang.org/dl
- - **NOTE** : Tor Browser Alpha uses the latest Stable major series go version
- - [ ] ***(Optional)*** Update `projects/go/config`
- - [ ] `version` : update go version
- - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page)
- - [ ] Check for manual updates by running (from `tor-browser-build` root): `./tools/fetch-manual.py`
- - [ ] ***(Optional)*** If new version is available:
- - [ ] Upload the downloaded `manual_$PIPELINEID.zip` file to people.tpo
- - [ ] Update `projects/manual/config`:
- - [ ] Change the `version` to `$PIPELINEID`
- - [ ] Update `sha256sum` in the `input_files` section
- - [ ] ***(Optional)*** Update the URL if you have uploaded to a different people.tpo home
-- [ ] Update `ChangeLog.txt`
- - [ ] Ensure ChangeLog.txt is sync'd between alpha and stable branches
- - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones
- - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'`
- - Make sure you have `requests` installed (e.g., `apt install python3-requests`)
- - The first time you run this script you will need to generate an access token; the script will guide you
- - [ ] Copy the output of the script to the beginning of `ChangeLog.txt` and adjust its output
- - **NOTE** : If you used the issue number, you will need to write the Tor Browser version manually
- - [ ] ***(Optional)*** Under `All Platforms` include any version updates for:
- - [ ] Translations
- - [ ] OpenSSL
- - [ ] NoScript
- - [ ] zlib
- - [ ] tor daemon
- - [ ] ***(Optional)*** Under `Windows + macOS + Linux` include updates for:
- - [ ] Firefox
- - [ ] ***(Optional)*** Under `Android`, include updates for:
- - [ ] Geckoview
- - [ ] ***(Optional)*** Under `Build System/All Platforms` include updates for:
- - [ ] Go
-- [ ] Open MR with above changes
-- [ ] Merge
-- [ ] Sign/Tag commit: `make torbrowser-signtag-alpha`
-- [ ] Push tag to `origin`
-- [ ] Begin build on `$(BUILD_SERVER)` (fix any issues in subsequent MRs)
-- [ ] **TODO** Submit build-tag to Mullvad build infra
-- [ ] Ensure builders have matching builds
+ ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git
+ Tor Browser Alpha (and Nightly) are on the `main` branch
+
+ - [ ] Update `rbm.conf`
+ - [ ] `var/torbrowser_version` : update to next version
+ - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)`
+ - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version
+ - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update
+ - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail
+ - [ ] Update Desktop-specific build configs
+ - [ ] Update `projects/firefox/config`
+ - [ ] `browser_build` : update to match `tor-browser` tag
+ - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
+ - [ ] Update `projects/translation/config`:
+ - [ ] run `make list_translation_updates-alpha` to get updated hashes
+ - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
+ - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch
+ - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch
+ - [ ] Update Android-specific build configs
+ - [ ] Update `projects/geckoview/config`
+ - [ ] `browser_build` : update to match `tor-browser` tag
+ - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased
+ - [ ] ***(Optional)*** Update `projects/tor-android-service/config`
+ - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch
+ - [ ] ***(Optional)*** Update `projects/application-services/config`:
+ **NOTE** we don't currently have any of our own patches for this project
+ - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)`
+ - [ ] ***(Optional)*** Update `projects/firefox-android/config`:
+ - [ ] `fenix_version` : update to match alpha `firefox-android` build tag
+ - [ ] `browser_branch` : update to match alpha `firefox-android` build tag
+ - [ ] Update allowed_addons.json by running (from `tor-browser-build` root):
+ - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json`
+ - [ ] Update common build configs
+ - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript
+ - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config`
+ - [ ] `URL`
+ - [ ] `sha256sum`
+ - [ ] Check for OpenSSL updates here : https://www.openssl.org/source/
+ - [ ] ***(Optional)*** If new 3.0.X version available, update `projects/openssl/config`
+ - [ ] `version` : update to next 3.0.X version
+ - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball
+ - [ ] Check for zlib updates here: https://github.com/madler/zlib/releases
+ - [ ] **(Optional)** If new tag available, update `projects/zlib/config`
+ - [ ] `version` : update to next release tag
+ - [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags
+ - [ ] ***(Optional)*** Update `projects/tor/config`
+ - [ ] `version` : update to latest `-alpha` tag or release tag if newer (ping dgoulet or ahf if unsure)
+ - [ ] Check for go updates here : https://golang.org/dl
+ - **NOTE** : Tor Browser Alpha uses the latest Stable major series go version
+ - [ ] ***(Optional)*** Update `projects/go/config`
+ - [ ] `version` : update go version
+ - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page)
+ - [ ] Check for manual updates by running (from `tor-browser-build` root): `./tools/fetch-manual.py`
+ - [ ] ***(Optional)*** If new version is available:
+ - [ ] Upload the downloaded `manual_$PIPELINEID.zip` file to people.tpo
+ - [ ] Update `projects/manual/config`:
+ - [ ] Change the `version` to `$PIPELINEID`
+ - [ ] Update `sha256sum` in the `input_files` section
+ - [ ] ***(Optional)*** Update the URL if you have uploaded to a different people.tpo home
+ - [ ] Update `ChangeLog-TBB.txt`
+ - [ ] Ensure ChangeLog-TBB.txt is sync'd between alpha and stable branches
+ - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones
+ - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'`
+ - Make sure you have `requests` installed (e.g., `apt install python3-requests`)
+ - The first time you run this script you will need to generate an access token; the script will guide you
+ - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and update its output
+ - [ ] Version
+ - [ ] Browser Name
+ - [ ] Release Date
+ - [ ] Under `All Platforms` include any version updates for:
+ - NoScript
+ - tor
+ - OpenSSL
+ - lyrebird
+ - Snowflake
+ - [ ] Under `Windows + macOS + Linux` include any version updates for:
+ - Firefox
+ - [ ] Under `Android` include any version updates for:
+ - Geckoview
+ - [ ] Under `Windows + Android` include any version updates for:
+ - zlib
+ - [ ] Under `Build System/All Platforms` include any version updates for:
+ - Go
+ - [ ] Open MR with above changes
+ - [ ] Build the MR after initial review on at least two of:
+ - [ ] Tor Project build machine
+ - [ ] Mullvad build machine
+ - [ ] Local developer machine
+ - [ ] Ensure builders have matching builds
+ - [ ] Merge
+ - [ ] Sign_Tag
+ - **NOTE** this must be done by one of:
+ - boklm
+ - dan
+ - ma1
+ - pierov
+ - richard
+ - [ ] Run: `make torbrowser-signtag-alpha`
+ - [ ] Push tag to `origin`
</details>
<details>
<summary>Communications</summary>
-### notify stakeholders
+ ### notify stakeholders
- <details>
- <summary>email template</summary>
+ - [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org
+ <details>
+ <summary>email template</summary>
- Subject:
- Tor Browser $(TOR_BROWSER_VERION) (Android, Windows, macOS, Linux)
+ Subject:
+ Tor Browser $(TOR_BROWSER_VERION) (Android, Windows, macOS, Linux)
- Body:
- Hello All,
+ Body:
+ Hello All,
- Unsigned Tor Browser $(TOR_BROWSER_VERSION) alpha candidate builds are now available for testing:
+ Unsigned Tor Browser $(TOR_BROWSER_VERSION) alpha candidate builds are now available for testing:
- - https://tb-build-05.torproject.org/~$(BUILDER)/builds/release/unsigned/$(TO…
+ - https://tb-build-05.torproject.org/~$(BUILDER)/builds/alpha/unsigned/$(TOR_…
- The full changelog can be found here:
+ The full changelog can be found here:
- - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/blob/$(T…
+ - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$(TB…
- </details>
+ </details>
-- [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org
- - ***(Optional)*** Additional information:
- - [ ] Note any new functionality which needs testing
- - [ ] Link to any known issues
-- [ ] ***(Optional, only around build/packaging changes)*** Email packagers:
- - Recipients:
- - Tails dev mailing list: tails-dev(a)boum.org
- - Guardian Project: nathan(a)guardianproject.info
- - torbrowser-launcher: micah(a)micahflee.com
- - FreeBSD port: freebsd(a)sysctl.cz <!-- Gitlab user maxfx -->
- - OpenBSD port: caspar(a)schutijser.com <!-- Gitlab user cschutijser -->
- - [ ] Note any changes which may affect packaging/downstream integration
-- [ ] Email external partners:
- - ***(Optional, after ESR migration)*** Cloudflare: ask-research(a)cloudflare.com
- - **NOTE** : We need to provide them with updated user agent string so they can update their internal machinery to prevent Tor Browser users from getting so many CAPTCHAs
+ - ***(Optional)*** Additional information:
+ - [ ] Note any new functionality which needs testing
+ - [ ] Link to any known issues
+ - [ ] ***(Optional, only around build/packaging changes)*** Email packagers:
+ - Recipients:
+ - Tails dev mailing list: tails-dev(a)boum.org
+ - Guardian Project: nathan(a)guardianproject.info
+ - torbrowser-launcher: micah(a)micahflee.com
+ - FreeBSD port: freebsd(a)sysctl.cz <!-- Gitlab user maxfx -->
+ - OpenBSD port: caspar(a)schutijser.com <!-- Gitlab user cschutijser -->
+ - [ ] Note any changes which may affect packaging/downstream integration
+ - [ ] Email external partners:
+ - ***(Optional, after ESR migration)*** Cloudflare: ask-research(a)cloudflare.com
+ - **NOTE** : We need to provide them with updated user agent string so they can update their internal machinery to prevent Tor Browser users from getting so many CAPTCHAs
</details>
<details>
<summary>Signing</summary>
-### signing
-- **NOTE** : In practice, it's most efficient to have the blog post and website updates ready to merge, since signing doesn't take very long
-- [ ] On `$(STAGING_SERVER)`, ensure updated:
- - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N) && git checkout tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N)`
- - [ ] `tor-browser-build/tools/signing/set-config.hosts`
- - `ssh_host_builder` : ssh hostname of machine with unsigned builds
- - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory)
- - `ssh_host_linux_signer` : ssh hostname of linux signing machine
- - `ssh_host_macos_signer` : ssh hostname of macOS signing machine
- - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization`
- - `macos_notarization_user` : the email login for a tor notariser Apple Developer account
- - [ ] `set-config.update-responses`
- - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git`
- - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
- - `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
- - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
- - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases
-- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script:
- - `cd tor-browser-build/tools/signing/`
- - `./macos-signer-proxy`
-- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050
-- [ ] run do-all-signing script:
- - `cd tor-browser-build/tools/signing/`
- - `./do-all-signing.torbrowser`
-- **NOTE**: at this point the signed binaries should have been copied to `staticiforme`
-- [ ] Update `staticiforme.torproject.org`:
- - From `screen` session on `staticiforme.torproject.org`:
- - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org`
- - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-alpha.sh`
- - [ ] Remove old release data from following places:
- - **NOTE** : Skip this step if we need to hold on to older versions for some reason (for example, this is an Andoid or Desktop-only release, or if we need to hold back installers in favor of build-to-build updates if there are signing issues, etc)
- - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser`
- - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser`
- - [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org`
-- [ ] Publish APKs to Google Play:
- - Log into https://play.google.com/apps/publish
- - Select `Tor Browser (Alpha)` app
- - Navigate to `Release > Production` and click `Create new release` button:
- - Upload the `*.multi.apk` APKs
- - Update Release Name to Tor Browser version number
- - Update Release Notes
- - Next to 'Release notes', click `Copy from a previous release`
- - Edit blog post url to point to most recent blog post
- - Save, review, and configure rollout percentage
- - [ ] 25% rollout when publishing a scheduled update
- - [ ] 100% rollout when publishing a security-driven release
- - [ ] Update rollout percentage to 100% after confirmed no major issues
+ ### signing
+ - **NOTE** : In practice, it's most efficient to have the blog post and website updates ready to merge, since signing doesn't take very long
+ - [ ] Assign this issue to the signer, one of:
+ - boklm
+ - richard
+ - [ ] On `$(STAGING_SERVER)`, ensure updated:
+ - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N) && git checkout tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N)`
+ - [ ] `tor-browser-build/tools/signing/set-config.hosts`
+ - `ssh_host_builder` : ssh hostname of machine with unsigned builds
+ - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory)
+ - `ssh_host_linux_signer` : ssh hostname of linux signing machine
+ - `ssh_host_macos_signer` : ssh hostname of macOS signing machine
+ - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization`
+ - `macos_notarization_user` : the email login for a tor notariser Apple Developer account
+ - [ ] `set-config.update-responses`
+ - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git`
+ - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
+ - `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
+ - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
+ - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases
+ - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script:
+ - `cd tor-browser-build/tools/signing/`
+ - `./macos-signer-proxy`
+ - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050
+ - [ ] run do-all-signing script:
+ - `cd tor-browser-build/tools/signing/`
+ - `./do-all-signing.torbrowser`
+ - **NOTE**: at this point the signed binaries should have been copied to `staticiforme`
+ - [ ] Update `staticiforme.torproject.org`:
+ - From `screen` session on `staticiforme.torproject.org`:
+ - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org`
+ - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-alpha.sh`
+ - [ ] Remove old release data from following places:
+ - **NOTE** : Skip this step if we need to hold on to older versions for some reason (for example, this is an Andoid or Desktop-only release, or if we need to hold back installers in favor of build-to-build updates if there are signing issues, etc)
+ - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser`
+ - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser`
+ - [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org`
+ - [ ] Publish APKs to Google Play:
+ - Log into https://play.google.com/apps/publish
+ - Select `Tor Browser (Alpha)` app
+ - Navigate to `Release > Production` and click `Create new release` button:
+ - Upload the `*.multi.apk` APKs
+ - Update Release Name to Tor Browser version number
+ - Update Release Notes
+ - Next to 'Release notes', click `Copy from a previous release`
+ - Edit blog post url to point to most recent blog post
+ - Save, review, and configure rollout percentage
+ - [ ] 25% rollout when publishing a scheduled update
+ - [ ] 100% rollout when publishing a security-driven release
+ - [ ] Update rollout percentage to 100% after confirmed no major issues
</details>
@@ -219,83 +237,86 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
<details>
<summary>Check whether the .exe files got properly signed and timestamped</summary>
- ```
- # Point OSSLSIGNCODE to your osslsigncode binary
- pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION
- OSSLSIGNCODE=/path/to/osslsigncode
- ../../../tools/authenticode_check.sh
- popd
- ```
+
+```bash
+# Point OSSLSIGNCODE to your osslsigncode binary
+pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION
+OSSLSIGNCODE=/path/to/osslsigncode
+../../../tools/authenticode_check.sh
+popd
+```
+
</details>
<details>
<summary>Check whether the MAR files got properly signed</summary>
- ```
- # Point NSSDB to your nssdb containing the mar signing certificate
- # Point SIGNMAR to your signmar binary
- # Point LD_LIBRARY_PATH to your mar-tools directory
- pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION
- NSSDB=/path/to/nssdb
- SIGNMAR=/path/to/mar-tools/signmar
- LD_LIBRARY_PATH=/path/to/mar-tools/
- ../../../tools/marsigning_check.sh
- popd
- ```
+
+```bash
+# Point NSSDB to your nssdb containing the mar signing certificate
+# Point SIGNMAR to your signmar binary
+# Point LD_LIBRARY_PATH to your mar-tools directory
+pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION
+NSSDB=/path/to/nssdb
+SIGNMAR=/path/to/mar-tools/signmar
+LD_LIBRARY_PATH=/path/to/mar-tools/
+../../../tools/marsigning_check.sh
+popd
+```
+
</details>
</details>
<details>
<summary>Publishing</summary>
-### website: https://gitlab.torproject.org/tpo/web/tpo.git
-- [ ] `databags/versions.ini` : Update the downloads versions
- - `torbrowser-stable/version` : sort of a catch-all for latest stable version
- - `torbrowser-alpha/version` : sort of a catch-all for latest stable version
- - `torbrowser-*-stable/version` : platform-specific stable versions
- - `torbrowser-*-alpha/version` : platform-specific alpha versions
- - `tor-stable`,`tor-alpha` : set by tor devs, do not touch
-- [ ] Push to origin as new branch, open 'Draft :' MR
-- [ ] Remove `Draft:` from MR once signed-packages are uploaded
-- [ ] Merge
-- [ ] Publish after CI passes and builds are published
-
-### blog: https://gitlab.torproject.org/tpo/web/blog.git
-
-- [ ] Duplicate previous Stable or Alpha release blog post as appropriate to new directory under `content/blog/new-release-tor-browser-$(TOR_BROWSER_VERSION)` and update with info on release :
- - [ ] Run `tools/signing/create-blog-post` which should create the new blog post from a template (edit set-config.blog to set you local blog directory)
- - [ ] Update Tor Browser version numbers
- - [ ] Note any ESR rebase
- - [ ] Link to any Firefox security updates from ESR upgrade
- - [ ] Link to any Android-specific security backports
- - [ ] Note any updates to :
- - tor
- - OpenSSL
- - NoScript
- - [ ] Convert ChangeLog.txt to markdown format used here by :
- - `tor-browser-build/tools/changelog-format-blog-post`
-- [ ] Push to origin as new branch, open `Draft:` MR
-- [ ] Remove `Draft:` from MR once signed-packages are uploaded
-- [ ] Merge
-- [ ] Publish after CI passes and website has been updated
-
-### tor-announce mailing list
- <details>
- <summary>email template</summary>
-
- Subject:
- New Release: Tor Browser $(TOR_BROWSER_VERSION) (Android, Windows, macOS, Linux)
-
- Body:
- Hi everyone,
-
- Tor Browser $(TOR_BROWSER_VERSION) has now been published for all platforms. For details please see our blog post:
-
- - $(BLOG_POST_URL)
-
- </details>
-
-- [ ] Email tor-announce mailing list: tor-announce(a)lists.torproject.org
- - **(Optional)** Additional information:
- - [ ] Link to any known issues
+ ### website: https://gitlab.torproject.org/tpo/web/tpo.git
+ - [ ] `databags/versions.ini` : Update the downloads versions
+ - `torbrowser-stable/version` : sort of a catch-all for latest stable version
+ - `torbrowser-alpha/version` : sort of a catch-all for latest stable version
+ - `torbrowser-*-stable/version` : platform-specific stable versions
+ - `torbrowser-*-alpha/version` : platform-specific alpha versions
+ - `tor-stable`,`tor-alpha` : set by tor devs, do not touch
+ - [ ] Push to origin as new branch, open 'Draft :' MR
+ - [ ] Remove `Draft:` from MR once signed-packages are uploaded
+ - [ ] Merge
+ - [ ] Publish after CI passes and builds are published
+
+ ### blog: https://gitlab.torproject.org/tpo/web/blog.git
+ - [ ] Duplicate previous Stable or Alpha release blog post as appropriate to new directory under `content/blog/new-release-tor-browser-$(TOR_BROWSER_VERSION)` and update with info on release :
+ - [ ] Run `tools/signing/create-blog-post` which should create the new blog post from a template (edit set-config.blog to set you local blog directory)
+ - [ ] Update Tor Browser version numbers
+ - [ ] Note any ESR rebase
+ - [ ] Link to any Firefox security updates from ESR upgrade
+ - [ ] Link to any Android-specific security backports
+ - [ ] Note any updates to :
+ - tor
+ - OpenSSL
+ - NoScript
+ - [ ] Convert ChangeLog-TBB.txt to markdown format used here by :
+ - `tor-browser-build/tools/changelog-format-blog-post`
+ - [ ] Push to origin as new branch, open `Draft:` MR
+ - [ ] Remove `Draft:` from MR once signed-packages are uploaded
+ - [ ] Merge
+ - [ ] Publish after CI passes and website has been updated
+
+ ### tor-announce mailing list
+ - [ ] Email tor-announce mailing list: tor-announce(a)lists.torproject.org
+ <details>
+ <summary>email template</summary>
+
+ Subject:
+ New Release: Tor Browser $(TOR_BROWSER_VERSION) (Android, Windows, macOS, Linux)
+
+ Body:
+ Hi everyone,
+
+ Tor Browser $(TOR_BROWSER_VERSION) has now been published for all platforms. For details please see our blog post:
+
+ - $(BLOG_POST_URL)
+
+ </details>
+
+ - **(Optional)** Additional information:
+ - [ ] Link to any known issues
</details>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.2.1esr-13.0-1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.0-1-build2
by Dan Ballard (@dan) 12 Sep '23
by Dan Ballard (@dan) 12 Sep '23
12 Sep '23
Dan Ballard pushed new tag firefox-android-115.2.1-13.0-1-build2 at The Tor Project / Applications / firefox-android
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Disable features and functionality
by Dan Ballard (@dan) 12 Sep '23
by Dan Ballard (@dan) 12 Sep '23
12 Sep '23
Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
2ed6053c by Dan Ballard at 2023-09-12T09:06:04-07:00
fixup! Disable features and functionality
Bug 42001: Hide 'Open links in external app' settings option and force defaults
- - - - -
5 changed files:
- fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
- fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
- fenix/app/src/main/res/navigation/nav_graph.xml
- fenix/app/src/main/res/xml/preferences.xml
Changes:
=====================================
fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
=====================================
@@ -848,7 +848,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
clipboardSuggestionsEnabled.set(settings.shouldShowClipboardSuggestions)
searchShortcutsEnabled.set(settings.shouldShowSearchShortcuts)
voiceSearchEnabled.set(settings.shouldShowVoiceSearch)
- openLinksInAppEnabled.set(settings.openLinksInExternalApp)
+ //openLinksInAppEnabled.set(settings.openLinksInExternalApp)
signedInSync.set(settings.signedInFxaAccount)
val syncedItems = SyncEnginesStorage(applicationContext).getStatus().entries.filter {
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
=====================================
@@ -234,9 +234,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
getString(R.string.preferences_credit_cards)
}
+ /*
val openLinksInAppsSettingsPreference =
requirePreference<Preference>(R.string.pref_key_open_links_in_apps)
openLinksInAppsSettingsPreference.summary = context?.settings()?.getOpenLinksInAppsString()
+ */
// Hide "Delete browsing data on quit" when in Private Browsing-only mode
deleteBrowsingDataPreference.isVisible =
@@ -308,9 +310,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
Addons.openAddonsInSettings.record(mozilla.components.service.glean.private.NoExtras())
SettingsFragmentDirections.actionSettingsFragmentToAddonsFragment()
}
+ /*
resources.getString(R.string.pref_key_open_links_in_apps) -> {
SettingsFragmentDirections.actionSettingsFragmentToOpenLinksInAppsFragment()
}
+ */
resources.getString(R.string.pref_key_data_choices) -> {
SettingsFragmentDirections.actionSettingsFragmentToDataChoicesFragment()
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
=====================================
@@ -599,6 +599,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
/**
* Get the display string for the current open links in apps setting
*/
+ /*
fun getOpenLinksInAppsString(): String =
when (openLinksInExternalApp) {
appContext.getString(R.string.pref_key_open_links_in_apps_always) -> {
@@ -615,6 +616,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
appContext.getString(R.string.preferences_open_links_in_apps_never)
}
}
+ */
var shouldUseDarkTheme by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_dark_theme),
@@ -1298,26 +1300,31 @@ class Settings(private val appContext: Context) : PreferencesHolder {
/**
* Check to see if we should open the link in an external app
*/
+ @Suppress("UNUSED_PARAMETER")
fun shouldOpenLinksInApp(isCustomTab: Boolean = false): Boolean {
- return when (openLinksInExternalApp) {
- appContext.getString(R.string.pref_key_open_links_in_apps_always) -> true
- appContext.getString(R.string.pref_key_open_links_in_apps_ask) -> true
+ return false
+ //return when (openLinksInExternalApp) {
+ // appContext.getString(R.string.pref_key_open_links_in_apps_always) -> true
+ // appContext.getString(R.string.pref_key_open_links_in_apps_ask) -> true
/* Some applications will not work if custom tab never open links in apps, return true if it's custom tab */
- appContext.getString(R.string.pref_key_open_links_in_apps_never) -> isCustomTab
- else -> false
- }
+ // appContext.getString(R.string.pref_key_open_links_in_apps_never) -> isCustomTab
+ //else -> false
+ //}
}
/**
* Check to see if we need to prompt the user if the link can be opened in an external app
*/
fun shouldPromptOpenLinksInApp(): Boolean {
+ return true
+ /*
return when (openLinksInExternalApp) {
appContext.getString(R.string.pref_key_open_links_in_apps_always) -> false
appContext.getString(R.string.pref_key_open_links_in_apps_ask) -> true
appContext.getString(R.string.pref_key_open_links_in_apps_never) -> true
else -> true
}
+ */
}
var openLinksInExternalApp by stringPreference(
=====================================
fenix/app/src/main/res/navigation/nav_graph.xml
=====================================
@@ -723,6 +723,7 @@
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
+ <!--
<action
android:id="@+id/action_settingsFragment_to_openLinksInAppsFragment"
app:destination="@id/openLinksInAppsFragment"
@@ -730,6 +731,7 @@
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
+ -->
<action
android:id="@+id/action_settingsFragment_to_tabsSettingsFragment"
app:destination="@id/tabsSettingsFragment"
@@ -963,9 +965,11 @@
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
</fragment>
+ <!--
<fragment
android:id="@+id/openLinksInAppsFragment"
android:name="org.mozilla.fenix.settings.OpenLinksInAppsFragment" />
+ -->
<fragment
android:id="@+id/deleteBrowsingDataFragment"
android:name="org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataFragment"
=====================================
fenix/app/src/main/res/xml/preferences.xml
=====================================
@@ -180,12 +180,12 @@
android:key="@string/pref_key_override_amo_collection"
app:iconSpaceReserved="false"
android:title="@string/preferences_customize_amo_collection" />
-
+ <!--
<androidx.preference.Preference
android:key="@string/pref_key_open_links_in_apps"
android:title="@string/preferences_open_links_in_apps"
app:iconSpaceReserved="false" />
-
+ -->
<androidx.preference.SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_external_download_manager"
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2ed…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2ed…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] 3 commits: fixup! Add Tor integration and UI
by Dan Ballard (@dan) 12 Sep '23
by Dan Ballard (@dan) 12 Sep '23
12 Sep '23
Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
a09967fd by Dan Ballard at 2023-09-12T08:52:55-07:00
fixup! Add Tor integration and UI
Bug 41878: Remove bootstrap from `Add Tor integration and UI`
- - - - -
40bf5511 by Dan Ballard at 2023-09-12T08:52:55-07:00
fixup! Add Tor integration and UI
Bug 41878: Remove rest of onboarding from `Add Tor integration and UI`
- - - - -
d2a7dfa6 by Dan Ballard at 2023-09-12T08:52:55-07:00
Bug 41878: Add standalone Tor Bootstrap
- - - - -
25 changed files:
- fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/Mode.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
- − fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingDonateViewHolder.kt
- − fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt
- + fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt
- + fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.kt
- + fenix/app/src/main/java/org/mozilla/fenix/tor/controller/TorBootstrapController.kt
- + fenix/app/src/main/java/org/mozilla/fenix/tor/interactor/TorBootstrapInteractor.kt
- + fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapAdapter.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapConnectViewHolder.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapLoggerViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapLoggerViewHolder.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/torbootstrap/BootstrapPagerAdapter.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapPagerAdapter.kt
- fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapPagerViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapPagerViewHolder.kt
- + fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapView.kt
- − fenix/app/src/main/res/drawable/tor_onboarding_donate_gradient.xml
- − fenix/app/src/main/res/drawable/tor_onboarding_donate_rounded_corners.xml
- − fenix/app/src/main/res/layout/tor_onboarding_donate.xml
- − fenix/app/src/main/res/layout/tor_onboarding_security_level.xml
- fenix/app/src/main/res/navigation/nav_graph.xml
- fenix/app/src/main/res/values/styles.xml
Changes:
=====================================
fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
=====================================
@@ -34,6 +34,7 @@ import androidx.annotation.VisibleForTesting.Companion.PROTECTED
import androidx.appcompat.app.ActionBar
import androidx.appcompat.widget.Toolbar
import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContentProviderCompat.requireContext
import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavDestination
import androidx.navigation.NavDirections
@@ -285,6 +286,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
it.start()
}
+ /*
if (settings().shouldShowJunoOnboarding(
hasUserBeenOnboarded = components.fenixOnboarding.userHasBeenOnboarded(),
isLauncherIntent = intent.toSafeIntent().isLauncherIntent,
@@ -295,6 +297,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
navHost.navController.navigate(NavGraphDirections.actionGlobalJunoOnboarding())
}
} else {
+ */
lifecycleScope.launch(IO) {
// showFullscreenMessageIfNeeded(applicationContext)
}
@@ -315,7 +318,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
}
showNotificationPermissionPromptIfRequired()
*/
- }
+ //}
Performance.processIntentIfPerformanceTest(intent, this)
@@ -1158,13 +1161,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
}
open fun navigateToHome() {
- // if (components.fenixOnboarding.userHasBeenOnboarded()) {
- navHost.navController.navigate(NavGraphDirections.actionStartupHome())
- /*
- } else {
- navHost.navController.navigate(NavGraphDirections.actionStartupOnboarding())
- }
- */
+ navHost.navController.navigate(NavGraphDirections.actionStartupTorbootstrap())
}
override fun attachBaseContext(base: Context) {
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
=====================================
@@ -113,6 +113,8 @@ import org.mozilla.fenix.perf.runBlockingIncrement
import org.mozilla.fenix.search.toolbar.DefaultSearchSelectorController
import org.mozilla.fenix.search.toolbar.SearchSelectorMenu
import org.mozilla.fenix.tabstray.TabsTrayAccessPoint
+import org.mozilla.fenix.tor.TorBootstrapFragmentDirections
+import org.mozilla.fenix.tor.TorBootstrapStatus
import org.mozilla.fenix.tor.bootstrap.TorQuickStart
import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD
import org.mozilla.fenix.utils.allowUndo
@@ -200,9 +202,9 @@ class HomeFragment : Fragment() {
private val recentBookmarksFeature = ViewBoundFeatureWrapper<RecentBookmarksFeature>()
private val historyMetadataFeature = ViewBoundFeatureWrapper<RecentVisitsFeature>()
private val searchSelectorBinding = ViewBoundFeatureWrapper<SearchSelectorBinding>()
- private val searchSelectorMenuBinding = ViewBoundFeatureWrapper<SearchSelectorMenuBinding>()
private val torQuickStart by lazy { TorQuickStart(requireContext()) }
- private lateinit var currentMode: CurrentMode
+ private val searchSelectorMenuBinding = ViewBoundFeatureWrapper<SearchSelectorMenuBinding>()
+ private lateinit var torBootstrapStatus: TorBootstrapStatus
override fun onCreate(savedInstanceState: Bundle?) {
// DO NOT ADD ANYTHING ABOVE THIS getProfilerTime CALL!
@@ -233,29 +235,27 @@ class HomeFragment : Fragment() {
val activity = activity as HomeActivity
val components = requireComponents
- val currentWallpaperName = requireContext().settings().currentWallpaperName
- applyWallpaper(wallpaperName = currentWallpaperName, orientationChange = false)
-
- currentMode = CurrentMode(
- requireContext(),
+ torBootstrapStatus = TorBootstrapStatus(
torQuickStart,
!BuildConfig.DISABLE_TOR,
components.torController,
- browsingModeManager,
::dispatchModeChanges
)
+ val currentWallpaperName = requireContext().settings().currentWallpaperName
+ applyWallpaper(wallpaperName = currentWallpaperName, orientationChange = false)
+
// Splits by full stops or commas and puts the parts in different lines.
// Ignoring separators at the end of the string, it is expected
// that there are at most two parts (e.g. "Explore. Privately.").
- val localBinding = binding;
+ val localBinding = binding
binding.exploreprivately.text = localBinding
.exploreprivately
.text
?.replace(" *([.,。।]) *".toRegex(), "$1\n")
?.trim()
- components.appStore.dispatch(AppAction.ModeChange(currentMode.getCurrentMode()))
+ components.appStore.dispatch(AppAction.ModeChange(Mode.fromBrowsingMode(browsingModeManager.mode)))
lifecycleScope.launch(IO) {
if (requireContext().settings().showPocketRecommendationsFeature) {
@@ -378,10 +378,6 @@ class HomeFragment : Fragment() {
registerCollectionStorageObserver = ::registerCollectionStorageObserver,
removeCollectionWithUndo = ::removeCollectionWithUndo,
showTabTray = ::openTabsTray,
- handleTorBootstrapConnect = ::handleTorBootstrapConnect,
- cancelTorBootstrap = ::cancelTorBootstrap,
- initiateTorBootstrap = ::initiateTorBootstrap,
- openTorNetworkSettings = ::openTorNetworkSettings
),
recentTabController = DefaultRecentTabsController(
selectTabUseCase = components.useCases.tabsUseCases.selectTab,
@@ -447,9 +443,6 @@ class HomeFragment : Fragment() {
FxNimbus.features.homescreen.recordExposure()
- adjustHomeFragmentView(currentMode.getCurrentMode())
- showSessionControlView()
-
// DO NOT MOVE ANYTHING BELOW THIS addMarker CALL!
requireComponents.core.engine.profiler?.addMarker(
MarkersFragmentLifecycleCallbacks.MARKER_NAME,
@@ -530,111 +523,6 @@ class HomeFragment : Fragment() {
binding.homeAppBar.setExpanded(true)
}
- // This function should be paired with showSessionControlView()
- @SuppressWarnings("ComplexMethod", "NestedBlockDepth", "LongMethod")
- private fun adjustHomeFragmentView(mode: Mode) {
- binding.sessionControlRecyclerView.apply {
- visibility = View.INVISIBLE
- }
-
- if (mode == Mode.Bootstrap) {
- binding.sessionControlRecyclerView.apply {
- setPadding(0, 0, 0, 0)
- (layoutParams as ViewGroup.MarginLayoutParams).setMargins(0, 0, 0, 0)
- }
- binding.homeAppBar.apply {
- visibility = View.GONE
-
- // Reset this as SCROLL in case it was previously set as NO_SCROLL after bootstrap
- children.forEach {
- (it.layoutParams as AppBarLayout.LayoutParams).scrollFlags =
- AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
- }
- }
- binding.onionPatternImage.apply {
- visibility = View.GONE
- }
- binding.toolbarLayout.apply {
- visibility = View.GONE
- }
- } else {
- // Keep synchronized with xml layout (somehow).
- binding.sessionControlRecyclerView.apply {
- setPadding(
- SESSION_CONTROL_VIEW_PADDING,
- SESSION_CONTROL_VIEW_PADDING,
- SESSION_CONTROL_VIEW_PADDING,
- SESSION_CONTROL_VIEW_PADDING
- )
- // Default margin until it is re-set below (either set immediately or after Layout)
- (layoutParams as ViewGroup.MarginLayoutParams).setMargins(
- 0,
- 0,
- 0,
- DEFAULT_ONBOARDING_FINISH_MARGIN
- )
- }
- binding.toolbarLayout.apply {
- visibility = View.VISIBLE
- // If the Layout rendering pass was completed, then we have a |height| value,
- // if it wasn't completed then we have 0.
- if (height == 0) {
- // Set the bottom margin after the toolbar height is defined during Layout
- doOnLayout {
- val toolbarLayoutHeight = binding.toolbarLayout.height
- binding.sessionControlRecyclerView.apply {
- (layoutParams as ViewGroup.MarginLayoutParams).setMargins(
- 0,
- 0,
- 0,
- toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING
- )
- }
- }
- } else {
- binding.sessionControlRecyclerView.apply {
- (layoutParams as ViewGroup.MarginLayoutParams).setMargins(
- 0,
- 0,
- 0,
- height - SESSION_CONTROL_VIEW_PADDING
- )
- }
- }
- }
- // Hide the onion pattern during Onboarding, too.
- // With new onboarding HomeFragment is only reached once onboarding is complete
- binding.onionPatternImage.apply {
- visibility = if (currentMode.getCurrentMode() != Mode.Bootstrap) {
- View.VISIBLE
- } else {
- View.GONE
- }
-
- }
- binding.homeAppBar.apply {
- visibility = View.VISIBLE
-
- children.forEach {
- (it.layoutParams as AppBarLayout.LayoutParams).scrollFlags =
- if (currentMode.getCurrentMode() != Mode.Bootstrap) {
- AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
- } else {
- AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
- }
-
- }
- }
- }
- }
-
- // This function should be paired with adjustHomeFragmentView()
- private fun showSessionControlView() {
- binding.sessionControlRecyclerView.apply {
- visibility = View.VISIBLE
- }
- }
-
@Suppress("LongMethod", "ComplexMethod")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
// DO NOT ADD ANYTHING ABOVE THIS getProfilerTime CALL!
@@ -880,13 +768,14 @@ class HomeFragment : Fragment() {
requireComponents.reviewPromptController.promptReview(requireActivity())
}
}
-
- private fun dispatchModeChanges(mode: Mode) {
- requireComponents.appStore.dispatch(AppAction.ModeChange(mode))
- adjustHomeFragmentView(mode)
- updateSessionControlView()
- showSessionControlView()
+ private fun dispatchModeChanges(isBootstrapping: Boolean) {
+ if (isBootstrapping) {
+ val directions =
+ TorBootstrapFragmentDirections
+ .actionStartupTorbootstrap()
+ findNavController().navigate(directions)
+ }
}
@VisibleForTesting
@@ -912,21 +801,16 @@ class HomeFragment : Fragment() {
override fun onStop() {
super.onStop()
- currentMode.unregisterTorListener()
+ torBootstrapStatus.unregisterTorListener()
}
override fun onResume() {
super.onResume()
+ torBootstrapStatus.registerTorListener()
if (browsingModeManager.mode == BrowsingMode.Private) {
activity?.window?.setBackgroundDrawableResource(R.drawable.private_home_background_gradient)
}
- // fenix#40176: Ensure the Home fragment is rendered correctly when we resume.
- val mode = currentMode.getCurrentMode()
- adjustHomeFragmentView(mode)
- updateSessionControlView()
- showSessionControlView()
-
hideToolbar()
// Whenever a tab is selected its last access timestamp is automatically updated by A-C.
@@ -1113,25 +997,6 @@ class HomeFragment : Fragment() {
}
}
- private fun handleTorBootstrapConnect() {
- requireComponents.torController.onTorConnecting()
- }
-
- private fun cancelTorBootstrap() {
- requireComponents.torController.stopTor()
- }
-
- private fun initiateTorBootstrap(withDebugLogging: Boolean = false) {
- requireComponents.torController.initiateTorBootstrap(lifecycleScope, withDebugLogging)
- }
-
- private fun openTorNetworkSettings() {
- val directions =
- HomeFragmentDirections
- .actionHomeFragmentToTorNetworkSettingsFragment()
- findNavController().navigate(directions)
- }
-
companion object {
const val ALL_NORMAL_TABS = "all_normal"
const val ALL_PRIVATE_TABS = "all_private"
@@ -1153,9 +1018,5 @@ class HomeFragment : Fragment() {
// Elevation for undo toasts
internal const val TOAST_ELEVATION = 80f
-
- // Layout
- private const val DEFAULT_ONBOARDING_FINISH_MARGIN = 60
- private const val SESSION_CONTROL_VIEW_PADDING = 16
}
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/Mode.kt
=====================================
@@ -4,12 +4,7 @@
package org.mozilla.fenix.home
-import android.content.Context
-import org.mozilla.fenix.tor.TorController
-import org.mozilla.fenix.tor.TorEvents
-import org.mozilla.fenix.tor.bootstrap.TorQuickStart
import org.mozilla.fenix.browser.browsingmode.BrowsingMode
-import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
/**
* Describes various states of the home fragment UI.
@@ -17,7 +12,6 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
sealed class Mode {
object Normal : Mode()
object Private : Mode()
- object Bootstrap : Mode()
companion object {
fun fromBrowsingMode(browsingMode: BrowsingMode) = when (browsingMode) {
@@ -26,48 +20,3 @@ sealed class Mode {
}
}
}
-
-@SuppressWarnings("LongParameterList", "TooManyFunctions")
-class CurrentMode(
- private val context: Context,
- private val torQuickStart: TorQuickStart,
- private val shouldStartTor: Boolean,
- private val torController: TorController,
- private val browsingModeManager: BrowsingModeManager,
- private val dispatchModeChanges: (mode: Mode) -> Unit
-) : TorEvents {
-
- init {
- torController.registerTorListener(this)
- }
-
- fun getCurrentMode() = if (shouldStartTor && (!torQuickStart.quickStartTor() && !torController.isBootstrapped)) {
- Mode.Bootstrap
- } else {
- Mode.fromBrowsingMode(browsingModeManager.mode)
- }
-
- fun emitModeChanges() {
- dispatchModeChanges(getCurrentMode())
- }
-
- @SuppressWarnings("EmptyFunctionBlock")
- override fun onTorConnecting() {
- }
-
- override fun onTorConnected() {
- dispatchModeChanges(getCurrentMode())
- }
-
- override fun onTorStopped() {
- dispatchModeChanges(getCurrentMode())
- }
-
- @SuppressWarnings("EmptyFunctionBlock")
- override fun onTorStatusUpdate(entry: String?, status: String?) {
- }
-
- fun unregisterTorListener() {
- torController.unregisterTorListener(this)
- }
-}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
=====================================
@@ -34,10 +34,7 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionHeaderViewHol
import org.mozilla.fenix.home.sessioncontrol.viewholders.CustomizeHomeButtonViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.NoCollectionsMessageViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder
-import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapPagerViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.MessageCardViewHolder
-import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.TorOnboardingSecurityLevelViewHolder
-import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.TorOnboardingDonateViewHolder
import org.mozilla.fenix.home.topsites.TopSitePagerViewHolder
import mozilla.components.feature.tab.collections.Tab as ComponentTab
@@ -102,8 +99,6 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) {
object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID)
object NoCollectionsMessage : AdapterItem(NoCollectionsMessageViewHolder.LAYOUT_ID)
- object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID)
-
object CollectionHeader : AdapterItem(CollectionHeaderViewHolder.LAYOUT_ID)
data class CollectionItem(
val collection: TabCollection,
@@ -143,9 +138,6 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) {
object CustomizeHomeButton : AdapterItem(CustomizeHomeButtonViewHolder.LAYOUT_ID)
- object TorOnboardingSecurityLevel : AdapterItem(TorOnboardingSecurityLevelViewHolder.LAYOUT_ID)
- object TorOnboardingDonate : AdapterItem(TorOnboardingDonateViewHolder.LAYOUT_ID)
-
object RecentTabsHeader : AdapterItem(RecentTabsHeaderViewHolder.LAYOUT_ID)
object RecentTabItem : AdapterItem(RecentTabViewHolder.LAYOUT_ID)
@@ -293,11 +285,6 @@ class SessionControlAdapter(
viewLifecycleOwner = viewLifecycleOwner,
interactor = interactor,
)
- TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder(
- view,
- components,
- interactor
- )
NoCollectionsMessageViewHolder.LAYOUT_ID ->
NoCollectionsMessageViewHolder(
view,
@@ -307,15 +294,6 @@ class SessionControlAdapter(
interactor,
)
BottomSpacerViewHolder.LAYOUT_ID -> BottomSpacerViewHolder(view)
-
- TorOnboardingSecurityLevelViewHolder.LAYOUT_ID -> TorOnboardingSecurityLevelViewHolder(
- view,
- interactor
- )
- TorOnboardingDonateViewHolder.LAYOUT_ID -> TorOnboardingDonateViewHolder(
- view,
- interactor
- )
else -> throw IllegalStateException()
}
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
=====================================
@@ -134,21 +134,6 @@ interface SessionControlController {
*/
fun handleTopSiteLongClicked(topSite: TopSite)
- /**
- * @see [OnboardingInteractor.onOpenSettingsClicked]
- */
- fun handleOpenSettingsClicked()
-
- /**
- * @see [OnboardingInteractor.onOpenSecurityLevelSettingsClicked]
- */
- fun handleOpenSecurityLevelSettingsClicked()
-
- /**
- * @see [OnboardingInteractor.onDonateClicked]
- */
- fun handleDonateClicked()
-
/**
* @see [CollectionInteractor.onToggleCollectionExpanded]
*/
@@ -188,31 +173,6 @@ interface SessionControlController {
* @see [SessionControlInteractor.reportSessionMetrics]
*/
fun handleReportSessionMetrics(state: AppState)
-
- /**
- * @see [TorBootstrapInteractor.onTorBootstrapConnectClicked]
- */
- fun handleTorBootstrapConnectClicked()
-
- /**
- * @see [TorBootstrapInteractor.onTorStopBootstrapping]
- */
- fun handleTorStopBootstrapping()
-
- /**
- * @see [TorBootstrapInteractor.onTorStartBootstrapping]
- */
- fun handleTorStartBootstrapping()
-
- /**
- * @see [TorBootstrapInteractor.onTorStartDebugBootstrapping]
- */
- fun handleTorStartDebugBootstrapping()
-
- /**
- * @see [TorBootstrapInteractor.onTorBootstrapNetworkSettingsClicked]
- */
- fun handleTorNetworkSettingsClicked()
}
@Suppress("TooManyFunctions", "LargeClass", "LongParameterList")
@@ -233,10 +193,6 @@ class DefaultSessionControlController(
private val registerCollectionStorageObserver: () -> Unit,
private val removeCollectionWithUndo: (tabCollection: TabCollection) -> Unit,
private val showTabTray: () -> Unit,
- private val handleTorBootstrapConnect: () -> Unit,
- private val initiateTorBootstrap: (Boolean) -> Unit,
- private val cancelTorBootstrap: () -> Unit,
- private val openTorNetworkSettings: () -> Unit
) : SessionControlController {
override fun handleCollectionAddTabTapped(collection: TabCollection) {
@@ -511,25 +467,6 @@ class DefaultSessionControlController(
}
}
}
-
- override fun handleOpenSettingsClicked() {
- val directions = HomeFragmentDirections.actionGlobalPrivateBrowsingFragment()
- navController.nav(R.id.homeFragment, directions)
- }
-
- override fun handleOpenSecurityLevelSettingsClicked() {
- val directions = HomeFragmentDirections.actionGlobalTorSecurityLevelFragment()
- navController.nav(R.id.homeFragment, directions)
- }
-
- override fun handleDonateClicked() {
- activity.openToBrowserAndLoad(
- searchTermOrURL = SupportUtils.DONATE_URL,
- newTab = true,
- from = BrowserDirection.FromHome
- )
- }
-
override fun handleToggleCollectionExpanded(collection: TabCollection, expand: Boolean) {
appStore.dispatch(AppAction.CollectionExpanded(collection, expand))
}
@@ -601,24 +538,4 @@ class DefaultSessionControlController(
RecentBookmarks.recentBookmarksCount.set(state.recentBookmarks.size.toLong())
}
-
- override fun handleTorBootstrapConnectClicked() {
- handleTorBootstrapConnect()
- }
-
- override fun handleTorStopBootstrapping() {
- cancelTorBootstrap()
- }
-
- override fun handleTorStartBootstrapping() {
- initiateTorBootstrap(false)
- }
-
- override fun handleTorStartDebugBootstrapping() {
- initiateTorBootstrap(true)
- }
-
- override fun handleTorNetworkSettingsClicked() {
- openTorNetworkSettings()
- }
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
=====================================
@@ -129,26 +129,6 @@ interface CollectionInteractor {
fun onRemoveCollectionsPlaceholder()
}
-/**
- * Interface for onboarding related actions in the [SessionControlInteractor].
- */
-interface OnboardingInteractor {
- /**
- * Hides the onboarding and navigates to Search. Called when a user clicks on the "Start Browsing" button.
- */
- fun onStartBrowsingClicked()
-
- /**
- * Hides the onboarding and navigates to Settings. Called when a user clicks on the "Open settings" button.
- */
- fun onOpenSettingsClicked()
-
- /**
- * Opens a custom tab to privacy notice url. Called when a user clicks on the "read our privacy notice" button.
- */
- fun onDonateClicked()
-}
-
interface CustomizeHomeIteractor {
/**
* Opens the customize home settings page.
@@ -156,34 +136,6 @@ interface CustomizeHomeIteractor {
fun openCustomizeHomePage()
}
-interface TorBootstrapInteractor {
- /**
- * Initiates Tor bootstrapping. Called when a user clicks on the "Connect" button.
- */
- fun onTorBootstrapConnectClicked()
-
- /**
- * Initiates Tor bootstrapping. Called when a user clicks on the "Connect" button.
- */
- fun onTorStartBootstrapping()
-
- /**
- * Stop Tor bootstrapping. Called when a user clicks on the "settings" cog/button.
- */
- fun onTorStopBootstrapping()
-
- /**
- * Initiates Tor bootstrapping with debug logging. Called when bootstrapping fails with
- * the control.txt file not existing.
- */
- fun onTorStartDebugBootstrapping()
-
- /**
- * Open Tor Network Settings preference screen
- */
- fun onTorBootstrapNetworkSettingsClicked()
-}
-
/**
* Interface for top site related actions in the [SessionControlInteractor].
*/
@@ -295,7 +247,6 @@ class SessionControlInteractor(
PocketStoriesInteractor,
PrivateBrowsingInteractor,
SearchSelectorInteractor,
- TorBootstrapInteractor,
WallpaperInteractor {
override fun onCollectionAddTabTapped(collection: TabCollection) {
@@ -358,15 +309,6 @@ class SessionControlInteractor(
return controller.handleShowWallpapersOnboardingDialog(state)
}
- // TODO: Do these still work, if not overrides, cus parent class dropped, are they wired in still?
- fun onOpenSettingsClicked() {
- controller.handleOpenSettingsClicked()
- }
-
- fun onDonateClicked() {
- controller.handleDonateClicked()
- }
-
override fun onToggleCollectionExpanded(collection: TabCollection, expand: Boolean) {
controller.handleToggleCollectionExpanded(collection, expand)
}
@@ -500,24 +442,4 @@ class SessionControlInteractor(
override fun onMenuItemTapped(item: SearchSelectorMenu.Item) {
searchSelectorController.handleMenuItemTapped(item)
}
-
- override fun onTorBootstrapConnectClicked() {
- controller.handleTorBootstrapConnectClicked()
- }
-
- override fun onTorStopBootstrapping() {
- controller.handleTorStopBootstrapping()
- }
-
- override fun onTorStartBootstrapping() {
- controller.handleTorStartBootstrapping()
- }
-
- override fun onTorStartDebugBootstrapping() {
- controller.handleTorStartDebugBootstrapping()
- }
-
- override fun onTorBootstrapNetworkSettingsClicked() {
- controller.handleTorNetworkSettingsClicked()
- }
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
=====================================
@@ -126,15 +126,6 @@ private fun showCollections(
private fun privateModeAdapterItems() = listOf(AdapterItem.PrivateBrowsingDescription)
-private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap)
-
-private fun torOnboardingAdapterItems() =
- listOf(
- AdapterItem.TorOnboardingSecurityLevel,
- AdapterItem.TorOnboardingDonate,
- // AdapterItem.OnboardingFinish
- )
-
private fun AppState.toAdapterList(settings: Settings): List<AdapterItem> = when (mode) {
is Mode.Normal -> normalModeAdapterItems(
settings,
@@ -151,7 +142,6 @@ private fun AppState.toAdapterList(settings: Settings): List<AdapterItem> = when
firstFrameDrawn,
)
is Mode.Private -> privateModeAdapterItems()
- is Mode.Bootstrap -> bootstrapAdapterItems()
}
private fun collectionTabItems(collection: TabCollection) =
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingDonateViewHolder.kt deleted
=====================================
@@ -1,28 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import org.mozilla.fenix.R
-import org.mozilla.fenix.databinding.TorOnboardingDonateBinding
-import org.mozilla.fenix.home.sessioncontrol.SessionControlInteractor
-
-class TorOnboardingDonateViewHolder(
- view: View,
- private val interactor: SessionControlInteractor
-) : RecyclerView.ViewHolder(view) {
-
- init {
- val binding = TorOnboardingDonateBinding.bind(view)
- binding.donateNowButton.setOnClickListener {
- interactor.onDonateClicked()
- }
- }
-
- companion object {
- const val LAYOUT_ID = R.layout.tor_onboarding_donate
- }
-}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt deleted
=====================================
@@ -1,95 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import org.mozilla.fenix.R
-import org.mozilla.fenix.databinding.TorOnboardingSecurityLevelBinding
-import org.mozilla.fenix.home.sessioncontrol.SessionControlInteractor
-import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.onboarding.OnboardingRadioButton
-import org.mozilla.fenix.tor.SecurityLevel
-import org.mozilla.fenix.tor.SecurityLevelUtil
-import org.mozilla.fenix.utils.view.addToRadioGroup
-
-class TorOnboardingSecurityLevelViewHolder(
- view: View,
- private val interactor: SessionControlInteractor
-) : RecyclerView.ViewHolder(view) {
-
- private var _binding: TorOnboardingSecurityLevelBinding? = null
- private val binding get() = _binding!!
-
- private var standardSecurityLevel: OnboardingRadioButton
- private var saferSecurityLevel: OnboardingRadioButton
- private var safestSecurityLevel: OnboardingRadioButton
-
- init {
- _binding = TorOnboardingSecurityLevelBinding.bind(view)
- binding.headerText.setOnboardingIcon(R.drawable.ic_onboarding_tracking_protection)
-
- standardSecurityLevel = binding.securityLevelStandardOption
- saferSecurityLevel = binding.securityLevelSaferOption
- safestSecurityLevel = binding.securityLevelSafestOption
-
- binding.descriptionText.text = view.context.getString(
- R.string.tor_onboarding_security_level_description
- )
-
- setupRadioGroup(view)
-
- }
-
- private fun setupRadioGroup(view: View) {
-
- addToRadioGroup(standardSecurityLevel, saferSecurityLevel, safestSecurityLevel)
-
- val securityLevel = try {
- SecurityLevelUtil.getSecurityLevelFromInt(
- view.context.components.core.engine.settings.torSecurityLevel
- )
- } catch (e: IllegalStateException) {
- SecurityLevel.STANDARD
- }
-
- standardSecurityLevel.isChecked = securityLevel == SecurityLevel.STANDARD
- safestSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFEST
- saferSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFER
-
- standardSecurityLevel.onClickListener {
- updateSecurityLevel(SecurityLevel.STANDARD, view)
- }
-
- saferSecurityLevel.onClickListener {
- updateSecurityLevel(SecurityLevel.SAFER, view)
- }
-
- safestSecurityLevel.onClickListener {
- updateSecurityLevel(SecurityLevel.SAFEST, view)
- }
-
- updateSecurityLevel(securityLevel, view)
- }
-
- private fun updateSecurityLevel(newLevel: SecurityLevel, view: View) {
- val resources = view.context.resources
- val securityLevel = when (newLevel) {
- SecurityLevel.STANDARD -> resources.getString(R.string.tor_security_level_standard_option)
- SecurityLevel.SAFER -> resources.getString(R.string.tor_security_level_safer_option)
- SecurityLevel.SAFEST -> resources.getString(R.string.tor_security_level_safest_option)
- }
- binding.currentLevel.text = resources.getString(
- R.string.tor_onboarding_chosen_security_level_label, securityLevel
- )
- view.context.components.let {
- it.core.engine.settings.torSecurityLevel = newLevel.intRepresentation
- }
- }
-
- companion object {
- const val LAYOUT_ID = R.layout.tor_onboarding_security_level
- }
-}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt
=====================================
@@ -0,0 +1,195 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+package org.mozilla.fenix.tor
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.VisibleForTesting
+import androidx.core.view.children
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import org.mozilla.fenix.BuildConfig
+import org.mozilla.fenix.databinding.FragmentHomeBinding
+import org.mozilla.fenix.ext.requireComponents
+import org.mozilla.fenix.tor.bootstrap.TorQuickStart
+import org.mozilla.fenix.tor.interactor.DefaultTorBootstrapInteractor
+import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.appbar.AppBarLayout
+import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.hideToolbar
+import org.mozilla.fenix.tor.controller.DefaultTorBootstrapController
+import org.mozilla.fenix.tor.view.TorBootstrapView
+
+
+@Suppress("TooManyFunctions", "LargeClass")
+class TorBootstrapFragment : Fragment() {
+ private val torQuickStart by lazy { TorQuickStart(requireContext()) }
+
+ internal var _binding: FragmentHomeBinding? = null
+ private val binding get() = _binding!!
+
+
+ private var torBootstrapView: TorBootstrapView? = null
+
+ private var _torBootstrapInteractor: TorBootstrapInteractor? = null
+ private val torBootstrapInteractor: TorBootstrapInteractor
+ get() = _torBootstrapInteractor!!
+
+ private lateinit var torBootstrapStatus: TorBootstrapStatus
+
+
+ @Suppress("LongMethod")
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?,
+ ): View {
+ _binding = FragmentHomeBinding.inflate(inflater, container, false)
+ val components = requireComponents
+
+ torBootstrapStatus = TorBootstrapStatus(
+ torQuickStart,
+ !BuildConfig.DISABLE_TOR,
+ components.torController,
+ ::dispatchModeChanges
+ )
+
+ if (!torBootstrapStatus.isBootstrapping()) {
+ openHome()
+ }
+
+ // Was _sessionControlInteractor
+ _torBootstrapInteractor = DefaultTorBootstrapInteractor(
+ controller = DefaultTorBootstrapController(
+ handleTorBootstrapConnect = ::handleTorBootstrapConnect,
+ cancelTorBootstrap = ::cancelTorBootstrap,
+ initiateTorBootstrap = ::initiateTorBootstrap,
+ openTorNetworkSettings = ::openTorNetworkSettings
+ ),
+ )
+
+ torBootstrapView = TorBootstrapView(
+ containerView = binding.sessionControlRecyclerView,
+ viewLifecycleOwner = viewLifecycleOwner,
+ interactor = torBootstrapInteractor,
+ )
+
+ adjustHomeFragmentView()
+ updateSessionControlView()
+ showSessionControlView()
+
+ return binding.root
+ }
+
+ private fun updateSessionControlView() {
+ torBootstrapView?.update(requireContext().components.appStore.state)
+ }
+
+ // This function should be paired with showSessionControlView()
+ private fun adjustHomeFragmentView() {
+ binding.sessionControlRecyclerView.apply {
+ visibility = View.INVISIBLE
+ }
+
+ binding.sessionControlRecyclerView.apply {
+ setPadding(0, 0, 0, 0)
+ (layoutParams as ViewGroup.MarginLayoutParams).setMargins(0, 0, 0, 0)
+ }
+
+ binding.homeAppBar.apply {
+ visibility = View.GONE
+
+ // Reset this as SCROLL in case it was previously set as NO_SCROLL after bootstrap
+ children.forEach {
+ (it.layoutParams as AppBarLayout.LayoutParams).scrollFlags =
+ AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
+ }
+ }
+ binding.onionPatternImage.apply {
+ visibility = View.GONE
+ }
+ binding.toolbarLayout.apply {
+ visibility = View.GONE
+ }
+ }
+
+ // This function should be paired with adjustHomeFragmentView()
+ private fun showSessionControlView() {
+ binding.sessionControlRecyclerView.apply {
+ visibility = View.VISIBLE
+ }
+ }
+
+ private fun dispatchModeChanges(isBootstrapping: Boolean) {
+ //requireComponents.appStore.dispatch(AppAction.ModeChange(mode))
+ if (!isBootstrapping) {
+ openHome()
+ } else {
+ adjustHomeFragmentView()
+ updateSessionControlView()
+ showSessionControlView()
+ }
+ }
+
+ override fun onStop() {
+ super.onStop()
+ torBootstrapStatus.unregisterTorListener()
+ }
+
+ override fun onResume() {
+ super.onResume()
+
+ torBootstrapStatus.registerTorListener()
+
+ // fenix#40176: Ensure the Home fragment is rendered correctly when we resume.
+ val isBootstraping = torBootstrapStatus.isBootstrapping()
+
+ if (!isBootstraping) {
+ openHome()
+ }
+
+ adjustHomeFragmentView()
+ updateSessionControlView()
+ showSessionControlView()
+
+ hideToolbar()
+
+ // Whenever a tab is selected its last access timestamp is automatically updated by A-C.
+ // However, in the case of resuming the app to the home fragment, we already have an
+ // existing selected tab, but its last access timestamp is outdated. No action is
+ // triggered to cause an automatic update on warm start (no tab selection occurs). So we
+ // update it manually here.
+ requireComponents.useCases.sessionUseCases.updateLastAccess()
+ }
+
+ private fun handleTorBootstrapConnect() {
+ requireComponents.torController.onTorConnecting()
+ }
+
+ private fun cancelTorBootstrap() {
+ requireComponents.torController.stopTor()
+ }
+
+ private fun initiateTorBootstrap(withDebugLogging: Boolean = false) {
+ requireComponents.torController.initiateTorBootstrap(lifecycleScope, withDebugLogging)
+ }
+
+ private fun openTorNetworkSettings() {
+ val directions =
+ TorBootstrapFragmentDirections.actionTorbootstrapFragmentToTorNetworkSettingsFragment()
+ findNavController().navigate(directions)
+ }
+
+ private fun openHome() {
+ val directions =
+ TorBootstrapFragmentDirections
+ .actionStartupHome()
+ findNavController().navigate(directions)
+ }
+
+}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.kt
=====================================
@@ -0,0 +1,48 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+package org.mozilla.fenix.tor
+
+import org.mozilla.fenix.tor.bootstrap.TorQuickStart
+
+@SuppressWarnings("LongParameterList", "TooManyFunctions")
+class TorBootstrapStatus(
+ private val torQuickStart: TorQuickStart,
+ private val shouldStartTor: Boolean,
+ private val torController: TorController,
+ private val dispatchModeChanges: (isShouldBootstrap: Boolean) -> Unit
+ ) : TorEvents {
+
+ init {
+ torController.registerTorListener(this)
+ }
+
+ fun isBootstrapping() = (shouldStartTor && (!torQuickStart.quickStartTor() && !torController.isBootstrapped))
+
+
+ @SuppressWarnings("EmptyFunctionBlock")
+ override fun onTorConnecting() {
+ }
+
+ override fun onTorConnected() {
+ dispatchModeChanges(isBootstrapping())
+ }
+
+ override fun onTorStopped() {
+ dispatchModeChanges(isBootstrapping())
+ }
+
+ @SuppressWarnings("EmptyFunctionBlock")
+ override fun onTorStatusUpdate(entry: String?, status: String?) {
+ }
+
+ fun unregisterTorListener() {
+ torController.unregisterTorListener(this)
+ }
+
+ fun registerTorListener() {
+ torController.registerTorListener(this)
+ }
+
+}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/tor/controller/TorBootstrapController.kt
=====================================
@@ -0,0 +1,63 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+package org.mozilla.fenix.tor.controller
+
+import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor
+
+interface TorBootstrapController {
+ /**
+ * @see [TorBootstrapInteractor.onTorBootstrapConnectClicked]
+ */
+ fun handleTorBootstrapConnectClicked()
+
+ /**
+ * @see [TorBootstrapInteractor.onTorStopBootstrapping]
+ */
+ fun handleTorStopBootstrapping()
+
+ /**
+ * @see [TorBootstrapInteractor.onTorStartBootstrapping]
+ */
+ fun handleTorStartBootstrapping()
+
+ /**
+ * @see [TorBootstrapInteractor.onTorStartDebugBootstrapping]
+ */
+ fun handleTorStartDebugBootstrapping()
+
+ /**
+ * @see [TorBootstrapInteractor.onTorBootstrapNetworkSettingsClicked]
+ */
+ fun handleTorNetworkSettingsClicked()
+
+
+}
+
+class DefaultTorBootstrapController(
+ private val handleTorBootstrapConnect: () -> Unit,
+ private val initiateTorBootstrap: (Boolean) -> Unit,
+ private val cancelTorBootstrap: () -> Unit,
+ private val openTorNetworkSettings: () -> Unit
+) : TorBootstrapController {
+ override fun handleTorBootstrapConnectClicked() {
+ handleTorBootstrapConnect()
+ }
+
+ override fun handleTorStopBootstrapping() {
+ cancelTorBootstrap()
+ }
+
+ override fun handleTorStartBootstrapping() {
+ initiateTorBootstrap(false)
+ }
+
+ override fun handleTorStartDebugBootstrapping() {
+ initiateTorBootstrap(true)
+ }
+
+ override fun handleTorNetworkSettingsClicked() {
+ openTorNetworkSettings()
+ }
+}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/tor/interactor/TorBootstrapInteractor.kt
=====================================
@@ -0,0 +1,60 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+package org.mozilla.fenix.tor.interactor
+
+import org.mozilla.fenix.tor.controller.TorBootstrapController
+
+interface TorBootstrapInteractor {
+ /**
+ * Initiates Tor bootstrapping. Called when a user clicks on the "Connect" button.
+ */
+ fun onTorBootstrapConnectClicked()
+
+ /**
+ * Initiates Tor bootstrapping. Called when a user clicks on the "Connect" button.
+ */
+ fun onTorStartBootstrapping()
+
+ /**
+ * Stop Tor bootstrapping. Called when a user clicks on the "settings" cog/button.
+ */
+ fun onTorStopBootstrapping()
+
+ /**
+ * Initiates Tor bootstrapping with debug logging. Called when bootstrapping fails with
+ * the control.txt file not existing.
+ */
+ fun onTorStartDebugBootstrapping()
+
+ /**
+ * Open Tor Network Settings preference screen
+ */
+ fun onTorBootstrapNetworkSettingsClicked()
+}
+
+class DefaultTorBootstrapInteractor(
+ private val controller: TorBootstrapController,
+) : TorBootstrapInteractor {
+
+ override fun onTorBootstrapConnectClicked() {
+ controller.handleTorBootstrapConnectClicked()
+ }
+
+ override fun onTorStopBootstrapping() {
+ controller.handleTorStopBootstrapping()
+ }
+
+ override fun onTorStartBootstrapping() {
+ controller.handleTorStartBootstrapping()
+ }
+
+ override fun onTorStartDebugBootstrapping() {
+ controller.handleTorStartDebugBootstrapping()
+ }
+
+ override fun onTorBootstrapNetworkSettingsClicked() {
+ controller.handleTorNetworkSettingsClicked()
+ }
+}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapAdapter.kt
=====================================
@@ -0,0 +1,83 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+package org.mozilla.fenix.tor.view
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.mozilla.fenix.components.Components
+import org.mozilla.fenix.home.topsites.TopSitePagerViewHolder
+import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor
+
+sealed class AdapterItem(@LayoutRes val viewType: Int) {
+ object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID)
+
+
+ open fun sameAs(other: AdapterItem) = this::class == other::class
+ open fun getChangePayload(newItem: AdapterItem): Any? = null
+ open fun contentsSameAs(other: AdapterItem) = this::class == other::class
+
+}
+
+class AdapterItemDiffCallback : DiffUtil.ItemCallback<AdapterItem>() {
+ override fun areItemsTheSame(oldItem: AdapterItem, newItem: AdapterItem) =
+ oldItem.sameAs(newItem)
+
+ @Suppress("DiffUtilEquals")
+ override fun areContentsTheSame(oldItem: AdapterItem, newItem: AdapterItem) =
+ oldItem.contentsSameAs(newItem)
+
+ override fun getChangePayload(oldItem: AdapterItem, newItem: AdapterItem): Any? {
+ return oldItem.getChangePayload(newItem) ?: return super.getChangePayload(oldItem, newItem)
+ }
+}
+
+
+
+class TorBootstrapAdapter(
+ private val interactor: TorBootstrapInteractor,
+ private val viewLifecycleOwner: LifecycleOwner,
+ private val components: Components,
+) : ListAdapter<AdapterItem, RecyclerView.ViewHolder>(AdapterItemDiffCallback()) {
+
+ // This method triggers the ComplexMethod lint error when in fact it's quite simple.
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+ val view = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
+ return when (viewType) {
+ TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder(
+ view,
+ components,
+ interactor
+ )
+ else -> throw IllegalStateException()
+ }
+ }
+
+ override fun getItemViewType(position: Int) = getItem(position).viewType
+
+ override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: MutableList<Any>) {
+ if (payloads.isEmpty()) {
+ onBindViewHolder(holder, position)
+ } else {
+ when (holder) {
+ is TopSitePagerViewHolder -> {
+ if (payloads[0] is org.mozilla.fenix.home.sessioncontrol.AdapterItem.TopSitePagerPayload) {
+ val payload = payloads[0] as org.mozilla.fenix.home.sessioncontrol.AdapterItem.TopSitePagerPayload
+ holder.update(payload)
+ }
+ }
+ }
+ }
+ }
+
+ override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+ // no-op. This ViewHolder receives the HomeStore as argument and will observe that
+ // without the need for us to manually update from here the data to be displayed.
+ }
+}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapConnectViewHolder.kt
=====================================
@@ -2,17 +2,16 @@
* 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/. */
-package org.mozilla.fenix.home.sessioncontrol.viewholders
+package org.mozilla.fenix.tor.view
import android.view.View
-import androidx.appcompat.widget.SwitchCompat
import androidx.recyclerview.widget.RecyclerView
import org.mozilla.fenix.R
+import org.mozilla.fenix.components.Components
import org.mozilla.fenix.databinding.TorBootstrapConnectBinding
import org.mozilla.fenix.tor.TorEvents
import org.mozilla.fenix.tor.bootstrap.TorQuickStart
-import org.mozilla.fenix.components.Components
-import org.mozilla.fenix.home.sessioncontrol.TorBootstrapInteractor
+import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor
class TorBootstrapConnectViewHolder(
private val view: View,
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapLoggerViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapLoggerViewHolder.kt
=====================================
@@ -2,20 +2,20 @@
* 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/. */
-package org.mozilla.fenix.home.sessioncontrol.viewholders
+package org.mozilla.fenix.tor.view
import android.text.method.ScrollingMovementMethod
import android.view.View
import androidx.recyclerview.widget.RecyclerView
import org.mozilla.fenix.R
+import org.mozilla.fenix.components.Components
import org.mozilla.fenix.databinding.TorBootstrapLoggerBinding
import org.mozilla.fenix.tor.TorEvents
-import org.mozilla.fenix.components.Components
class TorBootstrapLoggerViewHolder(
- private val view: View,
- private val components: Components
-) : RecyclerView.ViewHolder(view), TorEvents {
+ private val view: View,
+ private val components: Components
+ ) : RecyclerView.ViewHolder(view), TorEvents {
private var entries = mutableListOf<String>()
private var binding: TorBootstrapLoggerBinding
@@ -25,10 +25,10 @@ class TorBootstrapLoggerViewHolder(
components.torController.registerTorListener(this)
val currentEntries = components.torController.logEntries
- .filter { it.first != null }
- .filter { !(it.first!!.startsWith("Circuit") && it.second == "ON") }
- // Keep synchronized with format in onTorStatusUpdate
- .flatMap { listOf("(${it.second}) '${it.first}'") }
+ .filter { it.first != null }
+ .filter { !(it.first!!.startsWith("Circuit") && it.second == "ON") }
+ // Keep synchronized with format in onTorStatusUpdate
+ .flatMap { listOf("(${it.second}) '${it.first}'") }
val entriesLen = currentEntries.size
val subListOffset = if (entriesLen > MAX_NEW_ENTRIES) MAX_NEW_ENTRIES else entriesLen
entries = currentEntries.subList((entriesLen - subListOffset), entriesLen) as MutableList<String>
@@ -72,4 +72,5 @@ class TorBootstrapLoggerViewHolder(
const val MAX_NEW_ENTRIES = 24
const val MAX_LINES = 25
}
+
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/torbootstrap/BootstrapPagerAdapter.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapPagerAdapter.kt
=====================================
@@ -2,18 +2,15 @@
* 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/. */
-package org.mozilla.fenix.home.sessioncontrol.viewholders.torbootstrap
+package org.mozilla.fenix.tor.view
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
import org.mozilla.fenix.components.Components
-import org.mozilla.fenix.home.sessioncontrol.TorBootstrapInteractor
-import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapConnectViewHolder
-import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapLoggerViewHolder
+import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor
-class BootstrapPagerAdapter(
+class TorBootstrapPagerAdapter(
private val components: Components,
private val interactor: TorBootstrapInteractor
) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapPagerViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapPagerViewHolder.kt
=====================================
@@ -2,23 +2,22 @@
* 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/. */
-package org.mozilla.fenix.home.sessioncontrol.viewholders
+package org.mozilla.fenix.tor.view
import android.view.View
import androidx.recyclerview.widget.RecyclerView
import org.mozilla.fenix.R
-import org.mozilla.fenix.databinding.TorBootstrapPagerBinding
import org.mozilla.fenix.components.Components
-import org.mozilla.fenix.home.sessioncontrol.TorBootstrapInteractor
-import org.mozilla.fenix.home.sessioncontrol.viewholders.torbootstrap.BootstrapPagerAdapter
+import org.mozilla.fenix.databinding.TorBootstrapPagerBinding
+import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor
class TorBootstrapPagerViewHolder(
- view: View,
- components: Components,
- interactor: TorBootstrapInteractor
-) : RecyclerView.ViewHolder(view) {
+ view: View,
+ components: Components,
+ interactor: TorBootstrapInteractor
+ ) : RecyclerView.ViewHolder(view) {
- private val bootstrapPagerAdapter = BootstrapPagerAdapter(components, interactor)
+ private val bootstrapPagerAdapter = TorBootstrapPagerAdapter(components, interactor)
init {
val binding = TorBootstrapPagerBinding.bind(view)
=====================================
fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapView.kt
=====================================
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+package org.mozilla.fenix.tor.view
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import org.mozilla.fenix.components.appstate.AppState
+import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor
+
+
+class TorBootstrapView(
+ containerView: RecyclerView,
+ viewLifecycleOwner: LifecycleOwner,
+ interactor: TorBootstrapInteractor,
+) {
+
+ val view: RecyclerView = containerView //as RecyclerView
+
+ private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap)
+
+ private val torBootstrapAdapter = TorBootstrapAdapter(
+ interactor,
+ viewLifecycleOwner,
+ containerView.context.components,
+ )
+
+ //private val torBootstrapAdapter =
+ // TorBootstrapAdapter(interactor, containerView.context.components)
+ //private val torBootstrapAdapter = TorBootstrapPagerAdapter(containerView.context.components, interactor)
+
+ init {
+ containerView.apply {
+ adapter = torBootstrapAdapter
+ layoutManager = LinearLayoutManager(containerView.context)
+ }
+ }
+
+ private fun AppState.toAdapterList(): List<AdapterItem> {
+ return bootstrapAdapterItems()
+ }
+
+ fun update(state: AppState) {
+ torBootstrapAdapter.submitList(state.toAdapterList())
+ }
+}
=====================================
fenix/app/src/main/res/drawable/tor_onboarding_donate_gradient.xml deleted
=====================================
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <shape>
- <gradient
- android:angle="45"
- android:startColor="#07d1db"
- android:endColor="#b240f5"
- android:type="linear" />
- </shape>
- </item>
-</selector>
=====================================
fenix/app/src/main/res/drawable/tor_onboarding_donate_rounded_corners.xml deleted
=====================================
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<!-- Used for rounding the corners of a button -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="#70efde" />
- <corners android:radius="10dp" />
-</shape>
=====================================
fenix/app/src/main/res/layout/tor_onboarding_donate.xml deleted
=====================================
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-<androidx.constraintlayout.widget.ConstraintLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/onboarding_card"
- style="@style/TorOnboardingDonateCardLightWithPadding"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <TextView
- android:id="@+id/header_text"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:text="@string/tor_onboarding_donate_header"
- android:textAppearance="@style/TorHeaderTextStyle"
- android:gravity="center_vertical"
- android:lines="1"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
- <TextView
- android:id="@+id/description_text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAppearance="@style/TorBody16TextStyle"
- android:layout_marginTop="14dp"
- android:text="@string/tor_onboarding_donate_description"
- app:layout_constraintTop_toBottomOf="@id/header_text"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
-
- <Button
- style="@style/TorDonateOnboardingButton"
- android:id="@+id/donate_now_button"
- android:text="@string/tor_onboarding_donate_button"
- android:layout_marginTop="10dp"
- android:textAppearance="@style/TorHeaderTextStyle"
- android:background="@drawable/tor_onboarding_donate_rounded_corners"
- app:layout_constraintTop_toBottomOf="@id/description_text"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintBottom_toBottomOf="parent"/>
-</androidx.constraintlayout.widget.ConstraintLayout>
=====================================
fenix/app/src/main/res/layout/tor_onboarding_security_level.xml deleted
=====================================
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/onboarding_card"
- style="@style/OnboardingCardLightWithPadding"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clipChildren="false"
- android:clipToPadding="false">
-
- <TextView
- android:id="@+id/header_text"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:drawablePadding="12dp"
- android:gravity="center_vertical"
- android:lines="1"
- android:text="@string/tor_onboarding_security_level"
- android:textAppearance="@style/HeaderTextStyle"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:drawableStart="@drawable/ic_onboarding_tracking_protection" />
-
- <TextView
- android:id="@+id/description_text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="12dp"
- android:textAppearance="@style/Body14TextStyle"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/current_level"
- tools:text="@string/tor_onboarding_security_level_description" />
-
- <TextView
- android:id="@+id/current_level"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="12dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/header_text"
- tools:text="@string/tor_onboarding_chosen_security_level_label" />
-
- <org.mozilla.fenix.onboarding.OnboardingRadioButton
- android:id="@+id/security_level_standard_option"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="16dp"
- android:background="@android:color/transparent"
- android:checked="true"
- android:foreground="@drawable/rounded_ripple"
- android:gravity="top"
- android:paddingStart="8dp"
- android:paddingEnd="8dp"
- android:theme="@style/Checkable.Colored"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/description_text"
- app:onboardingKey="@string/pref_key_tor_security_level_standard_option"
- app:onboardingKeyDescription="@string/tor_security_level_standard_description"
- app:onboardingKeyTitle="@string/tor_security_level_standard_option"
- tools:text="Standard" />
-
- <org.mozilla.fenix.onboarding.OnboardingRadioButton
- android:id="@+id/security_level_safer_option"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="16dp"
- android:background="@android:color/transparent"
- android:checked="false"
- android:foreground="@drawable/rounded_ripple"
- android:gravity="top"
- android:paddingStart="8dp"
- android:paddingEnd="8dp"
- android:textColor="@color/primary_state_list_text_color"
- android:theme="@style/Checkable.Colored"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/security_level_standard_option"
- app:onboardingKey="@string/pref_key_tor_security_level_safer_option"
- app:onboardingKeyDescription="@string/tor_security_level_safer_description"
- app:onboardingKeyTitle="@string/tor_security_level_safer_option"
- tools:text="Safer" />
-
- <org.mozilla.fenix.onboarding.OnboardingRadioButton
- android:id="@+id/security_level_safest_option"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="16dp"
- android:background="@android:color/transparent"
- android:checked="false"
- android:foreground="@drawable/rounded_ripple"
- android:gravity="top"
- android:paddingStart="8dp"
- android:paddingEnd="8dp"
- android:textColor="@color/primary_state_list_text_color"
- android:theme="@style/Checkable.Colored"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/security_level_safer_option"
- app:onboardingKey="@string/pref_key_tor_security_level_safest_option"
- app:onboardingKeyDescription="@string/tor_security_level_safest_description"
- app:onboardingKeyTitle="@string/tor_security_level_safest_option"
- tools:text="Safest" />
-
- <Button
- android:id="@+id/open_settings_button"
- style="@style/NeutralOnboardingButton"
- android:layout_marginTop="16dp"
- android:text="@string/tor_onboarding_security_settings_button"
- app:layout_constraintTop_toBottomOf="@id/security_level_safest_option"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintBottom_toBottomOf="parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
=====================================
fenix/app/src/main/res/navigation/nav_graph.xml
=====================================
@@ -21,6 +21,12 @@
app:popUpTo="@id/startupFragment"
app:popUpToInclusive="true" />
+ <action
+ android:id="@+id/action_startup_torbootstrap"
+ app:destination="@id/torbootstrapFragment"
+ app:popUpTo="@id/startupFragment"
+ app:popUpToInclusive="true" />
+
<action
android:id="@+id/action_global_home"
app:destination="@id/homeFragment"
@@ -247,6 +253,24 @@
app:popUpToInclusive="true" />
</fragment>
+ <fragment
+ android:id="@+id/torbootstrapFragment"
+ android:name="org.mozilla.fenix.tor.TorBootstrapFragment"
+ tools:layout="@layout/fragment_home">
+ <action
+ android:id="@+id/action_home"
+ app:destination="@id/homeFragment"
+ app:popUpTo="@id/torbootstrapFragment"
+ app:popUpToInclusive="true" />
+ <action
+ android:id="@+id/action_torbootstrapFragment_to_torNetworkSettingsFragment"
+ app:destination="@id/torNetworkSettingsFragment"
+ app:enterAnim="@anim/slide_in_right"
+ app:exitAnim="@anim/slide_out_left"
+ app:popEnterAnim="@anim/slide_in_left"
+ app:popExitAnim="@anim/slide_out_right" />
+ </fragment>
+
<dialog
android:id="@+id/homeOnboardingDialogFragment"
android:name="org.mozilla.fenix.onboarding.HomeOnboardingDialogFragment" />
=====================================
fenix/app/src/main/res/values/styles.xml
=====================================
@@ -375,13 +375,6 @@
<item name="android:textColor">?attr/textPrimary</item>
</style>
- <!-- Ideally we should consolidate this with NeutralButton in the future -->
- <style name="TorDonateOnboardingButton" parent="NeutralButton">
- <item name="android:background">@drawable/tor_onboarding_donate_rounded_corners</item>
- <item name="backgroundTint">#70efde</item>
- <item name="android:textColor">#000000</item>
- </style>
-
<style name="DestructiveButton" parent="NeutralButton">
<item name="iconTint">@color/fx_mobile_icon_color_warning_button</item>
<item name="android:textColor">@color/fx_mobile_text_color_warning_button</item>
@@ -582,10 +575,6 @@
<item name="android:elevation">0dp</item>
</style>
- <style name="TorOnboardingDonateCardLightWithPadding" parent="OnboardingCardDark">
- <item name="android:background">@drawable/tor_onboarding_donate_gradient</item>
- </style>
-
<style name="SearchClipboardStyle">
<item name="android:ellipsize">end</item>
<item name="android:maxLines">1</item>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/d1…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/d1…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] Bug 42072: 2023 year end campaign for about:tor.
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
51bcca21 by Henry Wilkes at 2023-09-12T15:25:12+01:00
Bug 42072: 2023 year end campaign for about:tor.
- - - - -
1 changed file:
- browser/locales/en-US/browser/tor-browser.ftl
Changes:
=====================================
browser/locales/en-US/browser/tor-browser.ftl
=====================================
@@ -39,3 +39,21 @@ tor-browser-home-message-testing = This is an unstable version of Tor Browser fo
# Shown in Home settings, corresponds to the default about:tor home page.
home-mode-choice-tor =
.label = Tor Browser Home
+
+
+## 2023 year-end-campaign.
+
+# Large introduction text.
+yec-2023-introduction = Right now, Tor Browser is protecting your privacy and the privacy of millions of people like you!
+# Follows directly below yec-2023-introduction.
+# The <span data-l10n-name="attention"> tag is meant to bring some styling attention to the first phrase, but doesn't have any semantic meaning.
+yec-2023-please-donate = <span data-l10n-name="attention">This is possible because of donations from our community.</span> If you value the privacy that Tor Browser offers yourself and others, please make a donation today. You’ll ensure Tor Browser continues to provide online privacy to everyone who needs it.
+# Shown only during a period where donations will be matched. The end date should match the end of the year.
+# $amount (Number) - The donation limit. This will be a whole-number and will be automatically formatted according to the language/locale: using the language's numeral symbols and thousand-separators.
+# NOTE: The amount should be shown as USD (United States dollar) currency. In the original English string, the first "$" is the literal USD currency symbol, and this can be changed or removed when translating to whatever is most appropriate for USD currency in the locale. In contrast, the "$" at the start of "$amount" is part of the Fluent format's syntax and should not be changed when translating.
+# For example, "${ $amount }" for English would eventually be shown as "$5,000", whilst "{ $amount } US$" for Arabic would be shown as "٥٬٠٠٠ US$".
+# Translators: If you need any help or clarification, feel free to ask a question on weblate or in IRC (#tor-l10n).
+yec-2023-matched-donation = From now until December 31, your gift will be matched one-to-one, up to ${ $amount }!
+yec-2023-close-button =
+ .title = Close
+yec-2023-donate-button = Donate now
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/51bcca2…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/51bcca2…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] 2 commits: Revert "Bug 42022: Prevent extension search engines from breaking the whole search system"
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
a4d48a95 by Pier Angelo Vendrame at 2023-09-12T15:02:03+02:00
Revert "Bug 42022: Prevent extension search engines from breaking the whole search system"
This reverts commit 9d7a9a7969394bc9503cc22ad9324666ca72cecc.
- - - - -
92026016 by Pier Angelo Vendrame at 2023-09-12T15:02:04+02:00
Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8
Differential Revision: https://phabricator.services.mozilla.com/D186456
- - - - -
3 changed files:
- toolkit/components/search/SearchService.sys.mjs
- + toolkit/components/search/tests/xpcshell/test_webextensions_startup_duplicate.js
- toolkit/components/search/tests/xpcshell/xpcshell.ini
Changes:
=====================================
toolkit/components/search/SearchService.sys.mjs
=====================================
@@ -1574,11 +1574,18 @@ export class SearchService {
"engines reported by AddonManager startup"
);
for (let extension of this.#startupExtensions) {
- await this.#installExtensionEngine(
- extension,
- [lazy.SearchUtils.DEFAULT_TAG],
- true
- );
+ try {
+ await this.#installExtensionEngine(
+ extension,
+ [lazy.SearchUtils.DEFAULT_TAG],
+ true
+ );
+ } catch (ex) {
+ lazy.logConsole.error(
+ `#installExtensionEngine failed for ${extension.id}`,
+ ex
+ );
+ }
}
this.#startupExtensions.clear();
@@ -2715,7 +2722,6 @@ export class SearchService {
};
let engines = [];
- let revert = false;
for (let locale of locales) {
lazy.logConsole.debug(
"addEnginesFromExtension: installing:",
@@ -2723,28 +2729,7 @@ export class SearchService {
":",
locale
);
- try {
- engines.push(await installLocale(locale));
- } catch (err) {
- lazy.logConsole.error(
- `Could not install the search engine of ${extension.id}`,
- err
- );
- revert = true;
- break;
- }
- }
- if (revert) {
- for (let engine of engines) {
- try {
- this.removeEngine(engine);
- } catch (err) {
- lazy.logConsole.warn(
- "Failed to revert the addition of a search engine",
- err
- );
- }
- }
+ engines.push(await installLocale(locale));
}
return engines;
}
=====================================
toolkit/components/search/tests/xpcshell/test_webextensions_startup_duplicate.js
=====================================
@@ -0,0 +1,59 @@
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const lazy = {};
+
+const { promiseShutdownManager, promiseStartupManager } = AddonTestUtils;
+
+ChromeUtils.defineESModuleGetters(lazy, {
+ ExtensionTestUtils:
+ "resource://testing-common/ExtensionXPCShellUtils.sys.mjs",
+});
+
+add_setup(async function () {
+ let server = useHttpServer();
+ server.registerContentType("sjs", "sjs");
+ await SearchTestUtils.useTestEngines("test-extensions");
+ await promiseStartupManager();
+
+ registerCleanupFunction(async () => {
+ await promiseShutdownManager();
+ });
+});
+
+add_task(async function test_install_duplicate_engine_startup() {
+ let name = "Plain";
+ let id = "plain(a)tests.mozilla.org";
+ consoleAllowList.push(
+ `#installExtensionEngine failed for ${id}`,
+ `An engine called ${name} already exists`
+ );
+ // Do not use SearchTestUtils.installSearchExtension, as we need to manually
+ // start the search service after installing the extension.
+ let extensionInfo = {
+ useAddonManager: "permanent",
+ files: {},
+ manifest: SearchTestUtils.createEngineManifest({
+ name,
+ search_url: "https://example.com/plain",
+ }),
+ };
+
+ let extension = lazy.ExtensionTestUtils.loadExtension(extensionInfo);
+ await extension.startup();
+
+ await Services.search.init();
+
+ await AddonTestUtils.waitForSearchProviderStartup(extension);
+ let engine = await Services.search.getEngineByName(name);
+ let submission = engine.getSubmission("foo");
+ Assert.equal(
+ submission.uri.spec,
+ "https://duckduckgo.com/?q=foo&t=ffsb",
+ "Should have not changed the app provided engine."
+ );
+
+ await extension.unload();
+});
=====================================
toolkit/components/search/tests/xpcshell/xpcshell.ini
=====================================
@@ -191,6 +191,7 @@ support-files = data/search_ignorelist.json
[test_webextensions_migrate_to.js]
support-files = data/search-migration.json
[test_webextensions_normandy_upgrade.js]
+[test_webextensions_startup_duplicate.js]
[test_webextensions_startup_remove.js]
[test_webextensions_upgrade.js]
[test_webextensions_valid.js]
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/44ffc8…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/44ffc8…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] 2 commits: Revert "Bug 42022: Prevent extension search engines from breaking the whole search system"
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
967cf4de by Pier Angelo Vendrame at 2023-09-12T14:47:03+02:00
Revert "Bug 42022: Prevent extension search engines from breaking the whole search system"
This reverts commit 9d7a9a7969394bc9503cc22ad9324666ca72cecc.
- - - - -
27211730 by Pier Angelo Vendrame at 2023-09-12T14:48:04+02:00
Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8
Differential Revision: https://phabricator.services.mozilla.com/D186456
- - - - -
3 changed files:
- toolkit/components/search/SearchService.sys.mjs
- + toolkit/components/search/tests/xpcshell/test_webextensions_startup_duplicate.js
- toolkit/components/search/tests/xpcshell/xpcshell.ini
Changes:
=====================================
toolkit/components/search/SearchService.sys.mjs
=====================================
@@ -1574,11 +1574,18 @@ export class SearchService {
"engines reported by AddonManager startup"
);
for (let extension of this.#startupExtensions) {
- await this.#installExtensionEngine(
- extension,
- [lazy.SearchUtils.DEFAULT_TAG],
- true
- );
+ try {
+ await this.#installExtensionEngine(
+ extension,
+ [lazy.SearchUtils.DEFAULT_TAG],
+ true
+ );
+ } catch (ex) {
+ lazy.logConsole.error(
+ `#installExtensionEngine failed for ${extension.id}`,
+ ex
+ );
+ }
}
this.#startupExtensions.clear();
@@ -2713,7 +2720,6 @@ export class SearchService {
};
let engines = [];
- let revert = false;
for (let locale of locales) {
lazy.logConsole.debug(
"addEnginesFromExtension: installing:",
@@ -2721,28 +2727,7 @@ export class SearchService {
":",
locale
);
- try {
- engines.push(await installLocale(locale));
- } catch (err) {
- lazy.logConsole.error(
- `Could not install the search engine of ${extension.id}`,
- err
- );
- revert = true;
- break;
- }
- }
- if (revert) {
- for (let engine of engines) {
- try {
- this.removeEngine(engine);
- } catch (err) {
- lazy.logConsole.warn(
- "Failed to revert the addition of a search engine",
- err
- );
- }
- }
+ engines.push(await installLocale(locale));
}
return engines;
}
=====================================
toolkit/components/search/tests/xpcshell/test_webextensions_startup_duplicate.js
=====================================
@@ -0,0 +1,59 @@
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const lazy = {};
+
+const { promiseShutdownManager, promiseStartupManager } = AddonTestUtils;
+
+ChromeUtils.defineESModuleGetters(lazy, {
+ ExtensionTestUtils:
+ "resource://testing-common/ExtensionXPCShellUtils.sys.mjs",
+});
+
+add_setup(async function () {
+ let server = useHttpServer();
+ server.registerContentType("sjs", "sjs");
+ await SearchTestUtils.useTestEngines("test-extensions");
+ await promiseStartupManager();
+
+ registerCleanupFunction(async () => {
+ await promiseShutdownManager();
+ });
+});
+
+add_task(async function test_install_duplicate_engine_startup() {
+ let name = "Plain";
+ let id = "plain(a)tests.mozilla.org";
+ consoleAllowList.push(
+ `#installExtensionEngine failed for ${id}`,
+ `An engine called ${name} already exists`
+ );
+ // Do not use SearchTestUtils.installSearchExtension, as we need to manually
+ // start the search service after installing the extension.
+ let extensionInfo = {
+ useAddonManager: "permanent",
+ files: {},
+ manifest: SearchTestUtils.createEngineManifest({
+ name,
+ search_url: "https://example.com/plain",
+ }),
+ };
+
+ let extension = lazy.ExtensionTestUtils.loadExtension(extensionInfo);
+ await extension.startup();
+
+ await Services.search.init();
+
+ await AddonTestUtils.waitForSearchProviderStartup(extension);
+ let engine = await Services.search.getEngineByName(name);
+ let submission = engine.getSubmission("foo");
+ Assert.equal(
+ submission.uri.spec,
+ "https://duckduckgo.com/?q=foo&t=ffsb",
+ "Should have not changed the app provided engine."
+ );
+
+ await extension.unload();
+});
=====================================
toolkit/components/search/tests/xpcshell/xpcshell.ini
=====================================
@@ -191,6 +191,7 @@ support-files = data/search_ignorelist.json
[test_webextensions_migrate_to.js]
support-files = data/search-migration.json
[test_webextensions_normandy_upgrade.js]
+[test_webextensions_startup_duplicate.js]
[test_webextensions_startup_remove.js]
[test_webextensions_upgrade.js]
[test_webextensions_valid.js]
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cff16…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cff16…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_2_1esr_BUILD1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new tag FIREFOX_115_2_1esr_BUILD1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] Bug 42084: Ensure English spoofing works even if preferences are set out of order.
by ma1 (@ma1) 12 Sep '23
by ma1 (@ma1) 12 Sep '23
12 Sep '23
ma1 pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
44ffc800 by hackademix at 2023-09-12T11:56:26+02:00
Bug 42084: Ensure English spoofing works even if preferences are set out of order.
- - - - -
1 changed file:
- toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
Changes:
=====================================
toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
=====================================
@@ -158,6 +158,9 @@ class _RFPHelper {
// Add RFP and Letterboxing observers if prefs are enabled
this._handleResistFingerprintingChanged();
this._handleLetterboxingPrefChanged();
+
+ // Synchronize language preferences if accidentally messed up (tor-browser#42084)
+ this._handleSpoofEnglishChanged();
}
uninit() {
@@ -211,6 +214,7 @@ class _RFPHelper {
this._handleResistFingerprintingChanged();
break;
case kPrefSpoofEnglish:
+ case "intl.accept_languages":
this._handleSpoofEnglishChanged();
break;
case kPrefLetterboxing:
@@ -259,6 +263,7 @@ class _RFPHelper {
}
_handleSpoofEnglishChanged() {
+ Services.prefs.removeObserver("intl.accept_languages", this);
switch (Services.prefs.getIntPref(kPrefSpoofEnglish)) {
case 0: // will prompt
// This should only happen when turning privacy.resistFingerprinting off.
@@ -277,6 +282,8 @@ class _RFPHelper {
case 2: // spoof
Services.prefs.setCharPref("intl.accept_languages", "en-US, en");
Services.prefs.setBoolPref("javascript.use_us_english_locale", true);
+ // Ensure spoofing works if preferences are set out of order
+ Services.prefs.addObserver("intl.accept_languages", this);
break;
default:
break;
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/44ffc80…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/44ffc80…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-102.15.1esr-12.5-1-build1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new tag base-browser-102.15.1esr-12.5-1-build1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.15.1esr-12.5-1-build1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new tag tor-browser-102.15.1esr-12.5-1-build1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-102.15.1esr-12.5-1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new branch base-browser-102.15.1esr-12.5-1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-102.15.1esr-12.5-1] 145 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed to branch tor-browser-102.15.1esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
026e5ba6 by Pier Angelo Vendrame at 2023-09-12T10:06:51+02:00
Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
Bundled fonts were not picked up because also child processes need to
register them.
Also, they were assigned User visibility, instead of Base, which was
not coherent with other platforms.
Differential Revision: https://phabricator.services.mozilla.com/D150400
- - - - -
3ef7bbdb by Pier Angelo Vendrame at 2023-09-12T10:06:53+02:00
Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium
Add a configuration flag to make Enterprise Policies mechanism only
consult a policies.json file (avoiding the Windows Registry, macOS's
file system attributes, and /etc/firefox/policies/policies.json on
other OS).
Differential Revision: https://phabricator.services.mozilla.com/D146300
- - - - -
0663ed2b by Jamie Nicol at 2023-09-12T10:06:54+02:00
Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond
Differential Revision: https://phabricator.services.mozilla.com/D154897
- - - - -
7dab1283 by Pier Angelo Vendrame at 2023-09-12T10:06:54+02:00
Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers
Differential Revision: https://phabricator.services.mozilla.com/D157843
- - - - -
a51bb4f0 by Neill Miller at 2023-09-12T10:06:55+02:00
Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman
nsTransferable was modified to prevent disk leakings when copying data
in private browsing mode with Bug 1123480.
However, the context is nullptr when it is initialized, so it still
leaks if PBM is enabled by default.
Our solution is to check the browser.privatebrowsing.autostart in this
condition.
Differential Revision: https://phabricator.services.mozilla.com/D157800
- - - - -
4cd409e6 by Gabriele Svelto at 2023-09-12T10:06:55+02:00
Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium
macOS unfair locks enforce that a lock can only be released by the thread which locked it.
On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing.
Differential Revision: https://phabricator.services.mozilla.com/D148287
- - - - -
556410b7 by Gabriele Svelto at 2023-09-12T10:06:56+02:00
Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium
Depends on D148287
Differential Revision: https://phabricator.services.mozilla.com/D99280
- - - - -
473af944 by Kershaw Chang at 2023-09-12T10:06:56+02:00
Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers,valentin
Differential Revision: https://phabricator.services.mozilla.com/D164656
- - - - -
c6a170ef by Kathy Brade at 2023-09-12T10:06:56+02:00
Bug 1769028: Disable DNS lookup in nsProfileLock when the proxy bypass protection is enabled r=mossop
Instead of using the local computer's IP address within
symlink-based profile lock signatures, always use 127.0.0.1 when the
proxy bypass protection is enabled.
Differential Revision: https://phabricator.services.mozilla.com/D161264
- - - - -
77663e9d by Gabriele Svelto at 2023-09-12T10:06:57+02:00
Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone
Differential Revision: https://phabricator.services.mozilla.com/D149599
- - - - -
6f93d620 by Gabriele Svelto at 2023-09-12T10:06:57+02:00
Bug 1784018 - Remove deprecated OSSpinLocks r=glandium
On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space
which degrades performance significantly. To obviate for this we spin in
user-space like OSSpinLock does, for the same number of times and invoking
x86-specific pause instructions in-between the locking attempts to avoid
starving a thread that might be running on the same physical core.
Differential Revision: https://phabricator.services.mozilla.com/D154205
- - - - -
3623bd82 by Hubert Boma Manilla at 2023-09-12T10:06:58+02:00
Bug 1790542 - [devtools] Do not allow redirects on the 'sourceMappingUrl' r=jdescottes,devtools-reviewers
- Block redirects on sourceMappingUrl
- Add debugger test
Differential Revision: https://phabricator.services.mozilla.com/D168648
- - - - -
be05d7b9 by Hubert Boma Manilla at 2023-09-12T10:06:58+02:00
Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers
.sjs files depend on redirects to load static files.
In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js
fails because we use .sjs to serve the content.
This patch refactors to no longer use .sjs files
Differential Revision: https://phabricator.services.mozilla.com/D169739
- - - - -
ecc6de5c by Jonathan Kew at 2023-09-12T10:06:58+02:00
Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when they 'shadow' system-installed families. r=gfx-reviewers,lsalzman
Differential Revision: https://phabricator.services.mozilla.com/D175350
- - - - -
4bf3900a by Rob Wu at 2023-09-12T10:06:59+02:00
Bug 1802385 - Use NS_GetFinalChannelURI in FetchDriver r=rpl,valentin
Depends on D164656
Differential Revision: https://phabricator.services.mozilla.com/D166108
- - - - -
90b550e3 by Kash Shampur at 2023-09-12T10:06:59+02:00
Bug 1803109 - Discard blocks of data that are too big for two chunks. r=canaltinova
Currently, `ReserveAndPutRaw` allocates a second span even if the data would be too big for the chunk.
Here a second conditional is added to check if the block of data is too big in this scenario and silently discard the data if so.
Differential Revision: https://phabricator.services.mozilla.com/D167167
- - - - -
269a6ebb by Pier Angelo Vendrame at 2023-09-12T10:07:00+02:00
Bug 1814416: Generalize the app name in about:buildconfig. r=ahochheiden
Now it displays app display name, instead of having Firefox hardcoded.
Differential Revision: https://phabricator.services.mozilla.com/D168562
- - - - -
905b22f2 by Jon Coppeard at 2023-09-12T10:07:00+02:00
Bug 1816158 - Part 1: Disallow GC while iterating global's debugger vector r=sfink
GC can mutate this vector so don't allow that while we are iterating. I think
it would be safe to use index-based iteration but it's safer to just ban it
entirely.
This fixes the crash produced by the testcase.
Differential Revision: https://phabricator.services.mozilla.com/D169701
- - - - -
32865c7c by Jon Coppeard at 2023-09-12T10:07:00+02:00
Bug 1816158 - Part 2: Require no GC when giving out references to the realm's debugger vector r=sfink
To prevent any other instances of this problme we can update the getDebuggers()
methods on the global and the realm to require no GC.
Depends on D169701
Differential Revision: https://phabricator.services.mozilla.com/D169702
- - - - -
672679ad by Pier Angelo Vendrame at 2023-09-12T10:07:01+02:00
Bug 1817756 - Add a seed to the network ID. r=valentin,necko-reviewers
This helps to prevent linkability of users in the same network.
Differential Revision: https://phabricator.services.mozilla.com/D170373
- - - - -
21745695 by John Lin at 2023-09-12T10:07:01+02:00
Bug 1832832 - protect encoder accesses in Java callbacks. r=media-playback-reviewers,alwu a=pascalc
Differential Revision: https://phabricator.services.mozilla.com/D178564
- - - - -
dfb83cd2 by Arsen Arsenović at 2023-09-12T10:07:02+02:00
Bug 1811714 - Add a few missing <cstdint> includes r=gfx-reviewers,nical
GCC 13s libstdc++ reduced its dependency on some headers like <cstdint>,
so it's no longer transitively included through various headers.
Include it explicitly.
See also: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
11:16.32 .../components/telemetry/pingsender/pingsender.cpp:30:7:
error: unknown type name 'uint32_t'
11:16.33 const uint32_t kConnectionTimeoutMs = 30 * 1000;
11:16.33 ^
11:16.33 ... /components/telemetry/pingsender/pingsender.cpp:76:9:
error: unknown type name 'uint32_t'
11:16.33 const uint32_t kBufferSize = 4 * 1024 - 1;
11:16.34 ^
11:16.44 2 errors generated.
(et al)
Differential Revision: https://phabricator.services.mozilla.com/D167491
- - - - -
dc46a58f by James Teh at 2023-09-12T10:07:02+02:00
Bug 1772170: Ensure cached Accessibles and offsets are valid before returning them in DocAccessibleParent::SelectionRanges. r=eeejay
Differential Revision: https://phabricator.services.mozilla.com/D148745
- - - - -
f25fb2bd by James Teh at 2023-09-12T10:07:03+02:00
Bug 1781169: Ensure that the cached start/end containers contain characters before returning them in DocAccessibleParent::SelectionRanges. r=eeejay
In bug 1772170, I added code to ensure that the cached offsets are valid.
However, this didn't account for the possibility that one of the containers contained 0 characters.
In that case, offset 0 is itself invalid.
If there were also no children, this might in GetChildAtOffset being called and returning null, causing a crash when retrieving selection.
Differential Revision: https://phabricator.services.mozilla.com/D154964
- - - - -
c2d8e51d by Edgar Chen at 2023-09-12T10:07:03+02:00
Bug 1821884 - Ensure consistent state for fullscreen/pointerlock warnings; r=Gijs
Fullscreen/PointerLock warnings are initialized with hidden="true", but
change to hidden="" after being shown and hidden again. I think this
started happening when we began using HTML elements instead of XUL as
they handle hidden attribute differently.
Differential Revision: https://phabricator.services.mozilla.com/D177790
- - - - -
feb08328 by Edgar Chen at 2023-09-12T10:07:03+02:00
Bug 1821884 - Reshow initial fullscreen notification; r=Gijs
Depends on D177790
Differential Revision: https://phabricator.services.mozilla.com/D178339
- - - - -
4028ac81 by Andrew Osmond at 2023-09-12T10:07:19+02:00
Bug 1751583. r=media-playback-reviewers,alwu a=RyanVM
- - - - -
e14cab18 by Tim Huang at 2023-09-12T10:07:21+02:00
Bug 1842030 - Part 1: Adding CanonicalBrowsingContext::IsPrivateBrowsingActive(). r=nika
The CanonicalBrowsingContext::IsPrivateBrowsingActive() function allows
us to know if private browsing is active. We need it to prevent setting
cookies if there is no active private browsing session.
Differential Revision: https://phabricator.services.mozilla.com/D184010
- - - - -
11ef8b88 by Tim Huang at 2023-09-12T10:07:22+02:00
Bug 1842030 - Part 2: Check the global private browsing state for HttpBaseChannel::IsBrowsingContextDiscarded() if the loadGroup is not avaiable. r=necko-reviewers,jesup
The HttpBaseChannel::IsBrowsingContextDiscarded() did always return
false if the loadGroup is not avaiable. But, this may not be correct for
the private channels if the private session has been ended. To fix this,
we make the function to check the global private browsing state
if the loadGroup is not available for private channels.
Depends on D184010
Differential Revision: https://phabricator.services.mozilla.com/D184479
- - - - -
9711e81b by hsingh at 2023-09-12T10:07:22+02:00
Bug 1843046: Do not allow notifications in private window. r=saschanaz, a=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D184064
- - - - -
a833c881 by Georg Koppen at 2023-09-12T10:07:53+02:00
Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM"
This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f.
This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706.
However, it is a temporary workaround, that we should revert once
https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed.
- - - - -
1020a522 by Henry Wilkes at 2023-09-12T10:07:55+02:00
Bug 41454: Move focus after calling openPreferences for a sub-category.
Temporary fix until mozilla bug 1799153 gets a patch upstream.
- - - - -
2eb610ef by Henry Wilkes at 2023-09-12T10:07:55+02:00
Bug 41483: Remove the firefox override for appstrings.properties
Remove this patch after upstream bugzilla bug 1790187
- - - - -
4ba650ca by Pier Angelo Vendrame at 2023-09-12T10:07:56+02:00
Bug 41116: Normalize system fonts.
System fonts are an enormous fingerprinting vector.
Even with font allow lists and with our custom configuration on Linux,
which counter metrics measurements, getComputedStyle leaks several
details.
This patch counters both these kinds of attacks.
- - - - -
fe91ecb6 by Marco Simonelli at 2023-09-12T10:07:56+02:00
Bug 41459: WebRTC fails to build under mingw (Part 1)
- properly define NOMINMAX for just MSVC builds
- - - - -
ddbd2423 by Marco Simonelli at 2023-09-12T10:07:57+02:00
Bug 41459: WebRTC fails to build under mingw (Part 2)
- fixes required to build third_party/libwebrtc
- - - - -
26aea335 by Marco Simonelli at 2023-09-12T10:07:57+02:00
Bug 41459: WebRTC fails to build under mingw (Part 3)
- fixes required to build third_party/sipcc
- - - - -
d7973c8b by Marco Simonelli at 2023-09-12T10:07:57+02:00
Bug 41459: WebRTC fails to build under mingw (Part 4)
- fixes requried to build netwerk/sctp
- - - - -
37f3b42e by Marco Simonelli at 2023-09-12T10:07:58+02:00
Bug 41459: WebRTC fails to build under mingw (Part 5)
- fixes required to build dom/media/webrtc
- - - - -
816efc73 by Marco Simonelli at 2023-09-12T10:07:58+02:00
Bug 41459: WebRTC fails to build under mingw (Part 6)
- fixes required to build dom/media/systemservices
- - - - -
95b6e6ce by Gaba at 2023-09-12T10:07:59+02:00
Adding issue and merge request templates
- - - - -
4eee270f by Pier Angelo Vendrame at 2023-09-12T10:07:59+02:00
Base Browser's .mozconfigs.
Bug 17858: Cannot create incremental MARs for hardened builds.
Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
(which is part of mar-tools and is not distributed to end-users) with
ASan.
Bug 21849: Don't allow SSL key logging.
Bug 25741 - TBA: Disable features at compile-time
Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION
Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds
This fixes a problem where some preferences had the wrong default value.
Also see bug 27472 where we made a similar fix for Android.
Bug 29859: Disable HLS support for now
Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
Bug 33734: Set MOZ_NORMANDY to False
Bug 33851: Omit Parental Controls.
Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files
Bug 41584: Move some configuration options to base-browser level
- - - - -
29840943 by Pier Angelo Vendrame at 2023-09-12T10:07:59+02:00
Tweaks to the build system
Bug 40857: Modified the fat .aar creation file
This is a workaround to build fat .aars with the compiling enviornment
disabled.
Mozilla does not use a similar configuration, but either runs a Firefox
build and discards its output, or uses artifacts build.
We might switch to artifact builds too, and drop this patch, or write a
better one to upstream. But until then we need this patch.
See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770.
Bug 41458: Prevent `mach package-multi-locale` from actually creating a package
macOS builds need some files to be moved around with
./mach package-multi-locale to create multi-locale packages.
The required command isn't exposed through any other mach command.
So, we patch package-multi-locale both to prevent it from failing when
doing official builds and to detect any future changes on it.
- - - - -
335f6ec2 by Dan Ballard at 2023-09-12T10:08:00+02:00
Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restore email link on mac
- - - - -
f5ccea6e by Pier Angelo Vendrame at 2023-09-12T10:08:00+02:00
Bug 41108: Remove privileged macOS installation from 102
- - - - -
63a96919 by Dan Ballard at 2023-09-12T10:08:01+02:00
Bug 41149: Re-enable DLL injection protection in all builds not just nightlies
- - - - -
ac45c4a3 by Matthew Finkel at 2023-09-12T10:08:01+02:00
Bug 24796: Comment out excess permissions from GeckoView
The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's
manifest, so we can't use the ifdef preprocessor guards around the
permissions we do not want. Commenting the permissions is the
next-best-thing.
- - - - -
dda6bb2e by Matthew Finkel at 2023-09-12T10:08:01+02:00
Bug 28125: Prevent non-Necko network connections
- - - - -
34431d15 by Mike Perry at 2023-09-12T10:08:02+02:00
Bug 12974: Disable NTLM and Negotiate HTTP Auth
The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421,
https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602
- - - - -
d15384d1 by Alex Catarineu at 2023-09-12T10:08:02+02:00
Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899
- - - - -
ba5fe8da by Georg Koppen at 2023-09-12T10:08:03+02:00
Bug 16285: Exclude ClearKey system for now
In the past the ClearKey system had not been compiled when specifying
--disable-eme. But that changed and it is even bundled nowadays (see:
Mozilla's bug 1300654). We don't want to ship it right now as the use
case for it is not really visible while the code had security
vulnerabilities in the past.
- - - - -
bffd4782 by Kathy Brade at 2023-09-12T10:08:03+02:00
Bug 21431: Clean-up system extensions shipped in Firefox
Only ship the pdfjs extension.
- - - - -
80dfbeae by Kathy Brade at 2023-09-12T10:08:04+02:00
Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
Hide elements on about:logins that mention sync, "Firefox LockWise", and
Mozilla's LockWise mobile apps.
Disable the "Create New Login" button when security.nocertdb is true.
- - - - -
58b2dc7e by Alex Catarineu at 2023-09-12T10:08:04+02:00
Bug 41457: Remove Mozilla permissions
Bug 40025: Remove Mozilla add-on install permissions
- - - - -
3b2b30e0 by Kathy Brade at 2023-09-12T10:08:04+02:00
Bug 40002: Remove about:ion
Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people
volunteer to participate in studies that collect detailed, sensitive data about
how they use their browser.
Bug 41662: Disable about:sync-logs
Even though we disable sync by default with
`identity.fxaccounts.enabled`, this about: page is still avilable.
We could throw an exception on the constructor of the related
component, but it would result only in an error in the console, without
a visible "this address does not look right" error page.
If we fix the issues with MOZ_SERVICES_SYNC, we can restore the
component.
- - - - -
c1ffd5fd by Arthur Edelstein at 2023-09-12T10:08:05+02:00
Bug 26353: Prevent speculative connect that violated FPI.
Connections were observed in the catch-all circuit when
the user entered an https or http URL in the URL bar, or
typed a search term.
- - - - -
d49eb63f by Alex Catarineu at 2023-09-12T10:08:05+02:00
Bug 31740: Remove some unnecessary RemoteSettings instances
More concretely, SearchService.jsm 'hijack-blocklists' and
url-classifier-skip-urls.
Avoid creating instance for 'anti-tracking-url-decoration'.
If prefs are disabling their usage, avoid creating instances for
'cert-revocations' and 'intermediates'.
Do not ship JSON dumps for collections we do not expect to need. For
the ones in the 'main' bucket, this prevents them from being synced
unnecessarily (the code in remote-settings does so for collections
in the main bucket for which a dump or local data exists). For the
collections in the other buckets, we just save some size by not
shipping their dumps.
We also clear the collections database on the v2 -> v3 migration.
- - - - -
53f49764 by Pier Angelo Vendrame at 2023-09-12T10:08:06+02:00
Bug 41635: Disable the Normandy component
Do not include Normandy at all whenever MOZ_NORMANDY is False.
- - - - -
346ba80a by Georg Koppen at 2023-09-12T10:08:06+02:00
Bug 30541: Disable WebGL readPixel() for web content
Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034
- - - - -
84f7067e by Alex Catarineu at 2023-09-12T10:08:06+02:00
Bug 28369: Stop shipping pingsender executable
- - - - -
fb0e6255 by cypherpunks1 at 2023-09-12T10:08:07+02:00
Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING
- - - - -
792f2276 by cypherpunks1 at 2023-09-12T10:08:07+02:00
Bug 41568: Disable LaterRun
- - - - -
bda5b120 by cypherpunks1 at 2023-09-12T10:08:08+02:00
Bug 40717: Hide Windows SSO in settings
- - - - -
445bf465 by Pier Angelo Vendrame at 2023-09-12T10:08:08+02:00
Bug 40788: Prevent nsIURLQueryStrippingListService from calling home when it is not enabled.
The URL query stripping service is enabled only in nightly builds,
still it is initialized and remote settings are downloaded.
This adds a condition that prevents the service from being initialized
if disabled.
Upstream Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1812594
We should remove this patch if Mozilla decides that this is a problem
also for them, or if they do not but we decide to use the feature.
- - - - -
483bad60 by Pier Angelo Vendrame at 2023-09-12T10:08:08+02:00
Bug 41599: Always return an empty string as network ID
Firefox computes an internal network ID used to detect network changes
and act consequently (e.g., to improve WebSocket UX).
However, there are a few ways to get this internal network ID, so we
patch them out, to be sure any new code will not be able to use them and
possibly link users.
We also sent a patch to Mozilla to seed the internal network ID, to
prevent any accidental leak in the future.
Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756
- - - - -
5cd63445 by hackademix at 2023-09-12T11:27:14+02:00
Bug 42084: Ensure English spoofing works even if preferences are set out of order.
- - - - -
c315304e by Mike Perry at 2023-09-12T11:28:14+02:00
Firefox preference overrides.
This hack directly includes our preference changes in omni.ja.
Bug 18292: Staged updates fail on Windows
Temporarily disable staged updates on Windows.
Bug 18297: Use separate Noto JP,KR,SC,TC fonts
Bug 23404: Add Noto Sans Buginese to the macOS whitelist
Bug 23745: Set dom.indexedDB.enabled = true
Bug 13575: Disable randomised Firefox HTTP cache decay user tests.
(Fernando Fernandez Mancera <ffmancera(a)riseup.net>)
Bug 17252: Enable session identifiers with FPI
Session tickets and session identifiers were isolated
by OriginAttributes, so we can re-enable them by
allowing the default value (true) of
"security.ssl.disable_session_identifiers".
The pref "security.enable_tls_session_tickets" is obsolete
(removed in https://bugzilla.mozilla.org/917049)
Bug 14952: Enable http/2 and AltSvc
In Firefox, SPDY/HTTP2 now uses Origin Attributes for
isolation of connections, push streams, origin frames, etc.
That means we get first-party isolation provided
"privacy.firstparty.isolate" is true. So in this patch, we
stop overriding "network.http.spdy.enabled" and
"network.http.spdy.enabled.http2".
Alternate Services also use Origin Attributes for isolation.
So we stop overriding
"network.http.altsvc.enabled" and "network.http.altsvc.oe"
as well.
(All 4 of the abovementioned "network.http.*" prefs adopt
Firefox 60ESR's default value of true.)
However, we want to disable HTTP/2 push for now, so we
set "network.http.spdy.allow-push" to false.
"network.http.spdy.enabled.http2draft" was removed in Bug 1132357.
"network.http.sped.enabled.v2" was removed in Bug 912550.
"network.http.sped.enabled.v3" was removed in Bug 1097944.
"network.http.sped.enabled.v3-1" was removed in Bug 1248197.
Bug 26114: addons.mozilla.org is not special
* Don't expose navigator.mozAddonManager on any site
* Don't block NoScript from modifying addons.mozilla.org or other sites
Enable ReaderView mode again (#27281).
Bug 29916: Make sure enterprise policies are disabled
Bug 2874: Block Components.interfaces from content
Bug 26146: Spoof HTTP User-Agent header for desktop platforms
In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent
header and to JavaScript code via navigator.userAgent. To avoid
leaking the OS inside each HTTP request (which many web servers
log), always use the Windows 7 OS value in the desktop User-Agent
header. We continue to allow access to the actual OS via JavaScript,
since doing so improves compatibility with web applications such
as GitHub and Google Docs.
Bug 12885: Windows Jump Lists fail for Tor Browser
Jumplist entries are stored in a binary file in:
%APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\
and has a name in the form
[a-f0-9]+.customDestinations-ms
The hex at the front is unique per app, and is ultimately derived from
something called the 'App User Model ID' (AUMID) via some unknown
hashing method. The AUMID is provided as a key when programmatically
creating, updating, and deleting a jumplist. The default behaviour in
firefox is for the installer to define an AUMID for an app, and save it
in the registry so that the jumplist data can be removed by the
uninstaller.
However, the Tor Browser does not set this (or any other) regkey during
installation, so this codepath fails and the app's AUMID is left
undefined. As a result the app's AUMID ends up being defined by
windows, but unknowable by Tor Browser. This unknown AUMID is used to
create and modify the jumplist, but the delete API requires that we
provide the app's AUMID explicitly. Since we don't know what the AUMID
is (since the expected regkey where it is normally stored does not
exist) jumplist deletion will fail and we will leave behind a mostly
empty customDestinations-ms file. The name of the file is derived from
the binary path, so an enterprising person could reverse engineer how
that hex name is calculated, and generate the name for Tor Browser's
default Desktop installation path to determine whether a person had
used Tor Browser in the past.
The 'taskbar.grouping.useprofile' option that is enabled by this patch
works around this AUMID problem by having firefox.exe create it's own
AUMID based on the profile path (rather than looking for a regkey). This
way, if a user goes in and enables and disables jumplist entries, the
backing store is properly deleted.
Unfortunately, all windows users currently have this file lurking in
the above mentioned directory and this patch will not remove it since it
was created with an unknown AUMID. However, another patch could be
written which goes to that directory and deletes any item containing the
'Tor Browser' string. See bug 28996.
Bug 30845: Make sure default themes and other internal extensions are enabled
Bug 28896: Enable extensions in private browsing by default
Bug 31065: Explicitly allow proxying localhost
Bug 31598: Enable letterboxing
Disable Presentation API everywhere
Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer
security levels.
Bug 32321: Disable Mozilla's MitM pings
Bug 19890: Disable installation of system addons
By setting the URL to "" we make sure that already installed system
addons get deleted as well.
Bug 22548: Firefox downgrades VP9 videos to VP8.
On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor
Browser 7.0 all youtube videos are degraded to VP8.
This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0.
All clients will get better experience and lower traffic, beause TBB doesn't
use "Use hardware acceleration when available".
Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs
Bug 16441: Suppress "Reset Tor Browser" prompt.
Bug 29120: Use the in-memory media cache and increase its maximum size.
Bug 33697: use old search config based on list.json
Bug 33855: Ensure that site-specific browser mode is disabled.
Bug 30682: Disable Intermediate CA Preloading.
Bug 40061: Omit the Windows default browser agent from the build
Bug 40322: Consider disabling network.connectivity-service.enabled
Bug 40408: Disallow SVG Context Paint in all web content
Bug 40308: Disable network partitioning until we evaluate dFPI
Bug 40322: Consider disabling network.connectivity-service.enabled
Bug 40383: Disable dom.enable_event_timing
Bug 40423: Disable http/3
Bug 40177: Update prefs for Fx91esr
Bug 40700: Disable addons and features recommendations
Bug 40682: Disable network.proxy.allow_bypass
Bug 40736: Disable third-party cookies in PBM
Bug 19850: Enabled HTTPS-Only by default
Bug 40912: Hide the screenshot menu
Bug 41292: Disable moreFromMozilla in preferences page
Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector
Bug 24686: Set network.http.tailing.enabled to true
Bug 40183: Disable TLS ciphersuites using SHA-1
Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102
We reviewed all the preferences we set for 102, and remove a few old
ones. See the description of that issue to see all the preferences we
believed were still valid for 102, and some brief description for the
reasons to keep them.
- - - - -
cd0b1932 by Richard Pospesel at 2023-09-12T11:28:16+02:00
Bug 41659: Add canonical color definitions to base-browser
- - - - -
e2e7539a by Pier Angelo Vendrame at 2023-09-12T11:28:17+02:00
Bug 41043: Hardcode the UI font on Linux
The mechanism to choose the UI font does not play well with our
fontconfig configuration. As a result, the final criterion to choose
the font for the UI was its version.
Since we hardcode Arimo as a default sans-serif on preferences, we use
it also for the UI. FontConfig will fall back to some other font for
scripts Arimo does not cover as expected (we tested with Japanese).
- - - - -
6aee81fa by Alex Catarineu at 2023-09-12T11:28:17+02:00
Bug 30605: Honor privacy.spoof_english in Android
This checks `privacy.spoof_english` whenever `setLocales` is
called from Fenix side and sets `intl.accept_languages`
accordingly.
Bug 40198: Expose privacy.spoof_english pref in GeckoView
- - - - -
37e46388 by Alex Catarineu at 2023-09-12T11:28:17+02:00
Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView
- - - - -
d944aaac by Alex Catarineu at 2023-09-12T11:28:18+02:00
Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
- - - - -
6162ca64 by Alex Catarineu at 2023-09-12T11:28:18+02:00
Bug 26345: Hide tracking protection UI
- - - - -
b8514641 by Pier Angelo Vendrame at 2023-09-12T11:28:19+02:00
Bug 9173: Change the default Firefox profile directory to be relative.
This commit makes Firefox look for the default profile directory in a
directory relative to the binary path.
The directory can be specified through the --with-relative-data-dir.
This is relative to the same directory as the firefox main binary for
Linux and Windows.
On macOS, we remove Contents/MacOS from it.
Or, in other words, the directory is relative to the application
bundle.
This behavior can be overriden at runtime, by placing a file called
system-install adjacent to the firefox main binary (also on macOS).
- - - - -
3d04d8a9 by Alex Catarineu at 2023-09-12T11:28:19+02:00
Bug 27604: Fix addon issues when moving the profile directory
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838
- - - - -
696794b8 by Mike Perry at 2023-09-12T11:28:20+02:00
Bug 13028: Prevent potential proxy bypass cases.
It looks like these cases should only be invoked in the NSS command line
tools, and not the browser, but I decided to patch them anyway because there
literally is a maze of network function pointers being passed around, and it's
very hard to tell if some random code might not pass in the proper proxied
versions of the networking code here by accident.
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509
- - - - -
73c33930 by Igor Oliveira at 2023-09-12T11:28:20+02:00
Bug 23104: Add a default line height compensation
Many fonts have issues with their vertical metrics. they
are used to influence the height of ascenders and depth
of descenders. Gecko uses it to calculate the line height
(font height + ascender + descender), however because of
that idiosyncratic behavior across multiple operating
systems, it can be used to identify the user's OS.
The solution proposed in the patch uses a default factor
to be multiplied with the font size, simulating the concept
of ascender and descender. This way all operating
systems will have the same line height only and only if the
frame is outside the chrome.
- - - - -
c155a104 by Pier Angelo Vendrame at 2023-09-12T11:28:21+02:00
Bug 40309: Avoid using regional OS locales
Avoid regional OS locales if the pref
`intl.regional_prefs.use_os_locales` is false but RFP is enabled.
- - - - -
57012e15 by Matthew Finkel at 2023-09-12T11:28:21+02:00
Bug 40432: Prevent probing installed applications
Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084
- - - - -
4e6d6769 by Pier Angelo Vendrame at 2023-09-12T11:28:21+02:00
Base Browser strings
This commit adds all the strings needed by following Base Browser
patches.
- - - - -
6690800d by hackademix at 2023-09-12T11:28:22+02:00
Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs.
- - - - -
3532a59c by hackademix at 2023-09-12T11:28:22+02:00
Bug 41434: Letterboxing, improve logging.
- - - - -
4decfcd2 by hackademix at 2023-09-12T11:28:23+02:00
Bug 31064: Letterboxing, exempt browser extensions.
- - - - -
69c66315 by hackademix at 2023-09-12T11:28:23+02:00
Bug 32411: Letterboxing, exempt view-source: URIs.
- - - - -
1343092f by hackademix at 2023-09-12T11:28:24+02:00
Bug 32308: use direct browser sizing for letterboxing.
- - - - -
4c24a17d by hackademix at 2023-09-12T11:28:24+02:00
Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
- - - - -
bc2098d9 by Pier Angelo Vendrame at 2023-09-12T11:28:25+02:00
Bug 41369: Improve Firefox language settings for multi-lingual packages
Change the language selector to be sorted by language code, rather than
name, and to display the language code to the user.
Bug 41372: Handle Japanese as a special case in preferences on macOS
Japanese is treated in a special way on macOS. However, seeing the
Japanese language tag could be confusing for users, and moreover the
language name is not localized correctly like other langs.
Bug 41378: Tell users that they can change their language at the first start
With multi-lingual builds, Tor Browser matches the user's system
language, but some users might want to change it.
So, we tell them that it is possible, but only once.
- - - - -
18af296e by Henry Wilkes at 2023-09-12T11:28:25+02:00
Bug 41371: Temporary hack to fix language selector popup position
- - - - -
1d98c46a by p13dz at 2023-09-12T11:28:25+02:00
Bug 40283: Workaround for the file upload bug
- - - - -
0151e11c by Arthur Edelstein at 2023-09-12T11:28:26+02:00
Bug 18905: Hide unwanted items from help menu
Bug 25660: Remove the "New Private Window" option
- - - - -
83882f98 by Pier Angelo Vendrame at 2023-09-12T11:28:26+02:00
Bug 41603: Customize the creation of MOZ_SOURCE_URL
MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and
MOZ_SOURCE_CHANGESET.
But the code takes for granted that it refers to a Hg instance, so it
combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`.
With this commit, we change this logic to combine them to create a URL
that is valid for GitLab.
$MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag.
If that is needed, we could use /-/tree/, instead of /-/commit/.
- - - - -
8c16dfb1 by Henry Wilkes at 2023-09-12T11:28:27+02:00
Bug 31575: Disable Firefox Home (Activity Stream)
Treat about:blank as the default home page and new tab page.
Avoid loading AboutNewTab in BrowserGlue.jsm in order
to avoid several network requests that we do not need.
Bug 41624: Disable about:pocket-* pages and about:firefoxview.
Bug 40144: Redirect about:privatebrowsing to the user's home
- - - - -
b7184de0 by Pier Angelo Vendrame at 2023-09-12T11:28:27+02:00
Bug 41542: Disable the creation of a default profile
Firefox creates a profile as a fallback for old versions.
However, we do not need this, so we want to prevent Firefox from
creating the related directories.
We comment out the code, but should Mozilla be interested in a
compile-time flag, we could rewrite the patch to add one.
See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174.
- - - - -
45ae8e47 by Kathy Brade at 2023-09-12T11:28:28+02:00
Bug 13379: Allow using NSS to sign and verify MAR signatures
Allow using NSS on all platforms for checking MAR signatures (instead
of using OS-native APIs, the default on Mac OS and Windows).
So that the NSS and NSPR libraries the updater depends on can be
found at runtime, we add the firefox directory to the shared library
search path on macOS.
On Linux, rpath is used to solve that problem, but that approach
won't work on macOS because the updater executable is copied during
the update process to a location that can vary.
- - - - -
4b9ca5e8 by Kathy Brade at 2023-09-12T11:28:28+02:00
Bug 4234: Use the Firefox Update Process for Base Browser.
Windows: disable "runas" code path in updater (15201).
Windows: avoid writing to the registry (16236).
Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406,
16014, 16909, 24476, and 25909.
Also fix bug 27221: purge the startup cache if the Base Browser
version changed (even if the Firefox version and build ID did
not change), e.g., after a minor Base Browser update.
Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality.
Bug 26048: potentially confusing "restart to update" message
Within the update doorhanger, remove the misleading message that mentions
that windows will be restored after an update is applied, and replace the
"Restart and Restore" button label with an existing
"Restart to update Tor Browser" string.
Bug 28885: notify users that update is downloading
Add a "Downloading Base Browser update" item which appears in the
hamburger (app) menu while the update service is downloading a MAR
file. Before this change, the browser did not indicate to the user
that an update was in progress, which is especially confusing in
Tor Browser because downloads often take some time. If the user
clicks on the new menu item, the about dialog is opened to allow
the user to see download progress.
As part of this fix, the update service was changed to always show
update-related messages in the hamburger menu, even if the update
was started in the foreground via the about dialog or via the
"Check for Tor Browser Update" toolbar menu item. This change is
consistent with the Tor Browser goal of making sure users are
informed about the update process.
Removed #28885 parts of this patch which have been uplifted to Firefox.
- - - - -
9d71604a by Nicolas Vigier at 2023-09-12T11:28:28+02:00
Bug 41682: Add base-browser nightly mar signing key
- - - - -
84caffcc by hackademix at 2023-09-12T11:28:29+02:00
Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
- - - - -
d4f01d03 by hackademix at 2023-09-12T11:28:29+02:00
Bug 41854: Allow overriding download spam protection.
- - - - -
f02bf963 by Pier Angelo Vendrame at 2023-09-12T11:28:30+02:00
Bug 41698: Reword the recommendation badges in about:addons
Firefox strings use { -brand-product-name }.
As a result, it seems that the fork is recommending extensions, whereas
AMO curators are doing that.
So, we replace the strings with custom ones that clarify that Mozilla is
recommending them.
We assign the strings with JS because our translation backend does not
support Fluent attributes, yet, but once it does, we should switch to
them, instead.
Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033
- - - - -
c03c0f0f by Alex Catarineu at 2023-09-12T11:28:30+02:00
Bug 40069: Add helpers for message passing with extensions
- - - - -
b9b67013 by Matthew Finkel at 2023-09-12T11:28:32+02:00
Bug 41598: Prevent NoScript from being removed/disabled.
Bug 40253: Explicitly allow NoScript in Private Browsing mode.
- - - - -
a5241c23 by Pier Angelo Vendrame at 2023-09-12T11:28:33+02:00
Bug 40925: Implemented the Security Level component
This component adds a new Security Level toolbar button which visually
indicates the current global security level via icon (as defined by the
extensions.torbutton.security_slider pref), a drop-down hanger with a
short description of the current security level, and a new section in
the about:preferences#privacy page where users can change their current
security level. In addition, the hanger and the preferences page will
show a visual warning when the user has modified prefs associated with
the security level and provide a one-click 'Restore Defaults' button to
get the user back on recommended settings.
Bug 40125: Expose Security Level pref in GeckoView
- - - - -
bed0ae19 by Pier Angelo Vendrame at 2023-09-12T11:28:33+02:00
Bug 40926: Implemented the New Identity feature
- - - - -
79166977 by Henry Wilkes at 2023-09-12T11:28:34+02:00
Bug 41736: Customize toolbar for base-browser.
- - - - -
b9d7dd40 by Richard Pospesel at 2023-09-12T11:28:34+02:00
Bug 41649: Create rebase and security backport gitlab issue templates
- - - - -
f44ff5c4 by Richard Pospesel at 2023-09-12T11:28:34+02:00
Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
- - - - -
81aa9a77 by Henry Wilkes at 2023-09-12T11:28:35+02:00
Bug 41803: Add some developer tools for working on tor-browser.
- - - - -
2b0b1e7f by Kathy Brade at 2023-09-12T11:28:35+02:00
Bug 11641: Disable remoting by default.
Unless the -osint command line flag is used, the browser now defaults
to the equivalent of -no-remote. There is a new -allow-remote flag that
may be used to restore the original (Firefox-like) default behavior.
- - - - -
f09436c3 by Mike Perry at 2023-09-12T11:28:36+02:00
Bug 2176: Rebrand Firefox to TorBrowser
See also Bugs #5194, #7187, #8115, #8219.
This patch does some basic renaming of Firefox to TorBrowser. The rest of the
branding is done by images and icons.
Also fix bug 27905.
Bug 25702: Update Tor Browser icon to follow design guidelines
- Updated all of the branding in /browser/branding/official with new 'stable'
icon series.
- Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and
add the source svg in the same directory
- Copied /browser/branding/official over /browser/branding/nightly and the new
/browser/branding/alpha directories. Replaced content with 'nightly' and
'alpha' icon series.
Updated VisualElements_70.png and VisualElements_150.png with updated icons in
each branding directory (fixes #22654)
- Updated firefox.VisualElementsManfiest.xml with updated colors in each
branding directory
- Added firefox.svg to each branding directory from which all the other icons
are derived (apart from document.icns and document.ico)
- Added default256.png and default512.png icons
- Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed
original icon
- Use the Tor Browser icon within devtools/client/themes/images/.
Bug 30631: Blurry Tor Browser icon on macOS app switcher
It would seem the png2icns tool does not generate correct icns files and
so on macOS the larger icons were missing resulting in blurry icons in
the OS chrome. Regenerated the padded icons in a macOS VM using
iconutil.
Bug 28196: preparations for using torbutton tor-browser-brand.ftl
A small change to Fluent FileSource class is required so that we
can register a new source without its supported locales being
counted as available locales for the browser.
Bug 31803: Replaced about:debugging logo with flat version
Bug 21724: Make Firefox and Tor Browser distinct macOS apps
When macOS opens a document or selects a default browser, it sometimes
uses the CFBundleSignature. Changing from the Firefox MOZB signature to
a different signature TORB allows macOS to distinguish between Firefox
and Tor Browser.
Bug 32092: Fix Tor Browser Support link in preferences
For bug 40562, we moved onionPattern* from bug 27476 to here, as
about:tor needs these files but it is included earlier.
Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one
- - - - -
38b2a263 by Alex Catarineu at 2023-09-12T11:28:36+02:00
Bring back old Firefox onboarding
Revert "Bug 1462415 - Delete onboarding system add-on r=Standard8,k88hudson"
This reverts commit f7ffd78b62541d44d0102f8051d2f4080bdbc432.
Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs"
This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2.
Bug 28822: Convert onboarding to webextension
Partially revert 1564367 (controlCenter in UITour.jsm)
- - - - -
d28a8dcf by Kathy Brade at 2023-09-12T11:28:37+02:00
Bug 26961: New user onboarding.
Reuse the Firefox onboarding mechanism with minimal changes.
Localizable strings are pulled in from Torbutton (if Torbutton is
not installed, we lack about:tor and no tour will be shown).
Replace SVG images with PNGs (see bug 27002),
For defense in depth, omit include OnboardingTelemetry.jsm entirely.
Added support for the following UITour page event:
torBrowserOpenSecuritySettings
Also fix bug 27403: the onboarding bubble is not always displayed.
Arthur suggested to make the onboarding bubble visible on displays with
less than 960px width available, so we choose 200px instead.
Also fix bug 28628: Change onboarding Security panel to open new
Security Level panel.
Also fix bug 27484: Improve navigation within onboarding.
Bug 27082: enable a limited UITour
Disallow access to UITour functionality from all pages other than
about:home, about:newtab, and about:tor.
Implement a whitelist mechanism for page actions.
Bug 26962 - implement new features onboarding (part 1).
Add an "Explore" button to the "Circuit Display" panel within new user
onboarding which opens the DuckDuckGo .onion and then guides users through
a short circuit display tutorial.
Allow a few additional UITour actions while limiting as much as possible
how it can be used.
Tweak the UITour styles to match the Tor Browser branding.
All user interface strings are retrieved from Torbutton's
browserOnboarding.properties file.
Bug 27486 Avoid about:blank tabs when opening onboarding pages.
Instead of using a simple <a href>, programmatically open onboarding
web pages by using tabBrowser.addTab(). The same technique is now
used for "See My Path", "See FAQs", and "Visit an Onion".
Bug 29768: Introduce new features to users
Add an "update" tour for the Tor Browser 8.5 release that contains two
panels: Toolbar and Security (with appropriate description text and
images).
Display an attention-grabbing dot on the onboarding text bubble when
the update tour is active. The animation lasts for 14 seconds.
Bug 31768: Introduce toolbar and network settings changes in onboarding
Update the "Tor Network" onboarding page to include a note that
settings can now be accessed via the application preferences and
add an "Adjust Your Tor Network Settings" action button which opens
about:preferences#tor.
Replace the Tor Browser 8.5 "update" onboarding tour with a 9.0 one
that includes the revised "Tor Network" page and a revised "Toolbar"
page. The latter explains that Torbutton's toolbar item has been
removed ("Goodbye Onion Button") and explains how to access the
New Identity feature using the hamburger menu and new toolbar item.
Bug 34321 - Add Learn More onboarding item
Bug 40429: Update Onboarding for 10.5
- - - - -
e0db3cdc by sanketh at 2023-09-12T11:28:37+02:00
Bug 40209: Implement Basic Crypto Safety
Adds a CryptoSafety actor which detects when you've copied a crypto
address from a HTTP webpage and shows a warning.
Closes #40209.
Bug 40428: Fix string attribute names
- - - - -
63663d57 by Mike Perry at 2023-09-12T11:28:37+02:00
TB3: Tor Browser's official .mozconfigs.
Also:
Add an --enable-tor-browser-data-outside-app-dir configure option
Add --with-tor-browser-version configure option
Bug 31457: disable per-installation profiles
The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.
Bug 31935: Disable profile downgrade protection.
Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.
Add --enable-tor-browser-update build option
Bug 40793: moved Tor configuration options from old-configure.in to moz.configure
Bug 41584: Move some configuration options to base-browser level
- - - - -
c1fe3b16 by Henry Wilkes at 2023-09-12T11:28:38+02:00
Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
tor-browser#41285: Enable fluent warnings.
- - - - -
87ad0b32 by Pier Angelo Vendrame at 2023-09-12T11:28:38+02:00
Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
Before reordering patches, we used to keep the Tor-related patches
(torbutton and tor-launcher) at the beginning.
After that issue, we decided to move them towards the end.
In addition to that, we have decided to move Tor Browser-only
preferences there, too, to make Base Browser-only fixups easier to
apply.
- - - - -
0105a99d by Pier Angelo Vendrame at 2023-09-12T11:28:39+02:00
Bug 13252: Customize profile management on macOS
On macOS we allow both portable mode and system installation.
However, in the latter case, we customize Firefox's directories to
match the hierarchy we use for the portable mode.
Also, display an informative error message if the TorBrowser-Data
directory cannot be created due to an "access denied" or a
"read only volume" error.
- - - - -
9c365e23 by Pier Angelo Vendrame at 2023-09-12T11:28:39+02:00
Bug 40933: Add tor-launcher functionality
- - - - -
0590a6aa by Richard Pospesel at 2023-09-12T11:28:40+02:00
Bug 40597: Implement TorSettings module
- migrated in-page settings read/write implementation from about:preferences#tor
to the TorSettings module
- TorSettings initially loads settings from the tor daemon, and saves them to
firefox prefs
- TorSettings notifies observers when a setting has changed; currently only
QuickStart notification is implemented for parity with previous preference
notify logic in about:torconnect and about:preferences#tor
- about:preferences#tor, and about:torconnect now read and write settings
thorugh the TorSettings module
- all tor settings live in the torbrowser.settings.* preference branch
- removed unused pref modify permission for about:torconnect content page from
AsyncPrefs.jsm
Bug 40645: Migrate Moat APIs to Moat.jsm module
- - - - -
f4df0e08 by Alex Catarineu at 2023-09-12T11:28:40+02:00
Bug 10760: Integrate TorButton to TorBrowser core
Because of the non-restartless nature of Torbutton, it required
a two-stage installation process. On mobile, it was a problem,
because it was not loading when the user opened the browser for
the first time.
Moving it to tor-browser and making it a system extension allows it
to load when the user opens the browser for first time.
Additionally, this patch also fixes Bug 27611.
Bug 26321: New Circuit and New Identity menu items
Bug 14392: Make about:tor behave like other initial pages.
Bug 25013: Add torbutton as a tor-browser submodule
Bug 31575: Replace Firefox Home (newtab) with about:tor
- - - - -
1d4ce2f2 by hackademix at 2023-09-12T11:28:40+02:00
Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop
Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs
- - - - -
c3831ac9 by Henry Wilkes at 2023-09-12T11:28:41+02:00
Bug 41600: Add a tor circuit display panel.
- - - - -
82ec2bca by Amogh Pradeep at 2023-09-12T11:28:41+02:00
Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
See Bug 1357997 for partial uplift.
Also:
Bug 28051 - Use our Orbot for proxying our connections
Bug 31144 - ESR68 Network Code Review
- - - - -
09665e61 by Matthew Finkel at 2023-09-12T11:28:42+02:00
Bug 25741: TBA: Disable GeckoNetworkManager
The browser should not need information related to the network
interface or network state, tor should take care of that.
- - - - -
e81f4185 by Alex Catarineu at 2023-09-12T11:28:42+02:00
Add TorStrings module for localization
- - - - -
a50d8dbe by Kathy Brade at 2023-09-12T11:28:43+02:00
Bug 14631: Improve profile access error messages.
Instead of always reporting that the profile is locked, display specific
messages for "access denied" and "read-only file system".
To allow for localization, get profile-related error strings from Torbutton.
Use app display name ("Tor Browser") in profile-related error alerts.
- - - - -
cbbdb694 by Pier Angelo Vendrame at 2023-09-12T11:28:43+02:00
Bug 40807: Added QRCode.js to toolkit/modules
- - - - -
92756bb0 by Richard Pospesel at 2023-09-12T11:28:43+02:00
Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
This patch adds a new about:preferences#connection page which allows
modifying bridge, proxy, and firewall settings from within Tor Browser.
All of the functionality present in tor-launcher's Network
Configuration panel is present:
- Setting built-in bridges
- Requesting bridges from BridgeDB via moat
- Using user-provided bridges
- Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies
- Setting firewall ports
- Viewing and Copying Tor's logs
- The Networking Settings in General preferences has been removed
Bug 40774: Update about:preferences page to match new UI designs
- - - - -
4f9bfd44 by Richard Pospesel at 2023-09-12T11:28:44+02:00
Bug 27476: Implement about:torconnect captive portal within Tor Browser
- implements new about:torconnect page as tor-launcher replacement
- adds new torconnect component to browser
- tor process management functionality remains implemented in tor-launcher through the TorProtocolService module
- adds warning/error box to about:preferences#tor when not connected to tor
Bug 40773: Update the about:torconnect frontend page to match additional UI flows.
Bug 41608: Add a toolbar status button and a urlbar "Connect" button.
- - - - -
f947229c by Arthur Edelstein at 2023-09-12T11:28:44+02:00
Bug 12620: TorBrowser regression tests
Regression tests for Bug #2950: Make Permissions Manager memory-only
Regression tests for TB4: Tor Browser's Firefox preference overrides.
Note: many more functional tests could be made here
Regression tests for #2874: Block Components.interfaces from content
Bug 18923: Add a script to run all Tor Browser specific tests
Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt.
- - - - -
ad4e25ba by Pier Angelo Vendrame at 2023-09-12T11:28:45+02:00
Bug 41668: Tweaks to the Base Browser updater for Tor Browser
This commit was once part of "Bug 4234: Use the Firefox Update Process
for Tor Browser.".
However, some parts of it were not needed for Base Browser and some
derivative browsers.
Therefore, we extracted from that commit the parts for Tor Browser
legacy, and we add them back to the patch set with this commit.
- - - - -
37b944b6 by Kathy Brade at 2023-09-12T11:28:45+02:00
Bug 12647: Support symlinks in the updater.
- - - - -
22767d14 by Kathy Brade at 2023-09-12T11:28:46+02:00
Bug 19121: reinstate the update.xml hash check
This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122.
Revert most changes from Mozilla Bug 862173 "don't verify mar file hash
when using mar signing to verify the mar file (lessens main thread I/O)."
We kept the addition to the AppConstants API in case other JS code
references it in the future.
- - - - -
1b350a50 by Kathy Brade at 2023-09-12T11:28:46+02:00
Bug 16940: After update, load local change notes.
Add an about:tbupdate page that displays the first section from
TorBrowser/Docs/ChangeLog.txt and includes a link to the remote
post-update page (typically our blog entry for the release).
Always load about:tbupdate in a content process, but implement the
code that reads the file system (changelog) in the chrome process
for compatibility with future sandboxing efforts.
Also fix bug 29440. Now about:tbupdate is styled as a fairly simple
changelog page that is designed to be displayed via a link that is on
about:tor.
- - - - -
21f093af by Georg Koppen at 2023-09-12T11:28:46+02:00
Bug 32658: Create a new MAR signing key
It's time for our rotation again: Move the backup key in the front
position and add a new backup key.
Bug 33803: Move our primary nightly MAR signing key to tor-browser
Bug 33803: Add a secondary nightly MAR signing key
- - - - -
4244f64f by Mike Perry at 2023-09-12T11:28:48+02:00
Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
eBay and Amazon don't treat Tor users very well. Accounts often get locked and
payments reversed.
Also:
Bug 16322: Update DuckDuckGo search engine
We are replacing the clearnet URL with an onion service one (thanks to a
patch by a cypherpunk) and are removing the duplicated DDG search
engine. Duplicating DDG happend due to bug 1061736 where Mozilla
included DDG itself into Firefox. Interestingly, this caused breaking
the DDG search if JavaScript is disabled as the Mozilla engine, which
gets loaded earlier, does not use the html version of the search page.
Moreover, the Mozilla engine tracked where the users were searching from
by adding a respective parameter to the search query. We got rid of that
feature as well.
Also:
This fixes bug 20809: the DuckDuckGo team has changed its server-side
code in a way that lets users with JavaScript enabled use the default
landing page while those without JavaScript available get redirected
directly to the non-JS page. We adapt the search engine URLs
accordingly.
Also fixes bug 29798 by making sure we only specify the Google search
engine we actually ship an .xml file for.
Also regression tests.
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40494: Update Startpage search provider
squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
Bug 40438: Add Blockchair as a search engine
Bug 33342: Avoid disconnect search addon error after removal.
We removed the addon in #32767, but it was still being loaded
from addonStartup.json.lz4 and throwing an error on startup
because its resource: location is not available anymore.
- - - - -
941f279e by Alex Catarineu at 2023-09-12T11:28:49+02:00
Bug 40073: Disable remote Public Suffix List fetching
In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented
fetching the Public Suffix List via RemoteSettings and replacing the default
one at runtime, which we do not want.
- - - - -
5361af4d by Richard Pospesel at 2023-09-12T11:28:49+02:00
Bug 23247: Communicating security expectations for .onion
Encrypting pages hosted on Onion Services with SSL/TLS is redundant
(in terms of hiding content) as all traffic within the Tor network is
already fully encrypted. Therefore, serving HTTP pages from an Onion
Service is more or less fine.
Prior to this patch, Tor Browser would mostly treat pages delivered
via Onion Services as well as pages delivered in the ordinary fashion
over the internet in the same way. This created some inconsistencies
in behaviour and misinformation presented to the user relating to the
security of pages delivered via Onion Services:
- HTTP Onion Service pages did not have any 'lock' icon indicating
the site was secure
- HTTP Onion Service pages would be marked as unencrypted in the Page
Info screen
- Mixed-mode content restrictions did not apply to HTTP Onion Service
pages embedding Non-Onion HTTP content
This patch fixes the above issues, and also adds several new 'Onion'
icons to the mix to indicate all of the various permutations of Onion
Services hosted HTTP or HTTPS pages with HTTP or HTTPS content.
Strings for Onion Service Page Info page are pulled from Torbutton's
localization strings.
- - - - -
df3cb886 by Kathy Brade at 2023-09-12T11:28:50+02:00
Bug 30237: Add v3 onion services client authentication prompt
When Tor informs the browser that client authentication is needed,
temporarily load about:blank instead of about:neterror and prompt
for the user's key.
If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD
control port command to add the key (via Torbutton's control port
module) and reload the page.
If the user cancels the prompt, display the standard about:neterror
"Unable to connect" page. This requires a small change to
browser/actors/NetErrorChild.jsm to account for the fact that the
docShell no longer has the failedChannel information. The failedChannel
is used to extract TLS-related error info, which is not applicable
in the case of a canceled .onion authentication prompt.
Add a leaveOpen option to PopupNotifications.show so we can display
error messages within the popup notification doorhanger without
closing the prompt.
Add support for onion services strings to the TorStrings module.
Add support for Tor extended SOCKS errors (Tor proposal 304) to the
socket transport and SOCKS layers. Improved display of all of these
errors will be implemented as part of bug 30025.
Also fixes bug 19757:
Add a "Remember this key" checkbox to the client auth prompt.
Add an "Onion Services Authentication" section within the
about:preferences "Privacy & Security section" to allow
viewing and removal of v3 onion client auth keys that have
been stored on disk.
Also fixes bug 19251: use enhanced error pages for onion service errors.
- - - - -
737f605f by Alex Catarineu at 2023-09-12T11:28:50+02:00
Bug 21952: Implement Onion-Location
Whenever a valid Onion-Location HTTP header (or corresponding HTML
<meta> http-equiv attribute) is found in a document load, we either
redirect to it (if the user opted-in via preference) or notify the
presence of an onionsite alternative with a badge in the urlbar.
- - - - -
2865a0cf by Pier Angelo Vendrame at 2023-09-12T11:28:51+02:00
Bug 40458: Implement .tor.onion aliases
We have enabled HTTPS-Only mode, therefore we do not need
HTTPS-Everywhere anymore.
However, we want to keep supporting .tor.onion aliases (especially for
securedrop).
Therefore, in this patch we implemented the parsing of HTTPS-Everywhere
rulesets, and the redirect of .tor.onion domains.
Actually, Tor Browser believes they are actual domains. We change them
on the fly on the SOCKS proxy requests to resolve the domain, and on
the code that verifies HTTPS certificates.
- - - - -
b9ea891b by Pier Angelo Vendrame at 2023-09-12T11:28:51+02:00
Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
This patch associates the about:manual page to a translated page that
must be injected to browser/omni.ja after the build.
The content must be placed in chrome/browser/content/browser/manual/, so
that is then available at chrome://browser/content/manual/.
We preferred giving absolute freedom to the web team, rather than having
to change the patch in case of changes on the documentation.
- - - - -
c8853584 by Pier Angelo Vendrame at 2023-09-12T11:28:51+02:00
Bug 41435: Add a Tor Browser migration function
For now this function only deletes old language packs for which we are
already packaging the strings with the application.
- - - - -
d4082905 by Dan Ballard at 2023-09-12T11:28:52+02:00
Bug 40701: Add security warning when downloading a file
Shown in the downloads panel, about:downloads and places.xhtml.
- - - - -
485f73eb by Henry Wilkes at 2023-09-12T11:28:52+02:00
Bug 41736: Customize toolbar for tor-browser.
- - - - -
0a3c64ed by hackademix at 2023-09-12T11:28:53+02:00
Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key
- - - - -
30 changed files:
- .eslintignore
- .gitignore
- + .gitlab/issue_templates/Backport Android Security Fixes.md
- + .gitlab/issue_templates/Rebase Browser - Alpha.md
- + .gitlab/issue_templates/Rebase Browser - Stable.md
- + .gitlab/issue_templates/UXBug.md
- + .gitlab/issue_templates/bug.md
- + .gitlab/merge_request_templates/default.md
- accessible/ipc/DocAccessibleParent.cpp
- + browser/actors/AboutTBUpdateChild.jsm
- + browser/actors/AboutTBUpdateParent.jsm
- + browser/actors/CryptoSafetyChild.jsm
- + browser/actors/CryptoSafetyParent.jsm
- browser/actors/NetErrorChild.jsm
- browser/actors/NetErrorParent.jsm
- − browser/actors/RFPHelperChild.jsm
- − browser/actors/RFPHelperParent.jsm
- browser/actors/moz.build
- browser/app/Makefile.in
- browser/app/macbuild/Contents/Info.plist.in
- browser/app/macbuild/Contents/MacOS-files.in
- browser/app/permissions
- + browser/app/profile/000-tor-browser.js
- + browser/app/profile/001-base-profile.js
- browser/app/profile/firefox.js
- browser/base/content/aboutDialog-appUpdater.js
- browser/base/content/aboutDialog.js
- browser/base/content/aboutDialog.xhtml
- + browser/base/content/abouttbupdate/aboutTBUpdate.css
- + browser/base/content/abouttbupdate/aboutTBUpdate.js
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8d433d…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8d433d…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-102.15.0esr-12.5-1] Bug 42084: Ensure spoofing works even if preferences are set out of order.
by ma1 (@ma1) 12 Sep '23
by ma1 (@ma1) 12 Sep '23
12 Sep '23
ma1 pushed to branch base-browser-102.15.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
60d54c03 by hackademix at 2023-09-12T11:15:40+02:00
Bug 42084: Ensure spoofing works even if preferences are set out of order.
- - - - -
1 changed file:
- toolkit/components/resistfingerprinting/RFPHelper.jsm
Changes:
=====================================
toolkit/components/resistfingerprinting/RFPHelper.jsm
=====================================
@@ -163,6 +163,9 @@ class _RFPHelper {
// Add RFP and Letterboxing observers if prefs are enabled
this._handleResistFingerprintingChanged();
this._handleLetterboxingPrefChanged();
+
+ // Synchronize language preferences if accidentally messed up (tor-browser#42084)
+ this._handleSpoofEnglishChanged();
}
uninit() {
@@ -216,6 +219,7 @@ class _RFPHelper {
this._handleResistFingerprintingChanged();
break;
case kPrefSpoofEnglish:
+ case "intl.accept_languages":
this._handleSpoofEnglishChanged();
break;
case kPrefLetterboxing:
@@ -264,6 +268,7 @@ class _RFPHelper {
}
_handleSpoofEnglishChanged() {
+ Services.prefs.removeObserver("intl.accept_languages", this);
switch (Services.prefs.getIntPref(kPrefSpoofEnglish)) {
case 0: // will prompt
// This should only happen when turning privacy.resistFingerprinting off.
@@ -282,6 +287,8 @@ class _RFPHelper {
case 2: // spoof
Services.prefs.setCharPref("intl.accept_languages", "en-US, en");
Services.prefs.setBoolPref("javascript.use_us_english_locale", true);
+ // Ensure spoofing works if preferences are set out of order
+ Services.prefs.addObserver("intl.accept_languages", this);
break;
default:
break;
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60d54c0…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60d54c0…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-102.15.0esr-12.5-1] Bug 42084: Ensure spoofing works even if preferences are set out of order.
by ma1 (@ma1) 12 Sep '23
by ma1 (@ma1) 12 Sep '23
12 Sep '23
ma1 pushed to branch tor-browser-102.15.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
6f9146d0 by hackademix at 2023-09-12T11:11:13+02:00
Bug 42084: Ensure spoofing works even if preferences are set out of order.
- - - - -
1 changed file:
- toolkit/components/resistfingerprinting/RFPHelper.jsm
Changes:
=====================================
toolkit/components/resistfingerprinting/RFPHelper.jsm
=====================================
@@ -163,6 +163,9 @@ class _RFPHelper {
// Add RFP and Letterboxing observers if prefs are enabled
this._handleResistFingerprintingChanged();
this._handleLetterboxingPrefChanged();
+
+ // Synchronize language preferences if accidentally messed up (tor-browser#42084)
+ this._handleSpoofEnglishChanged();
}
uninit() {
@@ -216,6 +219,7 @@ class _RFPHelper {
this._handleResistFingerprintingChanged();
break;
case kPrefSpoofEnglish:
+ case "intl.accept_languages":
this._handleSpoofEnglishChanged();
break;
case kPrefLetterboxing:
@@ -264,6 +268,7 @@ class _RFPHelper {
}
_handleSpoofEnglishChanged() {
+ Services.prefs.removeObserver("intl.accept_languages", this);
switch (Services.prefs.getIntPref(kPrefSpoofEnglish)) {
case 0: // will prompt
// This should only happen when turning privacy.resistFingerprinting off.
@@ -282,6 +287,8 @@ class _RFPHelper {
case 2: // spoof
Services.prefs.setCharPref("intl.accept_languages", "en-US, en");
Services.prefs.setBoolPref("javascript.use_us_english_locale", true);
+ // Ensure spoofing works if preferences are set out of order
+ Services.prefs.addObserver("intl.accept_languages", this);
break;
default:
break;
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6f9146d…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6f9146d…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] Bug 42084: Ensure spoofing works even if preferences are set out of order.
by ma1 (@ma1) 12 Sep '23
by ma1 (@ma1) 12 Sep '23
12 Sep '23
ma1 pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
8cff1681 by hackademix at 2023-09-12T10:37:14+02:00
Bug 42084: Ensure spoofing works even if preferences are set out of order.
- - - - -
1 changed file:
- toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
Changes:
=====================================
toolkit/components/resistfingerprinting/RFPHelper.sys.mjs
=====================================
@@ -158,6 +158,9 @@ class _RFPHelper {
// Add RFP and Letterboxing observers if prefs are enabled
this._handleResistFingerprintingChanged();
this._handleLetterboxingPrefChanged();
+
+ // Synchronize language preferences if accidentally messed up (tor-browser#42084)
+ this._handleSpoofEnglishChanged();
}
uninit() {
@@ -211,6 +214,7 @@ class _RFPHelper {
this._handleResistFingerprintingChanged();
break;
case kPrefSpoofEnglish:
+ case "intl.accept_languages":
this._handleSpoofEnglishChanged();
break;
case kPrefLetterboxing:
@@ -259,6 +263,7 @@ class _RFPHelper {
}
_handleSpoofEnglishChanged() {
+ Services.prefs.removeObserver("intl.accept_languages", this);
switch (Services.prefs.getIntPref(kPrefSpoofEnglish)) {
case 0: // will prompt
// This should only happen when turning privacy.resistFingerprinting off.
@@ -277,6 +282,8 @@ class _RFPHelper {
case 2: // spoof
Services.prefs.setCharPref("intl.accept_languages", "en-US, en");
Services.prefs.setBoolPref("javascript.use_us_english_locale", true);
+ // Ensure spoofing works if preferences are set out of order
+ Services.prefs.addObserver("intl.accept_languages", this);
break;
default:
break;
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8cff168…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8cff168…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-102.15.1esr-12.5-1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new branch tor-browser-102.15.1esr-12.5-1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_102_15_1esr_BUILD1
by Pier Angelo Vendrame (@pierov) 12 Sep '23
by Pier Angelo Vendrame (@pierov) 12 Sep '23
12 Sep '23
Pier Angelo Vendrame pushed new tag FIREFOX_102_15_1esr_BUILD1 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-spec][main] 2 commits: Bug 40055: FF108 Audit
by richard (@richard) 12 Sep '23
by richard (@richard) 12 Sep '23
12 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-spec
Commits:
e8e6f825 by Richard Pospesel at 2023-09-11T23:56:52+00:00
Bug 40055: FF108 Audit
- - - - -
fc74e1ae by Richard Pospesel at 2023-09-12T00:41:12+00:00
Bug 40061: FF114 Audit
- - - - -
2 changed files:
- + audits/FF108_AUDIT
- + audits/FF114_AUDIT
Changes:
=====================================
audits/FF108_AUDIT
=====================================
@@ -0,0 +1,80 @@
+# General
+
+The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript).
+
+The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation.
+
+`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit.
+
+## Firefox: https://github.com/mozilla/gecko-dev.git
+
+- Start: `1187da3c99c93ad941eea0809d3b2c8f81ac5ccf` ( `FIREFOX_107_0_1_RELEASE` )
+- End: `0ae93a27c796bea7836d4b0885c8a1f2c4c18284` ( `FIREFOX_108_0_2_RELEASE` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+---
+
+## Application Services: https://github.com/mozilla/application-services.git
+
+- Start: `ce8f1767d991da9d6d26331faecd426210071c7e` ( `v96.1.0` )
+- End: `d8b5a386936aa156f4c6d93e6645a6d2188aa788` ( `v96.2.1` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Firefox Android: https://github.com/mozilla-mobile/firefox-android.git
+
+- Start: `0486e931b4427d646af1dcf69a53c90efbe60862`
+- End: `55d34bf82ad051e25f15c0d1ef5fb8b3a32a7522`
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Fenix: https://github.com/mozilla-mobile/fenix.git
+
+- Start: `171d8a7aa521676d008bfd98bfae34ce8774e5f5` ( `v108.0b1` )
+- End: `78718ba91dd19f78e94d8f8c462598c29d48069a` ( `v108.2.0` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Ticket Review ##
+
+Bugzilla Query: `https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=FIXED&target_milestone=108%20Branch&order=priority%2Cbug_severity&limit=0`
+
+#### Problematic Issues:
+
+- **Remove descriptionheightworkaround.** https://bugzilla.mozilla.org/show_bug.cgi?id=1795944
+ - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41959
+ - **RESOLUTOIN** not a security issue, more of a general ESR migration/functionality issue
+- **Proxy environment variables should be upper case / case insensitive** https://bugzilla.mozilla.org/show_bug.cgi?id=1797896
+ - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41960
+ - **RESOLUTION**: determined this logic is gated behind our tor configuration settings, and so aren't relevant or a de-anonimisation vector; nothing to do here
+- **Hide cookie banner handling UI by default** https://bugzilla.mozilla.org/show_bug.cgi?id=1798868
+ - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41961
+ - **RESOLUTION**: we will hide the UI to enable/disable the feature, and likely enable the feature for everyone
+
+## Export
+- [ ] Export Report and save to `tor-browser-spec/audits`
\ No newline at end of file
=====================================
audits/FF114_AUDIT
=====================================
@@ -0,0 +1,59 @@
+# General
+
+The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript).
+
+The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation.
+
+`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit.
+
+## Firefox: https://github.com/mozilla/gecko-dev.git
+
+- Start: `8a724297d78ba792067a7e4d17d170c6b3af796e` ( `FIREFOX_113_0_2_RELEASE` )
+- End: `b1d2c35b2699a6d77f6a41ae2338d9c370c5172e` ( `FIREFOX_114_0_2_RELEASE` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+---
+
+## Application Services: https://github.com/mozilla/application-services.git
+
+- Start: `b126218b17a2273edb2f1ed5806f689440740b23` ( `v114.1` not really, Mozilla created a new branch and there's no tag associated with v114.1 in )
+- End: `78ab4ce85120f45a4b67b055936e401193eabd68` ( `v115.0` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+#### Problematic Commits
+
+- Add Remote Settings client component `d054f01641a3da94dba4076c3ac8236547e2b3f4`
+
+## Firefox Android: https://github.com/mozilla-mobile/firefox-android.git
+
+- Start: `9d87757910437e94a860e1d6f2577d5648ded966`
+- End: `fa28e4ddf82bedaa65153cbc6bac3ce7d8729ef5`
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Ticket Review ##
+
+Bugzilla Query: `https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=FIXED&target_milestone=114%20Branch&order=priority%2Cbug_severity&limit=0`
+
+Nothing of interest (manual inspection)
+
+## Export
+- [x] Export Report and save to `tor-browser-spec/audits`
\ No newline at end of file
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/compare/7…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/compare/7…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Modify UI/UX
by Dan Ballard (@dan) 11 Sep '23
by Dan Ballard (@dan) 11 Sep '23
11 Sep '23
Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
d19b676f by clairehurst at 2023-09-11T23:51:22+00:00
fixup! Modify UI/UX
Bug 42076: Remove theme options from UI
- - - - -
2 changed files:
- fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt
- fenix/app/src/main/res/xml/customization_preferences.xml
Changes:
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt
=====================================
@@ -46,11 +46,12 @@ class CustomizationFragment : PreferenceFragmentCompat() {
}
private fun setupPreferences() {
- bindFollowDeviceTheme()
- bindDarkTheme()
- bindLightTheme()
- bindAutoBatteryTheme()
- setupRadioGroups()
+// Remove as part of tor-browser#42076 : https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42076
+// bindFollowDeviceTheme()
+// bindDarkTheme()
+// bindLightTheme()
+// bindAutoBatteryTheme()
+// setupRadioGroups()
setupToolbarCategory()
setupGesturesCategory()
}
=====================================
fenix/app/src/main/res/xml/customization_preferences.xml
=====================================
@@ -4,32 +4,33 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
- <androidx.preference.PreferenceCategory
- android:layout="@layout/preference_cat_style"
- android:title="@string/preferences_theme"
- app:iconSpaceReserved="false">
- <org.mozilla.fenix.settings.RadioButtonPreference
- android:defaultValue="@bool/underAPI28"
- android:key="@string/pref_key_light_theme"
- android:title="@string/preference_light_theme" />
-
- <org.mozilla.fenix.settings.RadioButtonPreference
- android:defaultValue="false"
- android:key="@string/pref_key_dark_theme"
- android:title="@string/preference_dark_theme" />
-
- <org.mozilla.fenix.settings.RadioButtonPreference
- android:defaultValue="false"
- android:key="@string/pref_key_auto_battery_theme"
- android:title="@string/preference_auto_battery_theme"
- app:isPreferenceVisible="@bool/underAPI28" />
-
- <org.mozilla.fenix.settings.RadioButtonPreference
- android:defaultValue="@bool/API28"
- android:key="@string/pref_key_follow_device_theme"
- android:title="@string/preference_follow_device_theme"
- app:isPreferenceVisible="@bool/API28" />
- </androidx.preference.PreferenceCategory>
+<!-- Remove as part of tor-browser#42076 : https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42076 -->
+<!-- <androidx.preference.PreferenceCategory-->
+<!-- android:layout="@layout/preference_cat_style"-->
+<!-- android:title="@string/preferences_theme"-->
+<!-- app:iconSpaceReserved="false">-->
+<!-- <org.mozilla.fenix.settings.RadioButtonPreference-->
+<!-- android:defaultValue="@bool/underAPI28"-->
+<!-- android:key="@string/pref_key_light_theme"-->
+<!-- android:title="@string/preference_light_theme" />-->
+<!---->
+<!-- <org.mozilla.fenix.settings.RadioButtonPreference-->
+<!-- android:defaultValue="false"-->
+<!-- android:key="@string/pref_key_dark_theme"-->
+<!-- android:title="@string/preference_dark_theme" />-->
+<!---->
+<!-- <org.mozilla.fenix.settings.RadioButtonPreference-->
+<!-- android:defaultValue="false"-->
+<!-- android:key="@string/pref_key_auto_battery_theme"-->
+<!-- android:title="@string/preference_auto_battery_theme"-->
+<!-- app:isPreferenceVisible="@bool/underAPI28" />-->
+<!---->
+<!-- <org.mozilla.fenix.settings.RadioButtonPreference-->
+<!-- android:defaultValue="@bool/API28"-->
+<!-- android:key="@string/pref_key_follow_device_theme"-->
+<!-- android:title="@string/preference_follow_device_theme"-->
+<!-- app:isPreferenceVisible="@bool/API28" />-->
+<!-- </androidx.preference.PreferenceCategory>-->
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_cat_style"
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/d19…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/d19…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-spec][main] Bug 40054: FF107 Audit
by richard (@richard) 11 Sep '23
by richard (@richard) 11 Sep '23
11 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-spec
Commits:
724a427b by Richard Pospesel at 2023-09-11T23:48:58+00:00
Bug 40054: FF107 Audit
- - - - -
1 changed file:
- + audits/FF107_AUDIT
Changes:
=====================================
audits/FF107_AUDIT
=====================================
@@ -0,0 +1,72 @@
+# General
+
+The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript).
+
+The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation.
+
+`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit.
+
+## Firefox: https://github.com/mozilla/gecko-dev.git
+
+- Start: `ac898d40ded7de23ef22a6f336f2ab1f0bca0d3f` ( `FIREFOX_106_0_5_RELEASE` )
+- End: `1187da3c99c93ad941eea0809d3b2c8f81ac5ccf` ( `FIREFOX_107_0_1_RELEASE` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+---
+
+## Application Services: https://github.com/mozilla/application-services.git
+
+- Start: `f1276e45b7c284bc4435896b1d5d09b35f3b295b` ( `v95.0.1` )
+- End: `ce8f1767d991da9d6d26331faecd426210071c7e` ( `v96.1.0` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Android Components: https://github.com/mozilla-mobile/android-components.git
+
+- Start: `1c48533cff068056259e62861344bd8a490a83e7`
+- End: `ff4f1f8ae3c12e6f6e0dcf52f88049ca251470d8` ( `v107.0.3` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Fenix: https://github.com/mozilla-mobile/fenix.git
+
+- Start: `8c088f08d339514ac12732bffdc9bb90540d9337` ( `v107.0b1` )
+- End: `1490acda7e44894c8437cc7fb677d3fba1a711ce` ( `v107.2.0` )
+
+### Languages:
+- [x] java
+- [x] cpp
+- [x] js
+- [x] rust
+
+Nothing of interest (using `code_audit.sh`)
+
+## Ticket Review ##
+
+Bugzilla Query: `https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=FIXED&target_milestone=107%20Branch&order=priority%2Cbug_severity&limit=0`
+
+where `$(FIREFOX_VERSION)` is the major Firefox version we are auditing (eg: '91')
+
+Nothing of interest (manual inspection)
+
+## Export
+- [x] Export Report and save to `tor-browser-spec/audits`
\ No newline at end of file
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/72…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/72…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Bug 7494: Create local home page for TBB.
by richard (@richard) 11 Sep '23
by richard (@richard) 11 Sep '23
11 Sep '23
richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
ea5cd3a3 by Henry Wilkes at 2023-09-11T18:34:24+01:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42075: Increase inline margin for the message links in about:tor.
Also increase the end margin of the emoji icon.
- - - - -
1 changed file:
- browser/components/abouttor/content/aboutTor.css
Changes:
=====================================
browser/components/abouttor/content/aboutTor.css
=====================================
@@ -56,6 +56,12 @@ h1 {
.message-emoji {
height: 1em;
vertical-align: sub;
+ margin-inline-end: 0.3em;
+}
+
+.home-message a {
+ /* Increase gap between the link and the rest of the text. */
+ margin-inline: 0.4em;
}
#search-form {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ea5cd3a…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ea5cd3a…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] Adding gitlab merge request template
by Dan Ballard (@dan) 11 Sep '23
by Dan Ballard (@dan) 11 Sep '23
11 Sep '23
Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
c190fae9 by Richard Pospesel at 2023-09-08T02:17:22+00:00
Adding gitlab merge request template
- - - - -
1 changed file:
- + .gitlab/merge_request_templates/default.md
Changes:
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -0,0 +1,57 @@
+## Merge Info
+
+<!-- Bookkeeping information for release management -->
+
+### Related Issues
+- tor-browser#xxxxx
+- tor-browser-build#xxxxx
+
+### Backporting
+
+#### Timeline
+- [ ] **Immediate**: patchset needed as soon as possible
+- [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport
+- [ ] **Eventually**: patchset that needs to be verified in alpha before backport
+- [ ] **No Backport (preferred)**: patchset for the next major stable
+
+#### (Optional) Justification
+- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc
+- [ ] **Censorship event**: patchset enables censorship circumvention
+- [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality
+- [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
+- [ ] **Sponsor required**: patchset required for sponsor
+- [ ] **Other**: please explain
+
+### Issue Tracking
+- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation
+
+### Review
+
+#### Request Reviewer
+
+- [ ] Request review from an applications developer depending on modified system:
+ - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
+ - **accessibility** : henry
+ - **android** : clairehurst, dan
+ - **build system** : boklm
+ - **extensions** : ma1
+ - **firefox internals (XUL/JS/XPCOM)** : ma1
+ - **fonts** : pierov
+ - **frontend (implementation)** : henry
+ - **frontend (review)** : donuts, richard
+ - **localization** : henry, pierov
+ - **macos** : clairehurst, dan
+ - **misc/other** : pierov, richard
+ - **nightly builds** : boklm
+ - **rebases/release-prep** : dan, ma1, pierov, richard
+ - **security** : ma1
+ - **signing** : boklm, richard
+ - **updater** : pierov
+
+#### Change Description
+
+<!-- Whatever context the reviewer needs to effectively review the patchset; if the patch includes UX updates be sure to include screenshots/video of how any new behaviour -->
+
+#### How Tested
+
+<!-- Description of steps taken to verify the change -->
\ No newline at end of file
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/c19…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/c19…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by ma1 (@ma1) 08 Sep '23
by ma1 (@ma1) 08 Sep '23
08 Sep '23
ma1 pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
03a24c6d by cypherpunks1 at 2023-09-08T22:06:56+00:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 41934: Treat unencrypted websocket connections to onion services as secure
- - - - -
1 changed file:
- dom/websocket/WebSocket.cpp
Changes:
=====================================
dom/websocket/WebSocket.cpp
=====================================
@@ -1734,12 +1734,15 @@ nsresult WebSocketImpl::Init(JSContext* aCx, bool aIsSecure,
}
// Don't allow https:// to open ws://
- if (!mIsServerSide && !mSecure &&
+ if (!mIsServerSide && !mSecure && aIsSecure &&
!Preferences::GetBool("network.websocket.allowInsecureFromHTTPS",
false) &&
!nsMixedContentBlocker::IsPotentiallyTrustworthyLoopbackHost(
mAsciiHost)) {
- if (aIsSecure) {
+ nsCOMPtr<nsIURI> uri;
+ nsresult rv = NS_NewURI(getter_AddRefs(uri), mURI);
+ NS_ENSURE_SUCCESS(rv, rv);
+ if (!nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(uri)) {
return NS_ERROR_DOM_SECURITY_ERR;
}
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/03a24c6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/03a24c6…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] Bug 41881: Don't persist custom network requests on private windows
by ma1 (@ma1) 08 Sep '23
by ma1 (@ma1) 08 Sep '23
08 Sep '23
ma1 pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
95b3625a by cypherpunks1 at 2023-09-08T11:45:15+01:00
Bug 41881: Don't persist custom network requests on private windows
- - - - -
1 changed file:
- devtools/client/netmonitor/src/components/new-request/HTTPCustomRequestPanel.js
Changes:
=====================================
devtools/client/netmonitor/src/components/new-request/HTTPCustomRequestPanel.js
=====================================
@@ -4,6 +4,11 @@
"use strict";
+const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
+});
+
const {
Component,
createFactory,
@@ -122,10 +127,12 @@ class HTTPCustomRequestPanel extends Component {
async componentDidMount() {
let { connector, request } = this.props;
- const persistedCustomRequest = await asyncStorage.getItem(
- "devtools.netmonitor.customRequest"
- );
- request = request || persistedCustomRequest;
+ if (!lazy.PrivateBrowsingUtils.isWindowPrivate(window)) {
+ const persistedCustomRequest = await asyncStorage.getItem(
+ "devtools.netmonitor.customRequest"
+ );
+ request = request || persistedCustomRequest;
+ }
if (!request) {
this.setState({ _isStateDataReady: true });
@@ -191,7 +198,9 @@ class HTTPCustomRequestPanel extends Component {
}
componentWillUnmount() {
- asyncStorage.setItem("devtools.netmonitor.customRequest", this.state);
+ if (!lazy.PrivateBrowsingUtils.isWindowPrivate(window)) {
+ asyncStorage.setItem("devtools.netmonitor.customRequest", this.state);
+ }
}
handleChangeURL(event) {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/95b3625…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/95b3625…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] Bug 41881: Don't persist custom network requests on private windows
by ma1 (@ma1) 08 Sep '23
by ma1 (@ma1) 08 Sep '23
08 Sep '23
ma1 pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
d66f99f2 by cypherpunks1 at 2023-09-08T10:16:52+00:00
Bug 41881: Don't persist custom network requests on private windows
- - - - -
1 changed file:
- devtools/client/netmonitor/src/components/new-request/HTTPCustomRequestPanel.js
Changes:
=====================================
devtools/client/netmonitor/src/components/new-request/HTTPCustomRequestPanel.js
=====================================
@@ -4,6 +4,11 @@
"use strict";
+const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
+});
+
const {
Component,
createFactory,
@@ -122,10 +127,12 @@ class HTTPCustomRequestPanel extends Component {
async componentDidMount() {
let { connector, request } = this.props;
- const persistedCustomRequest = await asyncStorage.getItem(
- "devtools.netmonitor.customRequest"
- );
- request = request || persistedCustomRequest;
+ if (!lazy.PrivateBrowsingUtils.isWindowPrivate(window)) {
+ const persistedCustomRequest = await asyncStorage.getItem(
+ "devtools.netmonitor.customRequest"
+ );
+ request = request || persistedCustomRequest;
+ }
if (!request) {
this.setState({ _isStateDataReady: true });
@@ -191,7 +198,9 @@ class HTTPCustomRequestPanel extends Component {
}
componentWillUnmount() {
- asyncStorage.setItem("devtools.netmonitor.customRequest", this.state);
+ if (!lazy.PrivateBrowsingUtils.isWindowPrivate(window)) {
+ asyncStorage.setItem("devtools.netmonitor.customRequest", this.state);
+ }
}
handleChangeURL(event) {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d66f99f…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d66f99f…
You're receiving this email because of your account on gitlab.torproject.org.
1
0