- tbb-commits - lists.torproject.org

[torbutton/maint-9.0] Bug 32125: Fix circuit display for bridge without a fingerprint
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 38209d00a355de274759c484a398fe381d8014cb Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Oct 17 14:40:40 2019 -0700 Bug 32125: Fix circuit display for bridge without a fingerprint Torbutton expects all bridges to have a fingerprint when creating the browser's circuit display. This patch works around the case when the user provides a bridge without a fingerprint by assuming it is a bridge, but we cannot determine the other displayed info: type (obfs4, meek, etc) nor the ip. In this scenario, the entry node in the circuit display will simply say "Bridge". --- chrome/content/tor-circuit-display.js | 24 ++++++++++++++++-------- modules/tor-control-port.js | 3 +++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index f75bd781..21bcc57b 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -84,12 +84,19 @@ let nodeDataForID = async function (controller, id) { result.ip = bridge.address.split(":")[0]; } catch (e) { } } else { - result.type = "default"; - // Get the IP address for the given node ID. - try { - let statusMap = await controller.getInfo("ns/id/" + id); - result.ip = statusMap.IP; - } catch (e) { } + // either dealing with a relay, or a bridge whose fingerprint is not saved in torrc + try { + let statusMap = await controller.getInfo("ns/id/" + id); + result.type = "default"; + result.ip = statusMap.IP; + } catch (e) { + // getInfo will throw if the given id is not a relay + // this probably means we are dealing with a user-provided bridge with no fingerprint + result.type = "bridge"; + // we don't know the ip or type, so leave blank + result.ip = ""; + result.bridgeType = ""; + } } if (result.ip) { // Get the country code for the node's IP address. @@ -294,10 +301,11 @@ let updateCircuitDisplay = function () { let bridgeType = nodeData[i].bridgeType; if (bridgeType === "meek_lite") { relayText += ": meek"; - } else if (bridgeType !== "vanilla") { + } + else if (bridgeType !== "vanilla" && bridgeType !== "") { relayText += ": " + bridgeType; } - } else { + } else if (nodeData[i].type == "default") { relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } let ip = nodeData[i].ip.startsWith("0.") ? "" : nodeData[i].ip; diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js index 6e310b52..9f6dbeb6 100644 --- a/modules/tor-control-port.js +++ b/modules/tor-control-port.js @@ -459,6 +459,9 @@ info.streamStatusParser = function (text) { "CircuitID", "Target"]); }; + +// TODO: fix this parsing logic to handle bridgeLine correctly +// fingerprint/id is an optional parameter // __info.bridgeParser(bridgeLine)__. // Takes a single line from a `getconf bridge` result and returns // a map containing the bridge's type, address, and ID.

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] Bug 1546832 - Adjust letterboxing to take the FindBar and Devtools into account r=johannh
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 3d31de7318e3074a4a533b3bfff76a8b84341a4a Author: Tom Ritter <tom(a)mozilla.com> Date: Fri May 24 07:53:11 2019 +0000 Bug 1546832 - Adjust letterboxing to take the FindBar and Devtools into account r=johannh Differential Revision: https://phabricator.services.mozilla.com/D31639 --HG-- extra : moz-landing-system : lando --- browser/actors/RFPHelperChild.jsm | 5 +++++ browser/components/BrowserGlue.jsm | 4 ++++ toolkit/components/resistfingerprinting/RFPHelper.jsm | 11 ++++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/browser/actors/RFPHelperChild.jsm b/browser/actors/RFPHelperChild.jsm index 0658d34ee910..90b675efbc93 100644 --- a/browser/actors/RFPHelperChild.jsm +++ b/browser/actors/RFPHelperChild.jsm @@ -27,4 +27,9 @@ class RFPHelperChild extends ActorChild { this.mm.sendAsyncMessage("Letterboxing:ContentSizeUpdated"); } } + receiveMessage(aMessage) { + if (isLetterboxingEnabled) { + this.mm.sendAsyncMessage("Letterboxing:ContentSizeUpdated"); + } + } } diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index d22f9512184d..4e851289fbe9 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -268,6 +268,10 @@ let LEGACY_ACTORS = { events: { resize: {}, }, + messages: [ + "Finder:FindbarOpen", + "Finder:FindbarClose", + ], }, }, diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 772b0259432e..a5d5bed86f98 100644 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -406,11 +406,20 @@ class _RFPHelper { let containerWidth = browserContainer.clientWidth; let containerHeight = browserContainer.clientHeight; + // If the findbar or devtools are out, we need to subtract their height (plus 1 + // for the separator) from the container height, because we need to adjust our + // letterboxing to acount for it; however it is not included in that dimension + // (but rather is subtracted from the content height.) + let findBar = browserContainer.getElementsByClassName("findbar-container"); + let findBarOffset = findBar.length ? findBar[0].clientHeight + 1 : 0; + let devtools = browserContainer.getElementsByClassName("devtools-toolbox-bottom-iframe"); + let devtoolsOffset = devtools.length ? devtools[0].clientHeight + 1 : 0; + return { contentWidth, contentHeight, containerWidth, - containerHeight, + containerHeight: containerHeight - findBarOffset - devtoolsOffset, }; });

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] Bug 1556017 - Fixing the off-by-one-pixel issue of find bar and devtool iframe for Letterboxing. r=johannh
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 90e3a224b2e9785dafb51263b0bde349c8681a59 Author: Tim Huang <tihuang(a)mozilla.com> Date: Tue Jun 11 08:53:44 2019 +0000 Bug 1556017 - Fixing the off-by-one-pixel issue of find bar and devtool iframe for Letterboxing. r=johannh This patch fixes the off-by-one-pixel issue of Letterboxing. For FindBar, it will be created when the user requests it and will be hidden if the user close it after that. The problem of the original approach is that it only observes the existance of the FindBar element but not the fact that whether or not it is visible. So, it will miscalculate the offset of FindBar after it has been created and closed. For devtools, the original approach adds one pixel offset for the separator. However, this one pixel offset is not required since there is no extra separator outside the devtools iframe. So, we don't need that and this patch removes this one pixel for the devtools. Differential Revision: https://phabricator.services.mozilla.com/D34156 --HG-- extra : moz-landing-system : lando --- toolkit/components/resistfingerprinting/RFPHelper.jsm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index a5d5bed86f98..f73ccf1797b0 100644 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -408,12 +408,12 @@ class _RFPHelper { // If the findbar or devtools are out, we need to subtract their height (plus 1 // for the separator) from the container height, because we need to adjust our - // letterboxing to acount for it; however it is not included in that dimension + // letterboxing to account for it; however it is not included in that dimension // (but rather is subtracted from the content height.) - let findBar = browserContainer.getElementsByClassName("findbar-container"); - let findBarOffset = findBar.length ? findBar[0].clientHeight + 1 : 0; + let findBar = win.gFindBarInitialized ? win.gFindBar : undefined; + let findBarOffset = (findBar && !findBar.hidden) ? findBar.clientHeight + 1 : 0; let devtools = browserContainer.getElementsByClassName("devtools-toolbox-bottom-iframe"); - let devtoolsOffset = devtools.length ? devtools[0].clientHeight + 1 : 0; + let devtoolsOffset = devtools.length ? devtools[0].clientHeight : 0; return { contentWidth,

