From 7db091d42726e4a464ebe613caf7128909484e49 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Sun, 27 Mar 2022 15:38:41 +0200
Subject: [PATCH 1/7] Simplify wording of save permissions

Use shorter and more consise titles for the save management related
permissions.
---
 packages/lib/users.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/lib/users.js b/packages/lib/users.js
index f5f59f1a..bbe9b98f 100644
--- a/packages/lib/users.js
+++ b/packages/lib/users.js
@@ -379,7 +379,7 @@ definePermission({
 });
 definePermission({
 	name: "core.instance.save.list",
-	title: "List saves on instance",
+	title: "List saves",
 	description: "List the saves currently on the instance.",
 });
 definePermission({
@@ -389,22 +389,22 @@ definePermission({
 });
 definePermission({
 	name: "core.instance.save.create",
-	title: "Create new instance save",
+	title: "Create new save",
 	description: "Create new savegames on instances.",
 });
 definePermission({
 	name: "core.instance.save.delete",
-	title: "Delete instance save",
+	title: "Delete save",
 	description: "Delete savegames on instances.",
 });
 definePermission({
 	name: "core.instance.save.upload",
-	title: "Upload save to instance",
+	title: "Upload save",
 	description: "Upload savegames to instances.",
 });
 definePermission({
 	name: "core.instance.save.download",
-	title: "Download save from instance",
+	title: "Download save",
 	description: "Download savegames from instances.",
 });
 definePermission({

From 0de964ec02ae15baf2d9aa8f81bf0b7be30d9289 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Sun, 27 Mar 2022 15:50:42 +0200
Subject: [PATCH 2/7] Reorganise instance save commands

Move create, list, upload and dalete save management commands to its own
'instance save' namespace in the command line interface.
---
 packages/ctl/ctl.js           | 24 ++++++++++++++----------
 test/integration/clusterio.js | 32 ++++++++++++++++----------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/packages/ctl/ctl.js b/packages/ctl/ctl.js
index b4cc3e5d..1c651140 100755
--- a/packages/ctl/ctl.js
+++ b/packages/ctl/ctl.js
@@ -533,8 +533,11 @@ async function loadMapSettings(args) {
 	};
 }
 
-instanceCommands.add(new libCommand.Command({
-	definition: ["list-saves <instance>", "list saves on an instance", (yargs) => {
+const instanceSaveCommands = new libCommand.CommandTree({
+	name: "save", alias: ["s"], description: "Instance save management",
+});
+instanceSaveCommands.add(new libCommand.Command({
+	definition: ["list <instance>", "list saves on an instance", (yargs) => {
 		yargs.positional("instance", { describe: "Instance to list saves on", type: "string" });
 	}],
 	handler: async function(args, control) {
@@ -548,8 +551,8 @@ instanceCommands.add(new libCommand.Command({
 	},
 }));
 
-instanceCommands.add(new libCommand.Command({
-	definition: ["create-save <instance> [name]", "Create a new save on an instance", (yargs) => {
+instanceSaveCommands.add(new libCommand.Command({
+	definition: ["create <instance> [name]", "Create a new save on an instance", (yargs) => {
 		yargs.positional("instance", { describe: "Instance to create on", type: "string" });
 		yargs.positional("name", { describe: "Name of save to create.", type: "string", default: "world.zip" });
 		yargs.options({
@@ -573,8 +576,8 @@ instanceCommands.add(new libCommand.Command({
 	},
 }));
 
-instanceCommands.add(new libCommand.Command({
-	definition: ["upload-save <instance> <filepath>", "Upload a save to an instance", (yargs) => {
+instanceSaveCommands.add(new libCommand.Command({
+	definition: ["upload <instance> <filepath>", "Upload a save to an instance", (yargs) => {
 		yargs.positional("instance", { describe: "Instance to upload to", type: "string" });
 		yargs.positional("filepath", { describe: "Path to save to upload", type: "string" });
 		yargs.options({
@@ -624,8 +627,8 @@ instanceCommands.add(new libCommand.Command({
 	},
 }));
 
-instanceCommands.add(new libCommand.Command({
-	definition: ["download-save <instance> <save>", "Download a save from an instance", (yargs) => {
+instanceSaveCommands.add(new libCommand.Command({
+	definition: ["download <instance> <save>", "Download a save from an instance", (yargs) => {
 		yargs.positional("instance", { describe: "Instance to download save from", type: "string" });
 		yargs.positional("save", { describe: "Save to download", type: "string" });
 	}],
@@ -669,8 +672,8 @@ instanceCommands.add(new libCommand.Command({
 	},
 }));
 
-instanceCommands.add(new libCommand.Command({
-	definition: ["delete-save <instance> <save>", "Delete a save from an instance", (yargs) => {
+instanceSaveCommands.add(new libCommand.Command({
+	definition: ["delete <instance> <save>", "Delete a save from an instance", (yargs) => {
 		yargs.positional("instance", { describe: "Instance to delete save from", type: "string" });
 		yargs.positional("save", { describe: "Save to delete", type: "string" });
 	}],
@@ -682,6 +685,7 @@ instanceCommands.add(new libCommand.Command({
 		});
 	},
 }));
+instanceCommands.add(instanceSaveCommands);
 
 instanceCommands.add(new libCommand.Command({
 	definition: ["export-data <instance>", "Export item icons and locale from instance", (yargs) => {
diff --git a/test/integration/clusterio.js b/test/integration/clusterio.js
index b066d15f..77c51b39 100644
--- a/test/integration/clusterio.js
+++ b/test/integration/clusterio.js
@@ -250,11 +250,11 @@ describe("Integration of Clusterio", function() {
 			});
 		});
 
-		describe("instance create-save", function() {
+		describe("instance save create", function() {
 			it("creates a save", async function() {
 				slowTest(this);
 				getControl().saveListUpdates = [];
-				await execCtl("instance create-save test");
+				await execCtl("instance save create test");
 				await checkInstanceStatus(44, "stopped");
 			});
 		});
@@ -266,10 +266,10 @@ describe("Integration of Clusterio", function() {
 			});
 		});
 
-		describe("instance list-saves", function() {
+		describe("instance save list", function() {
 			it("lists the created save", async function() {
 				slowTest(this);
-				let result = await execCtl("instance list-saves test");
+				let result = await execCtl("instance save list test");
 				assert(/world\.zip/.test(result.stdout), "world.zip not present in list save output");
 			});
 		});
@@ -530,10 +530,10 @@ describe("Integration of Clusterio", function() {
 			});
 		});
 
-		describe("instance upload-save", function() {
+		describe("instance save upload", function() {
 			it("should upload a zip file", async function() {
 				await fs.outputFile(path.join("temp", "test", "upload.zip"), "a test");
-				await execCtl("instance upload-save 44 upload.zip");
+				await execCtl("instance save upload 44 upload.zip");
 				assert(
 					await fs.pathExists(path.join("temp", "test", "instances", "test", "saves", "upload.zip")),
 					"file not uploaded to saves directory"
@@ -541,42 +541,42 @@ describe("Integration of Clusterio", function() {
 			});
 			it("should reject non-zip files", async function() {
 				await fs.outputFile(path.join("temp", "test", "invalid"), "a test");
-				await assert.rejects(execCtl("instance upload-save 44 invalid"));
+				await assert.rejects(execCtl("instance save upload 44 invalid"));
 			});
 			it("should reject path traversal attacks", async function() {
 				await fs.outputFile(path.join("temp", "test", "upload.zip"), "a test");
-				await assert.rejects(execCtl("instance upload-save 44 upload.zip --name ../traversal.zip"));
+				await assert.rejects(execCtl("instance save upload 44 upload.zip --name ../traversal.zip"));
 			});
 		});
 
-		describe("instance download-save", function() {
+		describe("instance save download", function() {
 			it("should download a save", async function() {
 				await fs.remove(path.join("temp", "test", "upload.zip"));
-				await execCtl("instance download-save 44 upload.zip");
+				await execCtl("instance save download 44 upload.zip");
 				assert(await fs.pathExists(path.join("temp", "test", "upload.zip")));
 			});
 			it("should error if save does not exist", async function() {
-				await assert.rejects(execCtl("instance download-save 44 invalid"));
+				await assert.rejects(execCtl("instance save download 44 invalid"));
 			});
 			it("should error on path traversal attacks", async function() {
-				await assert.rejects(execCtl("instance download-save 44 ../factorio-current.log"));
+				await assert.rejects(execCtl("instance save download 44 ../factorio-current.log"));
 			});
 		});
 
-		describe("instance delete-save", function() {
+		describe("instance save delete", function() {
 			it("should delete a save", async function() {
-				await execCtl("instance delete-save 44 upload.zip");
+				await execCtl("instance save delete 44 upload.zip");
 				assert(
 					!await fs.pathExists(path.join("temp", "test", "instances", "test", "saves", "upload.zip")),
 					"file not deleted"
 				);
 			});
 			it("should error if save does not exist", async function() {
-				await assert.rejects(execCtl("instance delete-save 44 upload.zip"));
+				await assert.rejects(execCtl("instance save delete 44 upload.zip"));
 			});
 			it("should error on path traversal attacks", async function() {
 				await fs.outputFile(path.join("temp", "test", "upload.zip"), "a test");
-				await assert.rejects(execCtl("instance delete-save 44 ../../upload.zip"));
+				await assert.rejects(execCtl("instance save delete 44 ../../upload.zip"));
 			});
 		});
 

From 9b5c6f8554a5b68f1c26f82bd33692767372591b Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Sun, 27 Mar 2022 18:16:56 +0200
Subject: [PATCH 3/7] Remove duplicated request checks

Move duplicated checking of save filenames and instance existing from
requests into separate functions.
---
 packages/slave/slave.js | 62 +++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/packages/slave/slave.js b/packages/slave/slave.js
index f4916ff8..cdb506b4 100755
--- a/packages/slave/slave.js
+++ b/packages/slave/slave.js
@@ -1077,6 +1077,15 @@ function checkFilename(name) {
 	}
 }
 
+function checkRequestSaveName(name) {
+	try {
+		checkFilename(name);
+	} catch (err) {
+		throw new libErrors.RequestError(`Save name ${err.message}`);
+	}
+}
+
+
 /**
  * Handles running the slave
  *
@@ -1351,6 +1360,14 @@ class Slave extends libLink.Link {
 		}
 	}
 
+	getRequestInstanceInfo(instanceId) {
+		let instanceInfo = this.instanceInfos.get(instanceId);
+		if (!instanceInfo) {
+			throw new libErrors.RequestError(`Instance with ID ${instanceId} does not exist`);
+		}
+		return instanceInfo;
+	}
+
 	/**
 	 * Initialize and connect an unloaded instance
 	 *
@@ -1358,11 +1375,7 @@ class Slave extends libLink.Link {
 	 * @returns {module:slave/slave~InstanceConnection} connection to instance.
 	 */
 	async _connectInstance(instanceId) {
-		let instanceInfo = this.instanceInfos.get(instanceId);
-		if (!instanceInfo) {
-			throw new libErrors.RequestError(`Instance with ID ${instanceId} does not exist`);
-		}
-
+		let instanceInfo = this.getRequestInstanceInfo(instanceId);
 		if (this.instanceConnections.has(instanceId)) {
 			throw new libErrors.RequestError(`Instance with ID ${instanceId} is running`);
 		}
@@ -1424,11 +1437,7 @@ class Slave extends libLink.Link {
 			return await request.send(instanceConnection, message.data);
 		}
 
-		let instanceInfo = this.instanceInfos.get(instanceId);
-		if (!instanceInfo) {
-			throw new libErrors.RequestError(`Instance with ID ${instanceId} does not exist`);
-		}
-
+		let instanceInfo = this.getRequestInstanceInfo(instanceId);
 		return {
 			list: await Instance.listSaves(path.join(instanceInfo.path, "saves"), null),
 		};
@@ -1454,15 +1463,8 @@ class Slave extends libLink.Link {
 
 	async deleteSaveRequestHandler(message) {
 		let { instance_id, save } = message.data;
-		try {
-			checkFilename(save);
-		} catch (err) {
-			throw new libErrors.RequestError(`Save name ${err.message}`);
-		}
-		let instanceInfo = this.instanceInfos.get(instance_id);
-		if (!instanceInfo) {
-			throw new libErrors.RequestError(`Instance with ID ${instance_id} does not exist`);
-		}
+		checkRequestSaveName(save);
+		let instanceInfo = this.getRequestInstanceInfo(instance_id);
 
 		try {
 			await fs.unlink(path.join(instanceInfo.path, "saves", save));
@@ -1477,15 +1479,8 @@ class Slave extends libLink.Link {
 
 	async pullSaveRequestHandler(message) {
 		let { instance_id, stream_id, filename } = message.data;
-		try {
-			checkFilename(filename);
-		} catch (err) {
-			throw new libErrors.RequestError(`Save name ${err.message}`);
-		}
-		let instanceInfo = this.instanceInfos.get(instance_id);
-		if (!instanceInfo) {
-			throw new libErrors.RequestError(`Instance with ID ${instance_id} does not exist`);
-		}
+		checkRequestSaveName(filename);
+		let instanceInfo = this.getRequestInstanceInfo(instance_id);
 
 		let url = new URL(this.config.get("slave.master_url"));
 		url.pathname += `api/stream/${stream_id}`;
@@ -1528,15 +1523,8 @@ class Slave extends libLink.Link {
 
 	async pushSaveRequestHandler(message) {
 		let { instance_id, stream_id, save } = message.data;
-		try {
-			checkFilename(save);
-		} catch (err) {
-			throw new libErrors.RequestError(`Save name ${err.message}`);
-		}
-		let instanceInfo = this.instanceInfos.get(instance_id);
-		if (!instanceInfo) {
-			throw new libErrors.RequestError(`Instance with ID ${instance_id} does not exist`);
-		}
+		checkRequestSaveName(save);
+		let instanceInfo = this.getRequestInstanceInfo(instance_id);
 
 		let content;
 		try {

From 4edc7a29492b04eeb7643ca04bbade9f9cabd076 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Sun, 27 Mar 2022 19:53:06 +0200
Subject: [PATCH 4/7] Implement rename and copy save

Add ability to rename and copy existing saves on an instance.
---
 CHANGELOG.md                                 |  2 +-
 packages/ctl/ctl.js                          | 32 ++++++++
 packages/lib/link/messages.js                | 22 +++++
 packages/lib/users.js                        | 10 +++
 packages/slave/slave.js                      | 40 +++++++++
 packages/web_ui/src/components/SavesList.jsx | 86 +++++++++++++++++++-
 test/integration/clusterio.js                | 35 ++++++++
 7 files changed, 225 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7844f35f..db398cca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@
 - Packaged and uploaded to npm again, greatly simplifying distribution and installation of both Clusterio and plugins.
 - Added centralized logging for the cluster.
   All logs from both Clusterio and Factorio is stored in a shared log which can be inspected and queried.
-- Added remote save management with the ability to list, create, upload, download, delete and load saves for instances.
+- Added remote save management with the ability to list, create, rename, copy, upload, download, delete and load saves for instances.
 
 ### Features
 
diff --git a/packages/ctl/ctl.js b/packages/ctl/ctl.js
index 1c651140..0f6dbedf 100755
--- a/packages/ctl/ctl.js
+++ b/packages/ctl/ctl.js
@@ -576,6 +576,38 @@ instanceSaveCommands.add(new libCommand.Command({
 	},
 }));
 
+instanceSaveCommands.add(new libCommand.Command({
+	definition: ["rename <instance> <old-name> <new-name>", "Rename a save on an instance", (yargs) => {
+		yargs.positional("instance", { describe: "Instance to rename save on", type: "string" });
+		yargs.positional("old-name", { describe: "Old name of save.", type: "string" });
+		yargs.positional("new-name", { describe: "New name of save.", type: "string" });
+	}],
+	handler: async function(args, control) {
+		let instanceId = await libCommand.resolveInstance(control, args.instance);
+		await libLink.messages.renameSave.send(control, {
+			instance_id: instanceId,
+			old_name: args.oldName,
+			new_name: args.newName,
+		});
+	},
+}));
+
+instanceSaveCommands.add(new libCommand.Command({
+	definition: ["copy <instance> <source> <destination>", "Copy a save on an instance", (yargs) => {
+		yargs.positional("instance", { describe: "Instance to copy save on", type: "string" });
+		yargs.positional("source", { describe: "Save to copy.", type: "string" });
+		yargs.positional("destination", { describe: "Name of copy.", type: "string" });
+	}],
+	handler: async function(args, control) {
+		let instanceId = await libCommand.resolveInstance(control, args.instance);
+		await libLink.messages.copySave.send(control, {
+			instance_id: instanceId,
+			source: args.source,
+			destination: args.destination,
+		});
+	},
+}));
+
 instanceSaveCommands.add(new libCommand.Command({
 	definition: ["upload <instance> <filepath>", "Upload a save to an instance", (yargs) => {
 		yargs.positional("instance", { describe: "Instance to upload to", type: "string" });
diff --git a/packages/lib/link/messages.js b/packages/lib/link/messages.js
index 06135ff4..13f5180a 100644
--- a/packages/lib/link/messages.js
+++ b/packages/lib/link/messages.js
@@ -550,6 +550,28 @@ messages.createSave = new Request({
 	},
 });
 
+messages.renameSave = new Request({
+	type: "rename_save",
+	links: ["control-master", "master-slave"],
+	permission: "core.instance.save.rename",
+	forwardTo: "instance",
+	requestProperties: {
+		"old_name": { type: "string" },
+		"new_name": { type: "string" },
+	},
+});
+
+messages.copySave = new Request({
+	type: "copy_save",
+	links: ["control-master", "master-slave"],
+	permission: "core.instance.save.copy",
+	forwardTo: "instance",
+	requestProperties: {
+		"source": { type: "string" },
+		"destination": { type: "string" },
+	},
+});
+
 messages.deleteSave = new Request({
 	type: "delete_save",
 	links: ["control-master", "master-slave"],
diff --git a/packages/lib/users.js b/packages/lib/users.js
index bbe9b98f..a5539b7c 100644
--- a/packages/lib/users.js
+++ b/packages/lib/users.js
@@ -392,6 +392,16 @@ definePermission({
 	title: "Create new save",
 	description: "Create new savegames on instances.",
 });
+definePermission({
+	name: "core.instance.save.rename",
+	title: "Rename save",
+	description: "Rename savegames on instances.",
+});
+definePermission({
+	name: "core.instance.save.copy",
+	title: "Copy save",
+	description: "Create copies of savegames on instances.",
+});
 definePermission({
 	name: "core.instance.save.delete",
 	title: "Delete save",
diff --git a/packages/slave/slave.js b/packages/slave/slave.js
index cdb506b4..61e4f110 100755
--- a/packages/slave/slave.js
+++ b/packages/slave/slave.js
@@ -1449,6 +1449,46 @@ class Slave extends libLink.Link {
 		await request.send(instanceConnection, message.data);
 	}
 
+	async renameSaveRequestHandler(message) {
+		let { instance_id, old_name, new_name } = message.data;
+		checkRequestSaveName(old_name);
+		checkRequestSaveName(new_name);
+		let instanceInfo = this.getRequestInstanceInfo(instance_id);
+		try {
+			await fs.move(
+				path.join(instanceInfo.path, "saves", old_name),
+				path.join(instanceInfo.path, "saves", new_name),
+				{ overwrite: false },
+			);
+		} catch (err) {
+			if (err.code === "ENOENT") {
+				throw new libErrors.RequestError(`${old_name} does not exist`);
+			}
+			throw err;
+		}
+		await this.sendSaveListUpdate(instance_id, path.join(instanceInfo.path, "saves"));
+	}
+
+	async copySaveRequestHandler(message) {
+		let { instance_id, source, destination } = message.data;
+		checkRequestSaveName(source);
+		checkRequestSaveName(destination);
+		let instanceInfo = this.getRequestInstanceInfo(instance_id);
+		try {
+			await fs.copy(
+				path.join(instanceInfo.path, "saves", source),
+				path.join(instanceInfo.path, "saves", destination),
+				{ overwrite: false, errorOnExist: true },
+			);
+		} catch (err) {
+			if (err.code === "ENOENT") {
+				throw new libErrors.RequestError(`${old_name} does not exist`);
+			}
+			throw err;
+		}
+		await this.sendSaveListUpdate(instance_id, path.join(instanceInfo.path, "saves"));
+	}
+
 	async sendSaveListUpdate(instance_id, savesDir) {
 		let instanceConnection = this.instanceConnections.get(instance_id);
 		let saveList;
diff --git a/packages/web_ui/src/components/SavesList.jsx b/packages/web_ui/src/components/SavesList.jsx
index 72c0554a..e63524fa 100644
--- a/packages/web_ui/src/components/SavesList.jsx
+++ b/packages/web_ui/src/components/SavesList.jsx
@@ -1,5 +1,5 @@
 import React, { useContext, useState } from "react";
-import { Button, List, Popconfirm, Progress, Space, Table, Tooltip, Upload } from "antd";
+import { Button, Form, Input, List, Modal, Popconfirm, Progress, Space, Table, Tooltip, Upload } from "antd";
 import CaretLeftOutlined from "@ant-design/icons/CaretLeftOutlined";
 import LeftOutlined from "@ant-design/icons/LeftOutlined";
 
@@ -13,6 +13,84 @@ import { useSaves } from "../model/saves";
 import { notifyErrorHandler } from "../util/notify";
 
 
+function RenameModal(props) {
+	let control = useContext(ControlContext);
+	let [visible, setVisible] = useState(false);
+	let [form] = Form.useForm();
+
+	return <>
+		<Button disabled={props.disabled} onClick={() => setVisible(true)}>Rename</Button>
+		<Modal
+			title="Rename save"
+			okText="Rename"
+			visible={visible}
+			onOk={() => form.submit()}
+			onCancel={() => setVisible(false)}
+		>
+			<Form
+				form={form}
+				layout="vertical"
+				initialValues={{ newName: props.save.name }}
+				onFinish={values => {
+					libLink.messages.renameSave.send(control,
+						{ instance_id: props.instanceId, old_name: props.save.name, new_name: values.newName }
+					).then(() => {
+						setVisible(false);
+						form.resetFields();
+					}).catch(notifyErrorHandler("Error renaming save"));
+				}}
+			>
+				<Form.Item
+					name="newName"
+					label="New name"
+					rules={[{ required: true, message: "New name is required" }]}
+				>
+					<Input autoFocus />
+				</Form.Item>
+			</Form>
+		</Modal>
+	</>;
+}
+
+function CopyModal(props) {
+	let control = useContext(ControlContext);
+	let [visible, setVisible] = useState(false);
+	let [form] = Form.useForm();
+
+	return <>
+		<Button disabled={props.disabled} onClick={() => setVisible(true)}>Copy</Button>
+		<Modal
+			title="Copy save"
+			okText="Copy"
+			visible={visible}
+			onOk={() => form.submit()}
+			onCancel={() => setVisible(false)}
+		>
+			<Form
+				form={form}
+				layout="vertical"
+				initialValues={{ newName: props.save.name }}
+				onFinish={values => {
+					libLink.messages.copySave.send(control,
+						{ instance_id: props.instanceId, source: props.save.name, destination: values.newName }
+					).then(() => {
+						setVisible(false);
+						form.resetFields();
+					}).catch(notifyErrorHandler("Error copying save"));
+				}}
+			>
+				<Form.Item
+					name="newName"
+					label="New name"
+					rules={[{ required: true, message: "New name is required" }]}
+				>
+					<Input autoFocus />
+				</Form.Item>
+			</Form>
+		</Modal>
+	</>;
+}
+
 function formatBytes(bytes) {
 	if (bytes === 0) {
 		return "0 Bytes";
@@ -81,6 +159,12 @@ export default function SavesList(props) {
 						);
 					}}
 				>Load save</Button>}
+				{account.hasPermission("core.instance.save.rename") && <RenameModal
+					disabled={slaveOffline} instanceId={props.instance.id} save={save}
+				/>}
+				{account.hasPermission("core.instance.save.copy") && <CopyModal
+					disabled={slaveOffline} instanceId={props.instance.id} save={save}
+				/>}
 				{account.hasPermission("core.instance.save.download") && <Button
 					disabled={slaveOffline}
 					onClick={() => {
diff --git a/test/integration/clusterio.js b/test/integration/clusterio.js
index 77c51b39..336d807b 100644
--- a/test/integration/clusterio.js
+++ b/test/integration/clusterio.js
@@ -563,6 +563,41 @@ describe("Integration of Clusterio", function() {
 			});
 		});
 
+		describe("instance save copy", function() {
+			it("copy a save file", async function() {
+				await execCtl("instance save copy 44 upload.zip copy.zip");
+				assert(await fs.pathExists(path.join("temp", "test", "instances", "test", "saves", "copy.zip")));
+			});
+			it("should error if destination exist", async function() {
+				await assert.rejects(execCtl("instance save copy 44 upload.zip copy.zip"));
+			});
+			it("should error if source does not exist", async function() {
+				await assert.rejects(execCtl("instance save copy 44 not-here.zip invalid.zip"));
+			});
+			it("should reject path traversal attacks", async function() {
+				await assert.rejects(execCtl("instance save copy 44 upload.zip ../traversal.zip"));
+				await assert.rejects(execCtl("instance save copy 44 ../saves/upload.zip traversal.zip "));
+			});
+		});
+
+		describe("instance save rename", function() {
+			it("rename a save file", async function() {
+				await execCtl("instance save rename 44 copy.zip rename.zip");
+				assert(!await fs.pathExists(path.join("temp", "test", "instances", "test", "saves", "copy.zip")));
+				assert(await fs.pathExists(path.join("temp", "test", "instances", "test", "saves", "rename.zip")));
+			});
+			it("should error if new name exist", async function() {
+				await assert.rejects(execCtl("instance save rename 44 upload.zip rename.zip"));
+			});
+			it("should error if old name does not exist", async function() {
+				await assert.rejects(execCtl("instance save rename 44 not-here.zip invalid.zip"));
+			});
+			it("should reject path traversal attacks", async function() {
+				await assert.rejects(execCtl("instance save rename 44 upload.zip ../traversal.zip"));
+				await assert.rejects(execCtl("instance save rename 44 ../saves/upload.zip traversal.zip "));
+			});
+		});
+
 		describe("instance save delete", function() {
 			it("should delete a save", async function() {
 				await execCtl("instance save delete 44 upload.zip");

From 2e1c1fd3c8deecb0105c44507b1c12e19abd046a Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Sun, 27 Mar 2022 20:19:52 +0200
Subject: [PATCH 5/7] Remove duplicated instance check

Deduplicate instance existence check for requests in master.
---
 packages/master/src/ControlConnection.js | 34 +++++-------------------
 packages/master/src/Master.js            | 21 +++++++++++----
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/packages/master/src/ControlConnection.js b/packages/master/src/ControlConnection.js
index 068076ee..5a10a780 100644
--- a/packages/master/src/ControlConnection.js
+++ b/packages/master/src/ControlConnection.js
@@ -159,10 +159,7 @@ class ControlConnection extends BaseConnection {
 
 	async getInstanceRequestHandler(message) {
 		let id = message.data.id;
-		let instance = this._master.instances.get(id);
-		if (!instance) {
-			throw new libErrors.RequestError(`Instance with ID ${id} does not exist`);
-		}
+		let instance = this._master.getRequestInstance(id);
 
 		return {
 			id,
@@ -249,11 +246,7 @@ class ControlConnection extends BaseConnection {
 	}
 
 	async deleteInstanceRequestHandler(message, request) {
-		let instance = this._master.instances.get(message.data.instance_id);
-		if (!instance) {
-			throw new libErrors.RequestError(`Instance with ID ${message.data.instance_id} does not exist`);
-		}
-
+		let instance = this._master.getRequestInstance(message.data.instance_id);
 		if (instance.config.get("instance.assigned_slave") !== null) {
 			await this.forwardRequestToInstance(message, request);
 		}
@@ -266,11 +259,7 @@ class ControlConnection extends BaseConnection {
 	}
 
 	async getInstanceConfigRequestHandler(message) {
-		let instance = this._master.instances.get(message.data.instance_id);
-		if (!instance) {
-			throw new libErrors.RequestError(`Instance with ID ${message.data.instance_id} does not exist`);
-		}
-
+		let instance = this._master.getRequestInstance(message.data.instance_id);
 		return {
 			serialized_config: instance.config.serialize("control"),
 		};
@@ -290,11 +279,7 @@ class ControlConnection extends BaseConnection {
 	}
 
 	async setInstanceConfigFieldRequestHandler(message) {
-		let instance = this._master.instances.get(message.data.instance_id);
-		if (!instance) {
-			throw new libErrors.RequestError(`Instance with ID ${message.data.instance_id} does not exist`);
-		}
-
+		let instance = this._master.getRequestInstance(message.data.instance_id);
 		if (message.data.field === "instance.assigned_slave") {
 			throw new libErrors.RequestError("instance.assigned_slave must be set through the assign-slave interface");
 		}
@@ -309,11 +294,7 @@ class ControlConnection extends BaseConnection {
 	}
 
 	async setInstanceConfigPropRequestHandler(message) {
-		let instance = this._master.instances.get(message.data.instance_id);
-		if (!instance) {
-			throw new libErrors.RequestError(`Instance with ID ${message.data.instance_id} does not exist`);
-		}
-
+		let instance = this._master.getRequestInstance(message.data.instance_id);
 		let { field, prop, value } = message.data;
 		instance.config.setProp(field, prop, value, "control");
 		await this.updateInstanceConfig(instance);
@@ -321,10 +302,7 @@ class ControlConnection extends BaseConnection {
 
 	async assignInstanceCommandRequestHandler(message, request) {
 		let { slave_id, instance_id } = message.data;
-		let instance = this._master.instances.get(instance_id);
-		if (!instance) {
-			throw new libErrors.RequestError(`Instance with ID ${instance_id} does not exist`);
-		}
+		let instance = this._master.getRequestInstance(instance_id);
 
 		// Check if target slave is connected
 		let newSlaveConnection;
diff --git a/packages/master/src/Master.js b/packages/master/src/Master.js
index 3d83e849..863bf48a 100644
--- a/packages/master/src/Master.js
+++ b/packages/master/src/Master.js
@@ -424,6 +424,21 @@ class Master {
 		}
 	}
 
+	/**
+	 * Get instance by ID for a request
+	 *
+	 * @param {number} instanceId - ID of instance to get.
+	 * @returns {object} instance
+	 * @throws {module:lib/errors.RequestError} if the instance does not exist.
+	 */
+	getRequestInstance(instanceId) {
+		let instance = this.instances.get(instanceId);
+		if (!instance) {
+			throw new libErrors.RequestError(`Instance with ID ${instanceId} does not exist`);
+		}
+		return instance;
+	}
+
 	addInstanceHooks(instance) {
 		instance.config.on("fieldChanged", (group, field, prev) => {
 			if (group.name === "instance" && field === "name") {
@@ -608,11 +623,7 @@ class Master {
 	 * @returns {object} data returned from the request.
 	 */
 	async forwardRequestToInstance(request, data) {
-		let instance = this.instances.get(data.instance_id);
-		if (!instance) {
-			throw new libErrors.RequestError(`Instance with ID ${data.instance_id} does not exist`);
-		}
-
+		let instance = this.getRequestInstance(data.instance_id);
 		let slaveId = instance.config.get("instance.assigned_slave");
 		if (slaveId === null) {
 			throw new libErrors.RequestError("Instance is not assigned to a slave");

From 38c249ec703fd2c8519b5e0b94dc262213da02e3 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Mon, 28 Mar 2022 20:37:35 +0200
Subject: [PATCH 6/7] Implement save transfer

Add ability to move or copy saves between instances.  For instances on
the same slave the saves are transferred with filesystem operations, for
instances on two different slaves the proxy stream interface is used to
send the save via the master server.
---
 CHANGELOG.md                                 |   2 +-
 packages/ctl/ctl.js                          |  28 ++++
 packages/lib/link/messages.js                |  16 +++
 packages/lib/users.js                        |   5 +
 packages/master/src/ControlConnection.js     |  80 +++++++++++
 packages/slave/slave.js                      |  39 +++++
 packages/web_ui/src/components/SavesList.jsx |  93 +++++++++++-
 test/integration/clusterio.js                | 144 +++++++++++++++++++
 8 files changed, 405 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db398cca..39386312 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@
 - Packaged and uploaded to npm again, greatly simplifying distribution and installation of both Clusterio and plugins.
 - Added centralized logging for the cluster.
   All logs from both Clusterio and Factorio is stored in a shared log which can be inspected and queried.
-- Added remote save management with the ability to list, create, rename, copy, upload, download, delete and load saves for instances.
+- Added remote save management with the ability to list, create, rename, copy, upload, download, transfer, delete and load saves for instances.
 
 ### Features
 
diff --git a/packages/ctl/ctl.js b/packages/ctl/ctl.js
index 0f6dbedf..41454c3d 100755
--- a/packages/ctl/ctl.js
+++ b/packages/ctl/ctl.js
@@ -659,6 +659,34 @@ instanceSaveCommands.add(new libCommand.Command({
 	},
 }));
 
+instanceSaveCommands.add(new libCommand.Command({
+	definition: [
+		"transfer <source-instance> <source-save> <target-instance> [target-save]",
+		"Transfer a save between instances",
+		(yargs) => {
+			yargs.positional("source-instance", { describe: "Instance to transfer save from", type: "string" });
+			yargs.positional("source-save", { describe: "Save to transfer.", type: "string" });
+			yargs.positional("target-instance", { describe: "Instance to transfer to", type: "string" });
+			yargs.positional("target-save", { describe: "Name to give transferred save.", type: "string" });
+			yargs.options({
+				"copy": { describe: "Copy instead of moving the save", type: "boolean", default: false },
+			});
+		},
+	],
+	handler: async function(args, control) {
+		let sourceInstanceId = await libCommand.resolveInstance(control, args.sourceInstance);
+		let targetInstanceId = await libCommand.resolveInstance(control, args.targetInstance);
+		let result = await libLink.messages.transferSave.send(control, {
+			instance_id: sourceInstanceId,
+			source_save: args.sourceSave,
+			target_instance_id: targetInstanceId,
+			target_save: args.targetSave || args.sourceSave,
+			copy: args.copy,
+		});
+		print(`Transferred as ${result.save} to ${args.targetInstance}.`);
+	},
+}));
+
 instanceSaveCommands.add(new libCommand.Command({
 	definition: ["download <instance> <save>", "Download a save from an instance", (yargs) => {
 		yargs.positional("instance", { describe: "Instance to download save from", type: "string" });
diff --git a/packages/lib/link/messages.js b/packages/lib/link/messages.js
index 13f5180a..dd187266 100644
--- a/packages/lib/link/messages.js
+++ b/packages/lib/link/messages.js
@@ -595,6 +595,22 @@ messages.downloadSave = new Request({
 	},
 });
 
+messages.transferSave = new Request({
+	type: "transfer_save",
+	links: ["control-master", "master-slave"],
+	permission: "core.instance.save.transfer",
+	requestProperties: {
+		"instance_id": { type: "integer" },
+		"source_save": { type: "string" },
+		"target_instance_id": { type: "integer" },
+		"target_save": { type: "string" },
+		"copy": { type: "boolean" },
+	},
+	responseProperties: {
+		"save": { type: "string" },
+	},
+});
+
 messages.pullSave = new Request({
 	type: "pull_save",
 	links: ["master-slave"],
diff --git a/packages/lib/users.js b/packages/lib/users.js
index a5539b7c..8432191b 100644
--- a/packages/lib/users.js
+++ b/packages/lib/users.js
@@ -412,6 +412,11 @@ definePermission({
 	title: "Upload save",
 	description: "Upload savegames to instances.",
 });
+definePermission({
+	name: "core.instance.save.transfer",
+	title: "Transfer save",
+	description: "Transfer savegames between instances.",
+});
 definePermission({
 	name: "core.instance.save.download",
 	title: "Download save",
diff --git a/packages/master/src/ControlConnection.js b/packages/master/src/ControlConnection.js
index 5a10a780..05a31320 100644
--- a/packages/master/src/ControlConnection.js
+++ b/packages/master/src/ControlConnection.js
@@ -1,5 +1,6 @@
 "use strict";
 const jwt = require("jsonwebtoken");
+const events = require("events");
 
 const libConfig = require("@clusterio/lib/config");
 const libErrors = require("@clusterio/lib/errors");
@@ -373,6 +374,85 @@ class ControlConnection extends BaseConnection {
 		return { stream_id: stream.id };
 	}
 
+	async transferSaveRequestHandler(message, request) {
+		let { source_save, target_save, copy, instance_id, target_instance_id } = message.data;
+		if (copy) {
+			this.user.checkPermission("core.instance.save.copy");
+		} else if (source_save !== target_save) {
+			this.user.checkPermission("core.instance.save.rename");
+		}
+
+		if (instance_id === target_instance_id) {
+			throw new libErrors.RequestError("Source and target instance may not be the same");
+		}
+		let sourceInstance = this._master.getRequestInstance(instance_id);
+		let targetInstance = this._master.getRequestInstance(target_instance_id);
+		let sourceSlaveId = sourceInstance.config.get("instance.assigned_slave");
+		let targetSlaveId = targetInstance.config.get("instance.assigned_slave");
+		if (sourceSlaveId === null) {
+			throw new libErrors.RequestError("Source instance is not assigned a slave");
+		}
+		if (targetSlaveId === null) {
+			throw new libErrors.RequestError("Target instance is not assigned a slave");
+		}
+
+		// Let slave handle request if source and target is on the same slave.
+		if (sourceSlaveId === targetSlaveId) {
+			return await this.forwardRequestToInstance(message, request);
+		}
+
+		// Check connectivity
+		let sourceSlaveConnection = this._master.wsServer.slaveConnections.get(sourceSlaveId);
+		if (!sourceSlaveConnection || sourceSlaveConnection.closing) {
+			throw new libErrors.RequestError("Source slave is not connected to the master server");
+		}
+
+		let targetSlaveConnection = this._master.wsServer.slaveConnections.get(targetSlaveId);
+		if (!targetSlaveConnection || targetSlaveConnection.closing) {
+			throw new libErrors.RequestError("Target slave is not connected to the master server");
+		}
+
+		// Create stream to proxy from target to source
+		let stream = await routes.createProxyStream(this._master.app);
+		stream.events.on("timeout", () => {
+			if (stream.source) {
+				stream.source.destroy();
+			}
+			stream.events.emit("error", new libErrors.RequestError("Timed out establishing transfer stream"));
+		});
+
+		// Ignore errors if not listening for them to avoid crash.
+		stream.events.on("error", () => { /* ignore */ });
+
+		// Establish push from source slave to stream, this is done first to
+		// ensure the file size is known prior to the target slave pull.
+		await Promise.all([
+			this._master.forwardRequestToInstance(libLink.messages.pushSave, {
+				instance_id,
+				stream_id: stream.id,
+				save: source_save,
+			}),
+			events.once(stream.events, "source"),
+		]);
+
+		// Establish pull from target slave to stream and wait for completion.
+		let result = await this._master.forwardRequestToInstance(libLink.messages.pullSave, {
+			instance_id: target_instance_id,
+			stream_id: stream.id,
+			filename: target_save,
+		});
+
+		// Delete source save if this is not a copy
+		if (!copy) {
+			await this._master.forwardRequestToInstance(libLink.messages.deleteSave, {
+				instance_id,
+				save: source_save,
+			});
+		}
+
+		return { save: result.save };
+	}
+
 	async setLogSubscriptionsRequestHandler(message) {
 		this.logSubscriptions = message.data;
 		this.updateLogSubscriptions();
diff --git a/packages/slave/slave.js b/packages/slave/slave.js
index 61e4f110..db3d0281 100755
--- a/packages/slave/slave.js
+++ b/packages/slave/slave.js
@@ -1489,6 +1489,45 @@ class Slave extends libLink.Link {
 		await this.sendSaveListUpdate(instance_id, path.join(instanceInfo.path, "saves"));
 	}
 
+	async transferSaveRequestHandler(message) {
+		let { source_save, target_save, copy, instance_id, target_instance_id } = message.data;
+		checkRequestSaveName(source_save);
+		checkRequestSaveName(target_save);
+		let sourceInstanceInfo = this.getRequestInstanceInfo(instance_id);
+		let targetInstanceInfo = this.getRequestInstanceInfo(target_instance_id);
+
+		// For consistency with remote transfer initiated through pullSave the
+		// target is renamed if it already exists.
+		target_save = await libFileOps.findUnusedName(
+			path.join(targetInstanceInfo.path, "saves"), target_save, ".zip"
+		);
+
+		try {
+			if (copy) {
+				await fs.copy(
+					path.join(sourceInstanceInfo.path, "saves", source_save),
+					path.join(targetInstanceInfo.path, "saves", target_save),
+					{ overwrite: true },
+				);
+			} else {
+				await fs.move(
+					path.join(sourceInstanceInfo.path, "saves", source_save),
+					path.join(targetInstanceInfo.path, "saves", target_save),
+					{ overwrite: true },
+				);
+			}
+		} catch (err) {
+			if (err.code === "ENOENT") {
+				throw new libErrors.RequestError(`${source_save} does not exist`);
+			}
+			throw err;
+		}
+		await this.sendSaveListUpdate(instance_id, path.join(sourceInstanceInfo.path, "saves"));
+		await this.sendSaveListUpdate(target_instance_id, path.join(targetInstanceInfo.path, "saves"));
+
+		return { save: target_save };
+	}
+
 	async sendSaveListUpdate(instance_id, savesDir) {
 		let instanceConnection = this.instanceConnections.get(instance_id);
 		let saveList;
diff --git a/packages/web_ui/src/components/SavesList.jsx b/packages/web_ui/src/components/SavesList.jsx
index e63524fa..133cffac 100644
--- a/packages/web_ui/src/components/SavesList.jsx
+++ b/packages/web_ui/src/components/SavesList.jsx
@@ -1,5 +1,8 @@
 import React, { useContext, useState } from "react";
-import { Button, Form, Input, List, Modal, Popconfirm, Progress, Space, Table, Tooltip, Upload } from "antd";
+import {
+	message, Button, Checkbox, Form, Input, List, Modal,
+	Popconfirm, Progress, Select, Space, Table, Tooltip, Upload,
+} from "antd";
 import CaretLeftOutlined from "@ant-design/icons/CaretLeftOutlined";
 import LeftOutlined from "@ant-design/icons/LeftOutlined";
 
@@ -9,6 +12,7 @@ import { useAccount } from "../model/account";
 import ControlContext from "./ControlContext";
 import CreateSaveModal from "./CreateSaveModal";
 import SectionHeader from "./SectionHeader";
+import { useInstanceList } from "../model/instance";
 import { useSaves } from "../model/saves";
 import { notifyErrorHandler } from "../util/notify";
 
@@ -91,6 +95,90 @@ function CopyModal(props) {
 	</>;
 }
 
+function TransferModal(props) {
+	let account = useAccount();
+	let control = useContext(ControlContext);
+	let [visible, setVisible] = useState(false);
+	let [form] = Form.useForm();
+	let [instanceList] = useInstanceList();
+
+	return <>
+		<Button disabled={props.disabled} onClick={() => setVisible(true)}>Transfer</Button>
+		<Modal
+			title="Transfer save"
+			okText="Transfer"
+			visible={visible}
+			onOk={() => form.submit()}
+			onCancel={() => setVisible(false)}
+			destroyOnClose
+		>
+			<Form
+				form={form}
+				labelCol={{ span: 6 }}
+				wrapperCol={{ span: 18 }}
+				initialValues={{ transferredName: props.save.name, copy: false }}
+				onFinish={values => {
+					setVisible(false);
+					let hide = message.loading("Transferring save...", 0);
+					libLink.messages.transferSave.send(control, {
+						instance_id: props.instanceId,
+						source_save: props.save.name,
+						target_instance_id: values.targetInstanceId,
+						target_save: values.transferredName || props.save.name,
+						copy: values.copy,
+					}).then(() => {
+						message.success("Transfer complete");
+						form.resetFields();
+					}).catch(
+						notifyErrorHandler("Error transfering save")
+					).finally(() => hide());
+				}}
+			>
+				<Form.Item
+					name="targetInstanceId"
+					label="Target Instance"
+					rules={[{ required: true, message: "Target Instance is required" }]}
+				>
+					<Select
+						autoFocus
+						showSearch
+						filterOption={(input, option) => option.title.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+					>
+						{instanceList.filter(
+							instance => instance["id"] !== props.instanceId
+						).map((instance) => <Select.Option
+							key={instance["id"]}
+							value={instance["id"]}
+							title={instance["name"]}
+							disabled={["unassigned", "unknown"].includes(instance["status"])}
+						>
+							{instance["name"]}
+							{instance["status"] === "unassigned" && " (unassigned)"}
+							{instance["status"] === "unknown" && " (offline)"}
+						</Select.Option>)}
+					</Select>
+				</Form.Item>
+				<Form.Item
+					name="transferredName"
+					label="Transferred name"
+					disabled={!account.hasAnyPermission("core.instance.save.rename", "core.instance.save.copy")}
+				>
+					<Input />
+				</Form.Item>
+				<Form.Item
+					name="copy"
+					valuePropName="checked"
+					label="Copy"
+					tooltip="Copy instead of moving the save to the new instance."
+					disabled={!account.hasPermission("core.instance.save.copy")}
+				>
+					<Checkbox />
+				</Form.Item>
+			</Form>
+		</Modal>
+	</>;
+}
+
 function formatBytes(bytes) {
 	if (bytes === 0) {
 		return "0 Bytes";
@@ -179,6 +267,9 @@ export default function SavesList(props) {
 						);
 					}}
 				>Download</Button>}
+				{account.hasPermission("core.instance.save.transfer") && <TransferModal
+					disabled={slaveOffline} instanceId={props.instance.id} save={save}
+				/>}
 				{account.hasPermission("core.instance.save.delete") && <Popconfirm
 					title="Permanently delete save?"
 					okText="Delete"
diff --git a/test/integration/clusterio.js b/test/integration/clusterio.js
index 336d807b..edeb4574 100644
--- a/test/integration/clusterio.js
+++ b/test/integration/clusterio.js
@@ -3,6 +3,7 @@ const assert = require("assert").strict;
 const fs = require("fs-extra");
 const path = require("path");
 const events = require("events");
+const phin = require("phin");
 
 const libLink = require("@clusterio/lib/link");
 const libUsers = require("@clusterio/lib/users");
@@ -25,6 +26,24 @@ async function checkInstanceStatus(id, status) {
 	assert.equal(instances.get(44).status, status, "incorrect instance status");
 }
 
+async function uploadSave(instanceId, name, content) {
+	return await phin({
+		url: `https://localhost:4443/api/upload-save?instance_id=${instanceId}&filename=${name}`,
+		method: "POST",
+		core: { rejectUnauthorized: false },
+		headers: {
+			"X-Access-Token": controlToken,
+			"Content-Type": "application/zip",
+			"Content-Length": String(content.length),
+		},
+		data: content,
+	});
+}
+
+async function deleteSave(instanceId, save) {
+	await libLink.messages.deleteSave.send(getControl(), { instance_id: instanceId, save });
+}
+
 describe("Integration of Clusterio", function() {
 	describe("clusteriomaster", function() {
 		describe("bootstrap generate-user-token", function() {
@@ -115,10 +134,14 @@ describe("Integration of Clusterio", function() {
 				let config = "alt-slave-config.json";
 				let configPath = path.join("temp", "test", config);
 				await fs.remove(configPath);
+				await fs.remove(path.join("temp", "test", "alt-instances"));
 				await execCtl(`slave create-config --id 5 --name alt-slave --generate-token --output ${config}`);
 				await exec(
 					`node ../../packages/slave --config ${config} config set slave.tls_ca ../../test/file/tls/cert.pem`
 				);
+				await exec(
+					`node ../../packages/slave --config ${config} config set slave.instances_directory alt-instances`
+				);
 
 				let slaveProcess;
 				try {
@@ -598,6 +621,127 @@ describe("Integration of Clusterio", function() {
 			});
 		});
 
+		describe("instance save transfer", function() {
+			before(async function() {
+				slowTest(this);
+				await execCtl("instance create spam --id 66");
+				await execCtl("instance assign spam 4");
+				await execCtl("instance create unassign --id 77");
+			});
+			after(async function() {
+				await execCtl("instance delete spam");
+			});
+			for (let remote of [false, true]) {
+				let pri = 44;
+				let sec = remote ? 99 : 66;
+				let priSaves = path.join("temp", "test", "instances", "test", "saves");
+				let secSaves = remote
+					? path.join("temp", "test", "alt-instances", "alt-test", "saves")
+					: path.join("temp", "test", "instances", "spam", "saves")
+				;
+				describe(remote ? "remote" : "local", function() {
+					if (remote) {
+						let slaveProcess;
+						before(async function() {
+							// On windows there's currently no way to automate graceful shutdown of the slave
+							// process as CTRL+C is some weird terminal thing and SIGINT isn't a thing.
+							if (process.platform === "win32") {
+								this.skip();
+							}
+							slowTest(this);
+							// Reuse from the clusterioslave test
+							let config = "alt-slave-config.json";
+							slaveProcess = await spawn(
+								"alt-slave:", `node ../../packages/slave run --config ${config}`, /Started slave/
+							);
+						});
+						after(async function() {
+							if (slaveProcess) {
+								slaveProcess.kill("SIGINT");
+								await events.once(slaveProcess, "exit");
+							}
+						});
+					}
+					it("should transfers a save", async function() {
+						await uploadSave(pri, "transfer.zip", "transfer.zip");
+						await execCtl(`instance save transfer ${pri} transfer.zip ${sec}`);
+						assert(!await fs.pathExists(path.join(priSaves, "transfer.zip")), "save still at pri");
+						assert(await fs.pathExists(path.join(secSaves, "transfer.zip")), "save not at sec");
+						await deleteSave(sec, "transfer.zip");
+					});
+					it("should support rename", async function() {
+						await uploadSave(pri, "transfer.zip", "transfer.zip");
+						await execCtl(`instance save transfer ${pri} transfer.zip ${sec} rename.zip`);
+						assert(!await fs.pathExists(path.join(priSaves, "transfer.zip")), "save still at pri");
+						assert(await fs.pathExists(path.join(secSaves, "rename.zip")), "save not at sec");
+						await deleteSave(sec, "rename.zip");
+					});
+					it("should auto-rename if target exists", async function() {
+						await uploadSave(pri, "transfer.zip", "transfer.zip");
+						await uploadSave(sec, "transfer.zip", "transfer.zip");
+						await execCtl(`instance save transfer ${pri} transfer.zip ${sec}`);
+						assert(!await fs.pathExists(path.join(priSaves, "transfer.zip")), "save still at pri");
+						assert(await fs.pathExists(path.join(secSaves, "transfer-2.zip")), "save not at sec");
+						await deleteSave(sec, "transfer.zip");
+						await deleteSave(sec, "transfer-2.zip");
+					});
+					it("should copy when using --copy", async function() {
+						await uploadSave(pri, "transfer.zip", "transfer.zip");
+						await execCtl(`instance save transfer ${pri} transfer.zip ${sec} --copy`);
+						assert(await fs.pathExists(path.join(priSaves, "transfer.zip")), "save not at pri");
+						assert(await fs.pathExists(path.join(secSaves, "transfer.zip")), "save not at sec");
+						await deleteSave(pri, "transfer.zip");
+						await deleteSave(sec, "transfer.zip");
+					});
+					it("should fail if save does not exist", async function() {
+						await assert.rejects(execCtl(`instance save transfer ${pri} not-here.zip ${sec}`));
+					});
+					it("should fail if source save name is invalid", async function() {
+						await assert.rejects(execCtl(`instance save transfer ${pri} nul 111`));
+					});
+					it("should fail if target save name is invalid", async function() {
+						await uploadSave(pri, "transfer.zip", "transfer.zip");
+						await assert.rejects(execCtl(`instance save transfer ${pri} transfer.zip 111 nul`));
+						await deleteSave(pri, "transfer.zip");
+					});
+					it("should reject path traversal of source save", async function() {
+						await assert.rejects(execCtl(`instance save transfer ${pri} ../saves/transfer.zip 111`));
+					});
+					it("should reject path traversal of target save", async function() {
+						await uploadSave(pri, "transfer.zip", "transfer.zip");
+						await assert.rejects(
+							execCtl(`instance save transfer ${pri} transfer.zip 111 ../saves/transfer.zip`)
+						);
+						await deleteSave(pri, "transfer.zip");
+					});
+					if (!remote) {
+						it("should fail if source and target instance is the same instance", async function() {
+							await uploadSave(pri, "transfer.zip", "transfer.zip");
+							await assert.rejects(execCtl(`instance save transfer ${pri} transfer.zip ${pri}`));
+							await deleteSave(pri, "transfer.zip");
+						});
+						it("should fail if source instance does not exist", async function() {
+							await assert.rejects(execCtl(`instance save transfer 111 not-here.zip ${sec}`));
+						});
+						it("should fail if target instance does not exist", async function() {
+							await uploadSave(pri, "transfer.zip", "transfer.zip");
+							await assert.rejects(execCtl(`instance save transfer ${pri} transfer.zip 111`));
+							await deleteSave(pri, "transfer.zip");
+						});
+						it("should fail if source instance is not assigned", async function() {
+							await assert.rejects(execCtl(`instance save transfer 77 transfer.zip ${pri}`));
+						});
+						it("should fail if target instance is not assigned", async function() {
+							await uploadSave(pri, "transfer.zip", "transfer.zip");
+							await assert.rejects(execCtl(`instance save transfer ${pri} transfer.zip 77`));
+							await deleteSave(pri, "transfer.zip");
+						});
+					}
+				});
+			}
+
+		});
+
 		describe("instance save delete", function() {
 			it("should delete a save", async function() {
 				await execCtl("instance save delete 44 upload.zip");

From c2cb58d0884d7121eff6074929087da629ab484f Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Tue, 29 Mar 2022 22:55:13 +0200
Subject: [PATCH 7/7] Comment out command logging in tests

Don't log commands executed while running tests as these spam the output
more than they are useful right now.
---
 test/integration/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration/index.js b/test/integration/index.js
index b254e05f..f8c40f46 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -109,7 +109,8 @@ let slaveConfigPath = path.join("temp", "test", "config-slave.json");
 let controlConfigPath = path.join("temp", "test", "config-control.json");
 
 async function exec(command, options = {}) {
-	console.log(command);
+	// Uncomment to show commands run in tests
+	// console.log(command);
 	options = { cwd: path.join("temp", "test"), ...options };
 	return await util.promisify(child_process.exec)(command, options);
 }