update

Author: breadchris

Pipfile

@@ -19,7 +19,6 @@ pdfrw = "*"
 scapy = "*"
 stegano = "*"
 qrcode = "*"
-pygraphviz = "*"
 passlib = "*"
 python-slugify = "*"
 Pillow = "*"

README.md

@@ -13,7 +13,6 @@ chalgen generates challenges and evidence for CTFs using a tree based format
 ## Prerequisites
 Note: This is **not required** for Github Codespaces. Everything will be installed automatically.
 
-- Follow the documentation [here](https://pygraphviz.github.io/documentation/stable/install.html) to install `pygraphviz` for your system
 - Install ffmpeg from [here](https://ffmpeg.org/download.html)
 - Install Docker from [here](https://docs.docker.com/engine/install/)
 - Install kubectl from [here](https://kubernetes.io/docs/tasks/tools/)

chal_types/crypto.py

@@ -246,7 +246,7 @@ def gen(self, chal_dir):
             # if config_text is not None:
             #text = config_text + "\n\n" + self.flag
 
-            chal_txt = encryptDecrypt(text + self.get_value("text"), key)
+            chal_txt = hex_text(xor_text(text + self.get_value("text"), key))
             f.write(chal_txt)
             self.display = chal_txt
 

chal_types/docker_builder.py

@@ -93,7 +93,7 @@ def build(self, docker_context):
     def __enter__(self):
         with FixMinikube(), tempfile.TemporaryDirectory() as temp_dir, console.status("[bold green]Creating Docker Environment", spinner_style="green"):
             self.build(temp_dir)
-            subprocess.check_output(f"docker build -q {temp_dir} -t {self.name}".split())
+            subprocess.check_output(f"docker build  --platform linux/amd64 -q {temp_dir} -t {self.name}".split())
             subprocess.check_output(f'docker run -d --name {self.name} {self.name}'.split())
             proc = Process(f'docker exec -it {self.name} /bin/sh', "container", self.color)
         stat.start()

chal_types/forensics/networking.py

@@ -12,7 +12,7 @@
 import random
 from ..text_transforms import text_transforms
 
-from scapy.all import rdpcap, wrpcap
+#from scapy.all import rdpcap, wrpcap
 
 class PCAPLogin(GeneratedChallenge):
     yaml_tag = u'!pcap_login'

chal_types/templates/docker_make/Makefile

@@ -1,5 +1,5 @@
 build:
-	@docker build . -t {chal_name}
+	@docker build  --platform linux/amd64 . -t {chal_name}
 
 run: build
 	@docker run {chal_run_options} {chal_name}

chal_types/templates/facebook_django/app/requirements.txt

@@ -1,3 +1,3 @@
 django==1.6.2
 Pillow
-pyyaml
+pyyaml==5.3.1

chal_types/templates/twitter_flask/requirements.txt

@@ -32,4 +32,4 @@ SQLAlchemy==1.0.13        # via flask-sqlalchemy
 Werkzeug==0.11.10         # via flask, flask-wtf
 WTForms==2.1              # via flask-wtf
 
-pyyaml
+pyyaml==5.3.1

chal_types/text_transforms.py

@@ -171,7 +171,7 @@ def encryptDecrypt(inpString, xorKey):
 
 
 def xor_text(string, key):
-    return "".join([chr(ord(c1) ^ ord(c2)) for c1, c2 in zip(string, key*(len(string) / len(key) + 1))])
+    return "".join([chr(ord(c1) ^ ord(c2)) for c1, c2 in zip(string, key*int(len(string) / len(key) + 1))])
 
 def pad(s, block_size):
     return s + (block_size - len(s) % block_size) * chr(block_size - len(s) % block_size)

chal_types/utils.py

@@ -11,7 +11,6 @@
 from rich.logging import RichHandler
 from dirhash import dirhash
 import random
-import openpyxl
 
 from chal_types.text_transforms import SHA256