MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-11-21 02:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve plugin file handling and cleanup logic (#7434)

Browse Source 
* Improve plugin file handling and cleanup logic

Adds checks and fallbacks for temporary directory write access when creating plugin zip files, and enhances error handling when creating write streams. Updates plugin removal to use fs.rmSync with force and recursive options, and adds error handling for directory removal.

* Update pluginHandler.js
This commit is contained in:
TheDevRyan
2025-11-17 10:33:09 +00:00
committed by GitHub
parent a1f182426e
commit afe0aed976
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pluginHandler.js
View File

@@ -384,10 +384,34 @@ module.exports.pluginHandler = function (parent) {
parent.db.getPlugin(id, function (err, docs) { parent.db.getPlugin(id, function (err, docs) {
// the "id" would probably suffice, but is probably an sanitary issue, generate a random instead // the "id" would probably suffice, but is probably an sanitary issue, generate a random instead
var randId = Math.random().toString(32).replace('0.', ''); var randId = Math.random().toString(32).replace('0.', '');
var fileName = obj.parent.path.join(require('os').tmpdir(), 'Plugin_' + randId + '.zip'); var tmpDir = require('os').tmpdir();
var fileName = obj.parent.path.join(tmpDir, 'Plugin_' + randId + '.zip');
try {
obj.fs.accessSync(tmpDir, obj.fs.constants.W_OK);
} catch (e) {
var pluginTmpPath = obj.parent.path.join(obj.pluginPath, '_tmp');
if (!obj.fs.existsSync(pluginTmpPath)) {
obj.fs.mkdirSync(pluginTmpPath, { recursive: true });
}
fileName = obj.parent.path.join(pluginTmpPath, 'Plugin_' + randId + '.zip');
}
var plugin = docs[0]; var plugin = docs[0];
if (plugin.repository.type == 'git') { if (plugin.repository.type == 'git') {
const file = obj.fs.createWriteStream(fileName); var file;
try {
file = obj.fs.createWriteStream(fileName);
} catch (e) {
if (fileName.indexOf(tmpDir) >= 0) {
var pluginTmpPath = obj.parent.path.join(obj.pluginPath, '_tmp');
if (!obj.fs.existsSync(pluginTmpPath)) {
obj.fs.mkdirSync(pluginTmpPath, { recursive: true });
}
fileName = obj.parent.path.join(pluginTmpPath, 'Plugin_' + randId + '.zip');
file = obj.fs.createWriteStream(fileName);
} else {
throw e;
}
}
var dl_url = plugin.downloadUrl; var dl_url = plugin.downloadUrl;
if (version_only != null && version_only != false) dl_url = version_only.url; if (version_only != null && version_only != false) dl_url = version_only.url;
if (force_url != null) dl_url = force_url; if (force_url != null) dl_url = force_url;
@@ -411,7 +435,7 @@ module.exports.pluginHandler = function (parent) {
var request = http.get(opts, function (response) { var request = http.get(opts, function (response) {
// handle redirections with grace // handle redirections with grace
if (response.headers.location) { if (response.headers.location) {
file.close(function () { obj.fs.unlink(file.path, function(err) { void err; }); }); file.close(() => obj.fs.unlink(fileName, () => {}));
return obj.installPlugin(id, version_only, response.headers.location, func); return obj.installPlugin(id, version_only, response.headers.location, func);
} }
response.pipe(file); response.pipe(file);
@@ -544,7 +568,13 @@ module.exports.pluginHandler = function (parent) {
parent.db.getPlugin(id, function (err, docs) { parent.db.getPlugin(id, function (err, docs) {
var plugin = docs[0]; var plugin = docs[0];
let pluginPath = obj.parent.path.join(obj.pluginPath, plugin.shortName); let pluginPath = obj.parent.path.join(obj.pluginPath, plugin.shortName);
obj.fs.rmdirSync(pluginPath, { recursive: true }); if (obj.fs.existsSync(pluginPath)) {
try {
obj.fs.rmSync(pluginPath, { recursive: true, force: true });
} catch (e) {
console.log("Error removing plugin directory:", e);
}
}
parent.db.deletePlugin(id, func); parent.db.deletePlugin(id, func);
delete obj.plugins[plugin.shortName]; delete obj.plugins[plugin.shortName];
}); });