February 2020 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-68.5.0esr-9.5-1] squash! Bug 30237: Add v3 onion services client authentication prompt
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit aed69dc95387429e18b18ad578fb78d4a83d91f2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 13 15:06:38 2020 -0500 squash! Bug 30237: Add v3 onion services client authentication prompt 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. --- .../onionservices/content/authPopup.inc.xul | 2 + .../onionservices/content/authPreferences.css | 20 ++ .../onionservices/content/authPreferences.inc.xul | 20 ++ .../onionservices/content/authPreferences.js | 63 +++++ .../components/onionservices/content/authPrompt.js | 40 ++-- .../components/onionservices/content/authUtil.jsm | 27 ++- .../onionservices/content/savedKeysDialog.js | 259 +++++++++++++++++++++ .../onionservices/content/savedKeysDialog.xul | 42 ++++ browser/components/onionservices/jar.mn | 4 + .../preferences/in-content/preferences.xul | 1 + .../components/preferences/in-content/privacy.js | 7 + .../components/preferences/in-content/privacy.xul | 2 + browser/modules/TorStrings.jsm | 15 +- 13 files changed, 477 insertions(+), 25 deletions(-) diff --git a/browser/components/onionservices/content/authPopup.inc.xul b/browser/components/onionservices/content/authPopup.inc.xul index d327e4c6a88d..bd0ec3aa0b00 100644 --- a/browser/components/onionservices/content/authPopup.inc.xul +++ b/browser/components/onionservices/content/authPopup.inc.xul @@ -9,6 +9,8 @@ <html:div> <html:input id="tor-clientauth-notification-key" type="password"/> <html:div id="tor-clientauth-warning"/> + <checkbox id="tor-clientauth-persistkey-checkbox" + label="&torbutton.onionServices.authPrompt.persistCheckboxLabel;"/> </html:div> </popupnotificationcontent> </popupnotification> diff --git a/browser/components/onionservices/content/authPreferences.css b/browser/components/onionservices/content/authPreferences.css new file mode 100644 index 000000000000..b3fb79b26ddc --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.css @@ -0,0 +1,20 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ + +#torOnionServiceKeys-overview-container { + margin-right: 30px; +} + +#onionservices-savedkeys-tree treechildren::-moz-tree-cell-text { + font-size: 80%; +} + +#onionservices-savedkeys-errorContainer { + margin-top: 4px; + min-height: 3em; +} + +#onionservices-savedkeys-errorIcon { + margin-right: 4px; + list-style-image: url("chrome://browser/skin/warning.svg"); + visibility: hidden; +} diff --git a/browser/components/onionservices/content/authPreferences.inc.xul b/browser/components/onionservices/content/authPreferences.inc.xul new file mode 100644 index 000000000000..0b6ce98efa31 --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.inc.xul @@ -0,0 +1,20 @@ +# Copyright (c) 2020, The Tor Project, Inc. + +<groupbox id="torOnionServiceKeys" orient="vertical" + data-category="panePrivacy" hidden="true"> + <label><html:h2 id="torOnionServiceKeys-header"/></label> + <hbox> + <description id="torOnionServiceKeys-overview-container" flex="1"> + <html:span id="torOnionServiceKeys-overview" + class="tail-with-learn-more"/> + <label id="torOnionServiceKeys-learnMore" class="learnMore text-link" + is="text-link"/> + </description> + <vbox align="end"> + <button id="torOnionServiceKeys-savedKeys" + is="highlightable-button" + class="accessory-button" + oncommand="OnionServicesAuthPreferences.onViewSavedKeys()"/> + </vbox> + </hbox> +</groupbox> diff --git a/browser/components/onionservices/content/authPreferences.js b/browser/components/onionservices/content/authPreferences.js new file mode 100644 index 000000000000..c388fbee6b3e --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.js @@ -0,0 +1,63 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +ChromeUtils.defineModuleGetter( + this, + "TorStrings", + "resource:///modules/TorStrings.jsm" +); + +/* + Onion Services Client Authentication Preferences Code + + Code to handle init and update of onion services authentication section + in about:preferences#privacy +*/ + +const OnionServicesAuthPreferences = { + selector: { + groupBox: "#torOnionServiceKeys", + header: "#torOnionServiceKeys-header", + overview: "#torOnionServiceKeys-overview", + learnMore: "#torOnionServiceKeys-learnMore", + savedKeysButton: "#torOnionServiceKeys-savedKeys", + }, + + init() { + // populate XUL with localized strings + this._populateXUL(); + }, + + _populateXUL() { + const groupbox = document.querySelector(this.selector.groupBox); + + let elem = groupbox.querySelector(this.selector.header); + elem.textContent = TorStrings.onionServices.authPreferences.header; + + elem = groupbox.querySelector(this.selector.overview); + elem.textContent = TorStrings.onionServices.authPreferences.overview; + + elem = groupbox.querySelector(this.selector.learnMore); + elem.setAttribute("value", TorStrings.onionServices.learnMore); + elem.setAttribute("href", TorStrings.onionServices.learnMoreURL); + + elem = groupbox.querySelector(this.selector.savedKeysButton); + elem.setAttribute( + "label", + TorStrings.onionServices.authPreferences.savedKeys + ); + }, + + onViewSavedKeys() { + gSubDialog.open( + "chrome://browser/content/onionservices/savedKeysDialog.xul" + ); + }, +}; // OnionServicesAuthPreferences + +Object.defineProperty(this, "OnionServicesAuthPreferences", { + value: OnionServicesAuthPreferences, + enumerable: true, + writable: false, +}); diff --git a/browser/components/onionservices/content/authPrompt.js b/browser/components/onionservices/content/authPrompt.js index 2d4ebcafd688..f7a10e75158a 100644 --- a/browser/components/onionservices/content/authPrompt.js +++ b/browser/components/onionservices/content/authPrompt.js @@ -56,14 +56,14 @@ const OnionAuthPrompt = (function() { }; this._prompt = PopupNotifications.show(this._browser, - OnionAuthUtil.string.notificationID, "", - OnionAuthUtil.string.anchorID, + OnionAuthUtil.domid.notification, "", + OnionAuthUtil.domid.anchor, mainAction, [cancelAction], options); }, _onPromptShowing(aWarningMessage) { let xulDoc = this._browser.ownerDocument; - let descElem = xulDoc.getElementById(OnionAuthUtil.string.descriptionID); + let descElem = xulDoc.getElementById(OnionAuthUtil.domid.description); if (descElem) { // Handle replacement of the onion name within the localized // string ourselves so we can show the onion name as bold text. @@ -89,7 +89,7 @@ const OnionAuthPrompt = (function() { span.textContent = prefix; descElem.appendChild(span); span = xulDoc.createElementNS(kHTMLNS, "span"); - span.id = OnionAuthUtil.string.onionNameSpanID; + span.id = OnionAuthUtil.domid.onionNameSpan; span.textContent = this._onionName; descElem.appendChild(span); span = xulDoc.createElementNS(kHTMLNS, "span"); @@ -98,13 +98,17 @@ const OnionAuthPrompt = (function() { } // Set "Learn More" label and href. - let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.string.learnMoreID); + let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.domid.learnMore); if (learnMoreElem) { learnMoreElem.setAttribute("value", TorStrings.onionServices.learnMore); learnMoreElem.setAttribute("href", TorStrings.onionServices.learnMoreURL); } this._showWarning(aWarningMessage); + let checkboxElem = this._getCheckboxElement(); + if (checkboxElem) { + checkboxElem.checked = false; + } }, _onPromptShown() { @@ -170,7 +174,9 @@ const OnionAuthPrompt = (function() { this.show(controllerFailureMsg); }); let onionAddr = this._onionName.toLowerCase().replace(/\.onion$/, ""); - torController.onionAuthAdd(onionAddr, base64key) + let checkboxElem = this._getCheckboxElement(); + let isPermanent = (checkboxElem && checkboxElem.checked); + torController.onionAuthAdd(onionAddr, base64key, isPermanent) .then(aResponse => { // Success! Reload the page. this._browser.messageManager.sendAsyncMessage("Browser:Reload", {}); @@ -189,19 +195,24 @@ const OnionAuthPrompt = (function() { _onCancel() { // Arrange for an error page to be displayed. this._browser.messageManager.sendAsyncMessage( - OnionAuthUtil.string.authPromptCanceledMessage, + OnionAuthUtil.message.authPromptCanceled, {failedURI: this._failedURI.spec}); }, _getKeyElement() { let xulDoc = this._browser.ownerDocument; - return xulDoc.getElementById(OnionAuthUtil.string.keyElementID); + return xulDoc.getElementById(OnionAuthUtil.domid.keyElement); + }, + + _getCheckboxElement() { + let xulDoc = this._browser.ownerDocument; + return xulDoc.getElementById(OnionAuthUtil.domid.checkboxElement); }, _showWarning(aWarningMessage) { let xulDoc = this._browser.ownerDocument; let warningElem = - xulDoc.getElementById(OnionAuthUtil.string.warningElementID); + xulDoc.getElementById(OnionAuthUtil.domid.warningElement); let keyElem = this._getKeyElement(); if (warningElem) { if (aWarningMessage) { @@ -225,9 +236,12 @@ const OnionAuthPrompt = (function() { let base64key; if (aKeyString.length == 52) { // The key is probably base32-encoded. Attempt to decode. + // Although base32 specifies uppercase letters, we accept lowercase + // as well because users may type in lowercase or copy a key out of + // a tor onion-auth file (which uses lowercase). let rawKey; try { - rawKey = CommonUtils.decodeBase32(aKeyString); + rawKey = CommonUtils.decodeBase32(aKeyString.toUpperCase()); } catch (e) {} if (rawKey) try { @@ -247,17 +261,17 @@ const OnionAuthPrompt = (function() { let retval = { init() { - Services.obs.addObserver(this, OnionAuthUtil.string.authPromptTopic); + Services.obs.addObserver(this, OnionAuthUtil.topic.authPrompt); }, uninit() { - Services.obs.removeObserver(this, OnionAuthUtil.string.authPromptTopic); + Services.obs.removeObserver(this, OnionAuthUtil.topic.authPrompt); }, // 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.string.authPromptTopic) { + if (aTopic != OnionAuthUtil.topic.authPrompt) { return; } diff --git a/browser/components/onionservices/content/authUtil.jsm b/browser/components/onionservices/content/authUtil.jsm index 8547fba83a62..e9446f51cfcb 100644 --- a/browser/components/onionservices/content/authUtil.jsm +++ b/browser/components/onionservices/content/authUtil.jsm @@ -9,20 +9,25 @@ var EXPORTED_SYMBOLS = [ var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const OnionAuthUtil = { - string: { - authPromptTopic: "tor-onion-services-auth-prompt", - authPromptCanceledMessage: "Tor:OnionServicesAuthPromptCanceled", - anchorID: "tor-clientauth-notification-icon", - notificationID: "tor-clientauth", - descriptionID: "tor-clientauth-notification-desc", - learnMoreID: "tor-clientauth-notification-learnmore", - onionNameSpanID: "tor-clientauth-notification-onionname", - keyElementID: "tor-clientauth-notification-key", - warningElementID: "tor-clientauth-warning", + topic: { + authPrompt: "tor-onion-services-auth-prompt", + }, + 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", }, addCancelMessageListener(aTabContent, aDocShell) { - aTabContent.addMessageListener(this.string.authPromptCanceledMessage, + aTabContent.addMessageListener(this.message.authPromptCanceled, (aMessage) => { let failedURI = Services.io.newURI(aMessage.data.failedURI); aDocShell.displayLoadError(Cr.NS_ERROR_CONNECTION_REFUSED, failedURI, diff --git a/browser/components/onionservices/content/savedKeysDialog.js b/browser/components/onionservices/content/savedKeysDialog.js new file mode 100644 index 000000000000..b1376bbabe85 --- /dev/null +++ b/browser/components/onionservices/content/savedKeysDialog.js @@ -0,0 +1,259 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +ChromeUtils.defineModuleGetter( + this, + "TorStrings", + "resource:///modules/TorStrings.jsm" +); + +ChromeUtils.defineModuleGetter( + this, + "controller", + "resource://torbutton/modules/tor-control-port.js" +); + +var gOnionServicesSavedKeysDialog = { + selector: { + dialog: "#onionservices-savedkeys-dialog", + intro: "#onionservices-savedkeys-intro", + tree: "#onionservices-savedkeys-tree", + onionSiteCol: "#onionservices-savedkeys-siteCol", + onionKeyCol: "#onionservices-savedkeys-keyCol", + errorIcon: "#onionservices-savedkeys-errorIcon", + errorMessage: "#onionservices-savedkeys-errorMessage", + removeButton: "#onionservices-savedkeys-remove", + removeAllButton: "#onionservices-savedkeys-removeall", + }, + + _tree: undefined, + _isBusy: false, // true when loading data, deleting a key, etc. + + // 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); + } + } + + if (indexesToDelete.length > 0) { + const controllerFailureMsg = + TorStrings.onionServices.authPreferences.failedToRemoveKey; + try { + const torController = controller(aError => { + this._showError(controllerFailureMsg); + }); + + // Remove in reverse index order to avoid issues caused by index changes. + for (let i = indexesToDelete.length - 1; i >= 0; --i) { + await this._deleteOneKey(torController, indexesToDelete[i]); + } + } catch (e) { + if (e.torMessage) { + this._showError(e.torMessage); + } else { + this._showError(controllerFailureMsg); + } + } + } + + this._setBusyState(false); + }, + + async deleteAllKeys() { + this._tree.view.selection.selectAll(); + await this.deleteSelectedKeys(); + }, + + updateButtonsState() { + const haveSelection = this._tree.view.selection.getRangeCount() > 0; + const dialog = document.querySelector(this.selector.dialog); + const removeSelectedBtn = dialog.querySelector(this.selector.removeButton); + removeSelectedBtn.disabled = this._isBusy || !haveSelection; + const removeAllBtn = dialog.querySelector(this.selector.removeAllButton); + removeAllBtn.disabled = this._isBusy || this.rowCount === 0; + }, + + // Private functions. + _onLoad() { + document.mozSubdialogReady = this._init(); + }, + + async _init() { + await 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() { + const dialog = document.querySelector(this.selector.dialog); + const authPrefStrings = TorStrings.onionServices.authPreferences; + dialog.setAttribute("title", authPrefStrings.dialogTitle); + + let elem = dialog.querySelector(this.selector.intro); + elem.textContent = authPrefStrings.dialogIntro; + + elem = dialog.querySelector(this.selector.onionSiteCol); + elem.setAttribute("label", authPrefStrings.onionSite); + + elem = dialog.querySelector(this.selector.onionKeyCol); + elem.setAttribute("label", authPrefStrings.onionKey); + + elem = dialog.querySelector(this.selector.removeButton); + elem.setAttribute("label", authPrefStrings.remove); + + elem = dialog.querySelector(this.selector.removeAllButton); + elem.setAttribute("label", authPrefStrings.removeAll); + + this._tree = dialog.querySelector(this.selector.tree); + }, + + async _loadSavedKeys() { + const controllerFailureMsg = + TorStrings.onionServices.authPreferences.failedToGetKeys; + this._setBusyState(true); + + try { + this._tree.view = this; + + const torController = controller(aError => { + this._showError(controllerFailureMsg); + }); + + const keyInfoList = await torController.onionAuthViewKeys(); + if (keyInfoList) { + // Filter out temporary keys. + this._keyInfoList = keyInfoList.filter(aKeyInfo => { + if (!aKeyInfo.Flags) { + return false; + } + + const flags = aKeyInfo.Flags.split(","); + return flags.includes("Permanent"); + }); + + // Sort by the .onion address. + this._keyInfoList.sort((aObj1, aObj2) => { + const hsAddr1 = aObj1.hsAddress.toLowerCase(); + const hsAddr2 = aObj2.hsAddress.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); + } + } + + this._setBusyState(false); + }, + + // This method may throw; callers should catch errors. + async _deleteOneKey(aTorController, aIndex) { + const keyInfoObj = this._keyInfoList[aIndex]; + await aTorController.onionAuthRemove(keyInfoObj.hsAddress); + 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(); + }, + + _onWindowKeyPress(event) { + if (event.keyCode === KeyEvent.DOM_VK_ESCAPE) { + window.close(); + } else if (event.keyCode === KeyEvent.DOM_VK_DELETE) { + this.deleteSelectedKeys(); + } + }, + + _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); + errorDesc.textContent = aMessage ? aMessage : ""; + }, + + // XUL tree widget view implementation. + get rowCount() { + return this._keyInfoList ? this._keyInfoList.length : 0; + }, + + getCellText(aRow, aCol) { + let val = ""; + if (this._keyInfoList && aRow < this._keyInfoList.length) { + const keyInfo = this._keyInfoList[aRow]; + if (aCol.id.endsWith("-siteCol")) { + val = keyInfo.hsAddress; + } else if (aCol.id.endsWith("-keyCol")) { + val = keyInfo.typeAndKey; + // Omit keyType because it is always "x25519". + const idx = val.indexOf(":"); + if (idx > 0) { + val = val.substring(idx + 1); + } + } + } + + return val; + }, + + isSeparator(index) { + return false; + }, + + isSorted() { + return false; + }, + + isContainer(index) { + return false; + }, + + setTree(tree) {}, + + getImageSrc(row, column) {}, + + getCellValue(row, column) {}, + + cycleHeader(column) {}, + + getRowProperties(row) { + return ""; + }, + + getColumnProperties(column) { + return ""; + }, + + getCellProperties(row, column) { + return ""; + }, +}; + +window.addEventListener("load", () => gOnionServicesSavedKeysDialog._onLoad()); diff --git a/browser/components/onionservices/content/savedKeysDialog.xul b/browser/components/onionservices/content/savedKeysDialog.xul new file mode 100644 index 000000000000..3db9bb05ea82 --- /dev/null +++ b/browser/components/onionservices/content/savedKeysDialog.xul @@ -0,0 +1,42 @@ +<?xml version="1.0"?> + + +<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/authPreferences.css" type="text/css"?> + +<window 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"/> + + <vbox id="onionservices-savedkeys" class="contentPane" flex="1"> + <label id="onionservices-savedkeys-intro" + control="onionservices-savedkeys-tree"/> + <separator class="thin"/> + <tree id="onionservices-savedkeys-tree" flex="1" hidecolumnpicker="true" + width="750" + style="height: 20em;" + onselect="gOnionServicesSavedKeysDialog.updateButtonsState();"> + <treecols> + <treecol id="onionservices-savedkeys-siteCol" flex="1" persist="width"/> + <splitter class="tree-splitter"/> + <treecol id="onionservices-savedkeys-keyCol" flex="1" persist="width"/> + </treecols> + <treechildren/> + </tree> + <hbox id="onionservices-savedkeys-errorContainer" align="baseline" flex="1"> + <image id="onionservices-savedkeys-errorIcon"/> + <description id="onionservices-savedkeys-errorMessage" flex="1"/> + </hbox> + <separator class="thin"/> + <hbox id="onionservices-savedkeys-buttons"> + <button id="onionservices-savedkeys-remove" disabled="true" + oncommand="gOnionServicesSavedKeysDialog.deleteSelectedKeys();"/> + <button id="onionservices-savedkeys-removeall" + oncommand="gOnionServicesSavedKeysDialog.deleteAllKeys();"/> + </hbox> + </vbox> +</window> diff --git a/browser/components/onionservices/jar.mn b/browser/components/onionservices/jar.mn index 06cf2df6e7ac..583ab77bc6d8 100644 --- a/browser/components/onionservices/jar.mn +++ b/browser/components/onionservices/jar.mn @@ -1,4 +1,8 @@ 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/onionservices.css (content/onionservices.css) + content/browser/onionservices/savedKeysDialog.js (content/savedKeysDialog.js) + content/browser/onionservices/savedKeysDialog.xul (content/savedKeysDialog.xul) diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index 7a01443ab048..30915e3d358f 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -15,6 +15,7 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/search.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/authPreferences.css"?> <?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js index 297d07fadf1f..ee86b4158d7c 100644 --- a/browser/components/preferences/in-content/privacy.js +++ b/browser/components/preferences/in-content/privacy.js @@ -62,6 +62,12 @@ XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", function() { } }); +XPCOMUtils.defineLazyScriptGetter( + this, + ["OnionServicesAuthPreferences"], + "chrome://browser/content/onionservices/authPreferences.js" +); + // TODO: module import via ChromeUtils.defineModuleGetter XPCOMUtils.defineLazyScriptGetter( this, @@ -369,6 +375,7 @@ var gPrivacyPane = { this.trackingProtectionReadPrefs(); this.networkCookieBehaviorReadPrefs(); this._initTrackingProtectionExtensionControl(); + OnionServicesAuthPreferences.init(); this._initSecurityLevel(); Services.telemetry.setEventRecordingEnabled("pwmgr", true); diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul index 013fe147bc82..e807ac69f1f1 100644 --- a/browser/components/preferences/in-content/privacy.xul +++ b/browser/components/preferences/in-content/privacy.xul @@ -468,6 +468,8 @@ </hbox> </groupbox> +#include ../../onionservices/content/authPreferences.inc.xul +  <groupbox id="formAutofillGroupBox" diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index f68d60cf1343..e9a8b3969297 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -329,7 +329,7 @@ var TorStrings = { }; let retval = { - learnMore: getString("torPreferences.learnMore", "Learn More"), + learnMore: getString("learnMore", "Learn more"), learnMoreURL: `https://2019.www.torproject.org/docs/tor-manual-dev.html.${getLocale()}#_client_authorization`, authPrompt: { description: @@ -341,6 +341,19 @@ var TorStrings = { failedToSetKey: getString("authPrompt.failedToSetKey", "Failed to set key"), }, + authPreferences: { + header: getString("authPreferences.header", "Onion Services Authentication"), + overview: getString("authPreferences.overview", "Some onion services require that you identify yourself with a key"), + savedKeys: getString("authPreferences.savedKeys", "Saved Keys"), + dialogTitle: getString("authPreferences.dialogTitle", "Onion Services Keys"), + dialogIntro: getString("authPreferences.dialogIntro", "Keys for the following onionsites are stored on your computer"), + onionSite: getString("authPreferences.onionSite", "Onionsite"), + onionKey: getString("authPreferences.onionKey", "Key"), + remove: getString("authPreferences.remove", "Remove"), + removeAll: getString("authPreferences.removeAll", "Remove All"), + failedToGetKeys: getString("authPreferences.failedToGetKeys", "Failed to get keys"), + failedToRemoveKey: getString("authPreferences.failedToRemoveKey", "Failed to remove key"), + }, }; return retval;

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit 9e9300163c9074f9b12691d42aefc489e27729ef Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:26:14 2020 +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 f87cd0af7462..078ae18e5f1c 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit f87cd0af7462faab1d349e28e7b17c76274624b0 +Subproject commit 078ae18e5f1cbf888e7c86c8aecaa383a727bf0d

