Merge pull request #181 from copenhagentruckwash/fix-remote-root-shell-execution-vulnerability
Gate edge-agent shell actions behind local opt-in
This commit is contained in:
Vendored
+20
@@ -151,6 +151,10 @@ function buildTransportHeartbeatState(brokerState = {}) {
|
||||
};
|
||||
}
|
||||
|
||||
function isShellAccessEnabled(config = {}) {
|
||||
return config.enableShellAccess === true;
|
||||
}
|
||||
|
||||
function normalizeBrokerBaseUrl(value) {
|
||||
const trimmed = String(value || "").trim().replace(/\/+$/, "");
|
||||
if (trimmed === "") {
|
||||
@@ -1785,6 +1789,10 @@ export async function processPolledShellAction(config, action, shell, fetchImpl
|
||||
}
|
||||
|
||||
try {
|
||||
if (!isShellAccessEnabled(config)) {
|
||||
throw new Error("Shell access is disabled by local configuration");
|
||||
}
|
||||
|
||||
if (actionType === "OPEN") {
|
||||
await shell.open(payload);
|
||||
} else if (actionType === "INPUT") {
|
||||
@@ -1919,18 +1927,30 @@ function createBrokerBridge({
|
||||
}
|
||||
|
||||
if (message.type === "OPEN_ROOT_SHELL") {
|
||||
if (!isShellAccessEnabled(config)) {
|
||||
throw new Error("Shell access is disabled by local configuration");
|
||||
}
|
||||
await shell.open(message.payload || {});
|
||||
return;
|
||||
}
|
||||
if (message.type === "SHELL_INPUT") {
|
||||
if (!isShellAccessEnabled(config)) {
|
||||
throw new Error("Shell access is disabled by local configuration");
|
||||
}
|
||||
shell.input(message.payload || {});
|
||||
return;
|
||||
}
|
||||
if (message.type === "RESIZE_ROOT_SHELL") {
|
||||
if (!isShellAccessEnabled(config)) {
|
||||
throw new Error("Shell access is disabled by local configuration");
|
||||
}
|
||||
shell.resize(message.payload || {});
|
||||
return;
|
||||
}
|
||||
if (message.type === "CLOSE_ROOT_SHELL") {
|
||||
if (!isShellAccessEnabled(config)) {
|
||||
throw new Error("Shell access is disabled by local configuration");
|
||||
}
|
||||
shell.close(message.payload || {});
|
||||
}
|
||||
} catch {
|
||||
|
||||
Reference in New Issue
Block a user