Merge pull request #17 from trixter-osec/fix/latest-rctf

DarinMao · web-flow · commit 5be8ff500dbc · 2025-10-30T10:22:14.000-04:00
Support latest rCTF and k8s version
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.15.1-bullseye AS build
+FROM node:18-bullseye AS build
 
 WORKDIR /app
 COPY package.json lerna.json ./
@@ -11,7 +11,7 @@ RUN yarn bootstrap --ci
 COPY packages/client packages/client
 RUN yarn build
 
-FROM node:16.15.1-bullseye-slim AS run
+FROM node:18-bullseye-slim AS run
 
 WORKDIR /app
 ENV NODE_ENV=production
diff --git a/docs/content/install-guide/prerequisites.md b/docs/content/install-guide/prerequisites.md
@@ -10,7 +10,7 @@ There are a number of prerequisites that you must set up before using Klodd.
 
 ## rCTF
 
-Klodd integrates with [rCTF](https://rctf.redpwn.net/), redpwn's CTF platform. Because [rCTF does not currently support OAuth](https://img.shields.io/badge/PRs-welcome-brightgreen), you must patch in "pseudo-OAuth" functionality. Consider using the following Cloudflare worker on your rCTF domain `/auth*`, replacing `[KLODD_URL]` with Klodd's public URL.
+Klodd integrates with [rCTF](https://rctf.osec.io/), redpwn's CTF platform. Because [rCTF does not currently support OAuth](https://img.shields.io/badge/PRs-welcome-brightgreen), you must patch in "pseudo-OAuth" functionality. Consider using the following Cloudflare worker on your rCTF domain `/auth*`, replacing `[KLODD_URL]` with Klodd's public URL.
 
 ```js
 const renderAuthPage = uri => `<!doctype html>
diff --git a/packages/server/src/app/rctf.js b/packages/server/src/app/rctf.js
@@ -13,7 +13,7 @@ const getTeam = async (token) => {
     resolveBodyOnly: true,
     throwHttpErrors: false,
   })
-  if (kind !== 'goodUserData') {
+  if (kind !== 'goodUserData' && kind !== 'goodUserSelfData') { // goodUserData used in redpwn/rctf, goodUserSelfData used in otter-sec/rctf
     return null
   }
   return data
diff --git a/packages/server/src/k8s/resource.js b/packages/server/src/k8s/resource.js
@@ -66,7 +66,9 @@ const subscribeToCluster = async () => {
       stopAll(apiObj.metadata.name)
     },
     (err) => {
-      if (err) {
+      // Slightly hacky, but k8s aborts the connection after 5 minutes for some reason. Because of that,
+      // we should just reconnect as otherwise the entire container gets restarted causing downtime.
+      if (err && err.code !== 'ECONNRESET') {
         throw err
       }
       subscribeToCluster() // TODO: is this proper usage?

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ const getTeam = async (token) => {`
`13`	`13`	`resolveBodyOnly: true,`
`14`	`14`	`throwHttpErrors: false,`
`15`	`15`	`})`
`16`		`- if (kind !== 'goodUserData') {`
	`16`	`+ if (kind !== 'goodUserData' && kind !== 'goodUserSelfData') { // goodUserData used in redpwn/rctf, goodUserSelfData used in otter-sec/rctf`
`17`	`17`	`return null`
`18`	`18`	`}`
`19`	`19`	`return data`