Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-10-22 19:24:01 -04:00
Code Packages Releases Activity

plugins: keep manifest paths inside the plugin directory

Browse Source
This commit is contained in:
bbedward
2026-10-22 09:44:08 -04:00
parent c5d1d4fe46
commit 6e86b53ccd
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Services/PluginService.qml
+25 -17
View File
@@ -308,8 +308,21 @@ Singleton {
}
}
function _stripDotSlash(p) {
return p.startsWith("./") ? p.slice(2) : p;
function _pluginFilePath(dir, rel) {
if (!rel)
return "";
const path = String(rel);
let decoded;
try {
decoded = decodeURIComponent(path);
} catch (e) {
decoded = "..";
}
if (decoded.split("/").includes("..")) {
log.warn("plugin path outside its directory, refusing:", path, "in", dir);
return "";
}
return dir + "/" + (path.startsWith("./") ? path.slice(2) : path);
}
function _deriveLegacySurface(type, capabilities) {
@@ -334,17 +347,16 @@ Singleton {
log.warn("unknown plugin surface", surface, "in", dir);
continue;
}
const rel = manifest.components[surface];
if (!rel)
const path = _pluginFilePath(dir, manifest.components[surface]);
if (!path)
continue;
paths[surface] = dir + "/" + _stripDotSlash(rel);
paths[surface] = path;
}
return paths;
}
if (manifest.component) {
const surface = _deriveLegacySurface(manifest.type, manifest.capabilities);
paths[surface] = dir + "/" + _stripDotSlash(manifest.component);
}
const legacyPath = _pluginFilePath(dir, manifest.component);
if (legacyPath)
paths[_deriveLegacySurface(manifest.type, manifest.capabilities)] = legacyPath;
return paths;
}
@@ -360,12 +372,8 @@ Singleton {
}
const dir = absPath.substring(0, absPath.lastIndexOf('/'));
let settings = manifest.settings;
if (settings && settings.startsWith("./"))
settings = settings.slice(2);
let startupCheck = manifest.startupCheck;
if (startupCheck && startupCheck.startsWith("./"))
startupCheck = startupCheck.slice(2);
const settingsPath = _pluginFilePath(dir, manifest.settings);
const startupCheckPath = _pluginFilePath(dir, manifest.startupCheck);
const componentPaths = _resolveComponentPaths(manifest, dir);
const surfaces = Object.keys(componentPaths);
@@ -397,8 +405,8 @@ Singleton {
info.componentPaths = componentPaths;
info.surfaces = surfaces;
info.componentPath = componentPaths.widget || componentPaths[surfaces[0]];
info.settingsPath = settings ? (dir + "/" + settings) : null;
info.startupCheckPath = startupCheck ? (dir + "/" + startupCheck) : null;
info.settingsPath = settingsPath || null;
info.startupCheckPath = startupCheckPath || null;
info.loaded = isPluginLoaded(manifest.id);
info.type = manifest.type || (manifest.components ? "composite" : "widget");
info.source = sourceTag;