Merge pull request #66 from commjoen/ctf

Ctf

Author: commjoen

aws/build-an-deploy-aws.sh

@@ -111,4 +111,4 @@ wait
 DEFAULT_PASSWORD=thankyou
 #TODO: REWRITE ABOVE, REWRITE THE HARDCODED DEPLOYMENT VALS INTO VALUES AND OVERRIDE THEM HERE!
 echo "default password is ${DEFAULT_PASSWORD}"
-helm upgrade --install mj ../helm/wrongsecrets-ctf-party --set="imagePullPolicy=Always" --set="balancer.env.K8S_ENV=aws" --set"balancer.env.IRSA_ROLE=arn:aws:iam::${ACCOUNT_ID}:role/wrongsecrets-secret-manager" --set="balancer.env.REACT_APP_ACCESS_PASSWORD=${DEFAULT_PASSWORD}" --set="balancer.cookie.cookieParserSecret=thisisanewrandomvaluesowecanworkatit" --set="balancer.repository=jeroenwillemsen/wrongsecrets-balancer" --set="balancer.tag=0.95aws" --set="balancer.replicas=4" --set="wrongsecretsCleanup.repository=jeroenwillemsen/wrongsecrets-ctf-cleaner" --set="wrongsecretsCleanup.tag=0.2"
+helm upgrade --install mj ../helm/wrongsecrets-ctf-party --set="imagePullPolicy=Always" --set="balancer.env.K8S_ENV=aws" --set"balancer.env.IRSA_ROLE=arn:aws:iam::${ACCOUNT_ID}:role/wrongsecrets-secret-manager" --set="balancer.env.REACT_APP_ACCESS_PASSWORD=${DEFAULT_PASSWORD}" --set="balancer.cookie.cookieParserSecret=thisisanewrandomvaluesowecanworkatit" --set="balancer.repository=jeroenwillemsen/wrongsecrets-balancer" --set="balancer.tag=0.98aws" --set="balancer.replicas=4" --set="wrongsecretsCleanup.repository=jeroenwillemsen/wrongsecrets-ctf-cleaner" --set="wrongsecretsCleanup.tag=0.2"

helm/wrongsecrets-ctf-party/values.yaml

@@ -35,7 +35,7 @@ balancer:
     # -- Set this to a fixed random alpa-numeric string (recommended length 24 chars). If not set this get randomly generated with every helm upgrade, each rotation invalidates all active cookies / sessions requirering users to login again.
     cookieParserSecret: null
   repository: jeroenwillemsen/wrongsecrets-balancer
-  tag: 0.95aws
+  tag: 0.98aws
   # -- Number of replicas of the wrongsecrets-balancer deployment
   replicas: 1
   service:

wrongsecrets-balancer/src/kubernetes.js

@@ -61,7 +61,7 @@ const createConfigmapForTeam = async (team) => {
   const configmap = {
     apiVersion: 'v1',
     data: {
-      'funny.entry': 'thisIsK8SConfigMap',
+      'funny.entry': 'helloCTF-configmap',
     },
     kind: 'ConfigMap',
     metadata: {
@@ -80,7 +80,7 @@ const createSecretsfileForTeam = async (team) => {
   const secret = {
     apiVersion: 'v1',
     data: {
-      funnier: 'dGhpcyBpcyBhcGFzc3dvcmQ=',
+      funnier: 'RmxhZzogYXJlIHlvdSBoYXZpbmcgZnVuIHlldD8K',
     },
     kind: 'Secret',
     type: 'Opaque',

wrongsecrets-balancer/ui/src/cards/InstanceRestartingCard.js

@@ -43,12 +43,18 @@ export const InstanceRestartingCard = ({ teamname }) => {
             />
           </span>
         </CenteredText>
-        <LinkButton data-test-id="start-hacking-button" href="/">
+        <LinkButton data-test-id="start-hacking-button" href="/" target="_blank">
           <FormattedMessage
             id="instance_status_back_to_hacking"
             defaultMessage="Get back to Hacking"
           />
         </LinkButton>
+        <LinkButton data-test-id="start-desktop-button" href="/?desktop" target="_blank">
+            <FormattedMessage
+              id="instance_status_start_vm"
+              defaultMessage="Start your Webtop, might require refresh"
+            />
+        </LinkButton>
       </BodyCard>
     );
   } else {