1 0

[tor-browser-build/maint-9.0] Bug 32413: Bump Go to 1.12.13
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 45e946444d778d3e5e734826604dfd39a2e53871 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 6 21:06:52 2019 +0000 Bug 32413: Bump Go to 1.12.13 Pick up security fixes. --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index ffe07ea..b9acfaf 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.12.9 +version: 1.12.13 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -90,7 +90,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc + sha256sum: 5383d3b8db4baa48284ffcb14606d9cad6f03e9db843fa6d835b94d63cccf5a7 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[torbutton/master] Translations update
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit cb83b2758bf9a616d1d7275ee8e099e56544bd21 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 26 08:22:50 2019 +0000 Translations update --- chrome/locale/bn-BD/browserOnboarding.properties | 6 +++--- chrome/locale/bn-BD/torbutton.dtd | 2 +- chrome/locale/bn-BD/torbutton.properties | 10 +++++----- chrome/locale/ro/aboutTor.dtd | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/chrome/locale/bn-BD/browserOnboarding.properties b/chrome/locale/bn-BD/browserOnboarding.properties index 6f458a2a..d905482f 100644 --- a/chrome/locale/bn-BD/browserOnboarding.properties +++ b/chrome/locale/bn-BD/browserOnboarding.properties @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=টর নেটওয়ার্কে য onboarding.tour-tor-network=টর নেটওয়ার্ক onboarding.tour-tor-network.title=একটি বিকেন্দ্রীকরণের নেটওয়ার্ক পরিভ্রমণ করে । onboarding.tour-tor-network.description=টর ব্রাউজার আপনাকে বিশ্বের হাজার হাজার স্বেচ্ছাসেবকদের দ্বারা পরিচালিত টর নেটওয়ার্কে সংযুক্ত করে। একটি ভিপিএন এর থেকে ভিন্ন, ইন্টারনেটের উপভোগ করার জন্য আপনার কোনও ব্যর্থতা বা কেন্দ্রীয় সত্তাকে বিশ্বাস করতে হবে। -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. +onboarding.tour-tor-network.description-para2=নতুন: টর ব্লক করা ব্রিজগুলির জন্য অনুরোধ করার ক্ষমতা সহ টর নেটওয়ার্ক সেটিংস এখন পছন্দসমূহে পাওয়া যাবে। onboarding.tour-tor-network.action-button=আপনার টোর নেটওয়ার্ক সেটিংস সামঞ্জস্য করুন onboarding.tour-tor-network.button=সার্কিট ডিসপ্লে-তে যান @@ -28,7 +28,7 @@ onboarding.tour-tor-circuit-display.next-button=সিকিউরিটিত onboarding.tour-tor-security=নিরাপত্তা onboarding.tour-tor-security.title=আপনার অভিজ্ঞতা পছন্দ করুন । onboarding.tour-tor-security.description=আমরা আপনার ব্রাউজার নিরাপত্তা উন্নয়নের জন্য অতিরিক্ত সেটিংস প্রদান করি। আমাদের সুরক্ষা সেটিংস আপনাকে এমন উপাদানগুলিকে ব্লক করার অনুমতি দেয় যা আপনার কম্পিউটারে আক্রমণ করার জন্য ব্যবহার করা যেতে পারে। বিভিন্ন অপশন কি দেখতে নিচে ক্লিক করুন। -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. +onboarding.tour-tor-security.description-suffix=দ্রষ্টব্য: ডিফল্টরূপে, নোস্ক্রিপ্ট এবং এইচটিটিপিএস সর্বত্র টুলবারে অন্তর্ভুক্ত নয়, তবে এগুলি যুক্ত করতে আপনি নিজের সরঞ্জামদণ্ডটি কাস্টমাইজ করতে পারেন। onboarding.tour-tor-security-level.button=আপনার নিরাপত্তা স্তর দেখুন onboarding.tour-tor-security-level.next-button=অভিজ্ঞতার টিপসে যান @@ -51,7 +51,7 @@ onboarding.tour-tor-update.prefix-updated=আপডেট করা হয়ে onboarding.tour-tor-toolbar=টুলবার onboarding.tour-tor-toolbar-update-9.0.title=বিদায় Onion বোতাম। onboarding.tour-tor-toolbar-update-9.0.description=Tor Browser মধ্যে পুরোপুরি সংহত করতে আমরা আপনার Tor ব্যবহার করার অভিজ্ঞতা চাই। -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. +onboarding.tour-tor-toolbar-update-9.0.description-para2=এজন্য এখন, পেঁয়াজ বোতামটি ব্যবহার করার পরিবর্তে, আপনি ইউআরএল বারে [i] এর মাধ্যমে টর সার্কিট দেখতে পারেন এবং টুলবার বোতাম বা [≡] মেনু ব্যবহার করে একটি নতুন পরিচয়ের জন্য অনুরোধ করতে পারেন। onboarding.tour-tor-toolbar-update-9.0.button=নতুন পরিচয়ের জন্য কীভাবে অনুরোধ করবেন onboarding.tour-tor-toolbar-update-9.0.next-button=টর নেটওয়ার্কে যান diff --git a/chrome/locale/bn-BD/torbutton.dtd b/chrome/locale/bn-BD/torbutton.dtd index 4f68679b..d9579cff 100644 --- a/chrome/locale/bn-BD/torbutton.dtd +++ b/chrome/locale/bn-BD/torbutton.dtd @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "এই সাইটের জন্য নতুন সার্কিট">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "onion সার্ভিস ক্লায়েন্টের অথেনটিকেশন প্রম্পটটি খুলুন"> diff --git a/chrome/locale/bn-BD/torbutton.properties b/chrome/locale/bn-BD/torbutton.properties index f169a1b1..1ff0a8e1 100644 --- a/chrome/locale/bn-BD/torbutton.properties +++ b/chrome/locale/bn-BD/torbutton.properties @@ -61,10 +61,10 @@ pageInfo_OnionEncryption=সংযোগ এনক্রিপ্ট (Onion Serv # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=Tor onion পরিষেবা ক্লায়েন্টের অনুমোদন হারিয়েছে +onionServices.authPrompt.description=%S আপনার ব্যক্তিগত কীটির জন্য অনুরোধ করছে। +onionServices.authPrompt.keyPlaceholder=এই onion পরিষেবার জন্য আপনার ব্যক্তিগত কী লিখুন onionServices.authPrompt.done=সম্পন্ন onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.invalidKey=দয়া করে একটি বৈধ কী (52 বেস32 অক্ষর বা 44 বেস 64 অক্ষর) প্রবেশ করুন +onionServices.authPrompt.failedToSetKey=আপনার কী দিয়ে টর কনফিগার করতে অক্ষম diff --git a/chrome/locale/ro/aboutTor.dtd b/chrome/locale/ro/aboutTor.dtd index 31550ff2..af4e0ff5 100644 --- a/chrome/locale/ro/aboutTor.dtd +++ b/chrome/locale/ro/aboutTor.dtd @@ -33,5 +33,5 @@  <!ENTITY aboutTor.ey2019.mozilla "Donează azi, și Mozilla va dona în aceeași măsură."> -<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online."> +<!ENTITY aboutTor.ey2019.tracking "Urmărirea, supravegherea și cenzura sunt răspândite online."> <!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor">

1 0

[torbutton/master] Don't check out securityLevel.properties
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 74bb2a6afe9143e208be7fa6190456f06189fcf4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 26 08:15:38 2019 +0000 Don't check out securityLevel.properties Since #24653 landed securityLevel strings are merged into torbutton.dtd. --- import-translations.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/import-translations.sh b/import-translations.sh index 4e5f29c1..b4c22295 100755 --- a/import-translations.sh +++ b/import-translations.sh @@ -23,7 +23,6 @@ FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" "browserOnboarding.properties:torbutton-browseronboardingproperties" "torbutton.dtd:torbutton-torbuttondtd" "torbutton.properties:torbutton-torbuttonproperties" - "securityLevel.properties:torbutton-securitylevelproperties" ) # Verify that the FILEMAP contains an entry for each Torbutton file.

1 0

[tor-browser-build/master] Bug 30548: Clean up keyring file
by gk＠torproject.org 25 Nov '19

25 Nov '19

commit 99c3350b632cc87136fcaf0531da7c5f46143ab9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 21 11:56:54 2019 +0000 Bug 30548: Clean up keyring file --- keyring/cmake.gpg | Bin 16939 -> 22706 bytes keyring/llvm.gpg | Bin 3335 -> 4309 bytes keyring/tor.gpg | Bin 159585 -> 9148 bytes keyring/torbrowser.gpg | Bin 125669 -> 2839 bytes keyring/torbutton.gpg | Bin 290913 -> 5120 bytes keyring/yawning.gpg | Bin 58959 -> 36705 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/cmake.gpg b/keyring/cmake.gpg index 51f19e7..05e12fc 100644 Binary files a/keyring/cmake.gpg and b/keyring/cmake.gpg differ diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg index a94f435..7c7ab06 100644 Binary files a/keyring/llvm.gpg and b/keyring/llvm.gpg differ diff --git a/keyring/tor.gpg b/keyring/tor.gpg index 45b333f..3bca5c5 100644 Binary files a/keyring/tor.gpg and b/keyring/tor.gpg differ diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index 4f19dd0..ec64740 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 5a505f2..7100dcd 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ diff --git a/keyring/yawning.gpg b/keyring/yawning.gpg index e3384c5..067e96e 100644 Binary files a/keyring/yawning.gpg and b/keyring/yawning.gpg differ

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 25 Nov '19

25 Nov '19

commit 8f2ba127875371bfa707525d0778942587daf87c Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Oct 21 18:27:13 2019 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/base/content/browser.xul | 1 - mobile/android/chrome/content/browser.xul | 1 - 2 files changed, 2 deletions(-) diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 6a81cc8c0f72..8e47fd36fb75 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -102,7 +102,6 @@ Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); - Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton_util.js", this); Services.scriptloader.loadSubScript("chrome://torbutton/content/tor-circuit-display.js", this); Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton.js", this); diff --git a/mobile/android/chrome/content/browser.xul b/mobile/android/chrome/content/browser.xul index fab93922a5f6..039599131f17 100644 --- a/mobile/android/chrome/content/browser.xul +++ b/mobile/android/chrome/content/browser.xul @@ -12,7 +12,6 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <script type="application/javascript" src="chrome://browser/content/browser.js"/> - <script type="application/javascript" src="chrome://torbutton/content/torbutton_util.js"/> <script type="application/javascript" src="chrome://torbutton/content/torbutton.js"/> <deck id="browsers" flex="1"/>

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Pick up latest Torbutton code
by gk＠torproject.org 25 Nov '19

