Skip to content
Snippets Groups Projects
Verified Commit 10a5f445 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

fixup! Bug 30237: Add v3 onion services client authentication prompt

Linted
parent 8853c8bd
No related branches found
No related tags found
1 merge request!694Bug 41796: Rebased on top of FIREFOX_ESR_115_BASE
......@@ -197,7 +197,8 @@ const OnionAuthPrompt = (function() {
);
let torController = await controller();
// ^(subdomain.)*onionserviceid.onion$ (case-insensitive)
const onionServiceIdRegExp = /^(.*\.)*(?<onionServiceId>[a-z2-7]{56})\.onion$/i;
const onionServiceIdRegExp =
/^(.*\.)*(?<onionServiceId>[a-z2-7]{56})\.onion$/i;
// match() will return null on bad match, causing throw
const onionServiceId = this._onionHostname
.match(onionServiceIdRegExp)
......
......@@ -5,23 +5,34 @@
<?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"
<window
id="onionservices-savedkeys-dialog"
windowtype="OnionServices:SavedKeys"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 45em;">
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"/>
<label
id="onionservices-savedkeys-intro"
control="onionservices-savedkeys-tree"
/>
<separator class="thin" />
<tree id="onionservices-savedkeys-tree" flex="1" hidecolumnpicker="true"
<tree
id="onionservices-savedkeys-tree"
flex="1"
hidecolumnpicker="true"
width="750"
style="height: 20em;"
onselect="gOnionServicesSavedKeysDialog.updateButtonsState();">
style="height: 20em"
onselect="gOnionServicesSavedKeysDialog.updateButtonsState();"
>
<treecols>
<treecol id="onionservices-savedkeys-siteCol" flex="1" persist="width"/>
<treecol
id="onionservices-savedkeys-siteCol"
flex="1"
persist="width"
/>
<splitter class="tree-splitter" />
<treecol id="onionservices-savedkeys-keyCol" flex="1" persist="width" />
</treecols>
......@@ -33,10 +44,15 @@
</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();"/>
<button
id="onionservices-savedkeys-remove"
disabled="true"
oncommand="gOnionServicesSavedKeysDialog.deleteSelectedKeys();"
/>
<button
id="onionservices-savedkeys-removeall"
oncommand="gOnionServicesSavedKeysDialog.deleteAllKeys();"
/>
</hbox>
</vbox>
</window>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment