mirror of
https://github.com/aljazceru/CTFd.git
synced 2025-12-17 14:04:20 +01:00
b8d0f80d01
2.2.0 / 2019-12-22
==================
## Notice
2.2.0 focuses on updating the front end of CTFd to use more modern programming practices and changes some aspects of core CTFd design. If your current installation is using a custom theme or custom plugin with ***any*** kind of JavaScript, it is likely that you will need to upgrade that theme/plugin to be useable with v2.2.0.
**General**
* Team size limits can now be enforced from the configuration panel
* Access tokens functionality for API usage
* Admins can now choose how to deliver their notifications
* Toast (new default)
* Alert
* Background
* Sound On / Sound Off
* There is now a notification counter showing how many unread notifications were received
* Setup has been redesigned to have multiple steps
* Added Description
* Added Start time and End time,
* Added MajorLeagueCyber integration
* Added Theme and color selection
* Fixes issue where updating dynamic challenges could change the value to an incorrect value
* Properly use a less restrictive regex to validate email addresses
* Bump Python dependencies to latest working versions
* Admins can now give awards to team members from the team's admin panel page
**API**
* Team member removals (`DELETE /api/v1/teams/[team_id]/members`) from the admin panel will now delete the removed members's Submissions, Awards, Unlocks
**Admin Panel**
* Admins can now user a color input box to specify a theme color which is injected as part of the CSS configuration. Theme developers can use this CSS value to change colors and styles accordingly.
* Challenge updates will now alert you if the challenge doesn't have a flag
* Challenge entry now allows you to upload files and enter simple flags from the initial challenge creation page
**Themes**
* Significant JavaScript and CSS rewrite to use ES6, Webpack, yarn, and babel
* Theme asset specially generated URLs
* Static theme assets are now loaded with either .dev.extension or .min.extension depending on production or development (i.e. debug server)
* Static theme assets are also given a `d` GET parameter that changes per server start. Used to bust browser caches.
* Use `defer` for script tags to not block page rendering
* Only show the MajorLeagueCyber button if configured in configuration
* The admin panel now links to https://help.ctfd.io/ in the top right
* Create an `ezToast()` function to use [Bootstrap's toasts](https://getbootstrap.com/docs/4.3/components/toasts/)
* The user-facing navbar now features icons
* Awards shown on a user's profile can now have award icons
* The default MarkdownIt render created by CTFd will now open links in new tabs
* Country flags can now be shown on the user pages
**Deployment**
* Switch `Dockerfile` from `python:2.7-alpine` to `python:3.7-alpine`
* Add `SERVER_SENT_EVENTS` config value to control whether Notifications are enabled
* Challenge ID is now recorded in the submission log
**Plugins**
* Add an endpoint parameter to `register_plugin_assets_directory()` and `register_plugin_asset()` to control what endpoint Flask uses for the added route
**Miscellaneous**
* `CTFd.utils.email.sendmail()` now allows the caller to specify subject as an argument
* The subject allows for injecting custom variable via the new `CTFd.utils.formatters.safe_format()` function
* Admin user information is now error checked during setup
* Added yarn to the toolchain and the yarn dev, yarn build, yarn verify, and yarn clean scripts
* Prevent old CTFd imports from being imported
128 lines
4.4 KiB
Python
128 lines
4.4 KiB
Python
#!/usr/bin/env python
|
|
# -*- coding: utf-8 -*-
|
|
|
|
from CTFd.models import Users, Tokens
|
|
from CTFd.utils.security.auth import generate_user_token
|
|
from CTFd.schemas.tokens import TokenSchema
|
|
from tests.helpers import (
|
|
create_ctfd,
|
|
destroy_ctfd,
|
|
login_as_user,
|
|
gen_user,
|
|
)
|
|
import datetime
|
|
|
|
|
|
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@ctfd.io")
|
|
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()
|
|
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()
|
|
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@ctfd.io")
|
|
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@ctfd.io")
|
|
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)
|