Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/js/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -298,14 +298,18 @@ const normalizedHostname = (hn) => {
* @param {string} str
*/
const decode = (str) => {
try {
if (decodeURI(str) !== decodeURIComponent(str)) {
return decode(decodeURIComponent(str));
let last = str;
while (true) {
try {
const decoded = decodeURIComponent(last);
if (decoded === last) {
return last;
}
last = decoded;
} catch (e) {
return last;
}
} catch (ex) {
err(ex);
}
return str;
};
// #endregion

Expand Down
13 changes: 13 additions & 0 deletions tools/test_decode.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { decode } from '../src/js/util.js';
import assert from 'assert';

const encodedURI = 'https://example.com/%25'; // %25 is '%'
const expectedDecodedURI = 'https://example.com/%';

try {
const result = decode(encodedURI);
assert.strictEqual(result, expectedDecodedURI, 'The URI should be decoded');
console.log('Test passed!');
} catch (e) {
console.error('Test failed:', e.message);
}