Merge pull request #1 from commjoen/firstport-activities

WIP for porting

Author: commjoen

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
         run: |
           sudo snap install yq
       - name: "Patch Chart.yaml to the current released version"
-        working-directory: helm/multi-juicer/
+        working-directory: helm/wrongsecrets-ctf-party/
         run: |
           RELEASE_VERSION="${GITHUB_REF#refs/*/}"
           # Remove leading 'v' from git tag to create valid semver
@@ -30,9 +30,9 @@ jobs:
     strategy:
       matrix:
         component:
-          - progress-watchdog
+          - unusued-progress-watchdog
           - cleaner
-          - juice-balancer
+          - wrongsecrets-balancer
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/test.yml

@@ -25,28 +25,29 @@ jobs:
       - uses: actions/checkout@master
       - name: "Install & Build BalancerUI"
         run: |
-          cd juice-balancer/ui
+          cd wrongsecrets-balancer/ui
           npm ci
           npm run build
       - name: Install Balancer
         run: |
-          cd juice-balancer
+          cd wrongsecrets-balancer
           npm ci
       - name: Run Linter
         run: |
-          cd juice-balancer
+          cd wrongsecrets-balancer
           npm run lint
       - name: Test Balancer
         run: |
-          cd juice-balancer
+          cd wrongsecrets-balancer
           npm test -- --ci --color --verbose
-  progressWatchdog:
-    name: ProgressWatchdog
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: "Test ProgressWatchdog"
-        run: |
-          cd progress-watchdog
-          go vet
-          go test -cover
+  #disabled as for now: we cannot use it yet
+  # progressWatchdog:
+  #   name: ProgressWatchdog
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - name: "Test ProgressWatchdog"
+  #       run: |
+  #         cd progress-watchdog
+  #         go vet
+  #         go test -cover

.idea/.gitignore

