This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser.
The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 64453c569f86 fixup! Bug 30237: Add v3 onion services client authentication prompt 64453c569f86 is described below
commit 64453c569f86ce08870947237a57aa01c34d04e1 Author: Henry Wilkes henry@torproject.org AuthorDate: Wed Oct 26 16:30:11 2022 +0100
fixup! Bug 30237: Add v3 onion services client authentication prompt --- browser/components/onionservices/content/authPrompt.js | 5 +---- browser/components/onionservices/content/savedKeysDialog.js | 9 ++------- 2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/browser/components/onionservices/content/authPrompt.js b/browser/components/onionservices/content/authPrompt.js index 889acc2c6f67..771c7e58f667 100644 --- a/browser/components/onionservices/content/authPrompt.js +++ b/browser/components/onionservices/content/authPrompt.js @@ -192,10 +192,7 @@ const OnionAuthPrompt = (function() { let { controller } = ChromeUtils.import( "resource://torbutton/modules/tor-control-port.js" ); - let torController = await controller(aError => { - console.error(controllerFailureMsg, aError); - this.show(controllerFailureMsg); - }); + let torController = await controller(); // ^(subdomain.)*onionserviceid.onion$ (case-insensitive) const onionServiceIdRegExp = /^(.*.)*(?<onionServiceId>[a-z2-7]{56}).onion$/i; // match() will return null on bad match, causing throw diff --git a/browser/components/onionservices/content/savedKeysDialog.js b/browser/components/onionservices/content/savedKeysDialog.js index f102e4e89bca..fd8b477a395d 100644 --- a/browser/components/onionservices/content/savedKeysDialog.js +++ b/browser/components/onionservices/content/savedKeysDialog.js @@ -49,9 +49,7 @@ var gOnionServicesSavedKeysDialog = { const controllerFailureMsg = TorStrings.onionServices.authPreferences.failedToRemoveKey; try { - const torController = controller(aError => { - this._showError(controllerFailureMsg); - }); + const torController = await controller();
// Remove in reverse index order to avoid issues caused by index changes. for (let i = indexesToDelete.length - 1; i >= 0; --i) { @@ -129,10 +127,7 @@ var gOnionServicesSavedKeysDialog = { try { this._tree.view = this;
- const torController = controller(aError => { - this._showError(controllerFailureMsg); - }); - + const torController = await controller(); const keyInfoList = await torController.onionAuthViewKeys(); if (keyInfoList) { // Filter out temporary keys.