translation/Protocol: add packet BIND_MOUNT_RW_EXEC

MaTriXy · Feb 6, 2025 · c5322e1 · c5322e1
1 parent 8856341
commit c5322e1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/src/translation/Parser.cxx b/src/translation/Parser.cxx
@@ -3902,6 +3902,7 @@ TranslateParser::HandleRegularPacket(TranslationCommand command,
 		case TranslationCommand::EXPAND_BIND_MOUNT_EXEC:
 		case TranslationCommand::BIND_MOUNT_FILE:
 		case TranslationCommand::WRITE_FILE:
+		case TranslationCommand::BIND_MOUNT_RW_EXEC:
 #if TRANSLATION_ENABLE_SPAWN
 			if (ns_options != nullptr &&
 			    mount_list != ns_options->mount.mounts.before_begin()) {
@@ -4400,6 +4401,15 @@ TranslateParser::HandleRegularPacket(TranslationCommand command,
 #else
 		break;
 #endif
+
+	case TranslationCommand::BIND_MOUNT_RW_EXEC:
+#if TRANSLATION_ENABLE_SPAWN
+		previous_command = command;
+		HandleBindMount(string_payload, false, true, true);
+		return;
+#else
+		break;
+#endif
 	}
 
 	throw FmtRuntimeError("unknown translation packet: {}", (unsigned)command);

diff --git a/src/translation/Protocol.hxx b/src/translation/Protocol.hxx
@@ -1327,6 +1327,11 @@ enum class TranslationCommand : uint16_t {
 	 * by a null byte.
 	 */
 	SYMLINK = 269,
+
+	/**
+	 * Combination of #BIND_MOUNT_RW and #BIND_MOUNT_EXEC.
+	 */
+	BIND_MOUNT_RW_EXEC = 270,
 };
 
 struct TranslationHeader {

diff --git a/src/translation/server/Response.hxx b/src/translation/server/Response.hxx
@@ -832,6 +832,15 @@ public:
 			return *this;
 		}
 
+		template<typename S, typename T>
+		auto BindMountRwExec(S &&source, T &&target) noexcept {
+			response.StringPacket(TranslationCommand::BIND_MOUNT_RW_EXEC,
+					      std::forward<S>(source),
+					      std::string_view{"", 1},
+					      std::forward<T>(target));
+			return *this;
+		}
+
 		template<typename S, typename T>
 		auto BindMountFile(S &&source, T &&target) noexcept {
 			response.StringPacket(TranslationCommand::BIND_MOUNT_FILE,