IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

skip symlinks to directories when generating plugin manifest (#30721)

Browse Source
This commit is contained in:
Dan Cech 2021-01-29 08:51:37 -05:00 committed by GitHub
parent 52a8f2bf7e
commit 06061c8741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/grafana-toolkit/src/plugins/manifest.ts
View File

@ -13,7 +13,7 @@ async function* walk(dir: string, baseDir: string): AsyncGenerator<string, any,
} else if (d.isFile()) {
yield path.posix.relative(baseDir, entry);
} else if (d.isSymbolicLink()) {
const realPath = fs.realpathSync(entry);
const realPath = await (fs.promises as any).realpath(entry);
if (!realPath.startsWith(baseDir)) {
throw new Error(
`symbolic link ${path.posix.relative(
@ -22,7 +22,11 @@ async function* walk(dir: string, baseDir: string): AsyncGenerator<string, any,
)} targets a file outside of the base directory: ${baseDir}`
);
}
yield path.posix.relative(baseDir, entry);
// if resolved symlink target is a file include it in the manifest
const stats = await (fs.promises as any).stat(realPath);
if (stats.isFile()) {
yield path.posix.relative(baseDir, entry);
}
}
}
}