Fix window not showing for some users (#2967)

Co-authored-by: Max Novich <mnovich@squareup.com>
This commit is contained in:
Zane
2025-06-17 12:46:10 -07:00
committed by GitHub
parent 3bec469043
commit d9ca16d9e6
8 changed files with 140 additions and 1471 deletions
+48 -1
View File
@@ -14,7 +14,35 @@ export function loadRecentDirs(): string[] {
if (fs.existsSync(RECENT_DIRS_FILE)) {
const data = fs.readFileSync(RECENT_DIRS_FILE, 'utf8');
const recentDirs: RecentDirs = JSON.parse(data);
return recentDirs.dirs;
// Filter out invalid directories (non-existent or not directories)
const validDirs = recentDirs.dirs.filter((dir) => {
try {
// Use lstat to detect symlinks and validate path structure
const stats = fs.lstatSync(dir);
// Reject symlinks for security
if (stats.isSymbolicLink()) {
console.warn(
`Removing symlink from recent directories for security: ${path.basename(dir)}`
);
return false;
}
return stats.isDirectory();
} catch (error) {
// Directory doesn't exist or can't be accessed - don't log full path for security
console.warn(`Removing inaccessible recent directory`);
return false;
}
});
// Save the cleaned list back if it changed
if (validDirs.length !== recentDirs.dirs.length) {
fs.writeFileSync(RECENT_DIRS_FILE, JSON.stringify({ dirs: validDirs }, null, 2));
}
return validDirs;
}
} catch (error) {
console.error('Error loading recent directories:', error);
@@ -24,6 +52,25 @@ export function loadRecentDirs(): string[] {
export function addRecentDir(dir: string): void {
try {
// Validate that the path is actually a directory before adding it
try {
const stats = fs.lstatSync(dir);
// Reject symlinks for security
if (stats.isSymbolicLink()) {
console.warn(`Cannot add recent directory: symlinks not allowed for security`);
return;
}
if (!stats.isDirectory()) {
console.warn(`Cannot add recent directory: not a directory`);
return;
}
} catch (error) {
console.warn(`Cannot add recent directory: path does not exist or cannot be accessed`);
return;
}
let dirs = loadRecentDirs();
// Remove the directory if it already exists
dirs = dirs.filter((d) => d !== dir);