mirror of
https://github.com/aljazceru/CTFd.git
synced 2025-12-17 05:54:19 +01:00
8de9819bd4
# 3.3.0 / UNRELEASED
**General**
- Don't require a team for viewing challenges if Challenge visibility is set to public
- Add a `THEME_FALLBACK` config to help develop themes. See **Themes** section for details.
**API**
- Implement a faster `/api/v1/scoreboard` endpoint in Teams Mode
- Add the `solves` item to both `/api/v1/challenges` and `/api/v1/challenges/[challenge_id]` to more easily determine how many solves a challenge has
- Add the `solved_by_me` item to both `/api/v1/challenges` and `/api/v1/challenges/[challenge_id]` to more easily determine if the current account has solved the challenge
- Prevent admins from deleting themselves through `DELETE /api/v1/users/[user_id]`
- Add length checking to some sensitive fields in the Pages and Challenges schemas
- Fix issue where `PATCH /api/v1/users[user_id]` returned a list instead of a dict
- Fix exception that occured on demoting admins through `PATCH /api/v1/users[user_id]`
- Add `team_id` to `GET /api/v1/users` to determine if a user is already in a team
**Themes**
- Add a `THEME_FALLBACK` config to help develop themes.
- `THEME_FALLBACK` will configure CTFd to try to find missing theme files in the default built-in `core` theme.
- This makes it easier to develop themes or use incomplete themes.
- Allow for one theme to reference and inherit from another theme through approaches like `{% extends "core/page.html" %}`
- Allow for the automatic date rendering format to be overridden by specifying a `data-time-format` attribute.
- Add styling for the `<blockquote>` element.
- Fix scoreboard table identifier to switch between User/Team depending on configured user mode
- Switch to using Bootstrap's scss in `core/main.scss` to allow using Bootstrap variables
- Consolidate Jinja error handlers into a single function and better handle issues where error templates can't be found
**Plugins**
- Set plugin migration version after successful migrations
- Fix issue where Page URLs injected into the navbar were relative instead of absolute
**Admin Panel**
- Add User standings as well as Teams standings to the admin scoreboard when in Teams Mode
- Add a UI for adding members to a team from the team's admin page
- Add ability for admins to disable public team creation
- Link directly to users who submitted something in the submissions page if the CTF is in Teams Mode
- Fix Challenge Requirements interface in Admin Panel to not allow empty/null requirements to be added
- Fixed an issue where config times (start, end, freeze times) could not be removed
- Fix an exception that occurred when demoting an Admin user
- Adds a temporary hack for re-enabling Javascript snippets in Flag editor templates. (See #1779)
**Deployment**
- Install `python3-dev` instead of `python-dev` in apt
- Bump lxml to 4.6.2
- Bump pip-compile to 5.4.0
**Miscellaneous**
- Cache Docker builds more by copying and installing Python dependencies before copying CTFd
- Change the default emails slightly and rework confirmation email page to make some recommendations clearer
- Use `examplectf.com` as testing/development domain instead of `ctfd.io`
- Fixes issue where user's name and email would not appear in logs properly
- Add more linting by also linting with `flake8-comprehensions` and `flake8-bugbear`
352 lines
12 KiB
Python
352 lines
12 KiB
Python
#!/usr/bin/env python
|
|
# -*- coding: utf-8 -*-
|
|
|
|
from CTFd.models import Challenges
|
|
from CTFd.plugins.dynamic_challenges import DynamicChallenge, DynamicValueChallenge
|
|
from CTFd.utils.security.signing import hmac
|
|
from tests.helpers import (
|
|
FakeRequest,
|
|
create_ctfd,
|
|
destroy_ctfd,
|
|
gen_flag,
|
|
gen_user,
|
|
login_as_user,
|
|
register_user,
|
|
)
|
|
|
|
|
|
def test_can_create_dynamic_challenge():
|
|
"""Test that dynamic challenges can be made from the API/admin panel"""
|
|
app = create_ctfd(enable_plugins=True)
|
|
with app.app_context():
|
|
register_user(app)
|
|
client = login_as_user(app, name="admin", password="password")
|
|
|
|
challenge_data = {
|
|
"name": "name",
|
|
"category": "category",
|
|
"description": "description",
|
|
"value": 100,
|
|
"decay": 20,
|
|
"minimum": 1,
|
|
"state": "hidden",
|
|
"type": "dynamic",
|
|
}
|
|
|
|
r = client.post("/api/v1/challenges", json=challenge_data)
|
|
assert r.get_json().get("data")["id"] == 1
|
|
|
|
challenges = DynamicChallenge.query.all()
|
|
assert len(challenges) == 1
|
|
|
|
challenge = challenges[0]
|
|
assert challenge.value == 100
|
|
assert challenge.initial == 100
|
|
assert challenge.decay == 20
|
|
assert challenge.minimum == 1
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_can_update_dynamic_challenge():
|
|
app = create_ctfd(enable_plugins=True)
|
|
with app.app_context():
|
|
challenge_data = {
|
|
"name": "name",
|
|
"category": "category",
|
|
"description": "description",
|
|
"value": 100,
|
|
"decay": 20,
|
|
"minimum": 1,
|
|
"state": "hidden",
|
|
"type": "dynamic",
|
|
}
|
|
req = FakeRequest(form=challenge_data)
|
|
challenge = DynamicValueChallenge.create(req)
|
|
|
|
assert challenge.value == 100
|
|
assert challenge.initial == 100
|
|
assert challenge.decay == 20
|
|
assert challenge.minimum == 1
|
|
|
|
challenge_data = {
|
|
"name": "new_name",
|
|
"category": "category",
|
|
"description": "new_description",
|
|
"value": "200",
|
|
"initial": "200",
|
|
"decay": "40",
|
|
"minimum": "5",
|
|
"max_attempts": "0",
|
|
"state": "visible",
|
|
}
|
|
|
|
req = FakeRequest(form=challenge_data)
|
|
challenge = DynamicValueChallenge.update(challenge, req)
|
|
|
|
assert challenge.name == "new_name"
|
|
assert challenge.description == "new_description"
|
|
assert challenge.value == 200
|
|
assert challenge.initial == 200
|
|
assert challenge.decay == 40
|
|
assert challenge.minimum == 5
|
|
assert challenge.state == "visible"
|
|
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_can_add_requirement_dynamic_challenge():
|
|
"""Test that requirements can be added to dynamic challenges"""
|
|
app = create_ctfd(enable_plugins=True)
|
|
with app.app_context():
|
|
challenge_data = {
|
|
"name": "name",
|
|
"category": "category",
|
|
"description": "description",
|
|
"value": 100,
|
|
"decay": 20,
|
|
"minimum": 1,
|
|
"state": "hidden",
|
|
"type": "dynamic",
|
|
}
|
|
req = FakeRequest(form=challenge_data)
|
|
challenge = DynamicValueChallenge.create(req)
|
|
|
|
assert challenge.value == 100
|
|
assert challenge.initial == 100
|
|
assert challenge.decay == 20
|
|
assert challenge.minimum == 1
|
|
|
|
challenge_data = {
|
|
"name": "second_name",
|
|
"category": "category",
|
|
"description": "new_description",
|
|
"value": "200",
|
|
"initial": "200",
|
|
"decay": "40",
|
|
"minimum": "5",
|
|
"max_attempts": "0",
|
|
"state": "visible",
|
|
}
|
|
|
|
req = FakeRequest(form=challenge_data)
|
|
challenge = DynamicValueChallenge.create(req)
|
|
|
|
assert challenge.name == "second_name"
|
|
assert challenge.description == "new_description"
|
|
assert challenge.value == 200
|
|
assert challenge.initial == 200
|
|
assert challenge.decay == 40
|
|
assert challenge.minimum == 5
|
|
assert challenge.state == "visible"
|
|
|
|
challenge_data = {"requirements": [1]}
|
|
|
|
req = FakeRequest(form=challenge_data)
|
|
challenge = DynamicValueChallenge.update(challenge, req)
|
|
|
|
assert challenge.requirements == [1]
|
|
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_can_delete_dynamic_challenge():
|
|
"""Test that dynamic challenges can be deleted"""
|
|
app = create_ctfd(enable_plugins=True)
|
|
with app.app_context():
|
|
register_user(app)
|
|
client = login_as_user(app, name="admin", password="password")
|
|
|
|
challenge_data = {
|
|
"name": "name",
|
|
"category": "category",
|
|
"description": "description",
|
|
"value": 100,
|
|
"decay": 20,
|
|
"minimum": 1,
|
|
"state": "hidden",
|
|
"type": "dynamic",
|
|
}
|
|
|
|
r = client.post("/api/v1/challenges", json=challenge_data)
|
|
assert r.get_json().get("data")["id"] == 1
|
|
|
|
challenges = DynamicChallenge.query.all()
|
|
assert len(challenges) == 1
|
|
|
|
challenge = challenges[0]
|
|
DynamicValueChallenge.delete(challenge)
|
|
|
|
challenges = DynamicChallenge.query.all()
|
|
assert len(challenges) == 0
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_dynamic_challenge_loses_value_properly():
|
|
app = create_ctfd(enable_plugins=True)
|
|
with app.app_context():
|
|
register_user(app)
|
|
client = login_as_user(app, name="admin", password="password")
|
|
|
|
challenge_data = {
|
|
"name": "name",
|
|
"category": "category",
|
|
"description": "description",
|
|
"value": 100,
|
|
"decay": 20,
|
|
"minimum": 1,
|
|
"state": "visible",
|
|
"type": "dynamic",
|
|
}
|
|
|
|
r = client.post("/api/v1/challenges", json=challenge_data)
|
|
assert r.get_json().get("data")["id"] == 1
|
|
|
|
gen_flag(app.db, challenge_id=1, content="flag")
|
|
|
|
for i, team_id in enumerate(range(2, 26)):
|
|
name = "user{}".format(team_id)
|
|
email = "user{}@examplectf.com".format(team_id)
|
|
# We need to bypass rate-limiting so gen_user instead of register_user
|
|
user = gen_user(app.db, name=name, email=email)
|
|
user_id = user.id
|
|
|
|
with app.test_client() as client:
|
|
# We need to bypass rate-limiting so creating a fake user instead of logging in
|
|
with client.session_transaction() as sess:
|
|
sess["id"] = user_id
|
|
sess["nonce"] = "fake-nonce"
|
|
sess["hash"] = hmac(user.password)
|
|
|
|
data = {"submission": "flag", "challenge_id": 1}
|
|
|
|
r = client.post("/api/v1/challenges/attempt", json=data)
|
|
resp = r.get_json()["data"]
|
|
assert resp["status"] == "correct"
|
|
|
|
chal = DynamicChallenge.query.filter_by(id=1).first()
|
|
if i >= 20:
|
|
assert chal.value == chal.minimum
|
|
else:
|
|
assert chal.initial >= chal.value
|
|
assert chal.value > chal.minimum
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_dynamic_challenge_doesnt_lose_value_on_update():
|
|
"""Dynamic challenge updates without changing any values or solves shouldn't change the current value. See #1043"""
|
|
app = create_ctfd(enable_plugins=True)
|
|
with app.app_context():
|
|
challenge_data = {
|
|
"name": "name",
|
|
"category": "category",
|
|
"description": "description",
|
|
"value": 10000,
|
|
"decay": 4,
|
|
"minimum": 10,
|
|
"state": "visible",
|
|
"type": "dynamic",
|
|
}
|
|
req = FakeRequest(form=challenge_data)
|
|
challenge = DynamicValueChallenge.create(req)
|
|
challenge_id = challenge.id
|
|
gen_flag(app.db, challenge_id=challenge.id, content="flag")
|
|
register_user(app)
|
|
with login_as_user(app) as client:
|
|
data = {"submission": "flag", "challenge_id": challenge_id}
|
|
r = client.post("/api/v1/challenges/attempt", json=data)
|
|
assert r.status_code == 200
|
|
assert r.get_json()["data"]["status"] == "correct"
|
|
chal = Challenges.query.filter_by(id=challenge_id).first()
|
|
prev_chal_value = chal.value
|
|
chal = DynamicValueChallenge.update(chal, req)
|
|
assert prev_chal_value == chal.value
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_dynamic_challenge_value_isnt_affected_by_hidden_users():
|
|
app = create_ctfd(enable_plugins=True)
|
|
with app.app_context():
|
|
register_user(app)
|
|
client = login_as_user(app, name="admin", password="password")
|
|
|
|
challenge_data = {
|
|
"name": "name",
|
|
"category": "category",
|
|
"description": "description",
|
|
"value": 100,
|
|
"decay": 20,
|
|
"minimum": 1,
|
|
"state": "visible",
|
|
"type": "dynamic",
|
|
}
|
|
|
|
r = client.post("/api/v1/challenges", json=challenge_data)
|
|
assert r.get_json().get("data")["id"] == 1
|
|
|
|
gen_flag(app.db, challenge_id=1, content="flag")
|
|
|
|
# Make a solve as a regular user. This should not affect the value.
|
|
data = {"submission": "flag", "challenge_id": 1}
|
|
|
|
r = client.post("/api/v1/challenges/attempt", json=data)
|
|
resp = r.get_json()["data"]
|
|
assert resp["status"] == "correct"
|
|
|
|
# Make solves as hidden users. Also should not affect value
|
|
for _, team_id in enumerate(range(2, 26)):
|
|
name = "user{}".format(team_id)
|
|
email = "user{}@examplectf.com".format(team_id)
|
|
# We need to bypass rate-limiting so gen_user instead of register_user
|
|
user = gen_user(app.db, name=name, email=email)
|
|
user.hidden = True
|
|
app.db.session.commit()
|
|
user_id = user.id
|
|
|
|
with app.test_client() as client:
|
|
# We need to bypass rate-limiting so creating a fake user instead of logging in
|
|
with client.session_transaction() as sess:
|
|
sess["id"] = user_id
|
|
sess["nonce"] = "fake-nonce"
|
|
sess["hash"] = hmac(user.password)
|
|
|
|
data = {"submission": "flag", "challenge_id": 1}
|
|
|
|
r = client.post("/api/v1/challenges/attempt", json=data)
|
|
assert r.status_code == 200
|
|
resp = r.get_json()["data"]
|
|
assert resp["status"] == "correct"
|
|
|
|
chal = DynamicChallenge.query.filter_by(id=1).first()
|
|
assert chal.value == chal.initial
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_dynamic_challenges_reset():
|
|
app = create_ctfd(enable_plugins=True)
|
|
with app.app_context():
|
|
client = login_as_user(app, name="admin", password="password")
|
|
|
|
challenge_data = {
|
|
"name": "name",
|
|
"category": "category",
|
|
"description": "description",
|
|
"value": 100,
|
|
"decay": 20,
|
|
"minimum": 1,
|
|
"state": "hidden",
|
|
"type": "dynamic",
|
|
}
|
|
|
|
r = client.post("/api/v1/challenges", json=challenge_data)
|
|
assert Challenges.query.count() == 1
|
|
assert DynamicChallenge.query.count() == 1
|
|
|
|
with client.session_transaction() as sess:
|
|
data = {"nonce": sess.get("nonce"), "challenges": "on"}
|
|
r = client.post("/admin/reset", data=data)
|
|
assert r.location.endswith("/admin/statistics")
|
|
assert Challenges.query.count() == 0
|
|
assert DynamicChallenge.query.count() == 0
|
|
|
|
destroy_ctfd(app)
|