Revamp general-ssh mechanics

Author: syreal17

example-problems/general-ssh/Dockerfile

@@ -1,55 +1,48 @@
-# LAUNCH sshHost
-
-FROM ubuntu@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 AS builder
+# LAUNCH ssh_host
 
+FROM ubuntu@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 AS builder_base
 
 # Install challenge dependencies within the image
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     python3
 
-
 # Create challenge dir for metadata.json and other file artifacts
-RUN mkdir /challenge
-
+RUN mkdir /challenge && chmod 700 /challenge
+COPY config-builder.py /challenge/
 
-# Bring in all environment vars from cmgr
+FROM builder_base as builder
+# Bring in cmgr args
 ARG SEED
-ARG FLAG_FORMAT
 ARG FLAG
 
-
-COPY config-builder.py /challenge/config-builder.py
-
 RUN python3 /challenge/config-builder.py
 
-
-
 #######################
 #### Host: sshHost ####
 #######################
-FROM ubuntu@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 AS sshHost
-
+FROM ubuntu@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 AS ssh_host_base
 
 # Install challenge dependencies within the image
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     openssh-server \
-    socat \
-    python3
+    python3 \
+    socat
 
+COPY config-sshhost.py /challenge/
+COPY start.sh /opt/
+COPY profile /home/ctf-player/.profile
+COPY instructions-to-2of3.txt /home/ctf-player/drop-in/
+COPY instructions-to-3of3.txt /
+COPY --from=builder /challenge/1of3.flag.txt /home/ctf-player/drop-in/
+COPY --from=builder /challenge/2of3.flag.txt /
 
-COPY --from=builder /challenge/password.txt /tmp/password.txt
-COPY config-sshhost.py /challenge/config-sshhost.py
-COPY start.sh /opt/start.sh
+FROM ssh_host_base AS ssh_host
+COPY --from=builder /challenge/password.txt /tmp/
 
-RUN python3 /challenge/config-sshhost.py
-RUN rm -rf /challenge/
+RUN python3 /challenge/config-sshhost.py && \
+    rm -rf /challenge/
 
-COPY profile /home/ctf-player/.profile
-COPY instructions-to-2of3.txt /home/ctf-player/drop-in/instructions-to-2of3.txt
-COPY instructions-to-3of3.txt /instructions-to-3of3.txt
-COPY --from=builder /challenge/1of3.flag.txt /home/ctf-player/drop-in/1of3.flag.txt
-COPY --from=builder /challenge/2of3.flag.txt /2of3.flag.txt
-COPY --from=builder /challenge/3of3.flag.txt /home/ctf-player/3of3.flag.txt
+COPY --from=builder /challenge/3of3.flag.txt /home/ctf-player/
 
 EXPOSE 5555
 # PUBLISH 5555 AS ssh

example-problems/general-ssh/Dockerfile.test

@@ -2,16 +2,13 @@
 # Configure a box for the general ssh example challenge.
 ################################################################################
 
-
 import sys
 import os
 import subprocess
 import re
 import zlib
 import json
 
-
-
 def main():
 
     try:
@@ -62,7 +59,6 @@ def main():
 
         # =====================================================================
 
-
         # Create and update metadata.json =====================================
 
         metadata = {}
@@ -79,11 +75,8 @@ def main():
         print("A subprocess has returned an error code")
         sys.exit(1)
 
-
-
 # =============================================================================
 
-
 if __name__ == "__main__":
     main()
 

example-problems/general-ssh/config-builder.py

@@ -2,15 +2,8 @@
 # Configure a box for the general ssh example challenge.
 ################################################################################
 
-
 import sys
-import os
 import subprocess
-import re
-import zlib
-import json
-
-
 
 def main():
 
@@ -27,15 +20,14 @@ def main():
 
         # =====================================================================
 
-
         # Make new dirs =======================================================
-        subprocess.run(
-            ["/bin/sh", "-c", "mkdir /home/ctf-player"], check=True
-        )
+        #subprocess.run(
+        #    ["/bin/sh", "-c", "mkdir /home/ctf-player"], check=True
+        #)
 
-        subprocess.run(
-            ["/bin/sh", "-c", "mkdir /home/ctf-player/drop-in"], check=True
-        )
+        #subprocess.run(
+        #    ["/bin/sh", "-c", "mkdir /home/ctf-player/drop-in"], check=True
+        #)
 
         # =====================================================================
 
@@ -86,4 +78,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-