mirror of
https://github.com/aljazceru/CTFd.git
synced 2025-12-17 22:14:25 +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`
124 lines
4.4 KiB
Python
124 lines
4.4 KiB
Python
#!/usr/bin/env python
|
|
# -*- coding: utf-8 -*-
|
|
|
|
import datetime
|
|
|
|
from CTFd.models import Tokens, Users
|
|
from CTFd.schemas.tokens import TokenSchema
|
|
from CTFd.utils.security.auth import generate_user_token
|
|
from tests.helpers import create_ctfd, destroy_ctfd, gen_user, login_as_user
|
|
|
|
|
|
def test_api_tag_list_post():
|
|
"""Can a user create a token"""
|
|
app = create_ctfd()
|
|
with app.app_context():
|
|
user = gen_user(app.db, name="user")
|
|
user_id = user.id
|
|
with login_as_user(app) as client:
|
|
r = client.post("/api/v1/tokens", json={})
|
|
assert r.status_code == 200
|
|
resp = r.get_json()
|
|
value = resp["data"]["value"]
|
|
token = Tokens.query.filter_by(value=value).first()
|
|
assert token.user_id == user_id
|
|
assert token.expiration > datetime.datetime.utcnow()
|
|
|
|
data = {"expiration": "9999-12-30"}
|
|
r = client.post("/api/v1/tokens", json=data)
|
|
assert r.status_code == 200
|
|
resp = r.get_json()
|
|
value = resp["data"]["value"]
|
|
token = Tokens.query.filter_by(value=value).first()
|
|
assert token.user_id == user_id
|
|
assert token.expiration.year == 9999
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_api_tag_list_get():
|
|
"""Can a user get /api/v1/tokens"""
|
|
app = create_ctfd()
|
|
with app.app_context():
|
|
user = gen_user(app.db, name="user")
|
|
generate_user_token(user)
|
|
|
|
user2 = gen_user(app.db, name="user2", email="user2@examplectf.com")
|
|
generate_user_token(user2)
|
|
generate_user_token(user2)
|
|
with login_as_user(app) as client:
|
|
r = client.get("/api/v1/tokens", json="")
|
|
assert r.status_code == 200
|
|
resp = r.get_json()
|
|
assert len(resp["data"]) == 1
|
|
|
|
with login_as_user(app, name="user2") as client:
|
|
r = client.get("/api/v1/tokens", json="")
|
|
assert r.status_code == 200
|
|
resp = r.get_json()
|
|
assert len(resp["data"]) == 2
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_api_tag_detail_get():
|
|
"""Can a user get /api/v1/tokens/<token_id>"""
|
|
app = create_ctfd()
|
|
with app.app_context():
|
|
user = gen_user(app.db, name="user")
|
|
generate_user_token(user)
|
|
|
|
with login_as_user(app) as client:
|
|
r = client.get("/api/v1/tokens/1", json="")
|
|
assert r.status_code == 200
|
|
resp = r.get_json()
|
|
assert sorted(resp["data"].keys()) == sorted(TokenSchema().views["user"])
|
|
|
|
with login_as_user(app, "admin") as client:
|
|
r = client.get("/api/v1/tokens/1", json="")
|
|
assert r.status_code == 200
|
|
resp = r.get_json()
|
|
assert sorted(resp["data"].keys()) == sorted(TokenSchema().views["admin"])
|
|
|
|
gen_user(app.db, name="user2", email="user2@examplectf.com")
|
|
with login_as_user(app, "user2") as client:
|
|
r = client.get("/api/v1/tokens/1", json="")
|
|
assert r.status_code == 404
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_api_token_delete():
|
|
"""Can tokens be deleted by owners, and admins"""
|
|
app = create_ctfd()
|
|
with app.app_context():
|
|
# Can be deleted by the user
|
|
user = gen_user(app.db)
|
|
user_id = user.id
|
|
username = user.name
|
|
token = generate_user_token(user)
|
|
token_id = token.id
|
|
with login_as_user(app, username) as client:
|
|
r = client.delete("/api/v1/tokens/" + str(token_id), json="")
|
|
assert r.status_code == 200
|
|
assert Tokens.query.count() == 0
|
|
|
|
# Can be deleted by admins
|
|
user = Users.query.filter_by(id=user_id).first()
|
|
token = generate_user_token(user)
|
|
token_id = token.id
|
|
with login_as_user(app, "admin") as client:
|
|
r = client.delete("/api/v1/tokens/" + str(token_id), json="")
|
|
assert r.status_code == 200
|
|
assert Tokens.query.count() == 0
|
|
|
|
# First user
|
|
first_user = Users.query.filter_by(id=user_id).first()
|
|
token = generate_user_token(first_user)
|
|
token_id = token.id
|
|
# Second user
|
|
second_user = gen_user(app.db, name="user2", email="user2@examplectf.com")
|
|
username2 = second_user.name
|
|
with login_as_user(app, username2) as client:
|
|
r = client.delete("/api/v1/tokens/" + str(token_id), json="")
|
|
assert r.status_code == 404
|
|
assert Tokens.query.count() == 1
|
|
destroy_ctfd(app)
|