mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 07:33:12 +09:00
Merge pull request #1053 from bbassie/fix/instance-save-name-traversal
Check save names in instance start and create save
This commit is contained in:
1 parent
ce6bfe282f
commit
069f537bde
2 files changed
+30
No files matched your search
@@ -15,6 +15,15 @@ import { exportData } from "./export.js";
|
||||
import type Host from "./Host.js";
|
||||
import { BaseInstancePlugin, InstanceHooks } from "./BaseInstancePlugin.js";
|
||||
|
||||
// Reject save names that would escape the instance's saves directory.
|
||||
function checkRequestSaveName(name: string) {
|
||||
try {
|
||||
lib.checkFilename(name);
|
||||
} catch (err: any) {
|
||||
throw new lib.RequestError(`Save name ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
const scriptCommands = [
|
||||
"/cheat", "/editor",
|
||||
"/command", "/c",
|
||||
@@ -1268,6 +1277,9 @@ end`.replace(/\r?\n/g, " ");
|
||||
|
||||
async handleInstanceStartRequest(request: lib.InstanceStartRequest) {
|
||||
let saveName = request.save;
|
||||
if (saveName !== undefined) {
|
||||
checkRequestSaveName(saveName);
|
||||
}
|
||||
try {
|
||||
try {
|
||||
await this.prepare();
|
||||
@@ -1327,6 +1339,7 @@ end`.replace(/\r?\n/g, " ");
|
||||
}
|
||||
|
||||
async handleInstanceCreateSaveRequest(request: lib.InstanceCreateSaveRequest) {
|
||||
checkRequestSaveName(request.name);
|
||||
this.notifyStatus("creating_save");
|
||||
try {
|
||||
this.logger.verbose("Writing server-settings.json");
|
||||
|
||||
Reference in new issue
Block a user