From 1ea7b42e2979d9f66ecbb46c8d58324b5f9b8dcb Mon Sep 17 00:00:00 2001 From: migueldar Date: Fri, 12 Jan 2024 01:26:03 +0100 Subject: [PATCH] added gui Reviewers: #testers, kuba-orlik Reviewed By: #testers, kuba-orlik Subscribers: kuba-orlik Maniphest Tasks: T2741 Differential Revision: https://hub.sealcode.org/D1354 --- .gitignore | 5 +- README.md | 25 +- android/code/index.js | 20 +- android/conf/docker-entrypoint.sh | 1 + android/conf/install_cert.sh | 2 + android/conf/wait_for_sd.sh | 5 + diagram.txt | 5 +- docker-compose.yaml | 2 + http_server/Dockerfile | 4 + http_server/code/docker-entrypoint.sh | 9 +- http_server/code/favicon.ico | Bin 0 -> 16548 bytes http_server/code/index.html | 86 ++++++ http_server/code/index.js | 50 ---- http_server/code/index.mjs | 114 ++++++++ http_server/code/package-lock.json | 404 +++++++++++++++++++++++++- http_server/code/package.json | 9 +- http_server/code/src/trafficLog.jsx | 38 +++ http_server/code/tsconfig.json | 12 + package-lock.json | 2 +- package.json | 5 + proxy/Dockerfile | 2 +- 21 files changed, 733 insertions(+), 67 deletions(-) create mode 100644 android/conf/wait_for_sd.sh create mode 100644 http_server/code/favicon.ico create mode 100644 http_server/code/index.html delete mode 100644 http_server/code/index.js create mode 100644 http_server/code/index.mjs create mode 100644 http_server/code/src/trafficLog.jsx create mode 100644 http_server/code/tsconfig.json diff --git a/.gitignore b/.gitignore index c2e2275..02c78a2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,7 @@ node_modules TODO certificates images -*.png \ No newline at end of file +*.png +bundleTrafficLog.js +/http_server/code/dist/ +log \ No newline at end of file diff --git a/README.md b/README.md index 63df0d0..029f94b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,27 @@ # RENTGEN ANDROID + ## INTRODUCTION + The aim of this project is to be able to visualize all the data that a given android app ~~steals~~ sends to third parties. -We are currently in v1, the environment, which is made up of a mitmproxy machine, a http server and an ubuntu machine with android emulator was created using docker, and all the tcp traffic from the android machine is redirected through the proxy. In future versions the [rentgen](https://github.com/internet-czas-dzialac/rentgen) firefox extension will be adapted to interpret the traffic from the proxy and display it in a user-friendly way. +We are currently in v1, the environment, which is made up of a mitmproxy +machine, a http server and an ubuntu machine with android emulator was created +using docker, and all the tcp traffic from the android machine is redirected +through the proxy. In future versions the +[rentgen](https://github.com/internet-czas-dzialac/rentgen) firefox extension +will be adapted to interpret the traffic from the proxy and display it in a +user-friendly way. ## COMMANDS -To get started, run `npm install` and `npx zx start.mjs up` -And then, to check the proxy's logs you can do `docker exec -it proxy tail -f /log` and to go into the android `docker exec -it android bash`. -To see the android screen, go to localhost:8080 in a browser. The endpoint takes a while to be enabled (because the tls certificate has to install in the android), but it will show in the output of `npx zx start.mjs up` whenever it is. To execute touch events, run a post request with query params x and y for the coordinates where the touch will happen (the screen size is 320x640). The way to do it with curl would be `curl -X POST "localhost:8080?x=$coordinate_x&y=$coordinate_y"`. \ No newline at end of file + +To get started, run `npm install` and `npm start` + +If you get a time out after "Waiting for full boot..." your machine may be to slow to run the software comfortably, however, you can change the delay between screenshots in ./http_server/Dockerfile, changing "ENV screenshotDelayMs 1000" with as much time as you want to have between screenshots. The time is measured in miliseconds. + +And then, to check the proxy's logs you can do `docker exec -it proxy tail -f +/log` and to go into the android `docker exec -it android bash`. + +To control the android device, go to localhost:8080 in a browser. The endpoint +takes a while to be enabled (because the tls certificate has to install in the +android), but it will show in the output of `npm start` whenever it +is. diff --git a/android/code/index.js b/android/code/index.js index 981810b..ddb9c87 100644 --- a/android/code/index.js +++ b/android/code/index.js @@ -4,20 +4,36 @@ const fs = require("fs"); const server = net.createServer(); +async function spawnPromise(program, args) { + return new Promise((resolve, reject) => { + const process = child_process.spawn(program, args); + process.on("close", (_) => { + resolve(); + }); + }); +} + //maybe check output of child processe and send errors in some way server.on("connection", (socket) => { socket.on("data", async (dataBuf) => { data = dataBuf.toString(); if (data === "screenshot") { socket.write("start"); - child_process.spawnSync("bash", ["/conf/screenshot.sh"]); + await spawnPromise("bash", ["/conf/screenshot.sh"]); socket.write(fs.readFileSync("/screenshot.png")); socket.write("ENDOFMSG"); } else if (data.includes("touch")) { dataSplit = data.split(" "); - child_process.spawnSync("bash", ["/conf/touch.sh", dataSplit[1], dataSplit[2]]); + await spawnPromise("bash", [ + "/conf/touch.sh", + dataSplit[1], + dataSplit[2], + ]); } }); + socket.on("close", (_) => { + socket.end(); + }); }); server.listen(3000, () => { diff --git a/android/conf/docker-entrypoint.sh b/android/conf/docker-entrypoint.sh index 7ac81b4..38c8ede 100644 --- a/android/conf/docker-entrypoint.sh +++ b/android/conf/docker-entrypoint.sh @@ -6,6 +6,7 @@ bash /conf/iptables_conf.sh redsocks -c /conf/redsocks.conf & emulator -avd virtual_dev -writable-system -no-window -no-audio & bash /conf/install_cert.sh $hashed_name.0 +bash /conf/wait_for_sd.sh #wait for cert to be installed before launching socket server node /code/index.js diff --git a/android/conf/install_cert.sh b/android/conf/install_cert.sh index 8541aed..0c0b5a6 100644 --- a/android/conf/install_cert.sh +++ b/android/conf/install_cert.sh @@ -11,11 +11,13 @@ wait-for-offline adb wait-for-device adb shell avbctl disable-verification +#here may be the issue with the bypass (start) adb wait-for-device adb reboot adb wait-for-device adb root +#(end) wait-for-offline adb wait-for-device diff --git a/android/conf/wait_for_sd.sh b/android/conf/wait_for_sd.sh new file mode 100644 index 0000000..7d89048 --- /dev/null +++ b/android/conf/wait_for_sd.sh @@ -0,0 +1,5 @@ +/opt/android-sdk-linux/platform-tools/adb shell screencap /sdcard/screenshot.png 2> /dev/null +while [ "$?" != 0 ]; do + sleep 0.5 + /opt/android-sdk-linux/platform-tools/adb shell screencap /sdcard/screenshot.png 2> /dev/null +done \ No newline at end of file diff --git a/diagram.txt b/diagram.txt index 086415a..5cfefd4 100644 --- a/diagram.txt +++ b/diagram.txt @@ -51,6 +51,7 @@ RENTGEN_ANDROID docker structure | :8080 | +---------------------------------+--------------------+ | - | HTTP: - GET /: screenshot - | - POST /: touch, query params x, y indicate position + | HTTP: - GET /: gui + | - GET /screen: screenshot + | - POST /touch: touch, body params x, y indicate position | diff --git a/docker-compose.yaml b/docker-compose.yaml index a06075c..100ac93 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,6 +6,7 @@ services: - rent_gen_android volumes: - $PWD/certificates:/root/.mitmproxy + - $PWD/log:/log android: build: ./android/ container_name: android @@ -28,6 +29,7 @@ services: - rent_gen_android volumes: - $PWD/http_server/code:/code + - $PWD/log:/log ports: - 8080:8080 diff --git a/http_server/Dockerfile b/http_server/Dockerfile index 8765f61..6c468a0 100644 --- a/http_server/Dockerfile +++ b/http_server/Dockerfile @@ -2,6 +2,10 @@ FROM alpine:3.18.2 RUN apk add npm +WORKDIR /code + RUN mkdir /images +ENV screenshotDelayMs 1000 + CMD sh /code/docker-entrypoint.sh \ No newline at end of file diff --git a/http_server/code/docker-entrypoint.sh b/http_server/code/docker-entrypoint.sh index 6126394..44151e2 100644 --- a/http_server/code/docker-entrypoint.sh +++ b/http_server/code/docker-entrypoint.sh @@ -1,7 +1,8 @@ #!/bin/bash -npm i -C /code -node /code/waitSocket.mjs -node /code/index.js +npm i +npm run build +node waitSocket.mjs +node index.mjs -#tail -f /dev/null \ No newline at end of file +#tail -f /dev/null diff --git a/http_server/code/favicon.ico b/http_server/code/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..de74c491a3837c2693577d0adc95a189ce4992b8 GIT binary patch literal 16548 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 z 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 U-=F~heE>{KOkT7GWElAW03{RA;s5{u literal 0 HcmV?d00001 diff --git a/http_server/code/index.html b/http_server/code/index.html new file mode 100644 index 0000000..82baa9d --- /dev/null +++ b/http_server/code/index.html @@ -0,0 +1,86 @@ + + + + + Rentgen android + + +
+ +