@@ -1,3 +1,5 @@
+Original Attirbution file of Multijuicer from which we Forked:
+
 MultiJuicer uses multiple Icons / Emojis from OpenMoji: https://openmoji.org/
 
 The Logo was originally created by [Straight outta Mane](https://en.99designs.de/profiles/2794862) via [99Desgins](https://en.99designs.de/logo-brand-guide/contests/create-juicy-logo-open-source-project-multijuicer-1075365/entries).

.idea/aws.xml

@@ -1,17 +1,19 @@
 #!/usr/bin/env bash
 
-echo "This Script canbe used to 'easily' build all MultiJuicer Components and install them to a local kubernetes cluster"
+echo "This Script can be used to 'easily' build all WrongSecrets CTF party Components and install them to a local kubernetes cluster"
 echo "For this to work the local kubernetes cluster must have access to the same local registry / image cache which 'docker build ...' writes its image to"
 echo "For example docker-desktop with its included k8s cluster"
 
 echo "Usage: ./build-and-deploy.sh"
 
 version="$(uuidgen)"
 
-docker build -t local/juice-balancer:$version ./juice-balancer &
+docker build -t local/wrongsecrets-balancer:$version ./wrongsecrets-balancer &
 docker build -t local/cleaner:$version ./cleaner &
-docker build -t local/progress-watchdog:$version ./progress-watchdog &
+#docker build -t local/unusued-progress-watchdog:$version ./unusued-progress-watchdog &
 
 wait
 
-helm upgrade --install mj ./helm/multi-juicer --set="imagePullPolicy=Never" --set="balancer.repository=local/juice-balancer" --set="balancer.tag=$version" --set="progressWatchdog.repository=local/progress-watchdog" --set="progressWatchdog.tag=$version" --set="juiceShopCleanup.repository=local/cleaner" --set="juiceShopCleanup.tag=$version"
+#helm upgrade --install mj ./helm/wrongsecrets-ctf-party --set="imagePullPolicy=Never" --set="balancer.repository=local/wrongsecrets-balancer" --set="balancer.tag=$version" --set="progressWatchdog.repository=local/unusued-progress-watchdog" --set="progressWatchdog.tag=$version" --set="wrongsecretsCleanup.repository=local/cleaner" --set="wrongsecretsCleanup.tag=$version"
+helm upgrade --install mj ./helm/wrongsecrets-ctf-party --set="imagePullPolicy=Never" --set="balancer.repository=local/wrongsecrets-balancer" --set="balancer.tag=$version" --set="wrongsecretsCleanup.repository=local/cleaner" --set="wrongsecretsCleanup.tag=$version"
+#helm upgrade --install mj ./helm/wrongsecrets-ctf-party --set="imagePullPolicy=Always" --set="balancer.repository=jeroenwillemsen/wrongsecrets-balancer" --set="balancer.tag=0.1" --set="wrongsecretsCleanup.repository=jeroenwillemsen/wrongsecrets-ctf-cleaner" --set="wrongsecretsCleanup.tag=0.1"

.idea/azure/azureSettings.xml

@@ -1,7 +1,7 @@
 {
   "name": "cleaner",
   "version": "1.0.0",
-  "description": "k8s ChronJob for cleaning up unused Juice Shop instances.",
+  "description": "k8s ChronJob for cleaning up unused WrongSecrets instances.",
   "main": "src/main.js",
   "scripts": {
     "test": "jest",

.idea/codeStyles/codeStyleConfig.xml

@@ -1,3 +1,7 @@
+#WrongSecrets CTF Cleaner
+
+This is a port from the Multijuice Cleaner. Original readme:
+
 ![Cleaner Cover](./cleaner-cover.svg)
 
 Cleaner is a sub component of MultiJuicer, a kubernetes Jobs which is responsible for cleaning up Juice Shop instances which haven't been used for some time.

.idea/inspectionProfiles/Project_Default.xml

@@ -36,23 +36,22 @@ async function main() {
   };
 
   console.log(
-    `Looking for Juice Shop Instances which have been inactive for more than ${MaxInactiveDuration}.`
+    `Looking for WrongSecerets Instances which have been inactive for more than ${MaxInactiveDuration}.`
   );
-  const instances = await k8sAppsApi.listNamespacedDeployment(
-    Namespace,
+  const instances = await k8sAppsApi.listDeploymentForAllNamespaces(
     true,
     undefined,
     undefined,
-    undefined,
-    'app=juice-shop'
+    'app in (wrongsecrets, virtualdesktop)',
+    200
   );
 
   console.log(`Found ${instances.body.items.length} instances. Checking their activity.`);
 
   for (const instance of instances.body.items) {
     const instanceName = instance.metadata.name;
     const lastConnectTimestamps = parseInt(
-      instance.metadata.annotations['multi-juicer.iteratec.dev/lastRequest'],
+      instance.metadata.annotations['wrongsecrets.owasp.dev/lastRequest'],
       10
     );
 
@@ -99,7 +98,7 @@ async function main() {
 
 main()
   .then((counts) => {
-    console.log('Finished Juice Shop Instance Cleanup');
+    console.log('Finished WrongSecrets Instance Cleanup');
     console.log('');
     console.log('Successful deletions:');
     console.log(`  Deployments: ${counts.successful.deployments}`);

.idea/misc.xml

@@ -15,7 +15,7 @@ This example expects you to have the following cli tools setup.
 # First we'll need a cluster, you can create one using the eksctl cli.
 # This will take a couple of minutes
 eksctl create cluster \
---name multi-juicer \
+--name wrongsecrets-ctf-party \
 --version 1.21 \
 --nodegroup-name standard-workers \
 --node-type t3.medium \
@@ -25,22 +25,22 @@ eksctl create cluster \
 --node-ami auto
 
 # After completion verify that your kubectl context has been updated:
-# Should print something like: Administrator@multi-juicer.eu-central-1.eksctl.io
+# Should print something like: Administrator@wrongsecrets-ctf-party.eu-central-1.eksctl.io
 kubectl config current-context
 ```
 
 ## Step 2. Installing MultiJuicer via helm
 
 ```sh
-# You'll need to add the multi-juicer helm repo to your helm repos
-helm repo add multi-juicer https://iteratec.github.io/multi-juicer/
+# You'll need to add the wrongsecrets-ctf-party helm repo to your helm repos
+helm repo add wrongsecrets-ctf-party https://iteratec.github.io/multi-juicer/
 
-helm install multi-juicer multi-juicer/multi-juicer
+helm install wrongsecrets-ctf-party wrongsecrets-ctf-party/wrongsecrets-ctf-party
 
 # kubernetes will now spin up the pods
 # to verify every thing is starting up, run:
 kubectl get pods
-# This should show you two pods a juice-balancer pod and a progress-watchdog pod
+# This should show you two pods a wrongsecrets-balancer pod and a unusued-progress-watchdog pod
 # Wait until both pods are ready
 ```
 
@@ -51,7 +51,7 @@ This step is optional, but helpful to catch errors quicker.
 ```sh
 # lets test out if the app is working correctly before proceeding
 # for that we can port forward the JuiceBalancer service to your local machine
-kubectl port-forward service/juice-balancer 3000:3000
+kubectl port-forward service/wrongsecrets-balancer 3000:3000
 
 # Open up your browser for localhost:3000
 # You should be able to see the MultiJuicer Balancer UI
@@ -64,15 +64,15 @@ kubectl port-forward service/juice-balancer 3000:3000
 # Go back to localhost:3000/balancer
 # To log in as the admin log in as the team "admin"
 # The password for the team gets autogenerated if not specified, you can extract it from the kubernetes secret:
-kubectl get secrets juice-balancer-secret -o=jsonpath='{.data.adminPassword}' | base64 --decode
+kubectl get secrets wrongsecrets-balancer-secret -o=jsonpath='{.data.adminPassword}' | base64 --decode
 ```
 
 ## Step 4. Add Ingress to expose the app to the world
 
 Create a loadbalancer which is exposed is achieved by running the following command:
 
 ```sh
-kubectl create -f  https://raw.githubusercontent.com/iteratec/multi-juicer/main/guides/aws/loadbalancer.yaml
+kubectl create -f  https://raw.githubusercontent.com/commjoen/wrongsecrets-ctf-party/firstport-activities/guides/aws/loadbalancer.yaml
 ```
 
 You can get the LoadBalancer's DNS record either from the AWS console, or by running:
@@ -81,9 +81,9 @@ You can get the LoadBalancer's DNS record either from the AWS console, or by run
 kubectl get services
 
 # NAME                                TYPE           CLUSTER-IP       EXTERNAL-IP                                                               PORT(S)        AGE
-# juice-balancer                      ClusterIP      10.100.29.23     <none>                                                                    3000/TCP       3m14s
+# wrongsecrets-balancer                      ClusterIP      10.100.29.23     <none>                                                                    3000/TCP       3m14s
 # kubernetes                          ClusterIP      10.100.0.1       <none>                                                                    443/TCP        11h
-# multi-juicer-service-loadbalancer   LoadBalancer   10.100.134.210   YOUR_DNS_RECORD_WILL_BE_HERE.eu-north-1.elb.amazonaws.com                 80:32111/TCP   3m13s
+# wrongsecrets-ctf-party-service-loadbalancer   LoadBalancer   10.100.134.210   YOUR_DNS_RECORD_WILL_BE_HERE.eu-north-1.elb.amazonaws.com                 80:32111/TCP   3m13s
 ```
 
 Use `kubectl get pods`to see the pods you have successfully running, which should be similar to
@@ -92,8 +92,8 @@ Use `kubectl get pods`to see the pods you have successfully running, which shoul
 kubectl get pods
 # NAME                                 READY   STATUS      RESTARTS   AGE
 # cleanup-job-ID-ID                    0/1     Completed   0          48m
-# juice-balancer-ID-ID                 1/1     Running     0          80m
-# progress-watchdog-ID-ID              1/1     Running     0          80m
+# wrongsecrets-balancer-ID-ID                 1/1     Running     0          80m
+# unusued-progress-watchdog-ID-ID              1/1     Running     0          80m
 
 
 kubectl get pods -n kube-system
@@ -110,11 +110,11 @@ kubectl get pods -n kube-system
 ## Step 5. Deinstallation
 
 ```sh
-helm delete multi-juicer
+helm delete wrongsecrets-ctf-party
 
 # Delete the loadbalancer setup
-kubectl delete -f kubectl create -f  https://raw.githubusercontent.com/iteratec/multi-juicer/main/guides/aws/loadbalancer.yaml
+kubectl delete -f kubectl create -f  https://raw.githubusercontent.com/commjoen/wrongsecrets-ctf-party/firstport-activities/guides/aws/loadbalancer.yaml
 
 # Delete the kubernetes cluster
-eksctl delete cluster multi-juicer
+eksctl delete cluster wrongsecrets-ctf-party
 ```

.idea/modules.xml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: multi-juicer-service-loadbalancer
+  name: wrongsecrets-balancer-public
 spec:
   type: LoadBalancer
   selector:
-    app.kubernetes.io/name: multi-juicer
-    app.kubernetes.io/instance: multi-juicer
+    app.kubernetes.io/name: wrongsecrets-ctf-party
+    app.kubernetes.io/instance: wrongsecrets-ctf-party
   ports:
     - protocol: TCP
       port: 80