Merge branch 'lugvitc:master' into tests

Author: celestix

src/pwncore/models/__init__.py

@@ -22,23 +22,15 @@
 from pwncore.models.user import (
     User,
     Team,
-    MetaTeam,
     Team_Pydantic,
     User_Pydantic,
-    MetaTeam_Pydantic,
 )
 from pwncore.models.pre_event import (
     PreEventProblem,
     PreEventSolvedProblem,
     PreEventUser,
     PreEventProblem_Pydantic,
 )
-from pwncore.models.round2 import (
-    R2Problem,
-    R2Ports,
-    R2Container,
-    R2AttackRecord,
-)
 
 
 __all__ = (
@@ -57,16 +49,9 @@
     "User_Pydantic",
     "Team",
     "Team_Pydantic",
-    "MetaTeam",
-    "MetaTeam_Pydantic",
     "PreEventProblem_Pydantic",
     "Problem_Pydantic",
     "BaseProblem",
-    "R2Problem",
-    "R2Ports",
-    "R2Container",
-    "R2Container_Pydantic",
-    "R2AttackRecord",
 )
 
 
@@ -76,7 +61,3 @@ def get_annotations(cls, method=None):
 
 tortoise.contrib.pydantic.utils.get_annotations = get_annotations  # type: ignore[unused-ignore]
 tortoise.contrib.pydantic.creator.get_annotations = get_annotations  # type: ignore[unused-ignore]
-
-
-tortoise.Tortoise.init_models(["pwncore.models.round2"], "models")
-R2Container_Pydantic = pydantic_model_creator(R2Container)

src/pwncore/models/round2.py

@@ -12,8 +12,6 @@
 __all__ = (
     "User",
     "Team",
-    "MetaTeam",
-    "MetaTeam_Pydantic",
     "User_Pydantic",
     "Team_Pydantic",
 )
@@ -57,22 +55,9 @@ class Team(Model):
     members: fields.ReverseRelation[User]
     containers: fields.ReverseRelation[Container]
 
-    meta_team: fields.ForeignKeyNullableRelation[MetaTeam] = fields.ForeignKeyField(
-        "models.MetaTeam", "teams", null=True, on_delete=fields.OnDelete.SET_NULL
-    )
-
     class PydanticMeta:
         exclude = ["secret_hash"]
 
 
-class MetaTeam(Model):
-    id = fields.IntField(pk=True)
-    name = fields.CharField(255, unique=True)
-    points = fields.IntField(default=0)
-
-    teams: fields.ReverseRelation[Team]
-
-
 Team_Pydantic = pydantic_model_creator(Team)
 User_Pydantic = pydantic_model_creator(User)
-MetaTeam_Pydantic = pydantic_model_creator(MetaTeam)

src/pwncore/models/user.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from pwncore.routes import ctf, team, auth, admin, leaderboard, round2
+from pwncore.routes import ctf, team, auth, admin, leaderboard
 
 # from pwncore.config import config
 
@@ -12,7 +12,6 @@
 router.include_router(ctf.router)
 router.include_router(team.router)
 router.include_router(leaderboard.router)
-router.include_router(round2.router)
 router.include_router(admin.router)
 # if config.development:
 # router.include_router(admin.router)

src/pwncore/routes/__init__.py

@@ -1,14 +1,9 @@
-import asyncio
 from datetime import date
-import itertools
 import logging
-import uuid
 
 from fastapi import APIRouter, Request, Response
 from passlib.hash import bcrypt
 from tortoise.transactions import atomic, in_transaction
-from tortoise.expressions import RawSQL, Q
-from tortoise.functions import Sum
 
 from pwncore.models import (
     Team,
@@ -19,12 +14,9 @@
     PreEventProblem,
 )
 from pwncore.config import config
-from pwncore.models.container import Container
 from pwncore.models.ctf import SolvedProblem
 from pwncore.models.pre_event import PreEventUser
 from pwncore.container import docker_client
