Revamp reversing-python and web-css

Author: syreal17

example-problems/reversing-python/Dockerfile

@@ -1,27 +1,24 @@
-FROM ubuntu@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322
+FROM ubuntu@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 AS base
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    socat \
-    python3
+    python3 \
+    socat
 
-RUN install -d -m 0700 /challenge
+RUN mkdir /challenge && chmod 700 /challenge
 
-COPY picker-I.py /app/
-COPY setup-challenge.py /app/
+COPY picker-I.py setup-challenge.py /app/
+COPY start.sh /opt/
 WORKDIR /app/
+RUN tar czvf /challenge/artifacts.tar.gz picker-I.py
 
-
-ARG FLAG_FORMAT
+FROM base AS challenge
 ARG FLAG
-ARG SEED
 
 RUN python3 setup-challenge.py
-RUN tar czvf /challenge/artifacts.tar.gz picker-I.py
-
-
-COPY start.sh /opt/start.sh
 
+# The start.sh script starts a socat listener on port 5555, that connects to the
+# python script.
 EXPOSE 5555
 # PUBLISH 5555 AS socat
 CMD ["/opt/start.sh"]

example-problems/reversing-python/Dockerfile.test

@@ -1,27 +1,24 @@
-FROM ubuntu@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322
+FROM ubuntu@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 AS base
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    socat \
-    python3
+    python3 \
+    socat
 
-RUN install -d -m 0700 /challenge
+RUN mkdir /challenge && chmod 700 /challenge
 
-COPY picker-I.py /app/
-COPY setup-challenge.py /app/
+COPY picker-I.py setup-challenge.py /app/
+COPY start.sh /opt/
 WORKDIR /app/
+RUN tar czvf /challenge/artifacts.tar.gz picker-I.py
 
-
-ARG FLAG_FORMAT
+FROM base AS challenge
 ARG FLAG
-ARG SEED
 
 RUN python3 /challenge/setup-challenge.py
-RUN tar czvf /challenge/artifacts.tar.gz picker-I.py
-
-
-COPY start.sh /opt/start.sh
 
+# The start.sh script starts a socat listener on port 5555, that connects to the
+# python script.
 EXPOSE 5555
 # PUBLISH 5555 AS socat
 CMD ["/opt/start.sh"]

example-problems/reversing-python/setup-challenge.py

@@ -1,18 +1,12 @@
 ################################################################################
-# Setup level 4 password cracking challenge for multiple instances
+# Setup flag and metadata for the challenge
 ################################################################################
 
-
 import sys
 import subprocess
 import os
 import re
-import zlib
 import json
-import random
-import hashlib
-
-
 
 def main():
 
@@ -40,7 +34,6 @@ def main():
 
     # =====================================================================
 
-
     # Create and update metadata.json =====================================
 
     metadata = {}
@@ -56,10 +49,7 @@ def main():
     print("A subprocess got an error")
     sys.exit(1)
 
-
 # =============================================================================
 
-
 if __name__ == "__main__":
   main()
-

example-problems/reversing-python/start.sh

@@ -3,4 +3,3 @@
 set -e
 
 socat tcp-listen:5555,reuseaddr,fork SYSTEM:"python3 /app/picker-I.py"
-

example-problems/web-css/Dockerfile

@@ -13,7 +13,7 @@ RUN mkdir /challenge && \
 COPY ./public-html/ /usr/share/nginx/html/
 
 # Copy box configuration script to challenge directory
-COPY config-box.py /challenge/
+COPY setup-challenge.py /challenge/
 
 WORKDIR /challenge/
 
@@ -26,7 +26,7 @@ ARG FLAG
 # Configuring the box can be nicer in Python rather than in Docker RUN commands,
 # but this particular config just does stuff (creating the flag and
 # metadata.json) that we have been doing in the Dockerfile so far.
-RUN python3 config-box.py
+RUN python3 setup-challenge.py
 
 # Open up this port for the web server
 EXPOSE 80

example-problems/web-css/Dockerfile.old

@@ -39,9 +39,9 @@ challenge.
 1. [public-html](/example-problems/web-css/public-html) this directory holds
    all the files that our web server hosts.
 
-1. [config-box.py](/example-problems/web-css/config-box.py) This script
-   generates the flag and appends it to the end of the stylesheet as well as
-   generating metadata.json that holds the flag's correct value. In previous
+1. [setup-challenge.py](/example-problems/web-css/setup-challenge.py) This
+   script generates the flag and appends it to the end of the stylesheet as well
+   as generating metadata.json that holds the flag's correct value. In previous
    challenges, this was done in the Dockerfile, but this example shows how to
    use Python instead, which opens up some doors to creativity.
 

example-problems/web-css/README.md

@@ -24,6 +24,7 @@ def main():
         else:
             flag_rand = flag_rand.group()
             flag_rand = flag_rand[1:-1]
+            flag_rand = flag_rand.zfill(8)
 
     new_flag = "picoCTF{1n5p3t0r_ftw_" + flag_rand + "}"
 
@@ -32,7 +33,6 @@ def main():
 
     # =====================================================================
 
-
     # Create and update metadata.json =====================================
 
     metadata = {}
@@ -44,9 +44,7 @@ def main():
 
     # =====================================================================
 
-
 # =============================================================================
 
-
 if __name__ == "__main__":
     main()