Fix Dockerfile

Modify python version in Dockerfile to 3.11 to use the tomllib module
Fix typo in cli.py

Signed-off-by: Amalia Ionescu <[email protected]>

Author: AmaliaI12

automatic_exploit_generation/cli.py

@@ -76,13 +76,13 @@ def exploit(
             "The exploiter could generate an exploit with the outcome of"
             f" {generated_exploit.outcome.name} and the following payloads:"
         )
-
         for payload in generated_exploit.payloads:
             print(f"- For {payload.input_stream.name}:\n")
             hexdump.hexdump(payload.content)
             print("")
+
     else:
-        print("The exploiter coudn't generate any exploit.")
+        print("The exploiter couldn't generate any exploit.")
 
 
 @cli.command(help="Get suitable exploiters for a binary.")

docker/Dockerfile.zeratool_lib

@@ -1,25 +1,28 @@
-FROM python:3.10
+FROM python:3.11
 
 # Install and configure Poetry
 RUN pip3 install poetry
 
 # Setup the convertor from pyproject.toml to requirements.txt
-RUN pip3 install click toml
+RUN pip3 install click toml tomli
 RUN wget https://raw.githubusercontent.com/jla524/requirements/main/requirements/convert.py -O /convert.py
 
 # Convert Zeratool's dependencies
 COPY /docker/zeratool_lib /zeratool_lib
-RUN python3 /convert.py --noversion /zeratool_lib
+RUN python3 /convert.py --no-version /zeratool_lib
 RUN mv /zeratool_lib/requirements.txt /requirements.zeratool_lib.txt
 
 # Copies service's dependencies
 COPY /docker/requirements.txt /requirements.service.txt
 
 # Convert module's dependencies
 COPY /pyproject.toml /pyproject.toml
-RUN python3 /convert.py --noversion /
+RUN python3 /convert.py --no-version /
 RUN mv /requirements.txt /requirements.aeg.txt
 
+# Download the commons library
+RUN git clone https://github.com/CyberReasoningSystem/commons /commons
+
 # Install all dependencies
 RUN pip3 install -r /requirements.service.txt
 RUN pip3 install -r /requirements.aeg.txt
@@ -30,9 +33,6 @@ COPY /automatic_exploit_generation /automatic_exploit_generation
 COPY /docker/protobuf /protobuf
 COPY /docker/zeratool_lib_service.py /zeratool_lib_service.py
 
-# Download the commons library
-RUN git clone https://github.com/CyberReasoningSystem/commons /commons
-
 # Set PYTHONPATH
 ENV PYTHONPATH=/zeratool_lib/zeratool_lib:/protobuf:/automatic_exploit_generation:/commons