-from pwncore.models.round2 import R2Container, R2Ports, R2Problem
-from pwncore.models.user import MetaTeam
 
 metadata = {
     "name": "admin",
@@ -61,108 +53,6 @@ async def _del_cont(id: str):
 
 
 @atomic()
-async def _create_container(prob: R2Problem, mteam: MetaTeam):
-    try:
-        container = await docker_client.containers.run(
-            name=f"{mteam.name}_{prob.pk}_{uuid.uuid4().hex}",
-            config={
-                "Image": prob.image_name,
-                # Detach stuff
-                "AttachStdin": False,
-                "AttachStdout": False,
-                "AttachStderr": False,
-                "Tty": False,
-                "OpenStdin": False,
-                **prob.image_config,
-            },
-        )
-
-        container_flag = f"{config.flag}{{{uuid.uuid4().hex}}}"
-
-        await (
-            await container.exec(["/bin/bash", "/root/gen_flag", container_flag])
-        ).start(detach=True)
-
-        db_container = await R2Container.create(
-            docker_id=container.id, problem=prob, meta_tam=mteam, flag=container_flag
-        )
-
-        ports = []
-        for guest_port in prob.image_config["PortBindings"]:
-            port = int((await container.port(guest_port))[0]["HostPort"])
-            ports.append(R2Ports(port=port, container=db_container))
-
-        await R2Ports.bulk_create(ports)
-    except Exception as err:
-        try:
-            await container.kill()
-            await container.delete()
-        except Exception:
-            pass
-        logging.exception("Error while starting", exc_info=err)
-
-
-@router.get("/round2")
-async def round2(response: Response, req: Request):
-    if not bcrypt.verify((await req.body()).strip(), ADMIN_HASH):
-        response.status_code = 401
-        return
-
-    containers = await Container.all()
-
-    async with in_transaction():
-        async with asyncio.TaskGroup() as tg:
-            for container in containers:
-                tg.create_task(_del_cont(container.docker_id))
-
-        try:
-            await Container.all().delete()
-        except Exception:
-            response.status_code = 500
-            logging.exception("Error while initing round2")
-            return {"msg_code": config.msg_codes["db_error"]}
-
-        await MetaTeam.all().delete()
-        await MetaTeam.bulk_create(
-            [MetaTeam(name=NAMES[i], id=i + 1) for i in range(12)]
-        )
-
-        teams = (
-            await Team.all()
-            .filter(Q(solved_problem__problem__visible=True) | Q(points__gte=0))
-            .annotate(
-                tpoints=RawSQL(
-                    'COALESCE((SUM("solvedproblem"."penalty" * '
-                    '"solvedproblem__problem"."points")'
-                    ' + "team"."points"), 0)'
-                )
-            )
-            .annotate(
-                tpoints2=Sum(
-                    RawSQL(
-                        '"solvedproblem"."penalty" * "solvedproblem__problem"."points"'
-                    )
-                )
-            )
-            .order_by("-tpoints")
-        )
-
-        for i in range(12):
-            for team in teams[i::12]:
-                team.meta_team_id = i + 1  # type: ignore[attr-defined]
-                # print(mts[i].pk, mts)
-                await team.save(update_fields=["meta_team_id"])
-
-        # await Team.bulk_update(teams, fields=["meta_team_id"])
-
-        problems = await R2Problem.all()
-        mteams = await MetaTeam.all()
-
-        async with asyncio.TaskGroup() as tg:
-            for pm in itertools.product(problems, mteams):
-                tg.create_task(_create_container(*pm))
-
-
 @router.get("/union")
 async def calculate_team_coins(
     response: Response, req: Request

src/pwncore/routes/admin.py

@@ -26,20 +26,23 @@ def __init__(self, period: float) -> None:
         self.data = b"[]"
 
     async def _do_update(self):
-        self.data = dumps((
-            await Team.all()
-            .filter(Q(solved_problem__problem__visible=True) | Q(points__gte=0))
-            .annotate(
-                tpoints=RawSQL(
-                    'COALESCE((SUM("solvedproblem"."penalty" * '
-                    '"solvedproblem__problem"."points")'
-                    ' + "team"."points"), 0)'
+        self.data = dumps(
+            (
+                await Team.all()
+                .filter(Q(solved_problem__problem__visible=True) | Q(points__gte=0))
+                .annotate(
+                    tpoints=RawSQL(
+                        'COALESCE((SUM("solvedproblem"."penalty" * '
+                        '"solvedproblem__problem"."points")'
+                        ' + "team"."points"), 0)'
+                    )
                 )
-            )
-            .group_by("id", "meta_team__name")
-            .order_by("-tpoints")
-            .values("name", "tpoints", "meta_team__name")
-        ), separators=(",", ":")).encode("utf-8")
+                .group_by("id")
+                .order_by("-tpoints")
+                .values("name", "tpoints")
+            ),
+            separators=(",", ":"),
+        ).encode("utf-8")
         self.last_update = monotonic()
 
     async def get_lb(self, req: Request):