Add problem visibility

src/pwncore/models/ctf.py

@@ -34,6 +34,7 @@ class Problem(BaseProblem):
 
  mi = fields.IntField(default=100) # Arbitrary meaning full defaults
  ma = fields.IntField(default=600)
+ visible = fields.BooleanField(default=True)
 
  hints: fields.ReverseRelation[Hint]
 

src/pwncore/routes/ctf/__init__.py

@@ -54,7 +54,7 @@ class Flag(BaseModel):
 
 @router.get("/list")
 async def ctf_list():
- problems = await BaseProblem_Pydantic.from_queryset(Problem.all())
+ problems = await BaseProblem_Pydantic.from_queryset(Problem.filter(visible=True))
  return problems
 
 
@@ -73,7 +73,7 @@ async def flag_post(
  req: Request, ctf_id: int, flag: Flag, response: Response, jwt: RequireJwt
 ):
  team_id = jwt["team_id"]
- problem = await Problem.get_or_none(id=ctf_id)
+ problem = await Problem.get_or_none(id=ctf_id, visible=True)
  if not problem:
  response.status_code = 404
  return {"msg_code": config.msg_codes["ctf_not_found"]}
@@ -102,7 +102,7 @@ async def flag_post(
 @router.get("/{ctf_id}/hint")
 async def hint_get(ctf_id: int, response: Response, jwt: RequireJwt):
  team_id = jwt["team_id"]
- problem = await Problem.exists(id=ctf_id)
+ problem = await Problem.exists(id=ctf_id, visible=True)
  if not problem:
  response.status_code = 404
  return {"msg_code": config.msg_codes["ctf_not_found"]}
@@ -151,14 +151,16 @@ async def viewed_problem_hints_get(ctf_id: int, jwt: RequireJwt):
 async def completed_problem_get(jwt: RequireJwt):
  team_id = jwt["team_id"]
  problems = await BaseProblem_Pydantic.from_queryset(
- Problem.filter(solvedproblems__team_id=team_id)
+ Problem.filter(solvedproblems__team_id=team_id, visible=True)
  )
  return problems
 
 
 @router.get("/{ctf_id}")
 async def ctf_get(ctf_id: int, response: Response):
- problem = await BaseProblem_Pydantic.from_queryset(Problem.filter(id=ctf_id))
+ problem = await BaseProblem_Pydantic.from_queryset(
+ Problem.filter(id=ctf_id, visible=True)
+ )
  if not problem:
  response.status_code = 404
  return {"msg_code": config.msg_codes["ctf_not_found"]}

src/pwncore/routes/ctf/start.py

@@ -26,7 +26,7 @@ async def start_docker_container(ctf_id: int, response: Response, jwt: RequireJw
  }
  """
 
- ctf = await Problem.get_or_none(id=ctf_id)
+ ctf = await Problem.get_or_none(id=ctf_id, visible=True)
  if not ctf:
  response.status_code = 404
  return {"msg_code": config.msg_codes["ctf_not_found"]}
@@ -131,6 +131,8 @@ async def stopall_docker_container(response: Response, jwt: RequireJwt):
 @atomic()
 @router.post("/{ctf_id}/stop")
 async def stop_docker_container(ctf_id: int, response: Response, jwt: RequireJwt):
+ # Let this work on invisible problems incase
+ # we mess up the database while making problems visible
  ctf = await Problem.get_or_none(id=ctf_id)
  if not ctf:
  response.status_code = 404

src/pwncore/routes/leaderboard.py

@@ -27,7 +27,7 @@ def __init__(self, period: float) -> None:
  async def _do_update(self):
  self.data = dict(
  await Team.all()
- .filter(solved_problem__problem__id__gt=-1)
+ .filter(solved_problem__problem__visible=True)
  .annotate(
  tpoints=Sum(
  RawSQL(