1 0

[tor-launcher/master] Bug 19757: Support on-disk storage of v3 client auth keys
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit 6ceda2e5565702f13933b83653c1951789fc0252 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 4 09:48:08 2019 -0500 Bug 19757: Support on-disk storage of v3 client auth keys Create a client-auth directory within the Tor data directory and use it. --- src/components/tl-process.js | 7 ++++++- src/modules/tl-util.jsm | 13 ++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 49abc0a..1cad103 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -372,6 +372,7 @@ TorProcessService.prototype = // Get the Tor data directory first so it is created before we try to // construct paths to files that will be inside it. var dataDir = TorLauncherUtil.getTorFile("tordatadir", true); + var onionAuthDir = TorLauncherUtil.getTorFile("toronionauthdir", true); var exeFile = TorLauncherUtil.getTorFile("tor", false); var torrcFile = TorLauncherUtil.getTorFile("torrc", true); var torrcDefaultsFile = @@ -388,6 +389,8 @@ TorProcessService.prototype = detailsKey = "torrc_missing"; else if (!dataDir) detailsKey = "datadir_missing"; + else if (!onionAuthDir) + detailsKey = "onionauthdir_missing"; else if (!hashedPassword) detailsKey = "password_hash_missing"; @@ -418,6 +421,8 @@ TorProcessService.prototype = args.push(torrcFile.path); args.push("DataDirectory"); args.push(dataDir.path); + args.push("ClientOnionAuthDir"); + args.push(onionAuthDir.path); args.push("GeoIPFile"); args.push(geoipFile.path); args.push("GeoIPv6File"); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index c54acb9..b721372 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2019, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -571,6 +571,8 @@ let TorLauncherUtil = // Public path = "Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Tor\\onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Tor\\PluggableTransports"; } @@ -586,6 +588,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Tor/onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Tor/PluggableTransports"; else if (isIPC) @@ -603,6 +607,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Tor/onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Tor/PluggableTransports"; else if (isIPC) @@ -622,6 +628,8 @@ let TorLauncherUtil = // Public path = "Data\\Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Data\\Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Data\\Tor\\onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Data\\Browser"; } @@ -638,6 +646,8 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Data/Tor/onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Data/Browser"; else if (isIPC) @@ -683,6 +693,7 @@ let TorLauncherUtil = // Public try { if (("tordatadir" == aTorFileType) || + ("toronionauthdir" == aTorFileType) || ("pt-profiles-dir" == aTorFileType)) { torFile.create(torFile.DIRECTORY_TYPE, 0o700);

