kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

~ Improvements to URL encoding handling (fewer edge-cases!)

This commit is contained in:
Greyhoof 2023-12-13 13:29:34 +01:00
parent b29b43de75
commit dcef50e0ec
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
electron/main.ts
View File

@ -188,14 +188,15 @@ function openURLExternally(linkUrl: string): void {
} }
if (fileIsExecutable) { if (fileIsExecutable) {
// check if URL is already encoded // regular expression that looks for an encoded % symbol followed by two hexadecimal characters
// (this should work almost all the time, but there might be edge-cases with very unusual URLs) // using this expression, we can find parts of the URL that were encoded twice
let isEncoded = (linkUrl !== decodeURI(linkUrl)); const re = new RegExp('%25([0-9a-f]{2})', 'ig');
// only encode URL if it isn't encoded yet
if (!isEncoded) { // encode the URL no matter what
// encode URL so if it contains spaces, it remains a single argument for the browser linkUrl = encodeURI(linkUrl);
linkUrl = encodeURI(linkUrl);
} // eliminate double-encoding using expression above
linkUrl = linkUrl.replace(re, '%$1');
if (!settings.browserArgs.includes('%s')) { if (!settings.browserArgs.includes('%s')) {
// append %s to params if it is not already there // append %s to params if it is not already there