Revert "feat: admin dashboard and static ctfs"

Author: celestix

.github/workflows/tox.yml

@@ -13,6 +13,7 @@ jobs:
     strategy:
       matrix:
         python-version: [
+          "3.11",
           "3.12"
         ]
 

.gitignore

@@ -5,7 +5,7 @@ __pycache__/
 
 # C extensions
 *.so
-data/
+
 # Distribution / packaging
 .Python
 build/

Dockerfile

@@ -1,6 +1,5 @@
 FROM python:3.12-slim
 
-RUN apt-get update && apt-get install -y --no-install-recommends build-essential gcc python3-dev
 WORKDIR /app
 
 RUN pip install poetry
@@ -16,9 +15,7 @@ RUN poetry install
 
 WORKDIR /app/src
 
-WORKDIR /app/src
-
 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 & uvicorn pwncore.admin_app:admin_app --host 0.0.0.0 --port 8081 & wait"]
+
+# Run FastAPI with Gunicorn
+CMD ["gunicorn", "-w", "4", "-k", "uvicorn.workers.UvicornWorker", "pwncore:app", "--bind", "0.0.0.0:8000", "--log-level", "debug"]

docker-compose.yaml

@@ -5,14 +5,12 @@ services:
             dockerfile: Dockerfile
         ports:
             - ${PORT}:8000
-            - ${PORT_ADMIN}:8081
         environment:
             - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
             - WORKERS=${WORKERS}
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
             - ${CONFIG_FILE}:/app/src/pwncore/config.py
-            # - ./src:/app/src
         depends_on:
             - db
 
@@ -34,10 +32,16 @@ services:
         ports:
             - 5432:5432
 
+#     admin_db:
+#         image: nocodb/nocodb:latest
+#         environment:
+#             NC_DB: pg://db:5432?u=${POSTGRES_USER}&p=${POSTGRES_PASSWORD}&d=${POSTGRES_DB}
+#         volumes:
+#             - nc_data:/usr/app/data
+#         ports:
+#             - ${PORT_ADMIN}:8080
+#         depends_on:
+#             - db
 
-    # admin_db:
-    #     image: nocodb/nocodb:latest
-    #     volumes:
-    #         - ./data:/usr/app/data
-    #     ports:
-    #         - 8001:8080
+# volumes:
+#     nc_data: {}

poetry.lock

@@ -28,8 +28,6 @@ multidict = "^6.0.5"
 gunicorn = "^23.0.0"
 bcrypt = ">3.1.0,<4.0"
 pydantic-core = "2.20.1"
-psutil = "^5.9.0"
-types-psutil = "^7.0.0.20251001"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.6.1"

pyproject.toml

@@ -1,10 +1,9 @@
-import shutil
 from contextlib import asynccontextmanager
-from logging import getLogger
 
+import shutil
 import aiodocker
-import jwt
-from fastapi import FastAPI, Request, Response, status
+from logging import getLogger
+from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from tortoise import Tortoise
 
@@ -13,11 +12,9 @@
 import pwncore.routes as routes
 from pwncore.config import config
 from pwncore.models import Container
-from pwncore.routes.auth import JwtInfo
 
 logger = getLogger(__name__)
 
-
 @asynccontextmanager
 async def app_lifespan(app: FastAPI):
     # Startup
@@ -75,25 +72,3 @@ async def app_lifespan(app: FastAPI):
     allow_methods=["*"],
     allow_headers=["*"],
 )
-
-
-@app.middleware("http")
-async def check_blacklist(
-    request: Request,
-    call_next,  # noqa: ANN001
-):
-    """Middleware to handle bans."""
-    try:
-        token = request.headers["authorization"].split(" ")[1]  # Remove Bearer
-
-        decoded_token: JwtInfo = jwt.decode(
-            token,
-            config.jwt_secret,
-            algorithms=["HS256"],
-        )
-        team_id = decoded_token["team_id"]
-        if team_id in config.blacklist:
-            return Response(status_code=status.HTTP_403_FORBIDDEN)
-    except KeyError:
-        pass
-    return await call_next(request)

src/pwncore/__init__.py

@@ -2,7 +2,6 @@
 
 
 def run_dev():
-
     uvicorn.run("pwncore:app", host="127.0.0.1", port=8080, reload=True)
 
 

src/pwncore/__main__.py

@@ -1,7 +1,7 @@
 import os
-import warnings
+import bcrypt
 from dataclasses import dataclass
-
+import warnings
 from passlib.hash import bcrypt_sha256
 
 """
@@ -65,7 +65,6 @@ class Config:
     staticfs_data_dir: str
     staticfs_jwt_secret: str
     admin_hash: str
-    blacklist: list[int]
 
 
 config = Config(
@@ -74,7 +73,7 @@ class Config:
     db_url=os.environ.get("DATABASE_URL", "sqlite://:memory:"),
     # docker_url=None,  # None for default system docker
     # Or set it to an arbitrary URL for testing without Docker
-    docker_url=None,
+    docker_url="http://google.com",
     flag="C0D",
     max_containers_per_team=3,
     jwt_secret="mysecret",
@@ -86,13 +85,9 @@ class Config:
     staticfs_data_dir=os.environ.get("STATIC_DATA_DIR", "/data"),
     staticfs_jwt_secret="PyMioVKFXHymQd+n7q5geOsT6fSYh3gDVw3GqilW+5U=",
     admin_hash=admin_hash_value,
-    blacklist=[],
 )
 
 # Warn in production if env not loaded
 if not config.development and using_default_admin:
-    warnings.warn(
-        "Default admin hash being used in production!",
-        RuntimeWarning,
-        stacklevel=2,
-    )
+    warnings.warn("Default admin hash being used in production!", RuntimeWarning)
+

src/pwncore/config.py

@@ -18,12 +18,10 @@ class Container(Model):
     problem: fields.ForeignKeyRelation[Problem] = fields.ForeignKeyField(
         "models.Problem", on_delete=fields.OnDelete.NO_ACTION
     )
-    problem_id = fields.IntField()
     team: fields.ForeignKeyRelation[Team] = fields.ForeignKeyField("models.Team")
-    team_id = fields.IntField()
     flag = fields.TextField()
-
-    token = fields.TextField(null=True)
+    
+    token = fields.TextField()
     ports: fields.ReverseRelation[Ports]