hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix: path checks in custom extension loader (#1170)

Browse Source 
* Check for path existence and directory type

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Check for package.json availability

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2020-10-29 11:23:54 +03:00 committed by GitHub
parent 66d5fdd8b5
commit a583dbe6d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/extensions/extension-manager.ts
View File

@ -63,6 +63,7 @@ export class ExtensionManager {
async getExtensionByManifest(manifestPath: string): Promise<InstalledExtension> { async getExtensionByManifest(manifestPath: string): Promise<InstalledExtension> {
let manifestJson: ExtensionManifest; let manifestJson: ExtensionManifest;
try { try {
fs.accessSync(manifestPath, fs.constants.F_OK); // check manifest file for existence
manifestJson = __non_webpack_require__(manifestPath) manifestJson = __non_webpack_require__(manifestPath)
this.packagesJson.dependencies[manifestJson.name] = path.dirname(manifestPath) this.packagesJson.dependencies[manifestJson.name] = path.dirname(manifestPath)
@ -113,7 +114,6 @@ export class ExtensionManager {
} }
const absPath = path.resolve(folderPath, fileName); const absPath = path.resolve(folderPath, fileName);
const manifestPath = path.resolve(absPath, "package.json"); const manifestPath = path.resolve(absPath, "package.json");
await fs.access(manifestPath, fs.constants.F_OK)
const ext = await this.getExtensionByManifest(manifestPath).catch(() => null) const ext = await this.getExtensionByManifest(manifestPath).catch(() => null)
if (ext) { if (ext) {
extensions.push(ext) extensions.push(ext)
@ -133,8 +133,10 @@ export class ExtensionManager {
continue continue
} }
const absPath = path.resolve(folderPath, fileName); const absPath = path.resolve(folderPath, fileName);
if (!fs.existsSync(absPath) || !fs.lstatSync(absPath).isDirectory()) { // skip non-directories
continue;
}
const manifestPath = path.resolve(absPath, "package.json"); const manifestPath = path.resolve(absPath, "package.json");
await fs.access(manifestPath, fs.constants.F_OK)
const ext = await this.getExtensionByManifest(manifestPath).catch(() => null) const ext = await this.getExtensionByManifest(manifestPath).catch(() => null)
if (ext) { if (ext) {
extensions.push(ext) extensions.push(ext)