1 0

[tor-launcher/master] Translations update
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit cb34de3fc8d80049c6bd526e56efc6df75b3a621 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 20:54:43 2020 +0000 Translations update --- src/chrome/locale/ja/torlauncher.properties | 2 +- src/chrome/locale/sv-SE/network-settings.dtd | 4 ++-- src/chrome/locale/vi/network-settings.dtd | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index c452259..38ef19a 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=Tor が起動中に終了しました。これは、torrc ファイルの誤りや、Tor または他のプログラムのバグ、もしくはハードウェアの故障に起因しているかもしれません。問題を解決して Tor を再起動するまで、Tor Browser は起動されません。 -torlauncher.tor_exited=Tor が突然終了しました。原因はおそらく Tor 自体のバグか、他の常駐プログラムか、あるいはハードウェアーが問題です。Tor を再起動するまで、Tor ブラウザーはウェブサイトに一切接続できません。再起動しても解決されない場合、Tor ログファイルをサポートチームに送信してください。 +torlauncher.tor_exited=Tor が突然終了しました。原因はおそらく Tor 自体のバグか、他の常駐プログラムか、あるいはハードウェアーが問題です。Tor を再起動するまで、 Tor Browser はウェブサイトに一切接続できません。再起動しても解決されない場合、Tor ログファイルをサポートチームに送信してください。 torlauncher.tor_exited2=Tor を再起動しても、あなたのブラウザータブはそのまま残ります。 torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。 torlauncher.tor_failed_to_start=Torは開始出来ませんでした。 diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index a31aa57..05823df 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klicka på "Anslut" för att ansluta till Tor."> -<!ENTITY torSettings.configurePrompt "Klicka "Konfigurera" för att justera nätverks inställningar ifall du är i ett land som censurerar Tor( som Egypten, Kina och Turkiet) eller ifall du ansluter från ett privat nätverk som kräver en proxy."> +<!ENTITY torSettings.configurePrompt "Klicka på "Konfigurera" för att justera nätverksinställningar om du är i ett land som censurerar Tor (som Egypten, Kina eller Turkiet) eller om du ansluter från ett privat nätverk som kräver en proxy."> <!ENTITY torSettings.configure "Konfigurera"> <!ENTITY torSettings.connect "Anslut"> @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Valfritt"> <!ENTITY torsettings.useProxy.checkbox "Jag använder en proxy för att ansluta till internet"> -<!ENTITY torsettings.useProxy.type "Proxy-typ"> +<!ENTITY torsettings.useProxy.type "Proxytyp"> <!ENTITY torsettings.useProxy.type.placeholder "Välj en proxytyp"> <!ENTITY torsettings.useProxy.address "Adress"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn"> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index aa31765..51e7992 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -64,7 +64,7 @@  <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Cài đặt Tor"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser dẫn lưu lượng của bạn qua mạng Tor, vận hành bởi hàng ngàn tình nguyện viên khắp thế giới." > +<!ENTITY torPreferences.torSettingsDescription "Trình duyệt Tor dẫn lưu lượng của bạn qua mạng Tor, vận hành bởi hàng ngàn tình nguyện viên khắp thế giới." > <!ENTITY torPreferences.learnMore "Tìm hiểu thêm"> <!ENTITY torPreferences.bridges "Cầu Nối"> <!ENTITY torPreferences.bridgesDescription "Cầu nối giúp bạn truy cập mạng Tor ở những nơi mạng Tor bị chặn. Tùy vào vị trí của bạn mà một cầu nối có thể hoạt động tốt hơn cầu nối khác."> @@ -72,7 +72,7 @@ <!ENTITY torPreferences.requestNewBridge "Yêu cầu Cầu nối mới..."> <!ENTITY torPreferences.provideBridge "Cung cấp cầu nối"> <!ENTITY torPreferences.advanced "Nâng cao"> -<!ENTITY torPreferences.advancedDescription "Cài đặt cách Tor Browser kết nối tới internet."> +<!ENTITY torPreferences.advancedDescription "Cài đặt cách trình duyệt Tor kết nối tới internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Giá trị ngăn cách bởi dấu phẩy"> <!ENTITY torPreferences.requestBridgeDialogTitle "Yêu cầu cầu nối"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Đang kết nối tới BridgeDB. Vui lòng đợi.">

