Skip to content

fix: wrong permissions directory #6172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krisfremen wants to merge 4 commits into
base: develop
Choose a base branch
from
+30 −20
Open

fix: wrong permissions directory #6172

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9257c64
fix permissions
krisfremen Feb 11, 2026
f6a8410
eslint
krisfremen Feb 11, 2026
2211997
Merge remote-tracking branch 'upstream/develop' into kris/fix-permiss…
krisfremen Feb 12, 2026
34898bc
use existing
krisfremen Feb 12, 2026
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
Next Next commit
fix permissions
  • Loading branch information
@krisfremen
krisfremen committed Feb 11, 2026
commit 9257c64abfd27b378f746de89544b73e3ed6418e
60 changes: 37 additions & 23 deletions source/app/service-providers/fsal/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,9 @@ export default class FSAL extends ProviderContract {
try {
return await this.getAnyDirectoryDescriptor(absPath)
} catch (err: any) {
if (err.code === 'EACCES' || err.code === 'EPERM') {
return FSALDir.getDirNotFoundDescriptor(absPath)
}
return await this.getDescriptorForAnySupportedFile(absPath)
}
}
Expand Down Expand Up @@ -823,23 +826,28 @@ export default class FSAL extends ProviderContract {
* @return {Promise<string[]>} Returns a list of the entire directory
*/
public async readDirectoryRecursively (directoryPath: string): Promise<string[]> {
const contents = (await fs.readdir(directoryPath, { withFileTypes: true }))
.filter(dirent => {
return (dirent.isFile() && !dirent.name.startsWith('.')) ||
(dirent.isDirectory() && !ignoreDir(dirent.name))
})
.map(dirent => {
const childPath = path.join(directoryPath, dirent.name)
if (dirent.isFile()) {
return Promise.resolve([childPath])
} else if (dirent.isDirectory()) {
return this.readDirectoryRecursively(childPath)
} else {
return Promise.resolve([])
}
})

return [ directoryPath, ...(await Promise.all(contents)).flat() ]
try {
const contents = (await fs.readdir(directoryPath, { withFileTypes: true }))
.filter(dirent => {
return (dirent.isFile() && !dirent.name.startsWith('.')) ||
(dirent.isDirectory() && !ignoreDir(dirent.name))
})
.map(dirent => {
const childPath = path.join(directoryPath, dirent.name)
if (dirent.isFile()) {
return Promise.resolve([childPath])
} else if (dirent.isDirectory()) {
return this.readDirectoryRecursively(childPath)
} else {
return Promise.resolve([])
}
})

return [ directoryPath, ...(await Promise.all(contents)).flat() ]
} catch (err: any) {
if (err.code === 'EACCES' || err.code === 'EPERM') return []
throw err
}
}

/**
Expand All @@ -855,12 +863,18 @@ export default class FSAL extends ProviderContract {
throw new Error(`[FSAL] Cannot read path ${absPath}: Not a directory!`)
}

const children = await fs.readdir(absPath)
let children: string[]
try {
children = await fs.readdir(absPath)
} catch (err: any) {
if (err.code === 'EACCES' || err.code === 'EPERM') return []
throw err
}

return await Promise.all(
children
.map(p => path.join(absPath, p))
.map(p => this.getDescriptorFor(p))
)
const paths = children.map(p => path.join(absPath, p))
const results = await Promise.allSettled(paths.map(p => this.getDescriptorFor(p)))
return results
.filter((r): r is PromiseFulfilledResult<AnyDescriptor> => r.status === 'fulfilled')
.map(r => r.value)
}
}