carta-controller 5.1.1 → 6.0.0-beta.1.0.3

package/dist/serverHandlers.js

@@ -46,19 +46,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serverRouter = exports.createScriptingProxyHandler = exports.createUpgradeHandler = void 0;
+const node_child_process_1 = require("node:child_process");
+const fs = __importStar(require("node:fs"));
+const querystring = __importStar(require("node:querystring"));
+const url = __importStar(require("node:url"));
+const io_1 = __importDefault(require("@pm2/io"));
 const express_1 = __importDefault(require("express"));
-const url = __importStar(require("url"));
-const fs = __importStar(require("fs"));
+const mnemonist_1 = require("mnemonist");
 const moment_1 = __importDefault(require("moment"));
-const querystring = __importStar(require("querystring"));
-const uuid_1 = require("uuid");
-const io_1 = __importDefault(require("@pm2/io"));
 const tcpPortUsed = __importStar(require("tcp-port-used"));
-const child_process_1 = require("child_process");
-const mnemonist_1 = require("mnemonist");
-const util_1 = require("./util");
+const uuid_1 = require("uuid");
 const auth_1 = require("./auth");
 const config_1 = require("./config");
+const util_1 = require("./util");
 const processMap = new Map();
 const logMap = new Map();
 const LOG_LIMIT = 1000;