+

+
+ + + + diff --git a/http_server/code/index.js b/http_server/code/index.js deleted file mode 100644 index 9f01fce..0000000 --- a/http_server/code/index.js +++ /dev/null @@ -1,50 +0,0 @@ -const express = require("express"); -const net = require("net"); -const fs = require("fs"); - -const device_size_x = 320; -const device_size_y = 640; - -const app = express(); -const socket_client = net.createConnection({ port: 3000, host: "android" }); - -async function sleep(time) { - return new Promise((resolve) => setTimeout(resolve, time)); -} - -let doneWrite = 0; -let fd; -socket_client.on("data", (dataBuf) => { - if (dataBuf.toString() === "start") - fd = fs.openSync("/code/screenshot.png", "w"); - else { - if (dataBuf.toString().includes("ENDOFMSG")) { - fs.writeSync(fd, dataBuf); - fs.close(fd); - doneWrite = 1; - } else fs.writeSync(fd, dataBuf); - } -}); - -app.get("/", async function (req, res) { - socket_client.write("screenshot"); - while (!doneWrite) await sleep(15); - res.sendFile("/code/screenshot.png"); - doneWrite = 0; -}); - -app.post("/", function (req, res) { - const x = parseInt(req.query.x); - const y = parseInt(req.query.y); - - if (isNaN(x) || isNaN(y) || x > device_size_x || y > device_size_y) { - res.send( - `the query params must be x <= ${device_size_x}, y <= ${device_size_y}\n` - ); - } else { - socket_client.write(`touch ${x} ${y}`); - res.sendStatus(200); - } -}); - -app.listen(8080, () => console.log("Listening in port 8080")); diff --git a/http_server/code/index.mjs b/http_server/code/index.mjs new file mode 100644 index 0000000..b215049 --- /dev/null +++ b/http_server/code/index.mjs @@ -0,0 +1,114 @@ +import express from "express"; +import net from "net"; +import fs from "fs"; +import { readFile } from "node:fs/promises"; + +const device_size_x = 320; +const device_size_y = 640; + +const app = express(); +app.use(express.urlencoded({ extended: false })); +const socket_client = net.createConnection({ port: 3000, host: "android" }); + +async function sleep(time) { + return new Promise((resolve) => setTimeout(resolve, time)); +} + +let doneWrite = 0; +let screenshotPromise = null; + +async function screenshot() { + socket_client.write("screenshot"); + while (!doneWrite) await sleep(15); + doneWrite = 0; + screenshotPromise = null; +} + +async function guardedScreenshot() { + if (!screenshotPromise) { + screenshotPromise = screenshot(); + } + return screenshotPromise; +} + +async function waitFullBoot() { + var start = performance.now(); + var counter = 0; + + //will timeout after 10 min + while (performance.now() - start < 600 * 1000) { + var before = performance.now(); + await screenshot(); + var after = performance.now(); + if (after - before < process.env.screenshotDelayMs) counter++; + else counter = 0; + + if (counter === 10) return; + } + + throw new Error("wait for screenshot time to be less than 0.5s timed out"); +} + +let fd; +socket_client.on("data", (dataBuf) => { + if (dataBuf.toString() === "start") + fd = fs.openSync("/code/screenshot.png", "w"); + else { + if (dataBuf.toString().includes("ENDOFMSG")) { + fs.writeSync(fd, dataBuf); + fs.close(fd); + doneWrite = 1; + } else fs.writeSync(fd, dataBuf); + } +}); + +console.log("Waiting for full boot..."); +await waitFullBoot(); +console.log("Boot detected! activating endpoints"); + +app.get("/screen", async function (req, res) { + await guardedScreenshot(); + res.sendFile("/code/screenshot.png"); +}); + +app.get("/favicon.ico", function (req, res) { + res.sendFile("/code/favicon.ico"); +}); + +app.get("/trafficLog.js", function (req, res) { + res.sendFile("/code/dist/trafficLog.js"); +}); + +app.get("/trafficLog", async function (req, res) { + res.sendFile("/log/trafficLog"); +}); + +app.post("/touch", function (req, res) { + const x = parseInt(req.body.x); + const y = parseInt(req.body.y); + + if (isNaN(x) || isNaN(y) || x > device_size_x || y > device_size_y) { + res.send( + `the query params must be x <= ${device_size_x}, y <= ${device_size_y}\n` + ); + } else { + socket_client.write(`touch ${x} ${y}`); + res.sendStatus(200); + } +}); + +app.get("/", async function (req, res) { + let fileData = (await readFile("/code/index.html")).toString(); + + fileData = fileData.replace( + "___screenshotDelayMs___", + process.env.screenshotDelayMs + ); + + res.setHeader("Content-Type", "text/html"); + res.setHeader("Content-Disposition", "inline"); + + res.send(fileData); +}); + +app.listen(8080, () => console.log("Listening in port 8080")); diff --git a/http_server/code/package-lock.json b/http_server/code/package-lock.json index 18aabe0..65a07f6 100644 --- a/http_server/code/package-lock.json +++ b/http_server/code/package-lock.json @@ -6,7 +6,363 @@ "": { "dependencies": { "express": "^4.18.2", - "net": "^1.0.2" + "net": "^1.0.2", + "preact": "^10.18.1" + }, + "devDependencies": { + "esbuild": "^0.19.5" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.5.tgz", + "integrity": "sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz", + "integrity": "sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.5.tgz", + "integrity": "sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz", + "integrity": "sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz", + "integrity": "sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz", + "integrity": "sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz", + "integrity": "sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz", + "integrity": "sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz", + "integrity": "sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz", + "integrity": "sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz", + "integrity": "sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz", + "integrity": "sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz", + "integrity": "sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz", + "integrity": "sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz", + "integrity": "sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz", + "integrity": "sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz", + "integrity": "sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz", + "integrity": "sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz", + "integrity": "sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz", + "integrity": "sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz", + "integrity": "sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz", + "integrity": "sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" } }, "node_modules/accepts": { @@ -139,6 +495,43 @@ "node": ">= 0.8" } }, + "node_modules/esbuild": { + "version": "0.19.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz", + "integrity": "sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==", + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.19.5", + "@esbuild/android-arm64": "0.19.5", + "@esbuild/android-x64": "0.19.5", + "@esbuild/darwin-arm64": "0.19.5", + "@esbuild/darwin-x64": "0.19.5", + "@esbuild/freebsd-arm64": "0.19.5", + "@esbuild/freebsd-x64": "0.19.5", + "@esbuild/linux-arm": "0.19.5", + "@esbuild/linux-arm64": "0.19.5", + "@esbuild/linux-ia32": "0.19.5", + "@esbuild/linux-loong64": "0.19.5", + "@esbuild/linux-mips64el": "0.19.5", + "@esbuild/linux-ppc64": "0.19.5", + "@esbuild/linux-riscv64": "0.19.5", + "@esbuild/linux-s390x": "0.19.5", + "@esbuild/linux-x64": "0.19.5", + "@esbuild/netbsd-x64": "0.19.5", + "@esbuild/openbsd-x64": "0.19.5", + "@esbuild/sunos-x64": "0.19.5", + "@esbuild/win32-arm64": "0.19.5", + "@esbuild/win32-ia32": "0.19.5", + "@esbuild/win32-x64": "0.19.5" + } + }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -418,6 +811,15 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, + "node_modules/preact": { + "version": "10.18.1", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.18.1.tgz", + "integrity": "sha512-mKUD7RRkQQM6s7Rkmi7IFkoEHjuFqRQUaXamO61E6Nn7vqF/bo7EZCmSyrUnp2UWHw0O7XjZ2eeXis+m7tf4lg==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", diff --git a/http_server/code/package.json b/http_server/code/package.json index f2cb654..86420ef 100644 --- a/http_server/code/package.json +++ b/http_server/code/package.json @@ -1,6 +1,13 @@ { + "scripts": { + "build": "esbuild --sourcemap --bundle src/trafficLog.jsx --outfile=dist/trafficLog.js --jsx-factory=h --jsx-fragment=Fragment" + }, "dependencies": { "express": "^4.18.2", - "net": "^1.0.2" + "net": "^1.0.2", + "preact": "^10.18.1" + }, + "devDependencies": { + "esbuild": "^0.19.5" } } diff --git a/http_server/code/src/trafficLog.jsx b/http_server/code/src/trafficLog.jsx new file mode 100644 index 0000000..9eed8dc --- /dev/null +++ b/http_server/code/src/trafficLog.jsx @@ -0,0 +1,38 @@ +import { h, render, Component } from "preact"; + +const refreshRate = 1000; + +class TrafficLog extends Component { + constructor() { + super(); + this.state = { content: "" }; + } + + componentDidMount() { + this.intervalSetter = setInterval(async () => { + var log = await (await fetch("trafficLog")).text(); + this.setState({ content: log }); + }, refreshRate); + } + + componentWillUnmount() { + clearInterval(this.intervalSetter); + } + + render() { + const contentWithLineBreaks = this.state.content + .split("\n") + .map((line, _) => { + return ( + + {line} +
+ + ); + }); + + return {contentWithLineBreaks}; + } +} + +render(, document.getElementById("traffic-log")); diff --git a/http_server/code/tsconfig.json b/http_server/code/tsconfig.json new file mode 100644 index 0000000..75df662 --- /dev/null +++ b/http_server/code/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, + "module": "commonjs" /* Specify what module code is generated. */, + "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, + "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, + "strict": true /* Enable all strict type-checking options. */, + "skipLibCheck": true /* Skip type checking all .d.ts files. */, + "jsx": "react-jsx", + "jsxImportSource": "preact" + } +} diff --git a/package-lock.json b/package-lock.json index 345bb77..b119b6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "rentGenAndroid", + "name": "rentgendroid", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index 687141b..762819c 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,9 @@ { + "scripts": { + "start": "zx start.mjs up", + "stop": "zx start.mjs down" + }, + "dependencies": { "zx": "^7.2.2" } diff --git a/proxy/Dockerfile b/proxy/Dockerfile index eb90d59..dd01871 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -1,3 +1,3 @@ FROM mitmproxy/mitmproxy:9.0.1 -CMD mitmdump --mode socks5 > /log \ No newline at end of file +CMD mitmdump --mode socks5 > /log/trafficLog \ No newline at end of file