Repo cleanup

Author: Aplet123

.dockerignore

@@ -8,14 +8,10 @@ COPY .puppeteerrc.cjs package.json package-lock.json ./
 RUN npm ci && npm cache clean --force
 RUN npx puppeteer browsers install chrome --install-deps
 
-COPY . .
+COPY index.js submit.html /app
+RUN mkdir /app/handlers
 
 ENV PORT=8080
 
-ARG RECAPTCHA_SITE
-ENV RECAPTCHA_SITE=${RECAPTCHA_SITE}
-ARG RECAPTCHA_SECRET
-ENV RECAPTCHA_SECRET=${RECAPTCHA_SECRET}
-
 USER node
 CMD ["node", "index.js"]

Dockerfile

@@ -1,7 +1,9 @@
 # Admin Bot
-
 Admin bot used for LA CTF challenges.
 
 ## Configuration
-Environment variables can be stored as `KEY=VALUE` pairs in either `chall.env` or `.env`, and handlers should be stored in the `handlers` directory.
+The admin bot is designed to be an extensible Docker image that can be deployed to Google Cloud Run. Environment variables can optionally be stored in a file as `KEY=VALUE` pairs in either `/app/chall.env` or `/app/.env`, and challenge handlers will be read from the `/app/handlers` directory.
+
+To use reCAPTCHA, set the `RECAPTCHA_SITE` and `RECAPTCHA_SECRET` environment variables to the correct value.
 
+An example of deployment can be seen in the [`example`](example) directory. The Docker container must be run with `--privileged` for Chrome's sandbox, or deployed in a second generation Cloud Run instance.

README.md

@@ -0,0 +1,4 @@
+FROM ghcr.io/lactf/admin-bot:latest
+
+COPY handlers /app/handlers
+COPY chall.env /app/

example/Dockerfile

@@ -0,0 +1,2 @@
+MYCHALL_ADMINPW=supersecretpassword
+MYCHALL_DOMAIN=mychall.chall.lac.tf

example/chall.env

@@ -1,12 +1,12 @@
 module.exports = {
-    name: "examplejs",
+    name: "mychall",
     timeout: 5000,
     async execute(browser, url) {
         const page = await browser.newPage();
         await page.setCookie({
             name: "adminpw",
-            value: process.env.CHALL_ADMINPW || "placeholder",
-            domain: process.env.CHALL_DOMAIN || "localhost:8080",
+            value: process.env.MYCHALL_ADMINPW || "placeholder",
+            domain: process.env.MYCHALL_DOMAIN || "localhost:8080",
             httpOnly: true,
         });
         await page.goto(url);