From 8dac82dfb2decbf75d9c787a8359399096262bae Mon Sep 17 00:00:00 2001 From: RaizeTheLimit Date: Wed, 12 Nov 2025 18:08:56 +0700 Subject: [PATCH 1/3] Docker support and simple web authentication --- .dockerignore | 55 +++++++++++ Dockerfile | 59 ++++++++++++ docker-compose.yml | 20 ++++ src/config/example.config.json | 1 + src/index.ts | 132 +++++++++++++++++++++++++- src/views/login.html | 165 +++++++++++++++++++++++++++++++++ src/views/print-protos.html | 30 ++++++ 7 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 src/views/login.html diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..d450231 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,55 @@ +# Dependencies +node_modules/ +npm-debug.log +yarn-error.log + +# Build output +dist/ + +# Proto samples (will be mounted as volume) +proto_samples/ + +# Git +.git/ +.gitignore +.gitattributes + +# Documentation +*.md +README* +CHANGELOG* +LICENSE* + +# IDE +.vscode/ +.idea/ +*.swp +*.swo +*~ + +# OS +.DS_Store +Thumbs.db + +# Environment +.env +.env.* + +# Testing +coverage/ +.nyc_output/ + +# Docker +Dockerfile +docker-compose.yml +.dockerignore + +# CI/CD +.github/ +.gitlab-ci.yml +.travis.yml + +# Misc +*.log +tmp/ +temp/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..81a08b9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,59 @@ +# Stage 1: Build +FROM node:20-alpine AS builder + +# Install Yarn globally +RUN corepack enable && corepack prepare yarn@1.22.22 --activate + +# Set working directory +WORKDIR /app + +# Copy package files +COPY package.json yarn.lock ./ + +# Install all dependencies (including devDependencies for build) +# Skip scripts to prevent prepare hook from running before source is copied +RUN yarn install --frozen-lockfile --ignore-scripts + +# Copy source code +COPY . . + +# Build the application (compile TypeScript + copy static assets) +RUN yarn build + +# Stage 2: Production +FROM node:20-alpine + +# Install Yarn globally +RUN corepack enable && corepack prepare yarn@1.22.22 --activate + +# Set working directory +WORKDIR /app + +# Copy package files +COPY package.json yarn.lock ./ + +# Install only production dependencies +# Skip scripts since we're only copying pre-built artifacts +RUN yarn install --frozen-lockfile --production --ignore-scripts + +# Copy built application from builder stage +COPY --from=builder /app/dist ./dist + +# Copy source config directory structure (for config.json mount point) +COPY --from=builder /app/src/config/example.config.json ./src/config/ + +# Create proto_samples directory +RUN mkdir -p proto_samples + +# Expose the default port +EXPOSE 8081 + +# Set NODE_ENV to production +ENV NODE_ENV=production + +# Health check +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ + CMD node -e "require('http').get('http://localhost:8081/', (r) => {process.exit(r.statusCode === 200 ? 0 : 1)})" + +# Start the application +CMD ["node", "dist/index.js"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..3bb333b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,20 @@ +services: + protodecoder-ui: + build: + context: . + dockerfile: Dockerfile + container_name: protodecoder-ui + ports: + - "8081:8081" + volumes: + - ./src/config/config.json:/app/src/config/config.json:ro + - ./proto_samples:/app/proto_samples + restart: unless-stopped + environment: + - NODE_ENV=production + healthcheck: + test: ["CMD", "node", "-e", "require('http').get('http://localhost:8081/', (r) => {process.exit(r.statusCode === 200 ? 0 : 1)})"] + interval: 30s + timeout: 10s + start_period: 5s + retries: 3 diff --git a/src/config/example.config.json b/src/config/example.config.json index 36c5ba5..c6f31ce 100644 --- a/src/config/example.config.json +++ b/src/config/example.config.json @@ -1,5 +1,6 @@ { "default_port": 8081, + "web_password": null, "trafficlight_identifier": "AwesomeProtoSender", "redirect_to_golbat_url": null, "redirect_to_golbat_token": null, diff --git a/src/index.ts b/src/index.ts index 41764fb..1595048 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,6 @@ import http from "http"; import fs from "fs"; +import crypto from "crypto"; import { WebStreamBuffer, getIPAddress, handleData, moduleConfigIsAvailable, redirect_post_golbat } from "./utils"; import { decodePayload, decodePayloadTraffic } from "./parser/proto-parser"; import SampleSaver from "./utils/sample-saver"; @@ -18,9 +19,114 @@ const portBind = config["default_port"]; // Initialize sample saver const sampleSaver = config.sample_saving ? new SampleSaver(config.sample_saving) : null; +// Authentication setup +const WEB_PASSWORD = config["web_password"]; +const AUTH_REQUIRED = WEB_PASSWORD !== null && WEB_PASSWORD !== undefined && WEB_PASSWORD !== ""; +const sessions = new Set(); + +// Helper functions for authentication +function generateSessionToken(): string { + return crypto.randomBytes(32).toString("hex"); +} + +function parseCookies(cookieHeader: string | undefined): Record { + const cookies: Record = {}; + if (!cookieHeader) return cookies; + + cookieHeader.split(';').forEach(cookie => { + const parts = cookie.trim().split('='); + if (parts.length === 2) { + cookies[parts[0]] = parts[1]; + } + }); + return cookies; +} + +function isAuthenticated(req: http.IncomingMessage): boolean { + if (!AUTH_REQUIRED) return true; + + const cookies = parseCookies(req.headers.cookie); + const sessionToken = cookies['session_token']; + return !!(sessionToken && sessions.has(sessionToken)); +} + +function requireAuth(req: http.IncomingMessage, res: http.ServerResponse): boolean { + if (!isAuthenticated(req)) { + res.writeHead(302, { Location: '/login' }); + res.end(); + return false; + } + return true; +} + // server const httpServer = http.createServer(function (req, res) { let incomingData: Array = []; + + // Authentication routes + if (req.url === "/login" && req.method === "GET") { + if (isAuthenticated(req)) { + res.writeHead(302, { Location: '/' }); + res.end(); + return; + } + res.writeHead(200, { "Content-Type": "text/html" }); + const loginHTML = fs.readFileSync("./dist/views/login.html"); + res.end(loginHTML); + return; + } + + if (req.url === "/auth/login" && req.method === "POST") { + req.on("data", function (chunk) { + incomingData.push(chunk); + }); + req.on("end", function () { + try { + const requestData = incomingData.join(""); + const parsedData = JSON.parse(requestData); + + if (parsedData.password === WEB_PASSWORD) { + const sessionToken = generateSessionToken(); + sessions.add(sessionToken); + + res.writeHead(200, { + "Content-Type": "application/json", + "Set-Cookie": `session_token=${sessionToken}; HttpOnly; Path=/; Max-Age=86400` + }); + res.end(JSON.stringify({ success: true })); + } else { + res.writeHead(401, { "Content-Type": "application/json" }); + res.end(JSON.stringify({ success: false, message: "Invalid password" })); + } + } catch (error) { + res.writeHead(400, { "Content-Type": "application/json" }); + res.end(JSON.stringify({ success: false, message: "Invalid request" })); + } + }); + return; + } + + if (req.url === "/auth/logout" && req.method === "POST") { + const cookies = parseCookies(req.headers.cookie); + const sessionToken = cookies['session_token']; + if (sessionToken) { + sessions.delete(sessionToken); + } + + res.writeHead(200, { + "Content-Type": "application/json", + "Set-Cookie": "session_token=; HttpOnly; Path=/; Max-Age=0" + }); + res.end(JSON.stringify({ success: true })); + return; + } + + if (req.url === "/auth/status" && req.method === "GET") { + res.writeHead(200, { "Content-Type": "application/json" }); + res.end(JSON.stringify({ authRequired: AUTH_REQUIRED })); + return; + } + switch (req.url) { case "/golbat": req.on("data", function (chunk) { @@ -158,26 +264,31 @@ const httpServer = http.createServer(function (req, res) { }); break; case "/images/favicon.png": + if (!requireAuth(req, res)) break; res.writeHead(200, { "Content-Type": "image/png" }); const favicon = fs.readFileSync("./dist/views/images/favicon.png"); res.end(favicon); break; case "/css/style.css": + if (!requireAuth(req, res)) break; res.writeHead(200, { "Content-Type": "text/css" }); const pageCssL = fs.readFileSync("./dist/views/css/style.css"); res.end(pageCssL); break; case "/json-viewer/jquery.json-viewer.css": + if (!requireAuth(req, res)) break; res.writeHead(200, { "Content-Type": "text/css" }); const pageCss = fs.readFileSync("node_modules/jquery.json-viewer/json-viewer/jquery.json-viewer.css"); res.end(pageCss); break; case "/json-viewer/jquery.json-viewer.js": + if (!requireAuth(req, res)) break; res.writeHead(200, { "Content-Type": "text/javascript" }); const pageJs = fs.readFileSync("node_modules/jquery.json-viewer/json-viewer/jquery.json-viewer.js"); res.end(pageJs); break; case "/": + if (!requireAuth(req, res)) break; res.writeHead(200, { "Content-Type": "text/html" }); const pageHTML = fs.readFileSync("./dist/views/print-protos.html"); res.end(pageHTML); @@ -189,6 +300,22 @@ const httpServer = http.createServer(function (req, res) { }); var io = require("socket.io")(httpServer); + +// Socket.IO authentication middleware +if (AUTH_REQUIRED) { + io.use((socket, next) => { + const cookieHeader = socket.handshake.headers.cookie; + const cookies = parseCookies(cookieHeader); + const sessionToken = cookies['session_token']; + + if (sessionToken && sessions.has(sessionToken)) { + next(); + } else { + next(new Error('Authentication required')); + } + }); +} + var incoming = io.of("/incoming").on("connection", function (socket) { const reader = { read: function (data: object) { @@ -221,9 +348,12 @@ var outgoing = io.of("/outgoing").on("connection", function (socket) { httpServer.keepAliveTimeout = 0; httpServer.listen(portBind, function () { + const authStatus = AUTH_REQUIRED ? "ENABLED - Password required to access web UI" : "DISABLED"; const welcome = ` Server start access of this in urls: http://localhost:${portBind} or WLAN mode http://${getIPAddress()}:${portBind}. - + + - Web Authentication: ${authStatus} + - Clients MITM: 1) --=FurtiF™=- Tools EndPoints: http://${getIPAddress()}:${portBind}/traffic or http://${getIPAddress()}:${portBind}/golbat (depending on the modes chosen) 2) If Other set here... diff --git a/src/views/login.html b/src/views/login.html new file mode 100644 index 0000000..3f6982b --- /dev/null +++ b/src/views/login.html @@ -0,0 +1,165 @@ + + + + + + + + ProtoDecoderUI - Login + + + + + + + + + diff --git a/src/views/print-protos.html b/src/views/print-protos.html index 9f588e4..58c926d 100644 --- a/src/views/print-protos.html +++ b/src/views/print-protos.html @@ -45,6 +45,7 @@