@@ -101,7 +101,7 @@ function deleteProcess(username) {
 function nextAvailablePort() {
     return __awaiter(this, void 0, void 0, function* () {
         // Get a map of all the ports in the range currently in use
-        let existingPorts = new Map();
+        const existingPorts = new Map();
         processMap.forEach(value => {
             existingPorts.set(value.port, true);
         });
@@ -176,7 +176,7 @@ function handleStartServer(req, res, next) {
                     const existingProcess = processMap.get(username);
                     if (existingProcess) {
                         // Kill the process via the kill script
-                        (0, child_process_1.spawnSync)("sudo", ["-u", `${username}`, config_1.ServerConfig.killCommand, `${existingProcess.process.pid}`]);
+                        (0, node_child_process_1.spawnSync)("sudo", ["-u", `${username}`, config_1.ServerConfig.killCommand, `${existingProcess.process.pid}`]);
                         // Delay to allow the parent process to exit
                         yield (0, util_1.delay)(10);
                         deleteProcess(username);
@@ -185,7 +185,10 @@ function handleStartServer(req, res, next) {
                 catch (e) {
                     util_1.logger.debug(e);
                     util_1.logger.error(`Error killing existing process belonging to user ${username}`);
-                    return next({ statusCode: 400, message: "Problem killing existing process" });
+                    return next({
+                        statusCode: 400,
+                        message: "Problem killing existing process"
+                    });
                 }
             }
             else {
@@ -210,7 +213,10 @@ function startServer(username) {
         try {
             const port = yield nextAvailablePort();
             if (port < 0) {
-                throw { statusCode: 500, message: "No available ports for the backend process" };
+                throw {
+                    statusCode: 500,
+                    message: "No available ports for the backend process"
+                };
             }
             let args = [];
             if (config_1.ServerConfig.preserveEnv) {
@@ -238,9 +244,14 @@ function startServer(username) {
             // Finally, add the positional argument for the base folder
             args.push(config_1.ServerConfig.baseFolderTemplate.replace("{username}", username));
             const headerToken = (0, uuid_1.v4)();
-            const child = (0, child_process_1.spawn)("sudo", args, { env: { CARTA_AUTH_TOKEN: headerToken } });
-            if ((child === null || child === void 0 ? void 0 : child.pid) == undefined) {
-                throw { statusCode: 500, message: `Problem starting process for user ${username}` };
+            const child = (0, node_child_process_1.spawn)("sudo", args, {
+                env: { CARTA_AUTH_TOKEN: headerToken }
+            });
+            if ((child === null || child === void 0 ? void 0 : child.pid) == null) {
+                throw {
+                    statusCode: 500,
+                    message: `Problem starting process for user ${username}`
+                };
             }
             setPendingProcess(username, port, headerToken, child);
             let logLocation;
@@ -248,16 +259,16 @@ function startServer(username) {
                 logLocation = config_1.ServerConfig.backendLogFileTemplate.replace("{username}", username).replace("{pid}", child.pid.toString()).replace("{datetime}", (0, moment_1.default)().format("YYYYMMDD.h_mm_ss"));
                 try {
                     logStream = fs.createWriteStream(logLocation, { flags: "a" });
-                    if (logStream == undefined) {
+                    if (logStream == null) {
                         throw new Error("Unable to open stream");
                     }
                     child.stdout.pipe(logStream);
                     child.stderr.pipe(logStream);
-                    child.stdout.on("data", function (data) {
+                    child.stdout.on("data", data => {
                         const line = data.toString();
                         appendLog(username, line);
                     });
-                    child.stderr.on("data", function (data) {
+                    child.stderr.on("data", data => {
                         const line = data.toString();
                         appendLog(username, line);
                     });
@@ -269,12 +280,12 @@ function startServer(username) {
             }
             else {
                 logLocation = "stdout";
-                child.stdout.on("data", function (data) {
+                child.stdout.on("data", data => {
                     const line = data.toString();
                     appendLog(username, line);
                     util_1.logger.info(line);
                 });
-                child.stderr.on("data", function (data) {
+                child.stderr.on("data", data => {
                     const line = data.toString();
                     appendLog(username, line);
                     util_1.logger.error(line);
@@ -288,7 +299,10 @@ function startServer(username) {
             // Check for early exit of backend process
             yield (0, util_1.delay)(config_1.ServerConfig.startDelay);
             if (child.exitCode || child.signalCode) {
-                throw { statusCode: 500, message: `Problem starting process for user ${username}` };
+                throw {
+                    statusCode: 500,
+                    message: `Problem starting process for user ${username}`
+                };
             }
             else {
                 util_1.logger.info(`Started process with PID ${child.pid} for user ${username} on port ${port}. Outputting to ${logLocation}`);
@@ -304,7 +318,10 @@ function startServer(username) {
                 throw e;
             }
             else {
-                throw { statusCode: 500, message: `Problem starting process for user ${username}` };
+                throw {
+                    statusCode: 500,
+                    message: `Problem starting process for user ${username}`
+                };
             }
         }
     });
@@ -320,7 +337,7 @@ function handleStopServer(req, res, next) {
             if (existingProcess) {
                 existingProcess.process.removeAllListeners();
                 // Kill the process via the kill script
-                (0, child_process_1.spawnSync)("sudo", ["-u", `${req.username}`, config_1.ServerConfig.killCommand, `${existingProcess.process.pid}`]);
+                (0, node_child_process_1.spawnSync)("sudo", ["-u", `${req.username}`, config_1.ServerConfig.killCommand, `${existingProcess.process.pid}`]);
                 // Delay to allow the parent process to exit
                 yield (0, util_1.delay)(10);
                 util_1.logger.info(`Process with PID ${existingProcess.process.pid} for user ${req.username} exited via stop request`);
@@ -328,13 +345,19 @@ function handleStopServer(req, res, next) {
                 res.json({ success: true });
             }
             else {
-                return next({ statusCode: 400, message: `No existing process belonging to user ${req.username}` });
+                return next({
+                    statusCode: 400,
+                    message: `No existing process belonging to user ${req.username}`
+                });
             }
         }
         catch (e) {
             util_1.logger.debug(e);
             util_1.logger.error(`Error killing existing process belonging to user ${req.username}`);
-            return next({ statusCode: 500, message: "Problem killing existing process" });
+            return next({
+                statusCode: 500,
+                message: "Problem killing existing process"
+            });
         }
     });
 }
@@ -344,12 +367,12 @@ const createUpgradeHandler = (server) => (req, socket, head) => __awaiter(void 0
         if (!(req === null || req === void 0 ? void 0 : req.url)) {
             return socket.end();
         }
-        let parsedUrl = url.parse(req.url);
+        const parsedUrl = url.parse(req.url);
         if (!(parsedUrl === null || parsedUrl === void 0 ? void 0 : parsedUrl.query)) {
             util_1.logger.warning(`Incoming Websocket upgrade request could not be parsed: ${req.url}`);
             return socket.end();
         }
-        let queryParameters = querystring.parse(parsedUrl.query);
+        const queryParameters = querystring.parse(parsedUrl.query);
         const tokenString = queryParameters === null || queryParameters === void 0 ? void 0 : queryParameters.token;
         if (!tokenString || Array.isArray(tokenString)) {
             util_1.logger.warning(`Incoming Websocket upgrade request is missing an authentication token`);
@@ -362,7 +385,7 @@ const createUpgradeHandler = (server) => (req, socket, head) => __awaiter(void 0
         }
         const remoteAddress = ((_a = req.headers) === null || _a === void 0 ? void 0 : _a["x-forwarded-for"]) || ((_b = req.connection) === null || _b === void 0 ? void 0 : _b.remoteAddress);
         util_1.logger.info(`WS upgrade request from ${remoteAddress} for authenticated user ${token.username}`);
-        const username = (0, auth_1.getUser)(token.username, token.iss);
+        const username = (0, auth_1.getUser)(token.username, `${token.iss}`);
         if (!username) {
             util_1.logger.error(`Could not find username ${token.username} in the user map`);
             return socket.end();
@@ -382,7 +405,9 @@ const createUpgradeHandler = (server) => (req, socket, head) => __awaiter(void 0
             util_1.logger.info(`Redirecting to backend process for ${username} (port ${existingProcess.port})`);
             req.headers["carta-auth-token"] = existingProcess.headerToken;
             req.url = "/";
-            return server.ws(req, socket, head, { target: { host: "localhost", port: existingProcess.port } });
+            return server.ws(req, socket, head, {
+                target: { host: "localhost", port: existingProcess.port }
+            });
         }
         else {
             util_1.logger.error(`Backend process could not be started`);
@@ -403,10 +428,14 @@ const createScriptingProxyHandler = (server) => (req, res, next) => __awaiter(vo
         return next({ statusCode: 401, message: "Not authorized" });
     }
     if (!req.scripting) {
-        return next({ statusCode: 403, message: "API token supplied does not permit scripting" });
+        return next({
+            statusCode: 403,
+            message: "API token supplied does not permit scripting"
+        });
     }
     try {
         const remoteAddress = ((_a = req.headers) === null || _a === void 0 ? void 0 : _a["x-forwarded-for"]) || ((_b = req.connection) === null || _b === void 0 ? void 0 : _b.remoteAddress);
+        util_1.logger.info(`Scripting proxy request from ${remoteAddress} for authenticated user ${username}`);
         let existingProcess = processMap.get(username);
         if (!(existingProcess === null || existingProcess === void 0 ? void 0 : existingProcess.process) || existingProcess.process.signalCode) {
             // Attempt to start new process
@@ -420,16 +449,24 @@ const createScriptingProxyHandler = (server) => (req, res, next) => __awaiter(vo
                 yield (0, util_1.delay)(config_1.ServerConfig.startDelay);
             }
             req.headers["carta-auth-token"] = existingProcess.headerToken;
-            return server.web(req, res, { target: { host: "localhost", port: existingProcess.port } });
+            return server.web(req, res, {
+                target: { host: "localhost", port: existingProcess.port }
+            });
         }
         else {
-            return next({ statusCode: 500, message: `Backend process could not be started for ${username}` });
+            return next({
+                statusCode: 500,
+                message: `Backend process could not be started for ${username}`
+            });
         }
     }
     catch (err) {
         util_1.logger.error(`Error proxying scripting request for ${req.username}`);
         util_1.logger.debug(err);
-        return next({ statusCode: 500, message: `Error proxying scripting request for ${req.username}` });
+        return next({
+            statusCode: 500,
+            message: `Error proxying scripting request for ${req.username}`
+        });
     }
 });
 exports.createScriptingProxyHandler = createScriptingProxyHandler;

package/dist/util.js

@@ -16,11 +16,12 @@ exports.logger = void 0;
 exports.delay = delay;
 exports.noCache = noCache;
 exports.getUserId = getUserId;
-const child_process_1 = require("child_process");
+exports.generateUrlSafeString = generateUrlSafeString;
+const node_child_process_1 = require("node:child_process");
 const winston_1 = __importDefault(require("winston"));
 exports.logger = winston_1.default.createLogger({
     // Detailed setup is completed in config.ts
-    levels: winston_1.default.config.syslog.levels,
+    levels: winston_1.default.config.syslog.levels
 });
 // Delay for the specified number of milliseconds
 function delay(delay) {
@@ -30,7 +31,7 @@ function delay(delay) {
         });
     });
 }
-function noCache(req, res, next) {
+function noCache(_req, res, next) {
     res.header("Cache-Control", "private, no-cache, no-store, must-revalidate");
     res.header("Expires", "-1");
     res.header("Pragma", "no-cache");
@@ -40,13 +41,21 @@ function getUserId(username) {
     if (!username) {
         throw new Error("Missing argument for username");
     }
-    const result = (0, child_process_1.spawnSync)("id", ["-u", username]);
+    const result = (0, node_child_process_1.spawnSync)("id", ["-u", username]);
     if (!result.status && (result === null || result === void 0 ? void 0 : result.stdout)) {
         const uid = Number.parseInt(result.stdout.toString());
-        if (isFinite(uid)) {
+        if (Number.isFinite(uid)) {
             return uid;
         }
     }
     throw new Error(`Can't find uid for username ${username}`);
 }
+function generateUrlSafeString(length) {
+    const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~";
+    let sessionId = "";
+    for (let i = 0; i < length; i++) {
+        sessionId += charset[Math.floor(Math.random() * charset.length)];
+    }
+    return sessionId;
+}
 //# sourceMappingURL=util.js.map