quick fixes and cleanups

commjoen · commjoen · commit 47965d6c6c16 · 2022-10-18T08:09:02.000+02:00
diff --git a/cleaner/src/main.js b/cleaner/src/main.js
@@ -76,6 +76,7 @@ async function main() {
         console.error(error);
       }
     } else {
+      var teamname = instance.metadata.labels.team;
       console.log(
         `Not deleting Instance: '${instanceName}' from '${teamname}'. Been last active ${msToHumanReadable(
           timeDifference
diff --git a/wrongsecrets-balancer/src/app.js b/wrongsecrets-balancer/src/app.js
@@ -50,7 +50,7 @@ if (get('metrics.enabled')) {
 const teamRoutes = require('./teams/teams');
 const adminRoutes = require('./admin/admin');
 const proxyRoutes = require('./proxy/proxy');
-//const scoreBoard = require('./score-board/score-board');
+//const scoreBoard = require('./score-board/score-board'); //the sscoreboard requires a progress watchdog in place
 
 app.get('/balancer/dynamics', (req, res) => {
   const accessPassword = process.env['REACT_APP_ACCESS_PASSWORD'];
diff --git a/wrongsecrets-balancer/src/kubernetes.js b/wrongsecrets-balancer/src/kubernetes.js
@@ -1047,7 +1047,6 @@ const createDesktopDeploymentForTeam = async ({ team, passcodeHash }) => {
         'wrongsecrets-ctf-party/lastRequest': `${new Date().getTime()}`,
         'wrongsecrets-ctf-party/lastRequestReadable': new Date().toString(),
         'wrongsecrets-ctf-party/passcode': passcodeHash,
-        'wrongsecrets-ctf-party/challengesSolved': '0',
       },
     },
     spec: {
diff --git a/wrongsecrets-balancer/src/score-board/score-board.js b/wrongsecrets-balancer/src/score-board/score-board.js
@@ -7,30 +7,34 @@ const { logger } = require('../logger');
 
 // Generated via curl https://wrongsecrets-ctf.herokuapp.com/api/challenges | jq '.data | map({ key: .key, value: .difficulty }) | from_entries'
 const keyDifficultyMapping = Object.freeze({
-  challenge1: 1,
-  challenge2: 1,
-  challenge3: 1,
-  challenge4: 2,
-  challenge5: 2,
-  challenge6: 2,
-  challenge7: 4,
-  challenge8: 2,
-  challenge9: 3,
-  challenge10: 4,
-  challenge11: 4,
-  challenge12: 3,
-  challenge13: 3,
-  challenge14: 4,
-  challenge15: 2,
-  challenge16: 3,
-  challenge17: 3,
-  challenge18: 5,
-  challenge19: 4,
-  challenge20: 4,
-  challenge21: 5,
-  challenge22: 5,
-  challenge23: 1,
-  challenge24: 2,
+  "challenge0": 1,
+  "challenge1": 1,
+  "challenge2": 1,
+  "challenge3": 1,
+  "challenge4": 2,
+  "challenge5": 2,
+  "challenge6": 2,
+  "challenge7": 4,
+  "challenge8": 2,
+  "challenge9": 3,
+  "challenge10": 4,
+  "challenge11": 4,
+  "challenge12": 3,
+  "challenge13": 3,
+  "challenge14": 4,
+  "challenge15": 2,
+  "challenge16": 3,
+  "challenge17": 3,
+  "challenge18": 5,
+  "challenge19": 4,
+  "challenge20": 4,
+  "challenge21": 5,
+  "challenge22": 5,
+  "challenge23": 1,
+  "challenge24": 2,
+  "challenge25": 2,
+  "challenge26": 2,
+  "challenge27": 2,
 });
 
 /**
diff --git a/wrongsecrets-balancer/src/teams/teams.js b/wrongsecrets-balancer/src/teams/teams.js
@@ -126,11 +126,11 @@ async function validatePassword(req, res, next) {
       if (password === accessPassword) {
         next();
       } else {
-        res.status(403).send({ message: 'Go home pizzaboy!' });
+        res.status(403).send({ message: 'Go home pizzaboy! https://www.youtube.com/watch?v=qyTj4WnPE9M' });
       }
     }
   } catch (error) {
-    res.status(500).send({ message: 'Go home pizzaboy!' });
+    res.status(500).send({ message: 'Go home pizzaboy! https://www.youtube.com/watch?v=qyTj4WnPE9M' });
   }
 }
 
diff --git a/wrongsecrets-balancer/ui/src/Layout.js b/wrongsecrets-balancer/ui/src/Layout.js
@@ -131,7 +131,7 @@ export function Layout({ children, footer, siteHeader = null, wide = false }) {
           <HeaderCard wide={wide}>
             <WSLogo alt="WrongSecretsLogo" /> WrongSecrets CTF, powered by
             <MJLogo alt="MultiJuicer Logo" />
-            {siteHeader ? <SiteHeader>WrongSecrets CTF, powered by{siteHeader}</SiteHeader> : null}
+            {siteHeader ? <SiteHeader>WrongSecrets CTF, powered by MultiJuicer - {siteHeader}</SiteHeader> : null}
           </HeaderCard>
         </Header>
         <Body>
diff --git a/wrongsecrets-balancer/ui/src/pages/ScoreBoard.js b/wrongsecrets-balancer/ui/src/pages/ScoreBoard.js
@@ -201,6 +201,7 @@ export const ScoreBoard = injectIntl(() => {
   return (
     <>
       <NoPaddingBodyCard>
+        Please note that the scoreboard is currently not functioning. It does tell you which other players play, but it is not yet ready to be used.
         <Table>
           <Thead>
             <Tr>

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ async function main() {`
`76`	`76`	`console.error(error);`
`77`	`77`	`}`
`78`	`78`	`} else {`
	`79`	`+ var teamname = instance.metadata.labels.team;`
`79`	`80`	`console.log(`
`80`	`81`	`Not deleting Instance: '${instanceName}' from '${teamname}'. Been last active ${msToHumanReadable(
`81`	`82`	`timeDifference`
Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,11 @@ async function validatePassword(req, res, next) {`
`126`	`126`	`if (password === accessPassword) {`
`127`	`127`	`next();`
`128`	`128`	`} else {`
`129`		`- res.status(403).send({ message: 'Go home pizzaboy!' });`
	`129`	`+ res.status(403).send({ message: 'Go home pizzaboy! https://www.youtube.com/watch?v=qyTj4WnPE9M' });`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`} catch (error) {`
`133`		`- res.status(500).send({ message: 'Go home pizzaboy!' });`
	`133`	`+ res.status(500).send({ message: 'Go home pizzaboy! https://www.youtube.com/watch?v=qyTj4WnPE9M' });`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`