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

[~] OpenURLExternally() now just checks if the path exists and is executable by user

Browse Source
This commit is contained in:
Greyhoof 2023-10-12 14:15:22 +02:00
parent 040c1ca21d
commit acb0387808
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
electron/main.ts
View File

@ -177,15 +177,43 @@ function openURLExternally(linkUrl: string): void {
// console.log('openURLExternally() -> path set?', settings.browserPath !== ''); // console.log('openURLExternally() -> path set?', settings.browserPath !== '');
// console.log('openURLExternally() -> path exists?', fs.existsSync(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 file?', fs.lstatSync(settings.browserPath).isFile());
// console.log('openURLExternally() -> path points to directory?', fs.lstatSync(settings.browserPath).isDirectory());
try {
fs.accessSync(settings.browserPath, fs.constants.X_OK);
console.log('can exec');
} catch (err) {
console.error('cannot exec');
}
// check if user set a path, whether it exists and if it is a file or an .app path // check if user set a path, whether it exists and if it is a file or an .app path
let isValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath)); let isValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath));
if (process.platform === "darwin") { // if (process.platform === "darwin") {
// is there a better way for this on macos? // // is there a better way for this on macos?
isValid = (isValid && settings.browserPath.endsWith('.app')); // isValid = (isValid && settings.browserPath.endsWith('.app'));
} else { // } else if (process.platform === "linux") {
isValid = (isValid && fs.lstatSync(settings.browserPath).isFile()); // // 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) { if(isValid) {
// check if URL is already encoded // check if URL is already encoded