1 0

[tor-launcher/master] Bug 19757: Support on-disk storage of v3 client auth keys
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit f53497c7255b040b6c97738c3c64e98b69cc96e4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 4 09:46:54 2019 -0500 Bug 19757: Support on-disk storage of v3 client auth keys Add string for the "missing onion authentication directory" error. --- src/chrome/locale/en-US/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/locale/en-US/torlauncher.properties b/src/chrome/locale/en-US/torlauncher.properties index ca9774b..6ec8c40 100644 --- a/src/chrome/locale/en-US/torlauncher.properties +++ b/src/chrome/locale/en-US/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S

1 0

[tor-launcher/master] Release preparations for 0.2.21.2
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit 227d33e077e94eada351a3c6304907f8b4d8700f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:36:55 2020 +0000 Release preparations for 0.2.21.2 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 78eef27..ac54464 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.21.1</em:version> + <em:version>0.2.21.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Merge remote-tracking branch 'bradetpo/bug19757-02'
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit bb1bff811c12fd8638ebede1514be512a9a4fbd7 Merge: cb34de3 6ceda2e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:06:02 2020 +0000 Merge remote-tracking branch 'bradetpo/bug19757-02' src/chrome/locale/en-US/torlauncher.properties | 3 ++- src/components/tl-process.js | 7 ++++++- src/modules/tl-util.jsm | 13 ++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-)

