December 2018 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 03 Dec '18

03 Dec '18

commit 58261033fb06884be4b6ebd64f2b22495645e6c4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 18:45:49 2018 +0000 Update translations for liveusb-creator --- bn/bn.po | 84 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/bn/bn.po b/bn/bn.po index 7d7040f73..2ba19b96f 100644 --- a/bn/bn.po +++ b/bn/bn.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-17 13:11+0200\n" -"PO-Revision-Date: 2018-10-17 14:51+0000\n" +"POT-Creation-Date: 2018-10-20 12:34+0200\n" +"PO-Revision-Date: 2018-12-03 18:29+0000\n" "Last-Translator: erinm\n" "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n" "MIME-Version: 1.0\n" @@ -77,194 +77,194 @@ msgstr "কপি করতে অক্ষম %(infile)s থেকে %(outfile msgid "Removing existing Live OS" msgstr "বিদ্যমান লাইভ অপারেটিং সিস্টেম অপসারণ" -#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456 +#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Chmod করতে অক্ষম %(file)sঃ%(message)s" -#: ../tails_installer/creator.py:449 +#: ../tails_installer/creator.py:450 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "পূর্ববর্তী LiveOS থেকে ফাইল সরাতে অক্ষম:%(message)s" -#: ../tails_installer/creator.py:462 +#: ../tails_installer/creator.py:464 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "পূর্ববর্তী LiveOS থেকে ডিরেক্টরি সরাতে অক্ষম: %(message)s" -#: ../tails_installer/creator.py:510 +#: ../tails_installer/creator.py:512 #, python-format msgid "Cannot find device %s" msgstr "ডিভাইস খুঁজে পাইনি %s" -#: ../tails_installer/creator.py:711 +#: ../tails_installer/creator.py:713 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "লিখতে অক্ষম %(device)s, skipping।" -#: ../tails_installer/creator.py:741 +#: ../tails_installer/creator.py:743 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "%(device)s ডিভাইসের কিছু পার্টিশন মাউন্ট করা হয়। ইনস্টলেশন প্রক্রিয়া আরম্ভ করার পূর্বে তাদের আনমাউন্ট করা হবে।" -#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008 +#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "অজানা ফাইল সিস্টেম আপনার ডিভাইসের পুনরায় ফরম্যাট করা প্রয়োজন হতে পারে।" -#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011 +#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013 #, python-format msgid "Unsupported filesystem: %s" msgstr "অসমর্থিত ফাইল সিস্টেম: %s" -#: ../tails_installer/creator.py:805 +#: ../tails_installer/creator.py:807 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" msgstr "ডিভাইস মাউন্ট করার চেষ্টা করার সময় অজানা GLib ব্যতিক্রম: %(message)s" -#: ../tails_installer/creator.py:810 +#: ../tails_installer/creator.py:812 #, python-format msgid "Unable to mount device: %(message)s" msgstr "ডিভাইস মাউন্ট করতে অক্ষম: %(message)s" -#: ../tails_installer/creator.py:815 +#: ../tails_installer/creator.py:817 msgid "No mount points found" msgstr "কোন মাউন্ট পয়েন্ট পাওয়া যায় নি" -#: ../tails_installer/creator.py:826 +#: ../tails_installer/creator.py:828 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "%(device)sএর জন্য আনমাউন্ট ডিভাইস প্রবেশ করানো হচ্ছে " -#: ../tails_installer/creator.py:836 +#: ../tails_installer/creator.py:838 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "মাউন্ট করা ফাইল সিস্টেমগুলি আনমাউন্ট করা হচ্ছে %(device)s" -#: ../tails_installer/creator.py:840 +#: ../tails_installer/creator.py:842 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "%(udi)s আনমাউন্ট %(device)s" -#: ../tails_installer/creator.py:851 +#: ../tails_installer/creator.py:853 #, python-format msgid "Mount %s exists after unmounting" msgstr "মাউন্ট %s আনমাউন্টিং পরে বিদ্যমান" -#: ../tails_installer/creator.py:864 +#: ../tails_installer/creator.py:866 #, python-format msgid "Partitioning device %(device)s" msgstr "বিভাজন ডিভাইস %(device)s" -#: ../tails_installer/creator.py:993 +#: ../tails_installer/creator.py:995 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "অসমর্থিত ডিভাইস '%(device)s', একটি বাগ রিপোর্ট করুন." -#: ../tails_installer/creator.py:996 +#: ../tails_installer/creator.py:998 msgid "Trying to continue anyway." msgstr "যাইহোক চালিয়ে যেতে চেষ্টা।" -#: ../tails_installer/creator.py:1005 ../tails_installer/creator.py:1401 +#: ../tails_installer/creator.py:1007 ../tails_installer/creator.py:1405 msgid "Verifying filesystem..." msgstr "ফাইল সিস্টেম যাচাই করা হচ্ছে ..." -#: ../tails_installer/creator.py:1029 +#: ../tails_installer/creator.py:1031 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "ভলিউম লেবেল পরিবর্তন করতে অক্ষম: %(message)s" -#: ../tails_installer/creator.py:1034 ../tails_installer/creator.py:1434 +#: ../tails_installer/creator.py:1037 ../tails_installer/creator.py:1440 msgid "Installing bootloader..." msgstr "বুটলোডার ইনস্টল হচ্ছে ..." -#: ../tails_installer/creator.py:1061 +#: ../tails_installer/creator.py:1064 #, python-format msgid "Could not find the '%s' COM32 module" msgstr "'%s' COM32 মডিউল খুঁজে পাওয়া যায়নি" -#: ../tails_installer/creator.py:1069 ../tails_installer/creator.py:1452 +#: ../tails_installer/creator.py:1072 ../tails_installer/creator.py:1458 #, python-format msgid "Removing %(file)s" msgstr "সরানো হচ্ছে %(file)s" -#: ../tails_installer/creator.py:1183 +#: ../tails_installer/creator.py:1186 #, python-format msgid "%s already bootable" msgstr "%s ইতিমধ্যে বুটযোগ্য " -#: ../tails_installer/creator.py:1203 +#: ../tails_installer/creator.py:1206 msgid "Unable to find partition" msgstr "পার্টিশন খুঁজে পাওয়া যায়নি" -#: ../tails_installer/creator.py:1226 +#: ../tails_installer/creator.py:1229 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "FAT32 হিসাবে %(device)s ফর্ম্যাটিং" -#: ../tails_installer/creator.py:1286 +#: ../tails_installer/creator.py:1289 msgid "Could not find syslinux' gptmbr.bin" msgstr "Syslinux 'gptmbr.bin খুঁজে পাওয়া যায়নি" -#: ../tails_installer/creator.py:1299 +#: ../tails_installer/creator.py:1302 #, python-format msgid "Reading extracted MBR from %s" msgstr "এফএফ থেকে এমবিআর সরানো পড়া %s" -#: ../tails_installer/creator.py:1303 +#: ../tails_installer/creator.py:1306 #, python-format msgid "Could not read the extracted MBR from %(path)s" msgstr "এক্সট্র্যাক্ট করা এমবিআর থেকে এক্সপিরিং করা যায়নি %(path)s" -#: ../tails_installer/creator.py:1316 ../tails_installer/creator.py:1317 +#: ../tails_installer/creator.py:1319 ../tails_installer/creator.py:1320 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "মাস্টার বুট রেকর্ড পুনরায় সেট %s" -#: ../tails_installer/creator.py:1322 +#: ../tails_installer/creator.py:1325 msgid "Drive is a loopback, skipping MBR reset" msgstr "ড্রাইভ একটি লুপব্যাক, MBR রিসেট স্কিপিং" -#: ../tails_installer/creator.py:1326 ../tails_installer/creator.py:1580 +#: ../tails_installer/creator.py:1329 ../tails_installer/creator.py:1589 #, python-format msgid "Calculating the SHA1 of %s" msgstr "%s SHA1 গণনা করা হচ্ছে" -#: ../tails_installer/creator.py:1351 +#: ../tails_installer/creator.py:1354 msgid "Synchronizing data on disk..." msgstr "ডিস্কের ডেটা সিঙ্ক্রোনাইজ করা হচ্ছে ..." -#: ../tails_installer/creator.py:1393 +#: ../tails_installer/creator.py:1397 msgid "Error probing device" msgstr "ত্রুটি ডিভাইস অনুসন্ধান" -#: ../tails_installer/creator.py:1395 +#: ../tails_installer/creator.py:1399 msgid "Unable to find any supported device" msgstr "কোন সমর্থিত ডিভাইস খুঁজে পাওয়া যায়নি" -#: ../tails_installer/creator.py:1405 +#: ../tails_installer/creator.py:1409 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "নিশ্চিত করুন যে আপনার USB কীটি প্লাগ ইন করা হয়েছে এবং FAT ফাইলসিস্টেম দিয়ে ফর্ম্যাট করা হয়েছে" -#: ../tails_installer/creator.py:1408 +#: ../tails_installer/creator.py:1412 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "অসমর্থিত ফাইল সিস্টেম: %s\nঅনুগ্রহ করে ব্যাকআপ করুন এবং আপনার ইউএসবি কি ফ্যাট ফাইল সিস্টেমের সাথে ফরম্যাট করুন।" -#: ../tails_installer/creator.py:1475 +#: ../tails_installer/creator.py:1481 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Win32_LogicalDisk পেতে অক্ষম; win32com ক্যোয়ারী কোন ফলাফল ফেরত দেয় নি" -#: ../tails_installer/creator.py:1528 +#: ../tails_installer/creator.py:1536 msgid "Cannot find" msgstr "খুঁজে পাচ্ছি না" -#: ../tails_installer/creator.py:1529 +#: ../tails_installer/creator.py:1537 msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program."

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1464481 - fix and test crash when getting registered channelwrapper, r=kmag
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 1305066f21439675842aad91844e6b490df8c3e0 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Fri May 25 16:41:19 2018 -0400 Bug 1464481 - fix and test crash when getting registered channelwrapper, r=kmag MozReview-Commit-ID: LEGojHEb742 --HG-- extra : rebase_source : 7018cfef6b7415ea275dc2c3e414586396a9e2be --- dom/chrome-webidl/ChannelWrapper.webidl | 2 +- .../test/mochitest/test_ext_webrequest_hsts.html | 25 ++++++++++++++++++++++ toolkit/modules/addons/WebRequest.jsm | 4 +++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dom/chrome-webidl/ChannelWrapper.webidl b/dom/chrome-webidl/ChannelWrapper.webidl index 2777aab65c8e..bc959d30d043 100644 --- a/dom/chrome-webidl/ChannelWrapper.webidl +++ b/dom/chrome-webidl/ChannelWrapper.webidl @@ -52,7 +52,7 @@ interface ChannelWrapper : EventTarget { * Returns the wrapper instance for the given channel. The same wrapper is * always returned for a given channel. */ - static ChannelWrapper getRegisteredChannel(unsigned long long aChannelId, + static ChannelWrapper? getRegisteredChannel(unsigned long long aChannelId, WebExtensionPolicy extension, TabParent? tabParent); diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html index ad4d4f32a657..849527ea4a80 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html @@ -185,6 +185,31 @@ add_task(async function test_hsts_header() { await extension.unload(); }); + +add_task(async function test_nonBlocking_securityInfo() { + let extension = ExtensionTestUtils.loadExtension({ + manifest: { + "permissions": [ + "webRequest", + "<all_urls>", + ], + }, + async background() { + let tab; + browser.webRequest.onHeadersReceived.addListener(async (details) => { + let securityInfo = await browser.webRequest.getSecurityInfo(details.requestId, {}); + browser.test.assertTrue(!securityInfo, "securityInfo undefined on http request"); + browser.tabs.remove(tab.id); + browser.test.notifyPass("success"); + }, {urls: ["<all_urls>"], types: ["main_frame"]}); + tab = await browser.tabs.create({url: "https://example.org/tests/toolkit/components/extensions/test/mochitest/file…"}); + }, + }); + await extension.startup(); + + await extension.awaitFinish("success"); + await extension.unload(); +}); </script> </head> <body> diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm index a4c9e9859a21..6a95182a3876 100644 --- a/toolkit/modules/addons/WebRequest.jsm +++ b/toolkit/modules/addons/WebRequest.jsm @@ -1012,7 +1012,9 @@ var WebRequest = { getSecurityInfo: (details) => { let channel = ChannelWrapper.getRegisteredChannel(details.id, details.extension, details.tabParent); - return SecurityInfo.getSecurityInfo(channel.channel, details.options); + if (channel) { + return SecurityInfo.getSecurityInfo(channel.channel, details.options); + } }, };

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1471959 - leave keaGroupName and signatureSchemeName undefined if value is none, r=rpl
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit b81fe53f5fe1ecd749ca900ccfc1a00ae1fd9328 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Fri Jul 6 09:41:56 2018 -0300 Bug 1471959 - leave keaGroupName and signatureSchemeName undefined if value is none, r=rpl MozReview-Commit-ID: 2Ca7xCMOPAH --HG-- extra : rebase_source : 2fa9d6b80c9ead0d90927878ce10390791cbadd9 --- toolkit/components/extensions/schemas/web_request.json | 10 ++++++++++ toolkit/modules/addons/SecurityInfo.jsm | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/extensions/schemas/web_request.json index 508ca8b05f8f..6fe12f7b6ca5 100644 --- a/toolkit/components/extensions/schemas/web_request.json +++ b/toolkit/components/extensions/schemas/web_request.json @@ -269,6 +269,16 @@ "description": "The cipher suite used in this request if state is \"secure\".", "optional": true }, + "keaGroupName": { + "type": "string", + "description": "The key exchange algorithm used in this request if state is \"secure\".", + "optional": true + }, + "signatureSchemeName": { + "type": "string", + "description": "The signature scheme used in this request if state is \"secure\".", + "optional": true + }, "certificates": { "description": "Certificate data if state is \"secure\". Will only contain one entry unless <code>certificateChain</code> is passed as an option.", "type": "array", diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm index 8c5cef18754d..a931602b517a 100644 --- a/toolkit/modules/addons/SecurityInfo.jsm +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -137,10 +137,14 @@ const SecurityInfo = { info.cipherSuite = SSLStatus.cipherName; // Key exchange group name. - info.keaGroupName = SSLStatus.keaGroupName; + if (SSLStatus.keaGroupName !== "none") { + info.keaGroupName = SSLStatus.keaGroupName; + } // Certificate signature scheme. - info.signatureSchemeName = SSLStatus.signatureSchemeName; + if (SSLStatus.signatureSchemeName !== "none") { + info.signatureSchemeName = SSLStatus.signatureSchemeName; + } info.isDomainMismatch = SSLStatus.isDomainMismatch; info.isExtendedValidation = SSLStatus.isExtendedValidation;

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1322748 add securityInfo to webRequest listeners, r=keeler, rpl
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 1935dcf38ca112f9fbc9fe42c2289d77e4f95932 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Wed May 23 14:36:19 2018 -0400 Bug 1322748 add securityInfo to webRequest listeners, r=keeler,rpl MozReview-Commit-ID: Hen1tl1RWTC --HG-- extra : rebase_source : e5dae021438ece0477d89e1d4e91eaaf2ebfd06e --- toolkit/components/extensions/ext-webRequest.js | 8 + .../components/extensions/schemas/web_request.json | 171 ++++++++++++ .../test/mochitest/test_ext_webrequest_hsts.html | 28 +- toolkit/modules/addons/SecurityInfo.jsm | 297 +++++++++++++++++++++ toolkit/modules/addons/WebRequest.jsm | 21 +- toolkit/modules/moz.build | 1 + 6 files changed, 516 insertions(+), 10 deletions(-) diff --git a/toolkit/components/extensions/ext-webRequest.js b/toolkit/components/extensions/ext-webRequest.js index f953be4a6e40..19306816adc3 100644 --- a/toolkit/components/extensions/ext-webRequest.js +++ b/toolkit/components/extensions/ext-webRequest.js @@ -102,6 +102,14 @@ this.webRequest = class extends ExtensionAPI { onResponseStarted: new WebRequestEventManager(context, "onResponseStarted").api(), onErrorOccurred: new WebRequestEventManager(context, "onErrorOccurred").api(), onCompleted: new WebRequestEventManager(context, "onCompleted").api(), + getSecurityInfo: function(requestId, options = {}) { + return WebRequest.getSecurityInfo({ + id: requestId, + extension: context.extension.policy, + tabParent: context.xulBrowser.frameLoader.tabParent, + options, + }); + }, handlerBehaviorChanged: function() { // TODO: Flush all caches. }, diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/extensions/schemas/web_request.json index 97badfc797b9..ed1840cabe2a 100644 --- a/toolkit/components/extensions/schemas/web_request.json +++ b/toolkit/components/extensions/schemas/web_request.json @@ -177,6 +177,148 @@ } }, { + "id": "CertificateInfo", + "type": "object", + "description": "Contains the certificate properties of the request if it is a secure request.", + "properties": { + "subject": { + "type": "string" + }, + "issuer": { + "type": "string" + }, + "validity": { + "type": "object", + "description": "Contains start and end dates in GMT.", + "properties": { + "startGMT": { "type": "string" }, + "endGMT": { "type": "string" } + } + }, + "fingerprint": { + "type": "object", + "properties": { + "sha1": { "type": "string" }, + "sha256": { "type": "string" } + } + }, + "serialNumber": { + "type": "string" + }, + "isBuiltInRoot": { + "type": "boolean" + }, + "subjectPublicKeyInfoDigest": { + "type": "object", + "properties": { + "sha256": { "type": "string" } + } + }, + "keyUsages": { + "type": "string" + }, + "rawDER": { + "optional": true, + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + { + "id": "CertificateTransparencyStatus", + "type": "string", + "enum": ["not_applicable", "policy_compliant", "policy_not_enough_scts", "policy_not_diverse_scts"] + }, + { + "id": "TransportWeaknessReasons", + "type": "string", + "enum": ["cipher"] + }, + { + "id": "SecurityInfo", + "type": "object", + "description": "Contains the security properties of the request (ie. SSL/TLS information).", + "properties": { + "state": { + "type": "string", + "enum": [ + "insecure", + "weak", + "broken", + "secure" + ] + }, + "errorMessage": { + "type": "string", + "description": "Error message if state is \"broken\"", + "optional": true + }, + "protocolVersion": { + "type": "string", + "description": "Protocol version if state is \"secure\"", + "enum": [ + "TLSv1", + "TLSv1.1", + "TLSv1.2", + "TLSv1.3", + "unknown" + ], + "optional": true + }, + "cipherSuite": { + "type": "string", + "description": "The cipher suite used in this request if state is \"secure\".", + "optional": true + }, + "certificates": { + "description": "Certificate data if state is \"secure\". Will only contain one entry unless <code>certificateChain</code> is passed as an option.", + "type": "array", + "items": { "$ref": "CertificateInfo" } + }, + "isDomainMismatch": { + "description": "The domain name does not match the certificate domain.", + "type": "boolean", + "optional": true + }, + "isExtendedValidation": { + "type": "boolean", + "optional": true + }, + "isNotValidAtThisTime": { + "description": "The certificate is either expired or is not yet valid. See <code>CertificateInfo.validity</code> for start and end dates.", + "type": "boolean", + "optional": true + }, + "isUntrusted": { + "type": "boolean", + "optional": true + }, + "certificateTransparencyStatus": { + "description": "Certificate transparency compliance per RFC 6962. See <code>https://www.certificate-transparency.org/what-is-ct</code> for more information.", + "$ref": "CertificateTransparencyStatus", + "optional": true + }, + "hsts": { + "type": "boolean", + "description": "True if host uses Strict Transport Security and state is \"secure\".", + "optional": true + }, + "hpkp": { + "type": "string", + "description": "True if host uses Public Key Pinning and state is \"secure\".", + "optional": true + }, + "weaknessReasons": { + "type": "array", + "items": { "$ref": "TransportWeaknessReasons" }, + "description": "list of reasons that cause the request to be considered weak, if state is \"weak\"", + "optional": true + } + } + }, + { "id": "UploadData", "type": "object", "properties": { @@ -225,6 +367,35 @@ "additionalProperties": {"type": "any"}, "isInstanceOf": "StreamFilter" } + }, + { + "name": "getSecurityInfo", + "type": "function", + "async": true, + "description": "Retrieves the security information for the request. Returns a promise that will resolve to a SecurityInfo object.", + "parameters": [ + { + "name": "requestId", + "type": "string" + }, + { + "name": "options", + "optional": true, + "type": "object", + "properties": { + "certificateChain": { + "type": "boolean", + "description": "Include the entire certificate chain.", + "optional": true + }, + "rawDER": { + "type": "boolean", + "description": "Include raw certificate data for processing by the extension.", + "optional": true + } + } + } + ] } ], "events": [ diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html index 4dce90cd377e..ad4d4f32a657 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html @@ -25,9 +25,35 @@ function getExtension() { browser.webRequest.onSendHeaders.addListener(details => { browser.test.assertEq(expect.shift(), "onSendHeaders"); }, {urls}, ["requestHeaders"]); - browser.webRequest.onHeadersReceived.addListener(details => { + + async function testSecurityInfo(details, options) { + let securityInfo = await browser.webRequest.getSecurityInfo(details.requestId, options); + browser.test.assertTrue(securityInfo && securityInfo.state == "secure", + "security info reflects https"); + + if (options.certificateChain) { + // Some of the tests here only produce a single cert in the chain. + browser.test.assertTrue(securityInfo.certificates.length >= 1, "have certificate chain"); + } else { + browser.test.assertTrue(securityInfo.certificates.length == 1, "no certificate chain"); + } + if (options.rawDER) { + for (let cert of securityInfo.certificates) { + browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER"); + } + } + } + + browser.webRequest.onHeadersReceived.addListener(async (details) => { browser.test.assertEq(expect.shift(), "onHeadersReceived"); + // We exepect all requests to have been upgraded at this point. + browser.test.assertTrue(details.url.startsWith("https"), "connection is https"); + await testSecurityInfo(details, {}); + await testSecurityInfo(details, {certificateChain: true}); + await testSecurityInfo(details, {rawDER: true}); + await testSecurityInfo(details, {certificateChain: true, rawDER: true}); + let headers = details.responseHeaders || []; for (let header of headers) { if (header.name.toLowerCase() === "strict-transport-security") { diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm new file mode 100644 index 000000000000..4984f76dd463 --- /dev/null +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -0,0 +1,297 @@ +/* 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/. */ + +"use strict"; + +const EXPORTED_SYMBOLS = ["SecurityInfo"]; + +ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); + +const wpl = Ci.nsIWebProgressListener; +XPCOMUtils.defineLazyServiceGetter(this, "NSSErrorsService", + "@mozilla.org/nss_errors_service;1", + "nsINSSErrorsService"); +XPCOMUtils.defineLazyServiceGetter(this, "sss", + "@mozilla.org/ssservice;1", + "nsISiteSecurityService"); + +// NOTE: SecurityInfo is largely reworked from the devtools NetworkHelper with changes +// to better support the WebRequest api. The objects returned are formatted specifically +// to pass through as part of a response to webRequest listeners. + +const SecurityInfo = { + /** + * Extracts security information from nsIChannel.securityInfo. + * + * @param {nsIChannel} channel + * If null channel is assumed to be insecure. + * @param {Object} options + * + * @returns {Object} + * Returns an object containing following members: + * - state: The security of the connection used to fetch this + * request. Has one of following string values: + * * "insecure": the connection was not secure (only http) + * * "weak": the connection has minor security issues + * * "broken": secure connection failed (e.g. expired cert) + * * "secure": the connection was properly secured. + * If state == broken: + * - errorMessage: full error message from + * nsITransportSecurityInfo. + * If state == secure: + * - protocolVersion: one of TLSv1, TLSv1.1, TLSv1.2, TLSv1.3. + * - cipherSuite: the cipher suite used in this connection. + * - cert: information about certificate used in this connection. + * See parseCertificateInfo for the contents. + * - hsts: true if host uses Strict Transport Security, + * false otherwise + * - hpkp: true if host uses Public Key Pinning, false otherwise + * If state == weak: Same as state == secure and + * - weaknessReasons: list of reasons that cause the request to be + * considered weak. See getReasonsForWeakness. + */ + getSecurityInfo(channel, options = {}) { + const info = { + state: "insecure", + }; + + /** + * Different scenarios to consider here and how they are handled: + * - request is HTTP, the connection is not secure + * => securityInfo is null + * => state === "insecure" + * + * - request is HTTPS, the connection is secure + * => .securityState has STATE_IS_SECURE flag + * => state === "secure" + * + * - request is HTTPS, the connection has security issues + * => .securityState has STATE_IS_INSECURE flag + * => .errorCode is an NSS error code. + * => state === "broken" + * + * - request is HTTPS, the connection was terminated before the security + * could be validated + * => .securityState has STATE_IS_INSECURE flag + * => .errorCode is NOT an NSS error code. + * => .errorMessage is not available. + * => state === "insecure" + * + * - request is HTTPS but it uses a weak cipher or old protocol, see + * https://hg.mozilla.org/mozilla-central/annotate/def6ed9d1c1a/ + * security/manager/ssl/nsNSSCallbacks.cpp#l1233 + * - request is mixed content (which makes no sense whatsoever) + * => .securityState has STATE_IS_BROKEN flag + * => .errorCode is NOT an NSS error code + * => .errorMessage is not available + * => state === "weak" + */ + + let securityInfo = channel.securityInfo; + if (!securityInfo) { + return info; + } + + securityInfo.QueryInterface(Ci.nsITransportSecurityInfo); + securityInfo.QueryInterface(Ci.nsISSLStatusProvider); + + const SSLStatus = securityInfo.SSLStatus; + if (NSSErrorsService.isNSSErrorCode(securityInfo.errorCode)) { + // The connection failed. + info.state = "broken"; + info.errorMessage = securityInfo.errorMessage; + if (options.certificateChain && SSLStatus.failedCertChain) { + info.certificates = this.getCertificateChain(SSLStatus.failedCertChain, options); + } + return info; + } + + const state = securityInfo.securityState; + + let uri = channel.URI; + if (uri && !uri.schemeIs("https") && !uri.schemeIs("wss")) { + // it is not enough to look at the transport security info - + // schemes other than https and wss are subject to + // downgrade/etc at the scheme level and should always be + // considered insecure. + // Leave info.state = "insecure"; + } else if (state & wpl.STATE_IS_SECURE) { + // The connection is secure if the scheme is sufficient + info.state = "secure"; + } else if (state & wpl.STATE_IS_BROKEN) { + // The connection is not secure, there was no error but there's some + // minor security issues. + info.state = "weak"; + info.weaknessReasons = this.getReasonsForWeakness(state); + } else if (state & wpl.STATE_IS_INSECURE) { + // This was most likely an https request that was aborted before + // validation. Return info as info.state = insecure. + return info; + } else { + // No known STATE_IS_* flags. + return info; + } + + // Cipher suite. + info.cipherSuite = SSLStatus.cipherName; + + // Key exchange group name. + info.keaGroupName = SSLStatus.keaGroupName; + + // Certificate signature scheme. + info.signatureSchemeName = SSLStatus.signatureSchemeName; + + info.isDomainMismatch = SSLStatus.isDomainMismatch; + info.isExtendedValidation = SSLStatus.isExtendedValidation; + info.isNotValidAtThisTime = SSLStatus.isNotValidAtThisTime; + info.isUntrusted = SSLStatus.isUntrusted; + + info.certificateTransparencyStatus = this.getTransparencyStatus(SSLStatus.certificateTransparencyStatus); + + // Protocol version. + info.protocolVersion = this.formatSecurityProtocol(SSLStatus.protocolVersion); + + if (options.certificateChain && SSLStatus.succeededCertChain) { + info.certificates = this.getCertificateChain(SSLStatus.succeededCertChain, options); + } else { + info.certificates = [this.parseCertificateInfo(SSLStatus.serverCert, options)]; + } + + // HSTS and HPKP if available. + if (uri && uri.host) { + // SiteSecurityService uses different storage if the channel is + // private. Thus we must give isSecureURI correct flags or we + // might get incorrect results. + let flags = 0; + if (channel instanceof Ci.nsIPrivateBrowsingChannel && channel.isChannelPrivate) { + flags = Ci.nsISocketProvider.NO_PERMANENT_STORAGE; + } + + info.hsts = sss.isSecureURI(sss.HEADER_HSTS, uri, flags); + info.hpkp = sss.isSecureURI(sss.HEADER_HPKP, uri, flags); + } else { + info.hsts = false; + info.hpkp = false; + } + + return info; + }, + + getCertificateChain(certChain, options = {}) { + let certificates = []; + for (let cert of XPCOMUtils.IterSimpleEnumerator(certChain.getEnumerator(), Ci.nsIX509Cert)) { + certificates.push(this.parseCertificateInfo(cert, options)); + } + return certificates; + }, + + /** + * Takes an nsIX509Cert and returns an object with certificate information. + * + * @param {nsIX509Cert} cert + * The certificate to extract the information from. + * @param {Object} options + * @returns {Object} + * An object with following format: + * { + * subject: subjectName, + * issuer: issuerName, + * validity: { start, end }, + * fingerprint: { sha1, sha256 } + * } + */ + parseCertificateInfo(cert, options = {}) { + if (!cert) { + return {}; + } + + let certData = { + subject: cert.subjectName, + issuer: cert.issuerName, + validity: { + startGMT: cert.validity.notBeforeGMT, + endGMT: cert.validity.notAfterGMT, + }, + fingerprint: { + sha1: cert.sha1Fingerprint, + sha256: cert.sha256Fingerprint, + }, + serialNumber: cert.serialNumber, + isBuiltInRoot: cert.isBuiltInRoot, + subjectPublicKeyInfoDigest: { + sha256: cert.sha256SubjectPublicKeyInfoDigest, + }, + keyUsages: cert.keyUsages, + }; + if (options.rawDER) { + certData.rawDER = cert.getRawDER({}); + } + return certData; + }, + + // Bug 1355903 Transparency is currently disabled using security.pki.certificate_transparency.mode + getTransparencyStatus(status) { + switch (status) { + case Ci.nsISSLStatus.CERTIFICATE_TRANSPARENCY_NOT_APPLICABLE: + return "not_applicable"; + case Ci.nsISSLStatus.CERTIFICATE_TRANSPARENCY_POLICY_COMPLIANT: + return "policy_compliant"; + case Ci.nsISSLStatus.CERTIFICATE_TRANSPARENCY_POLICY_NOT_ENOUGH_SCTS: + return "policy_not_enough_scts"; + case Ci.nsISSLStatus.CERTIFICATE_TRANSPARENCY_POLICY_NOT_DIVERSE_SCTS: + return "policy_not_diverse_scts"; + } + return "unknown"; + }, + + /** + * Takes protocolVersion of SSLStatus object and returns human readable + * description. + * + * @param {number} version + * One of nsISSLStatus version constants. + * @returns {string} + * One of TLSv1, TLSv1.1, TLSv1.2, TLSv1.3 if version + * is valid, Unknown otherwise. + */ + formatSecurityProtocol(version) { + switch (version) { + case Ci.nsISSLStatus.TLS_VERSION_1: + return "TLSv1"; + case Ci.nsISSLStatus.TLS_VERSION_1_1: + return "TLSv1.1"; + case Ci.nsISSLStatus.TLS_VERSION_1_2: + return "TLSv1.2"; + case Ci.nsISSLStatus.TLS_VERSION_1_3: + return "TLSv1.3"; + } + return "unknown"; + }, + + /** + * Takes the securityState bitfield and returns reasons for weak connection + * as an array of strings. + * + * @param {number} state + * nsITransportSecurityInfo.securityState. + * + * @returns {array<string>} + * List of weakness reasons. A subset of { cipher } where + * * cipher: The cipher suite is consireded to be weak (RC4). + */ + getReasonsForWeakness(state) { + // If there's non-fatal security issues the request has STATE_IS_BROKEN + // flag set. See https://hg.mozilla.org/mozilla-central/file/44344099d119 + // /security/manager/ssl/nsNSSCallbacks.cpp#l1233 + let reasons = []; + + if (state & wpl.STATE_IS_BROKEN) { + if (state & wpl.STATE_USES_WEAK_CRYPTO) { + reasons.push("cipher"); + } + } + + return reasons; + }, +}; diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm index 786a2d5dbe91..a4c9e9859a21 100644 --- a/toolkit/modules/addons/WebRequest.jsm +++ b/toolkit/modules/addons/WebRequest.jsm @@ -15,14 +15,12 @@ const {nsIHttpActivityObserver, nsISocketTransport} = Ci; ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -ChromeUtils.defineModuleGetter(this, "ExtensionUtils", - "resource://gre/modules/ExtensionUtils.jsm"); -ChromeUtils.defineModuleGetter(this, "WebRequestCommon", - "resource://gre/modules/WebRequestCommon.jsm"); -ChromeUtils.defineModuleGetter(this, "WebRequestUpload", - "resource://gre/modules/WebRequestUpload.jsm"); - -XPCOMUtils.defineLazyGetter(this, "ExtensionError", () => ExtensionUtils.ExtensionError); +XPCOMUtils.defineLazyModuleGetters(this, { + ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm", + WebRequestCommon: "resource://gre/modules/WebRequestCommon.jsm", + WebRequestUpload: "resource://gre/modules/WebRequestUpload.jsm", + SecurityInfo: "resource://gre/modules/SecurityInfo.jsm", +}); function runLater(job) { Services.tm.dispatchToMainThread(job); @@ -41,7 +39,7 @@ function parseExtra(extra, allowed = [], optionsObj = {}) { if (extra) { for (let ex of extra) { if (!allowed.includes(ex)) { - throw new ExtensionError(`Invalid option ${ex}`); + throw new ExtensionUtils.ExtensionError(`Invalid option ${ex}`); } } } @@ -1011,6 +1009,11 @@ var WebRequest = { // nsIHttpActivityObserver. onErrorOccurred: onErrorOccurred, + + getSecurityInfo: (details) => { + let channel = ChannelWrapper.getRegisteredChannel(details.id, details.extension, details.tabParent); + return SecurityInfo.getSecurityInfo(channel.channel, details.options); + }, }; Services.ppmm.loadProcessScript("resource://gre/modules/WebRequestContent.js", true); diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 110fff7737f2..0a1e48b964c1 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -167,6 +167,7 @@ with Files('docs/**'): EXTRA_JS_MODULES += [ 'addons/MatchURLFilters.jsm', + 'addons/SecurityInfo.jsm', 'addons/WebNavigation.jsm', 'addons/WebNavigationContent.js', 'addons/WebNavigationFrames.jsm',

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1470516 - remove or fix localized values in securityInfo, r=rpl
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 05cbc6e53b30707e32af750eb082a90f715cbf95 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Mon Jul 2 15:45:18 2018 -0300 Bug 1470516 - remove or fix localized values in securityInfo, r=rpl MozReview-Commit-ID: 3xURSfbPTmS --HG-- extra : rebase_source : aeb333a0c72120724a5a7d988f460e3c703b09c3 --- toolkit/components/extensions/schemas/web_request.json | 9 +++------ .../extensions/test/mochitest/test_ext_webrequest_hsts.html | 2 ++ toolkit/modules/addons/SecurityInfo.jsm | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/extensions/schemas/web_request.json index ed1840cabe2a..508ca8b05f8f 100644 --- a/toolkit/components/extensions/schemas/web_request.json +++ b/toolkit/components/extensions/schemas/web_request.json @@ -189,10 +189,10 @@ }, "validity": { "type": "object", - "description": "Contains start and end dates in GMT.", + "description": "Contains start and end timestamps.", "properties": { - "startGMT": { "type": "string" }, - "endGMT": { "type": "string" } + "start": { "type": "integer" }, + "end": { "type": "integer" } } }, "fingerprint": { @@ -214,9 +214,6 @@ "sha256": { "type": "string" } } }, - "keyUsages": { - "type": "string" - }, "rawDER": { "optional": true, "type": "array", diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html index 849527ea4a80..df8b541808f9 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html @@ -37,6 +37,8 @@ function getExtension() { } else { browser.test.assertTrue(securityInfo.certificates.length == 1, "no certificate chain"); } + let cert = securityInfo.certificates[0]; + browser.test.assertTrue(cert.validity.start < Date.now() < cert.validity.end, "cert validity is correct"); if (options.rawDER) { for (let cert of securityInfo.certificates) { browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER"); diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm index 4984f76dd463..8c5cef18754d 100644 --- a/toolkit/modules/addons/SecurityInfo.jsm +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -210,8 +210,8 @@ const SecurityInfo = { subject: cert.subjectName, issuer: cert.issuerName, validity: { - startGMT: cert.validity.notBeforeGMT, - endGMT: cert.validity.notAfterGMT, + start: cert.validity.notBefore, + end: cert.validity.notAfter, }, fingerprint: { sha1: cert.sha1Fingerprint, @@ -222,7 +222,6 @@ const SecurityInfo = { subjectPublicKeyInfoDigest: { sha256: cert.sha256SubjectPublicKeyInfoDigest, }, - keyUsages: cert.keyUsages, }; if (options.rawDER) { certData.rawDER = cert.getRawDER({});

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1322748 add ability to get registered channelwrappers, r=kmag
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit c1774ae7fc74bef7956caca4fe1b8de1365f5d48 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Tue May 22 14:19:57 2018 -0400 Bug 1322748 add ability to get registered channelwrappers, r=kmag MozReview-Commit-ID: SphwWjzQuo --HG-- extra : rebase_source : 0b5193d7f4e9e7f27f9a7d622699b673781c3dd4 --- dom/chrome-webidl/ChannelWrapper.webidl | 8 ++++++++ .../extensions/webrequest/ChannelWrapper.cpp | 18 ++++++++++++++++++ .../components/extensions/webrequest/ChannelWrapper.h | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dom/chrome-webidl/ChannelWrapper.webidl b/dom/chrome-webidl/ChannelWrapper.webidl index b8d921cea58d..2777aab65c8e 100644 --- a/dom/chrome-webidl/ChannelWrapper.webidl +++ b/dom/chrome-webidl/ChannelWrapper.webidl @@ -49,6 +49,14 @@ interface ChannelWrapper : EventTarget { static ChannelWrapper get(MozChannel channel); /** + * Returns the wrapper instance for the given channel. The same wrapper is + * always returned for a given channel. + */ + static ChannelWrapper getRegisteredChannel(unsigned long long aChannelId, + WebExtensionPolicy extension, + TabParent? tabParent); + + /** * A unique ID for for the requests which remains constant throughout the * redirect chain. */ diff --git a/toolkit/components/extensions/webrequest/ChannelWrapper.cpp b/toolkit/components/extensions/webrequest/ChannelWrapper.cpp index de4a7fee1a2a..52508f0f24ed 100644 --- a/toolkit/components/extensions/webrequest/ChannelWrapper.cpp +++ b/toolkit/components/extensions/webrequest/ChannelWrapper.cpp @@ -78,6 +78,24 @@ ChannelWrapper::Get(const GlobalObject& global, nsIChannel* channel) return wrapper.forget(); } +already_AddRefed<ChannelWrapper> +ChannelWrapper::GetRegisteredChannel(const GlobalObject& global, uint64_t aChannelId, const WebExtensionPolicy& aAddon, nsITabParent* aTabParent) +{ + nsIContentParent* contentParent = nullptr; + if (TabParent* parent = static_cast<TabParent*>(aTabParent)) { + contentParent = static_cast<nsIContentParent*>(parent->Manager()); + } + + auto& webreq = WebRequestService::GetSingleton(); + + nsCOMPtr<nsITraceableChannel> channel = webreq.GetTraceableChannel(aChannelId, aAddon.Id(), contentParent); + if (!channel) { + return nullptr; + } + nsCOMPtr<nsIChannel> chan(do_QueryInterface(channel)); + return ChannelWrapper::Get(global, chan); +} + void ChannelWrapper::SetChannel(nsIChannel* aChannel) { diff --git a/toolkit/components/extensions/webrequest/ChannelWrapper.h b/toolkit/components/extensions/webrequest/ChannelWrapper.h index 8ba238991070..750aed434f6a 100644 --- a/toolkit/components/extensions/webrequest/ChannelWrapper.h +++ b/toolkit/components/extensions/webrequest/ChannelWrapper.h @@ -121,7 +121,7 @@ public: NS_DECLARE_STATIC_IID_ACCESSOR(NS_CHANNELWRAPPER_IID) static already_AddRefed<extensions::ChannelWrapper> Get(const dom::GlobalObject& global, nsIChannel* channel); - + static already_AddRefed<extensions::ChannelWrapper> GetRegisteredChannel(const dom::GlobalObject& global, uint64_t aChannelId, const WebExtensionPolicy& aAddon, nsITabParent* aTabParent); uint64_t Id() const { return mId; }

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1474626 - fix timestamp test and values, r=rpl
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit b3d74f7db1cc0ddf54771e3e9e5de4b8549b0c88 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Wed Jul 11 14:54:03 2018 -0300 Bug 1474626 - fix timestamp test and values, r=rpl The test was incorrect and the timestamp should be milliseconds, not microseconds. MozReview-Commit-ID: 2d79r6PHH4Z --HG-- extra : rebase_source : edd97899f0646f2cae2fbf119206ec470a6b97a0 --- .../extensions/test/mochitest/test_ext_webrequest_hsts.html | 6 +++++- toolkit/modules/addons/SecurityInfo.jsm | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html index df8b541808f9..b8385ca08843 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html @@ -38,7 +38,11 @@ function getExtension() { browser.test.assertTrue(securityInfo.certificates.length == 1, "no certificate chain"); } let cert = securityInfo.certificates[0]; - browser.test.assertTrue(cert.validity.start < Date.now() < cert.validity.end, "cert validity is correct"); + let now = Date.now(); + browser.test.assertTrue(Number.isInteger(cert.validity.start), "cert start is integer"); + browser.test.assertTrue(Number.isInteger(cert.validity.end), "cert end is integer"); + browser.test.assertTrue(cert.validity.start < now, "cert start validity is correct"); + browser.test.assertTrue(now < cert.validity.end, "cert end validity is correct"); if (options.rawDER) { for (let cert of securityInfo.certificates) { browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER"); diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm index a931602b517a..de0084398aa6 100644 --- a/toolkit/modules/addons/SecurityInfo.jsm +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -214,8 +214,8 @@ const SecurityInfo = { subject: cert.subjectName, issuer: cert.issuerName, validity: { - start: cert.validity.notBefore, - end: cert.validity.notAfter, + start: cert.validity.notBefore ? Math.trunc(cert.validity.notBefore / 1000) : 0, + end: cert.validity.notAfter ? Math.trunc(cert.validity.notAfter / 1000) : 0, }, fingerprint: { sha1: cert.sha1Fingerprint,

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 03 Dec '18

03 Dec '18

commit 624ab8b6f695c1409d35cc56dd51dbe1ff8a6873 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 15:49:38 2018 +0000 Update translations for support-portal --- contents+fo.po | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/contents+fo.po b/contents+fo.po index 1185f4933..7219540af 100644 --- a/contents+fo.po +++ b/contents+fo.po @@ -1,5 +1,6 @@ # Translators: # erinm, 2018 +# Robin Kjeld <romeooscarkilo(a)protonmail.ch>, 2018 # msgid "" msgstr "" @@ -7,7 +8,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-30 10:36+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2018\n" +"Last-Translator: Robin Kjeld <romeooscarkilo(a)protonmail.ch>, 2018\n" "Language-Team: Faroese (https://www.transifex.com/otf/teams/1519/fo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3775,7 +3776,7 @@ msgstr "" #: http//localhost/misc/tor-bittorrent/ #: (content/misc/misc-4/contents+en.lrquestion.description) msgid "We do not recommend using Tor with BitTorrent." -msgstr "" +msgstr "Vit viðmæla ikki at brúka BitTorrent ígjögnum Tor. " #: http//localhost/misc/tor-bittorrent/ #: (content/misc/misc-4/contents+en.lrquestion.description) @@ -3848,7 +3849,7 @@ msgstr "Goymir Tor loggar?" #: (content/misc/misc-6/contents+en.lrquestion.description) msgid "Tor doesn't keep any logs that could identify a particular user." msgstr "" -"Tor goymir ikki dátu sum kunnu brúkast at eymerkja ein einstakan brúkara." +"Tor goymir ikki loggar sum kunnu brúkast at eymerkja ein einstakan brúkara." #: http//localhost/misc/does-tor-keep-logs/ #: (content/misc/misc-6/contents+en.lrquestion.description) @@ -3873,7 +3874,7 @@ msgstr "" #: http//localhost/misc/does-tor-project-offer-email-or-privacy-protecting-web-services/ #: (content/misc/misc-7/contents+en.lrquestion.description) msgid "No, we don't provide any online services." -msgstr "" +msgstr "Nei, vit veita ikki nakrar online tænastur." #: http//localhost/misc/does-tor-project-offer-email-or-privacy-protecting-web-services/ #: (content/misc/misc-7/contents+en.lrquestion.description) @@ -3909,12 +3910,12 @@ msgstr "" #: http//localhost/misc/having-a-problem-updating-vidalia/ #: (content/misc/misc-9/contents+en.lrquestion.title) msgid "I'm having a problem updating or using Vidalia." -msgstr "" +msgstr "Eg havi ein trupuleika við at dagföra ella brúka Vidalia." #: http//localhost/misc/having-a-problem-updating-vidalia/ #: (content/misc/misc-9/contents+en.lrquestion.description) msgid "Vidalia is no longer maintained or supported." -msgstr "Vidalia verður iki longur dagfört ella stuðla." +msgstr "Vidalia verður hvörki stuðla ella dagfört longur." #: http//localhost/misc/having-a-problem-updating-vidalia/ #: (content/misc/misc-9/contents+en.lrquestion.description) @@ -3922,6 +3923,8 @@ msgid "" "A large portion of the features Vidalia offered have now been integrated " "into Tor Browser itself." msgstr "" +"Ein stórur partur av möguleikunum ið Vidalia hevði eru nú tökir í Tor " +"Kagarinum. " #: http//localhost/misc/having-a-problem-updating-vidalia/ #: (content/misc/misc-9/contents+en.lrquestion.seo_slug)

1 0

[torbutton/master] Bug 28540: Use new text for 2018 donation banner
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 4ad39b362dd7692b5e24841c616f63a5ca2bc67a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 20 17:25:48 2018 -0800 Bug 28540: Use new text for 2018 donation banner --- src/chrome/content/aboutTor/aboutTor-content.js | 2 +- src/chrome/content/aboutTor/aboutTor.xhtml | 24 +++++++++++++++--------- src/chrome/content/torbutton.js | 2 +- src/defaults/preferences/preferences.js | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index d34bbe5c..e53266bd 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -72,7 +72,7 @@ var AboutTorListener = { sendAsyncMessage(that.kAboutTorHideDonationBanner); }); }); - bindPrefAndInit("extensions.torbutton.donation_banner_countdown", + bindPrefAndInit("extensions.torbutton.donation_banner_countdown2", countdown => { if (content.document && content.document.body) { content.document.body.setAttribute( diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 94dd13f3..5f5fccdc 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -37,15 +37,17 @@ window.addEventListener("pageshow", function() { <div id="donation-banner-lines"> <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div> <div id="donation-banner-line2" - data-0="&aboutTor.donationBanner.line2a;" - data-1="&aboutTor.donationBanner.line2b;" - data-2="&aboutTor.donationBanner.line2c;" - data-3="&aboutTor.donationBanner.line2d;" - data-4="&aboutTor.donationBanner.line2e;" - data-5="&aboutTor.donationBanner.line2f;"> - &aboutTor.donationBanner.line2a; + data-6="&aboutTor.donationBanner.line2e;" + data-7="&aboutTor.donationBanner.line2f;" + data-8="&aboutTor.donationBanner.line2g;" + data-9="&aboutTor.donationBanner.line2h;" + data-10="&aboutTor.donationBanner.line2i;" + data-11="&aboutTor.donationBanner.line2j;"> + &aboutTor.donationBanner.line2e; </div> - <div id="donation-banner-line3">&aboutTor.donationBanner.line3;</div> + <div id="donation-banner-line3" + data-b="&aboutTor.donationBanner.line3b;"> + &aboutTor.donationBanner.line3;</div> <a id="donation-banner-button" href="https://www.torproject.org/donate/donate-sin-tbd0-0" type="button" @@ -58,13 +60,17 @@ window.addEventListener("pageshow", function() { </div> <script type="text/javascript"> <![CDATA[ - let lineChoice = Math.floor(Math.random() * 6); + let lineChoice = 6 + Math.floor(Math.random() * 6); let line2 = document.getElementById("donation-banner-line2"); let line2text = line2.getAttribute(`data-${lineChoice}`); let line2pieces = line2text.split(" "); let line2end = '<span>' + line2pieces.pop() + '</span>'; line2pieces.push(line2end); line2.innerHTML = line2pieces.join(" "); + line3 = document.getElementById("donation-banner-line3"); + if (lineChoice === 11) { + line3.innerHTML = line3.getAttribute("data-b"); + } let buttonChoice = Math.floor(Math.random() * 2); let button = document.getElementById("donation-banner-button"); button.innerHTML = button.getAttribute(`data-${buttonChoice}`); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ee13f461..8bd847f9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -17,7 +17,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown"; +const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown2"; var m_tb_prefs = Services.prefs; diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 9beb3993..eb055a65 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.donation_banner_countdown", 12); +pref("extensions.torbutton.donation_banner_countdown2", 12); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
by translation＠torproject.org 03 Dec '18

03 Dec '18

commit 0094ec85f83d7e5e2b0a0a3f95e48766ed255075 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 08:46:59 2018 +0000 Update translations for tba-torbrowserstringsdtd_completed --- ar/android_strings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ar/android_strings.dtd b/ar/android_strings.dtd index 5bd00cec6..4aace79db 100644 --- a/ar/android_strings.dtd +++ b/ar/android_strings.dtd @@ -12,14 +12,14 @@ <!ENTITY firstrun_tornetwork_message "متصفح تور يصلك بشبكه تور التي يتم تشغيلها بواسطة الاف المتطوعين حول العالم . على عكس الشبكات الوهميه الخاصه "VPN" لا يوجد نقطة قصور مركزيه او نقطة واحده يجب ان تثق بها للتمتع بخصوصيتك عبر اﻹنترنت"> <!ENTITY firstrun_tornetwork_next "التالي"> <!ENTITY firstrun_secsettings_tab_title "الأمان"> -<!ENTITY firstrun_secsettings_title "اختر مدى خبرتك"> +<!ENTITY firstrun_secsettings_title "اختر تجربتك"> <!ENTITY firstrun_secsettings_message "نحن ايضا ندعمك بالمزيد من الخيارات اﻹضافيه للإعدادات لزيادة امان متصفحك. اعدادات اﻷمان تمكنك من منع العناصر التي قد تستخدم للهجوم على حاسوبك"> <!ENTITY firstrun_secsettings_next "التالي"> <!ENTITY firstrun_tips_tab_title "تلميحات"> -<!ENTITY firstrun_tips_title "تلميحات لزيادة خبرتك"> +<!ENTITY firstrun_tips_title "تلميحات لاثراء تجربتك"> <!ENTITY firstrun_tips_message "مع كل خصائص اﻷمان و الخصوصيه التي يوفرها تور , تجربتك اثناء تصفح اﻹنترنت قد تختلف قليلا. قد تكون ابطأ قليلا اعتمادا على مستوى اعدادات اﻷمان ,بعد العناصر قد لا تعمل او تحمل. قد يتم سؤالك ايضا اذا كنت انسان او آلي"> <!ENTITY firstrun_tips_next "التالي"> -<!ENTITY firstrun_onionservices_tab_title "البصل"> +<!ENTITY firstrun_onionservices_tab_title "Onions"> <!ENTITY firstrun_onionservices_title "خدمات البصلة Onion"> -<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> +<!ENTITY firstrun_onionservices_message "خدمات اونيون هي مواقع تنتهي ب .onion و التي تمنحك مزيد من الحمايه للناشرين و الزائرين. و تتضمن حمايه اضافيه ضد الرقابه. خدمات اونيون تمكن اي شخص من تقديم الخدمات و المحتوى بشكل مجهول"> <!ENTITY firstrun_onionservices_next "الذهاب لإستكشاف">

1 0