25 Nov '19

commit 07dbe49e336ede579f3158a7a130f45b37d69d37 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 25 14:54:34 2019 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index c05e56d7b4e3..ed3fafebab28 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit c05e56d7b4e36e83c0915989ee608e68c637f782 +Subproject commit ed3fafebab28d005e22208aa921e5f5c7c54153f

1 0

[torbutton/master] Bug 30888: move torbutton_util.js to modules/utils.js
by gk＠torproject.org 25 Nov '19

25 Nov '19

commit ed3fafebab28d005e22208aa921e5f5c7c54153f Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 17 19:16:47 2019 +0200 Bug 30888: move torbutton_util.js to modules/utils.js --- chrome/content/preferences.xhtml | 1 - chrome/content/tor-circuit-display.js | 9 +--- chrome/content/torbutton.js | 32 +++++++------- chrome/content/torbutton_util.js | 79 ----------------------------------- components/external-app-blocker.js | 16 +++---- modules/utils.js | 54 +++++++++++++++++++++++- 6 files changed, 80 insertions(+), 111 deletions(-) diff --git a/chrome/content/preferences.xhtml b/chrome/content/preferences.xhtml index 6f662f5f..eafbf01e 100644 --- a/chrome/content/preferences.xhtml +++ b/chrome/content/preferences.xhtml @@ -6,7 +6,6 @@ <title>&torbutton.prefs.security_settings;</title> <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences.css"/> <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences-mobile.css"/> - <script type="text/javascript" src="torbutton_util.js"></script> <script type="text/javascript" src="preferences-mobile.js"></script> <style> </style> diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 1e58b2b4..19b55d18 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -32,7 +32,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); let { controller } = ChromeUtils.import("resource://torbutton/modules/tor-control-port.js", {}); // Utility functions -let { bindPrefAndInit, observe, getLocale, getDomainForBrowser } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, observe, getLocale, getDomainForBrowser, torbutton_get_property_string } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); // Make the TorButton logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -204,15 +204,10 @@ let collectBrowserCredentials = function () { // ## User interface -// __torbuttonBundle__. -// Bundle of localized strings for torbutton UI. -let torbuttonBundle = Services.strings.createBundle( - "chrome://torbutton/locale/torbutton.properties"); - // __uiString__. // Read the localized strings for this UI. let uiString = function (shortName) { - return torbuttonBundle.GetStringFromName("torbutton.circuit_display." + shortName); + return torbutton_get_property_string("torbutton.circuit_display." + shortName); }; // __localizedCountryNameFromCode(countryCode)__. diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index e75584cf..0ca37789 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -1,3 +1,9 @@ +// window globals +var torbutton_init; +var torbutton_new_circuit; +var torbutton_new_identity; + +(() => { // Bug 1506 P1-P5: This is the main Torbutton overlay file. Much needs to be // preserved here, but in an ideal world, most of this code should perhaps be // moved into an XPCOM service, and much can also be tossed. See also @@ -7,18 +13,20 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -/* global torbutton_log, gBrowser, torbutton_safelog, CustomizableUI, - createTorCircuitDisplay, torbutton_get_property_string, gFindBarInitialized, - gFindBar, OpenBrowserWindow, PrivateBrowsingUtils, torbutton_get_stringbundle, +/* global gBrowser, CustomizableUI, + createTorCircuitDisplay, gFindBarInitialized, + gFindBar, OpenBrowserWindow, PrivateBrowsingUtils, Services, AppConstants */ let { - showDialog, show_torbrowser_manual, unescapeTorString, bindPrefAndInit, getDomainForBrowser, + torbutton_safelog, + torbutton_log, + torbutton_get_property_string, } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = ChromeUtils.import("resource://torbutton/modules/security-prefs.js", {}); let { configureControlPortModule } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); @@ -32,15 +40,10 @@ var m_tb_prefs = Services.prefs; // status var m_tb_wasinited = false; -var m_tb_plugin_string = false; var m_tb_is_main_window = false; -var m_tb_hidden_browser = false; var m_tb_confirming_plugins = false; -var m_tb_window_height = window.outerHeight; -var m_tb_window_width = window.outerWidth; - var m_tb_control_ipc_file = null; // Set if using IPC (UNIX domain socket). var m_tb_control_port = null; // Set if using TCP. var m_tb_control_host = null; // Set if using TCP. @@ -232,7 +235,7 @@ function torbutton_is_mobile() { // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. -function torbutton_init() { +torbutton_init = function() { torbutton_log(3, 'called init()'); SecurityPrefs.initialize(); @@ -746,7 +749,7 @@ function torbutton_send_ctrl_cmd(command) { } // Bug 1506 P4: Needed for New IP Address -function torbutton_new_circuit() { +torbutton_new_circuit = function() { let firstPartyDomain = getDomainForBrowser(gBrowser.selectedBrowser); let domainIsolator = Cc["@torproject.org/domain-isolator;1"] @@ -758,7 +761,7 @@ function torbutton_new_circuit() { } // Bug 1506 P4: Needed for New Identity. -async function torbutton_new_identity() { +torbutton_new_identity = async function() { try { // Make sure that we can only click once on New Identiy to avoid race // conditions leading to failures (see bug 11783 for an example). @@ -1720,9 +1723,6 @@ function torbutton_new_window(event) return; } - m_tb_window_height = window.outerHeight; - m_tb_window_width = window.outerWidth; - if (!m_tb_wasinited) { torbutton_init(); } @@ -1906,5 +1906,5 @@ function torbutton_init_user_manual_links() { torbutton_abouttor_message_handler.updateAllOpenPages(); }); } - +})(); //vim:set ts=4 diff --git a/chrome/content/torbutton_util.js b/chrome/content/torbutton_util.js deleted file mode 100644 index e6446cde..00000000 --- a/chrome/content/torbutton_util.js +++ /dev/null @@ -1,79 +0,0 @@ -// Bug 1506 P1-P3: These utility functions might be useful, but -// you probably just want to rewrite them or use the underlying -// code directly. I don't see any of them as essential for 1506, -// really. - -var m_tb_torlog = Cc["@torproject.org/torbutton-logger;1"] -.getService(Ci.nsISupports).wrappedJSObject; - -var m_tb_string_bundle = torbutton_get_stringbundle(); - -function torbutton_safelog(nLevel, sMsg, scrub) { - m_tb_torlog.safe_log(nLevel, sMsg, scrub); - return true; -} - -function torbutton_log(nLevel, sMsg) { - m_tb_torlog.log(nLevel, sMsg); - - // So we can use it in boolean expressions to determine where the - // short-circuit is.. - return true; -} - -// get a preferences branch object -// FIXME: this is lame. -function torbutton_get_prefbranch(branch_name) { - var o_prefs = false; - var o_branch = false; - - torbutton_log(1, "called get_prefbranch()"); - o_prefs = Services.prefs; - if (!o_prefs) { - torbutton_log(5, "Failed to get preferences-service!"); - return false; - } - - o_branch = o_prefs.getBranch(branch_name); - if (!o_branch) - { - torbutton_log(5, "Failed to get prefs branch!"); - return false; - } - - return o_branch; -} - -// load localization strings -function torbutton_get_stringbundle() -{ - var o_stringbundle = false; - - try { - var oBundle = Services.strings; - o_stringbundle = oBundle.createBundle("chrome://torbutton/locale/torbutton.properties"); - } catch(err) { - o_stringbundle = false; - } - if (!o_stringbundle) { - torbutton_log(5, 'ERROR (init): failed to find torbutton-bundle'); - } - - return o_stringbundle; -} - -function torbutton_get_property_string(propertyname) -{ - try { - if (!m_tb_string_bundle) { - m_tb_string_bundle = torbutton_get_stringbundle(); - } - - return m_tb_string_bundle.GetStringFromName(propertyname); - } catch(e) { - torbutton_log(4, "Unlocalized string "+propertyname); - } - - return propertyname; -} - diff --git a/components/external-app-blocker.js b/components/external-app-blocker.js index afd5c002..9d5cbd79 100644 --- a/components/external-app-blocker.js +++ b/components/external-app-blocker.js @@ -16,6 +16,8 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { PromptUtils } = ChromeUtils.import("resource://gre/modules/SharedPromptUtils.jsm"); +let { torbutton_get_property_string } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); + // Module specific constants const kMODULE_NAME = "Torbutton External App Handler"; const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlocker;1"; @@ -82,13 +84,13 @@ ExternalAppBlocker.prototype = parentWin = Services.wm.getMostRecentWindow("navigator:browser"); } - let title = parentWin.torbutton_get_property_string("torbutton.popup.external.title"); - let app = parentWin.torbutton_get_property_string("torbutton.popup.external.app"); - let note = parentWin.torbutton_get_property_string("torbutton.popup.external.note"); - let suggest = parentWin.torbutton_get_property_string("torbutton.popup.external.suggest"); - let launch = parentWin.torbutton_get_property_string("torbutton.popup.launch"); - let cancel = parentWin.torbutton_get_property_string("torbutton.popup.cancel"); - let dontask = parentWin.torbutton_get_property_string("torbutton.popup.dontask"); + let title = torbutton_get_property_string("torbutton.popup.external.title"); + let app = torbutton_get_property_string("torbutton.popup.external.app"); + let note = torbutton_get_property_string("torbutton.popup.external.note"); + let suggest = torbutton_get_property_string("torbutton.popup.external.suggest"); + let launch = torbutton_get_property_string("torbutton.popup.launch"); + let cancel = torbutton_get_property_string("torbutton.popup.cancel"); + let dontask = torbutton_get_property_string("torbutton.popup.dontask"); let args = { promptType: "confirmEx", diff --git a/modules/utils.js b/modules/utils.js index 0caf475f..b726342b 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -239,6 +239,58 @@ var getDomainForBrowser = (browser) => { return fpd; }; +var m_tb_torlog = Cc["@torproject.org/torbutton-logger;1"] +.getService(Ci.nsISupports).wrappedJSObject; + +var m_tb_string_bundle = torbutton_get_stringbundle(); + +function torbutton_safelog(nLevel, sMsg, scrub) { + m_tb_torlog.safe_log(nLevel, sMsg, scrub); + return true; +} + +function torbutton_log(nLevel, sMsg) { + m_tb_torlog.log(nLevel, sMsg); + + // So we can use it in boolean expressions to determine where the + // short-circuit is.. + return true; +} + +// load localization strings +function torbutton_get_stringbundle() +{ + var o_stringbundle = false; + + try { + var oBundle = Services.strings; + o_stringbundle = oBundle.createBundle("chrome://torbutton/locale/torbutton.properties"); + } catch(err) { + o_stringbundle = false; + } + if (!o_stringbundle) { + torbutton_log(5, 'ERROR (init): failed to find torbutton-bundle'); + } + + return o_stringbundle; +} + +function torbutton_get_property_string(propertyname) +{ + try { + if (!m_tb_string_bundle) { + m_tb_string_bundle = torbutton_get_stringbundle(); + } + + return m_tb_string_bundle.GetStringFromName(propertyname); + } catch(e) { + torbutton_log(4, "Unlocalized string "+propertyname); + } + + return propertyname; +} + // Export utility functions for external use. let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", "getDomainForBrowser", - "getPrefValue", "observe", "showDialog", "show_torbrowser_manual", "unescapeTorString"]; + "getPrefValue", "observe", "showDialog", "show_torbrowser_manual", "unescapeTorString", + "torbutton_safelog", "torbutton_log", "torbutton_get_property_string"];

1 0