1 0

[torbutton/master] Bug 19757: Support on-disk storage of v3 client auth keys
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit fddbe371f2eb43d7d6007561db38d1ad8a6ff8e4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 4 09:40:34 2019 -0500 Bug 19757: Support on-disk storage of v3 client auth keys Add strings for "Remember this key" checkbox and the new "Onion Services Authentication" preferences section. --- chrome/locale/en-US/torbutton.dtd | 1 + chrome/locale/en-US/torbutton.properties | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/chrome/locale/en-US/torbutton.dtd b/chrome/locale/en-US/torbutton.dtd index ed3cb1a6..b9ae0f00 100644 --- a/chrome/locale/en-US/torbutton.dtd +++ b/chrome/locale/en-US/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 1020e57a..375067b3 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Connection Encrypted (Onion Service) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Learn more 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 @@ -68,3 +69,14 @@ onionServices.authPrompt.done=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.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Key +onionServices.authPreferences.remove=Remove +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit 4f85cd273bffc0f8056c5a07f35e265700205af3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 20:58:16 2020 +0000 Translations update --- chrome/locale/sv-SE/aboutDialog.dtd | 2 +- chrome/locale/vi/browserOnboarding.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/locale/sv-SE/aboutDialog.dtd b/chrome/locale/sv-SE/aboutDialog.dtd index c556fcf2..9a2c95c5 100644 --- a/chrome/locale/sv-SE/aboutDialog.dtd +++ b/chrome/locale/sv-SE/aboutDialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "Hjälp Tor-nätverket växa!">  -<!ENTITY bottomLinks.license "Licens information"> +<!ENTITY bottomLinks.license "Licensinformation"> <!ENTITY tor.TrademarkStatement "'Tor' och 'Onion-logotypen' är registerade varumärken av Tor Project, Inc."> diff --git a/chrome/locale/vi/browserOnboarding.properties b/chrome/locale/vi/browserOnboarding.properties index 0b14f935..f0c784cb 100644 --- a/chrome/locale/vi/browserOnboarding.properties +++ b/chrome/locale/vi/browserOnboarding.properties @@ -8,12 +8,12 @@ onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Riêng tư -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. +onboarding.tour-tor-privacy.title=Chống theo dõi, rình mò. onboarding.tour-tor-privacy.description=Trình duyệt Tor cô lập cookies và xoá lịch sử duyệt web của bạn sau mỗi phiên. Những thay đổi này đảm bảo quyền riêng tư của bạn được bảo vệ trong trình duyệt. Nhân 'Tor Network' để tìm hiểu cách chúng tôi bảo vệ bạn trên cấp độ mạng. onboarding.tour-tor-privacy.button=Đi đến mạng Tor onboarding.tour-tor-network=Mạng Tor -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network.title=Di chuyển trên mạng lưới phi tập trung. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. 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.action-button=Adjust Your Tor Network Settings

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 22 Feb '20

