Merge pull request #95 from Fexaop/master

some fixes for handling errors

Author: celestix

Dockerfile

@@ -1,3 +1,4 @@
+
 FROM python:3.12-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends build-essential gcc python3-dev
@@ -16,9 +17,8 @@ RUN poetry install
 
 WORKDIR /app/src
 
-WORKDIR /app/src
+ENV PORT=${PORT:-8000}
+ENV WORKERS=${WORKERS:-4}
+EXPOSE ${PORT}
 
-EXPOSE 8000
-EXPOSE 8081
-# Run both main app and admin app
-CMD ["sh", "-c", "gunicorn -w 4 -k uvicorn.workers.UvicornWorker pwncore:app --bind 0.0.0.0:8000 --log-level debug"]
+CMD ["bash", "-c", "gunicorn -w ${WORKERS} -k uvicorn.workers.UvicornWorker pwncore:app --bind 0.0.0.0:${PORT} --log-level debug"]

src/pwncore/routes/ctf/__init__.py

@@ -126,9 +126,12 @@ async def flag_post(
             return {"msg_code": config.msg_codes["db_error"]}
 
         if problem.static_files:
-            shutil.rmtree(
-                f"{config.staticfs_data_dir}/{team_id}/{team_container.docker_id}"
-            )
+            try:
+                shutil.rmtree(
+                    f"{config.staticfs_data_dir}/{team_id}/{team_container.docker_id}"
+                )
+            except:
+                pass
         else:
             try:
                 container = await containerASD.docker_client.containers.get(

src/pwncore/routes/ctf/start.py

@@ -291,9 +291,6 @@ async def stop_docker_container(ctf_id: int, response: Response, jwt: RequireJwt
         except:
             pass
 
-        container = await containerASD.docker_client.containers.get(
-            team_container.docker_id
-        )
         try:
             container = await containerASD.docker_client.containers.get(
                 team_container.docker_id