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

~ Refactored logic for checking browser path and access

This commit is contained in:
Greyhoof 2023-10-12 14:41:04 +02:00
parent acb0387808
commit 1b9401cbfa
1 changed files with 41 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
electron/main.ts
View File

@ -173,66 +173,38 @@ async function addSpellcheckerItems(menu: electron.Menu): Promise<void> {
} }
function openURLExternally(linkUrl: string): void { function openURLExternally(linkUrl: string): void {
// console.log('openURLExternally()', JSON.stringify(settings));
// console.log('openURLExternally() -> path set?', settings.browserPath !== '');
// console.log('openURLExternally() -> path exists?', fs.existsSync(settings.browserPath));
// console.log('openURLExternally() -> path points to file?', fs.lstatSync(settings.browserPath).isFile());
// console.log('openURLExternally() -> path points to directory?', fs.lstatSync(settings.browserPath).isDirectory());
// check if user set a path and whether it exists
const pathIsValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath));
if(pathIsValid) {
// also check if the user can execute whatever is located at the selected path
let fileIsExecutable = false;
try { try {
fs.accessSync(settings.browserPath, fs.constants.X_OK); fs.accessSync(settings.browserPath, fs.constants.X_OK);
console.log('can exec'); fileIsExecutable = true;
} catch (err) { } catch (err) {
console.error('cannot exec'); log.error(`Selected browser is not executable by user. Path: "${settings.browserPath}"`);
} }
// check if user set a path, whether it exists and if it is a file or an .app path if (fileIsExecutable) {
let isValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath));
// if (process.platform === "darwin") {
// // is there a better way for this on macos?
// isValid = (isValid && settings.browserPath.endsWith('.app'));
// } else if (process.platform === "linux") {
// // isFile() doesn't like symlinks, so we check if the user can execute the selected path
// let canExec = false;
// try {
// fs.accessSync(settings.browserPath, fs.constants.X_OK);
// canExec = true;
// } catch (err) {
// log.error("Selected browser cannot is not executable by user.");
// }
// isValid = (isValid && canExec);
// } else {
// isValid = (isValid && fs.lstatSync(settings.browserPath).isFile());
// }
// we check if the user can execute whatever is located at the selected path
let canExec = false;
try {
fs.accessSync(settings.browserPath, fs.constants.X_OK);
canExec = true;
} catch (err) {
log.error("Selected browser cannot is not executable by user.");
}
isValid = (isValid && canExec);
if(isValid) {
// check if URL is already encoded // check if URL is already encoded
// (this should work almost all the time, but there might be edge-cases with very unusual URLs) // (this should work almost all the time, but there might be edge-cases with very unusual URLs)
let isEncoded = (linkUrl !== decodeURI(linkUrl)); let isEncoded = (linkUrl !== decodeURI(linkUrl));
// only encode URL if it isn't encoded yet // only encode URL if it isn't encoded yet
if(!isEncoded) { if (!isEncoded) {
// encode URL so if it contains spaces, it remains a single argument for the browser // encode URL so if it contains spaces, it remains a single argument for the browser
linkUrl = encodeURI(linkUrl); linkUrl = encodeURI(linkUrl);
} }
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
settings.browserArgs += ' %s'; settings.browserArgs += ' %s';
} }
// replace %s in arguments with URL and encapsulate in quotes to prevent issues with spaces and special characters in the path // replace %s in arguments with URL and encapsulate in quotes to prevent issues with spaces and special characters in the path
let link = settings.browserArgs.replace('%s', '\"'+linkUrl+'\"'); let link = settings.browserArgs.replace('%s', '\"' + linkUrl + '\"');
const execFile = require('child_process').exec; const execFile = require('child_process').exec;
if (process.platform === "darwin") { if (process.platform === "darwin") {
@ -244,9 +216,11 @@ function openURLExternally(linkUrl: string): void {
} else { } else {
execFile(`"${settings.browserPath}" ${link}`); execFile(`"${settings.browserPath}" ${link}`);
} }
} else { return;
electron.shell.openExternal(linkUrl);
} }
}
electron.shell.openExternal(linkUrl);
} }
function setUpWebContents(webContents: electron.WebContents): void { function setUpWebContents(webContents: electron.WebContents): void {