22 Feb '20

commit 9b8d504f8db580e7a6b5b76787a713a223a9e330 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Feb 6 14:30:58 2020 +0000 Translations update --- chrome/locale/lt/browserOnboarding.properties | 2 +- chrome/locale/nb-NO/browserOnboarding.properties | 4 ++-- chrome/locale/nb-NO/torbutton.properties | 4 ++-- chrome/locale/ru/aboutTor.dtd | 10 ++++----- chrome/locale/ru/brand.dtd | 2 +- chrome/locale/ru/brand.properties | 4 ++-- chrome/locale/ru/browserOnboarding.properties | 10 ++++----- chrome/locale/ru/torbutton.dtd | 26 ++++++++++++------------ chrome/locale/ru/torbutton.properties | 4 ++-- chrome/locale/zh-CN/torbutton.properties | 6 +++--- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/chrome/locale/lt/browserOnboarding.properties b/chrome/locale/lt/browserOnboarding.properties index a53b857f..53f4d4cf 100644 --- a/chrome/locale/lt/browserOnboarding.properties +++ b/chrome/locale/lt/browserOnboarding.properties @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Pereiti prie Tor tinklo onboarding.tour-tor-network=Tor tinklas onboarding.tour-tor-network.title=Keliaukite po decentralizuotą tinklą. onboarding.tour-tor-network.description=Tor Naršyklė prijungia jus prie Tor tinklo, veikiančio tūkstančių, po visą pasaulį išsidėsčiusių, savanorių dėka. Skirtingai nei VPN, čia, norint mėgautis privačiu naršymu saityne, nėra vieno žlugimo taško, ar centralizuoto objekto, kuriuo turėtumėte pasitikėti. -onboarding.tour-tor-network.description-para2=NAUJA: Tor tinklo nustatymai, įtraukiant galimybę prašyti tinklo tiltų, kur Tor užblokuotas, dabar galima rasti pirmenybėse +onboarding.tour-tor-network.description-para2=NAUJA: Dabar, Tor tinklo nustatymus (įskaitant galimybę užklausti tinklų tiltus ten, kur Tor yra blokuojamas) rasite Nuostatose. onboarding.tour-tor-network.action-button=Derinti savo Tor tinklo nustatymus onboarding.tour-tor-network.button=Pereiti į grandinės rodinį diff --git a/chrome/locale/nb-NO/browserOnboarding.properties b/chrome/locale/nb-NO/browserOnboarding.properties index a444b823..99e81620 100644 --- a/chrome/locale/nb-NO/browserOnboarding.properties +++ b/chrome/locale/nb-NO/browserOnboarding.properties @@ -49,8 +49,8 @@ onboarding.tour-tor-update.prefix-new=Ny onboarding.tour-tor-update.prefix-updated=Oppdatert onboarding.tour-tor-toolbar=Verktøylinje -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. +onboarding.tour-tor-toolbar-update-9.0.title=Farvel løk-knapp. +onboarding.tour-tor-toolbar-update-9.0.description=Vi ønsker at din erfaring med å bruke Tor skal være fullt integrert i Tor Browser. 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.button=Hvordan be om en Ny identitet onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor Nettverk diff --git a/chrome/locale/nb-NO/torbutton.properties b/chrome/locale/nb-NO/torbutton.properties index fc09dd04..1d3746c3 100644 --- a/chrome/locale/nb-NO/torbutton.properties +++ b/chrome/locale/nb-NO/torbutton.properties @@ -62,9 +62,9 @@ pageInfo_OnionEncryption=Tilkobling kryptert (Løk Tjeneste) # 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.description=%S ber om din private nøkkel. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Ferdig 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.failedToSetKey=Kan ikke konfigurere Tor med nøkkelen din diff --git a/chrome/locale/ru/aboutTor.dtd b/chrome/locale/ru/aboutTor.dtd index c24343fa..818f7067 100644 --- a/chrome/locale/ru/aboutTor.dtd +++ b/chrome/locale/ru/aboutTor.dtd @@ -4,16 +4,16 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "О проекте Tor"> +<!ENTITY aboutTor.title "О Tor"> -<!ENTITY aboutTor.viewChangelog.label "Посмотреть список изменений"> +<!ENTITY aboutTor.viewChangelog.label "Список изменений"> <!ENTITY aboutTor.ready.label "Исследуйте. Приватно."> <!ENTITY aboutTor.ready2.label "Вы готовы к самому приватному просмотру веб-страниц в мире."> <!ENTITY aboutTor.failure.label "Что-то пошло не так!"> <!ENTITY aboutTor.failure2.label "Tor не работает в этом браузере."> -<!ENTITY aboutTor.search.label "Поиск с помощью сервиса DuckDuckGo"> +<!ENTITY aboutTor.search.label "Поиск с помощью DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Вопросы?"> @@ -26,6 +26,6 @@ <!ENTITY aboutTor.getInvolved.label "Присоединяйтесь »"> <!ENTITY aboutTor.newsletter.tagline "Получайте последние новости Tor прямо на ваш почтовый ящик."> -<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> -<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным."> +<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor"> +<!ENTITY aboutTor.donationBanner.line2e "Поддержите Tor."> <!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> diff --git a/chrome/locale/ru/brand.dtd b/chrome/locale/ru/brand.dtd index f4983534..35202d37 100644 --- a/chrome/locale/ru/brand.dtd +++ b/chrome/locale/ru/brand.dtd @@ -5,7 +5,7 @@ <!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Проект Tor"> +<!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc.">  diff --git a/chrome/locale/ru/brand.properties b/chrome/locale/ru/brand.properties index 91aef011..e7a6c20c 100644 --- a/chrome/locale/ru/brand.properties +++ b/chrome/locale/ru/brand.properties @@ -2,10 +2,10 @@ # 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/. -brandShorterName=Обозреватель Tor +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser -vendorShortName=Проект Tor +vendorShortName=Tor Project homePageSingleStartMain=Firefox Start - домашняя страничка со встроенным поиском homePageImport=Импорт вашей домашней страницы из %S diff --git a/chrome/locale/ru/browserOnboarding.properties b/chrome/locale/ru/browserOnboarding.properties index 79776b39..f07b540d 100644 --- a/chrome/locale/ru/browserOnboarding.properties +++ b/chrome/locale/ru/browserOnboarding.properties @@ -10,7 +10,7 @@ onboarding.tour-tor-welcome.next-button=Перейти к Кофиденциал onboarding.tour-tor-privacy=Приватность onboarding.tour-tor-privacy.title=Следопыты и ищейки. onboarding.tour-tor-privacy.description=Tor Browser изолирует cookies и удаляет историю просмотров после завершения сессии. Эти меры обеспечивают вашу приватность и безопасность. Нажмите «Сеть Tor», чтобы узнать, как мы защищаем вас на сетевом уровне. -onboarding.tour-tor-privacy.button=Перейти в «Сеть Tor» +onboarding.tour-tor-privacy.button=Перейти в cеть Tor onboarding.tour-tor-network=Сеть Tor onboarding.tour-tor-network.title=Перемещайтесь по децентрализованной сети. @@ -49,11 +49,11 @@ onboarding.tour-tor-update.prefix-new=Новое 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.title=Прощай, кнопка "Onion" onboarding.tour-tor-toolbar-update-9.0.description=Мы хотим, чтобы ваше использование Tor было полностью интегрировано в Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=Вот почему теперь, вместо того, чтобы использовать кнопку «onion», вы можете увидеть свою цепочку Tor с помощью [i] в строке адреса и запросить новый идентификатор с помощью кнопки на панели инструментов или меню [≡]. -onboarding.tour-tor-toolbar-update-9.0.button=Как запросить новый идентификатор -onboarding.tour-tor-toolbar-update-9.0.next-button=Перейти в «Сеть Tor» +onboarding.tour-tor-toolbar-update-9.0.description-para2=Вот почему теперь вместо того, чтобы использовать кнопку "onion", вы можете увидеть свою цепочку Tor с помощью [i] в адресной строке и создать новую личность нажатием кнопки на панели инструментов или меню [≡]. +onboarding.tour-tor-toolbar-update-9.0.button=Как запросить новую личность +onboarding.tour-tor-toolbar-update-9.0.next-button=Перейти в cеть Tor # Circuit Display onboarding. onboarding.tor-circuit-display.next=Вперёд diff --git a/chrome/locale/ru/torbutton.dtd b/chrome/locale/ru/torbutton.dtd index aadcb8c8..6ab6b91e 100644 --- a/chrome/locale/ru/torbutton.dtd +++ b/chrome/locale/ru/torbutton.dtd @@ -23,30 +23,30 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Ползунок безопасности позволяет вам запретить некоторые особенности обозревателя, которые могут сделать ваш браузер более уязвимым к попыткам взлома."> -<!ENTITY torbutton.prefs.sec_standard_label "Стандартные"> +<!ENTITY torbutton.prefs.sec_standard_label "Обычный"> <!ENTITY torbutton.prefs.sec_standard_description "Все функции Tor Browser и веб-сайтов включены."> -<!ENTITY torbutton.prefs.sec_safer_label "Более безопасные"> -<!ENTITY torbutton.prefs.sec_safer_description "Отключены функции веб-сайтов, которые часто бывают опасны, что может привести к потере функциональности некоторыми сайтами."> +<!ENTITY torbutton.prefs.sec_safer_label "Высокий"> +<!ENTITY torbutton.prefs.sec_safer_description "Отключены функции веб-сайтов, которые часто бывают опасны. Могут быть проблемы с работой некоторых сайтов."> <!ENTITY torbutton.prefs.sec_safer_list_label "При более безопасных настройках:"> -<!ENTITY torbutton.prefs.sec_safest_label "Наиболее безопасные"> +<!ENTITY torbutton.prefs.sec_safest_label "Высший"> <!ENTITY torbutton.prefs.sec_safest_description "Разрешены только функции веб-сайтов, требующиеся для статических сайтов и основных сервисов. Эти изменения влияют на изображения, медиа и скрипты."> <!ENTITY torbutton.prefs.sec_safest_list_label "При самых безопасных настройках:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Подробнее"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only " JavaScript отключен на всех не HTTPS сайтах. "> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript отключен на всех сайтах без HTTPS. "> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript отключен по умолчанию на всех сайтах."> -<!ENTITY torbutton.prefs.sec_limit_typography "Некоторые шрифты и математические символы отключены."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Некоторые шрифты, значки, математические символы и изображения отключены."> +<!ENTITY torbutton.prefs.sec_limit_typography "Отключены некоторые шрифты и математические символы."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Отключены некоторые шрифты, значки, математические символы и изображения."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Аудио, видео (медиа HTML5) и WebGL проигрываются при нажатии."> <!ENTITY torbutton.prefs.sec_custom_warning "Пользовательский"> -<!ENTITY torbutton.prefs.sec_overview "Отключите веб-функции, которые могут использоваться для атаки на вашу безопасность и анонимность."> -<!ENTITY torbutton.prefs.sec_standard_tooltip "Уровень безопасности : Стандартный"> -<!ENTITY torbutton.prefs.sec_safer_tooltip "Уровень безопасности : Более безопасный"> -<!ENTITY torbutton.prefs.sec_safest_tooltip "Уровень безопасности : Наиболее безопасный"> +<!ENTITY torbutton.prefs.sec_overview "Можно отключить веб-функции, которые могут использоваться для атаки на вашу безопасность и анонимность."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Уровень безопасности: обычный"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Уровень безопасности: высокий"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Уровень безопасности: высший"> <!ENTITY torbutton.prefs.sec_custom_summary "Ваши настройки браузера привели к необычным параметрам безопасности. По соображениям безопасности и приватности мы рекомендуем выбрать один из уровней безопасности по умолчанию."> <!ENTITY torbutton.prefs.sec_restore_defaults "Восстановить значения по умолчанию"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Дополнительные настройки безопасности..."> -<!ENTITY torbutton.circuit_display.title "Схема Tor"> -<!ENTITY torbutton.circuit_display.new_circuit "Новая схема для этого Сайта"> +<!ENTITY torbutton.circuit_display.title "Цепочка Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Новая цепочка для этого сайта">  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> diff --git a/chrome/locale/ru/torbutton.properties b/chrome/locale/ru/torbutton.properties index 06ab9597..a1da2002 100644 --- a/chrome/locale/ru/torbutton.properties +++ b/chrome/locale/ru/torbutton.properties @@ -29,7 +29,7 @@ torbutton.popup.short_torbrowser = Важная информация о Torbutto torbutton.popup.confirm_plugins = Плагины, такие как Flash, могут нанести вред вашей конфиденциальности и анонимности.\n\nТакже они могут обойти Tor, чтобы узнать ваше текущее местоположение и IP-адрес.\n\nВы уверены, что хотите включить плагины?\n\n torbutton.popup.never_ask_again = Больше не спрашивать -torbutton.popup.confirm_newnym = Tor Browser закроет все окна и вкладки. Все сессии сайта будут потеряны.\n\nПерезапустить Tor Browser сейчас, чтобы сбросить вашу личность?\n\n +torbutton.popup.confirm_newnym = Tor Browser закроет все окна и вкладки. Все сессии сайтов будут закрыты.\n\nПерезапустить Tor Browser, чтобы получить новую личность?\n\n torbutton.maximize_warning = Открытие Tor Browser на максимальную величину позволяет веб-сайтам определять размер вашего монитора, что может использоваться для вашего отслеживания. Мы рекомендуем оставлять окна браузера Tor в их исходном размере по умолчанию. @@ -47,7 +47,7 @@ canvas.neverAccessKey=e profileProblemTitle=Проблема с профилем %S profileReadOnly=Вы не можете запустить %S из файловой системы доступной только для чтения. Пожалуйста, скопируйте %S в другое место перед использованием. profileReadOnlyMac=Вы не можете запустить %S из файловой системы доступной только для чтения. Пожалуйста, скопируйте %S на рабочий стол или в папку Приложения перед использованием. -profileAccessDenied=У %Sне имеет прав доступа к профилю. Пожалуйста, настройте разрешения вашей файловой системы и попробуйте снова. +profileAccessDenied=У %S нет прав доступа к профилю. Пожалуйста, настройте разрешения вашей файловой системы и попробуйте снова. profileMigrationFailed=Миграция вашего существующего %S профиля не удалась.\nБудут использованы новые настройки. # "Downloading update" string for the hamburger menu (see #28885). diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index ca456387..72b5b373 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -63,8 +63,8 @@ pageInfo_OnionEncryption=连接已经被加密（洋葱服务） # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.clientAuthMissing=Tor 洋葱服务客户端认证失败 onionServices.authPrompt.description=%S 需要您的私钥 -onionServices.authPrompt.keyPlaceholder=键入您的私人密钥来使用此洋葱服务 +onionServices.authPrompt.keyPlaceholder=输入您的私钥来使用此洋葱服务 onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=天 -onionServices.authPrompt.invalidKey=请键入一个合法的密钥（52位base32字符或44位base64字符） -onionServices.authPrompt.failedToSetKey=无法使用您的密钥来配置Tor +onionServices.authPrompt.invalidKey=请输入一个合法的密钥（52位 base32 字符或44位 base64 字符） +onionServices.authPrompt.failedToSetKey=无法使用您的密钥来配置 Tor

1 0