mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-23 00:13:13 +09:00
Fix path traversal on mod upload
Fix possibility of a maliciously crafted mod being written outside of the mods directory and thus possibily overwriting unrelated files.
This commit is contained in:
1 parent
94cb607930
commit
1095d2466d
4 files changed
+27
-2
No files matched your search
@@ -559,6 +559,7 @@ async function uploadMod(req: Request, res: Response) {
|
|||||||
await finished(writeStream);
|
await finished(writeStream);
|
||||||
|
|
||||||
const modInfo = await lib.ModInfo.fromModFile(path.join(modsDirectory, tempFilename));
|
const modInfo = await lib.ModInfo.fromModFile(path.join(modsDirectory, tempFilename));
|
||||||
|
checkModName(modInfo.filename);
|
||||||
await fs.rename(path.join(modsDirectory, tempFilename), path.join(modsDirectory, modInfo.filename));
|
await fs.rename(path.join(modsDirectory, tempFilename), path.join(modsDirectory, modInfo.filename));
|
||||||
req.app.locals.controller.mods.set(modInfo.filename, modInfo);
|
req.app.locals.controller.mods.set(modInfo.filename, modInfo);
|
||||||
req.app.locals.controller.modUpdated(modInfo);
|
req.app.locals.controller.modUpdated(modInfo);
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ const yargs = require("yargs");
|
|||||||
const finished = util.promisify(stream.finished);
|
const finished = util.promisify(stream.finished);
|
||||||
|
|
||||||
|
|
||||||
async function buildMod(args, info) {
|
async function buildMod(args, info, modName) {
|
||||||
if (args.build) {
|
if (args.build) {
|
||||||
await fs.ensureDir(args.outputDir);
|
await fs.ensureDir(args.outputDir);
|
||||||
let modName = `${info.name}_${info.version}`;
|
modName = args.modName ?? `${info.name}_${info.version}`;
|
||||||
|
|
||||||
if (args.pack) {
|
if (args.pack) {
|
||||||
let zip = new JSZip();
|
let zip = new JSZip();
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"name": "../bad_path_mod",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"title": "Path Traversing Mod",
|
||||||
|
"author": "Me",
|
||||||
|
"description": "A mod who's name traverses the filesystem",
|
||||||
|
"factorio_version": "1.1",
|
||||||
|
"dependencies": []
|
||||||
|
}
|
||||||
@@ -934,6 +934,21 @@ describe("Integration of Clusterio", function() {
|
|||||||
"mod not present in mods directory"
|
"mod not present in mods directory"
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
it("rejects path traversing mods", async function() {
|
||||||
|
await libBuildMod.build({
|
||||||
|
build: true,
|
||||||
|
pack: true,
|
||||||
|
sourceDir: path.join("test", "file", "path_traversing_mod"),
|
||||||
|
outputDir: path.join("temp", "test"),
|
||||||
|
modName: "path_traversing_mod_1.0.0",
|
||||||
|
});
|
||||||
|
await fs.remove(path.join("temp", "test", "bad_path_mod_1.0.0.zip"));
|
||||||
|
await assert.rejects(execCtl("mod upload path_traversing_mod_1.0.0.zip"));
|
||||||
|
assert(
|
||||||
|
!await fs.pathExists(path.join("temp", "test", "bad_path_mod_1.0.0.zip")),
|
||||||
|
"mod executed a path traversal attack",
|
||||||
|
);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("mod show", function() {
|
describe("mod show", function() {
|
||||||
|
|||||||
Reference in new issue
Block a user