+

@@ -484,6 +485,22 @@
$("#clear-button").click(function () { clearTable(); }); + $("#logout-button").click(async function () { + if (confirm("Are you sure you want to logout?")) { + try { + await fetch("/auth/logout", { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + }); + window.location.href = "/login"; + } catch (error) { + console.error("Logout error:", error); + alert("Failed to logout. Please try again."); + } + } + }); function clearTable() { $("#data_socket tbody tr").remove(); messages = []; @@ -630,6 +647,19 @@
$("#maxlogs").val(maxLogs); } loadSettings(); + + // Check if authentication is enabled and show logout button + fetch("/auth/status") + .then(response => response.json()) + .then(data => { + if (data.authRequired) { + document.getElementById("logout-button").style.display = "inline-block"; + } + }) + .catch(error => { + console.log("Could not check auth status:", error); + }); + function storeSettings() { localStorage.setItem( "settings", From f574785e43ebd6a3034d724dc80a59adf400a62d Mon Sep 17 00:00:00 2001 From: RaizeTheLimit Date: Wed, 12 Nov 2025 18:30:24 +0700 Subject: [PATCH 2/3] chore(protos): Update js proto package --- yarn.lock | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 18f879a..c03a99d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15,9 +15,9 @@ wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" "@na-ji/pogo-protos@^2.131.0": - version "2.205.0" - resolved "https://registry.yarnpkg.com/@na-ji/pogo-protos/-/pogo-protos-2.205.0.tgz#7001f8cbe65c2c5de697308b28833b076003076b" - integrity sha512-9riW9iEODcRMQ1p5pUIFvkwGT/6iVw7vmHnSmAYVAZ1rNG2cM/28aR7MEi4UJNbZPF69atOz8IKdetJHblHndg== + version "2.208.0" + resolved "https://registry.yarnpkg.com/@na-ji/pogo-protos/-/pogo-protos-2.208.0.tgz#170c28ea91d4cc5072fd48970a6dc95468b7174b" + integrity sha512-L4jUB7J+7DspAGDMYe8nC0i0F2R5UoipB021NeNfUQe0Yt1siosvOYafqErBrXd6XxG8T5Iyq0OY+YX6FcT1xw== dependencies: protobufjs "^6.11.4" @@ -96,13 +96,20 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== -"@types/node@*", "@types/node@>=10.0.0", "@types/node@>=13.7.0": +"@types/node@*", "@types/node@>=10.0.0": version "24.9.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-24.9.2.tgz#90ded2422dbfcafcf72080f28975adc21366148d" integrity sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA== dependencies: undici-types "~7.16.0" +"@types/node@>=13.7.0": + version "24.10.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-24.10.1.tgz#91e92182c93db8bd6224fca031e2370cef9a8f01" + integrity sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ== + dependencies: + undici-types "~7.16.0" + "@types/node@^20.3.1": version "20.19.24" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.24.tgz#6bc35bc96cda1a251000b706c76380b5c843f30b" From 20e3ef76cf06b3f67aeb100f1dc809a3f5a5c988 Mon Sep 17 00:00:00 2001 From: RaizeTheLimit Date: Wed, 12 Nov 2025 19:15:50 +0700 Subject: [PATCH 3/3] fix(docker): load the config volume ocrrectly --- Dockerfile | 6 +- docker-compose.yml | 2 +- src/index.ts | 135 ++++++++++++++++++++++++++++----------------- src/utils/index.ts | 9 +++ 4 files changed, 97 insertions(+), 55 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81a08b9..cc9cf00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,8 +39,10 @@ RUN yarn install --frozen-lockfile --production --ignore-scripts # Copy built application from builder stage COPY --from=builder /app/dist ./dist -# Copy source config directory structure (for config.json mount point) -COPY --from=builder /app/src/config/example.config.json ./src/config/ +# Copy config directory structure (for config.json mount point) +# Note: example.config.json is already in dist/config/ from the build process +# This ensures the directory structure exists for the volume mount +COPY --from=builder /app/dist/config/example.config.json ./dist/config/ # Create proto_samples directory RUN mkdir -p proto_samples diff --git a/docker-compose.yml b/docker-compose.yml index 3bb333b..4498507 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: ports: - "8081:8081" volumes: - - ./src/config/config.json:/app/src/config/config.json:ro + - ./src/config/config.json:/app/dist/config/config.json:ro - ./proto_samples:/app/proto_samples restart: unless-stopped environment: diff --git a/src/index.ts b/src/index.ts index 1595048..d2bb8ff 100644 --- a/src/index.ts +++ b/src/index.ts @@ -133,27 +133,37 @@ const httpServer = http.createServer(function (req, res) { incomingData.push(chunk); }); req.on("end", function () { - const requestData = incomingData.join(""); - let parsedData = JSON.parse(requestData); - res.writeHead(200, { "Content-Type": "application/json" }); - res.end(""); - if (Array.isArray(parsedData)) { - console.error("Incoming Data is an array, need to be single object"); - return; - } - // redirect because endpoint is in use there, leave null to ignore. - // ex http://123.123.123.123:9001/raw - // this need a test ping ok or throw for better. - if (config["redirect_to_golbat_url"]) { - try { - redirect_post_golbat(config["redirect_to_golbat_url"], config["redirect_to_golbat_token"], JSON.stringify(parsedData)); + try { + const requestData = incomingData.join(""); + let parsedData = JSON.parse(requestData); + res.writeHead(200, { "Content-Type": "application/json" }); + res.end(""); + if (Array.isArray(parsedData)) { + console.error("Incoming Data is an array, need to be single object"); + return; } - catch (err) { - console.error("Endpoint golbat offline or bad!" + err); + // Validate required fields + if (!parsedData['contents'] || !Array.isArray(parsedData['contents'])) { + console.error("Invalid golbat data: 'contents' field missing or not an array"); + return; } - } - const identifier = parsedData['username']; - for (let i = 0; i < parsedData['contents'].length; i++) { + if (parsedData['contents'].length === 0) { + console.error("Invalid golbat data: 'contents' array is empty"); + return; + } + // redirect because endpoint is in use there, leave null to ignore. + // ex http://123.123.123.123:9001/raw + // this need a test ping ok or throw for better. + if (config["redirect_to_golbat_url"]) { + try { + redirect_post_golbat(config["redirect_to_golbat_url"], config["redirect_to_golbat_token"], JSON.stringify(parsedData)); + } + catch (err) { + console.error("Endpoint golbat offline or bad!" + err); + } + } + const identifier = parsedData['username']; + for (let i = 0; i < parsedData['contents'].length; i++) { const rawRequest = parsedData['contents'][i].request || ""; const rawResponse = parsedData['contents'][i].payload || ""; @@ -191,6 +201,9 @@ const httpServer = http.createServer(function (req, res) { } } } + } catch (error) { + console.error("Error processing golbat request:", error); + } }); break; case "/traffic": @@ -217,25 +230,34 @@ const httpServer = http.createServer(function (req, res) { incomingData.push(chunk); }); req.on("end", () => { - const requestData = incomingData.join(""); - let parsedData = JSON.parse(requestData); - res.writeHead(200, { "Content-Type": "application/json" }); - res.end(""); - const parsedResponseData = decodePayload( - parsedData.contents, - "response" - ); - if (typeof parsedResponseData === "string") { - incomingProtoWebBufferInst.write({ error: parsedResponseData }); - } else { - for (let parsedObject of parsedResponseData) { - parsedObject.identifier = - parsedData["uuid"] || - parsedData["devicename"] || - parsedData["deviceName"] || - parsedData["instanceName"]; - incomingProtoWebBufferInst.write(parsedObject); + try { + const requestData = incomingData.join(""); + let parsedData = JSON.parse(requestData); + res.writeHead(200, { "Content-Type": "application/json" }); + res.end(""); + // Validate required fields + if (!parsedData.contents) { + console.error("Invalid raw data: 'contents' field missing"); + return; + } + const parsedResponseData = decodePayload( + parsedData.contents, + "response" + ); + if (typeof parsedResponseData === "string") { + incomingProtoWebBufferInst.write({ error: parsedResponseData }); + } else { + for (let parsedObject of parsedResponseData) { + parsedObject.identifier = + parsedData["uuid"] || + parsedData["devicename"] || + parsedData["deviceName"] || + parsedData["instanceName"]; + incomingProtoWebBufferInst.write(parsedObject); + } } + } catch (error) { + console.error("Error processing raw request:", error); } }); break; @@ -244,22 +266,31 @@ const httpServer = http.createServer(function (req, res) { incomingData.push(chunk); }); req.on("end", function () { - const requestData = incomingData.join(""); - let parsedData = JSON.parse(requestData); - res.writeHead(200, { "Content-Type": "application/json" }); - res.end(""); - const parsedRequestData = decodePayload(parsedData.contents, "request"); - if (typeof parsedRequestData === "string") { - outgoingProtoWebBufferInst.write({ error: parsedRequestData }); - } else { - for (let parsedObject of parsedRequestData) { - parsedObject.identifier = - parsedData["uuid"] || - parsedData["devicename"] || - parsedData["deviceName"] || - parsedData["instanceName"]; - outgoingProtoWebBufferInst.write(parsedObject); + try { + const requestData = incomingData.join(""); + let parsedData = JSON.parse(requestData); + res.writeHead(200, { "Content-Type": "application/json" }); + res.end(""); + // Validate required fields + if (!parsedData.contents) { + console.error("Invalid debug data: 'contents' field missing"); + return; + } + const parsedRequestData = decodePayload(parsedData.contents, "request"); + if (typeof parsedRequestData === "string") { + outgoingProtoWebBufferInst.write({ error: parsedRequestData }); + } else { + for (let parsedObject of parsedRequestData) { + parsedObject.identifier = + parsedData["uuid"] || + parsedData["devicename"] || + parsedData["deviceName"] || + parsedData["instanceName"]; + outgoingProtoWebBufferInst.write(parsedObject); + } } + } catch (error) { + console.error("Error processing debug request:", error); } }); break; diff --git a/src/utils/index.ts b/src/utils/index.ts index 4c57e70..6315029 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -34,6 +34,15 @@ export function getIPAddress() { } export function handleData(incoming: WebStreamBuffer, outgoing: WebStreamBuffer, identifier: any, parsedData: string, sampleSaver?: any) { + // Validate required fields + if (!parsedData['protos'] || !Array.isArray(parsedData['protos'])) { + console.error("Invalid traffic data: 'protos' field missing or not an array"); + return; + } + if (parsedData['protos'].length === 0) { + console.error("Invalid traffic data: 'protos' array is empty"); + return; + } for (let i = 0; i < parsedData['protos'].length; i++) { const rawRequest = parsedData['protos'][i].request || ""; const rawResponse = parsedData['protos'][i].response || "";