Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor Browser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Applications
Tor Browser
Commits
10a5f445
Verified
Commit
10a5f445
authored
Jun 9, 2023
by
Pier Angelo Vendrame
Browse files
Options
Downloads
Patches
Plain Diff
fixup! Bug 30237: Add v3 onion services client authentication prompt
Linted
parent
8853c8bd
No related branches found
No related tags found
1 merge request
!694
Bug 41796: Rebased on top of FIREFOX_ESR_115_BASE
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
browser/components/onionservices/content/authPrompt.js
+3
-2
3 additions, 2 deletions
browser/components/onionservices/content/authPrompt.js
browser/components/onionservices/content/savedKeysDialog.xhtml
+40
-24
40 additions, 24 deletions
...er/components/onionservices/content/savedKeysDialog.xhtml
with
43 additions
and
26 deletions
browser/components/onionservices/content/authPrompt.js
+
3
−
2
View file @
10a5f445
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
browser/components/onionservices/content/savedKeysDialog.xhtml
+
40
−
24
View file @
10a5f445
...
...
@@ -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
>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment