mirror of
https://github.com/aljazceru/CTFd.git
synced 2025-12-17 05:54:19 +01:00
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
144 lines
5.2 KiB
Python
144 lines
5.2 KiB
Python
#!/usr/bin/env python
|
|
# -*- coding: utf-8 -*-
|
|
|
|
from tests.helpers import create_ctfd, destroy_ctfd, login_as_user, gen_user
|
|
from CTFd.utils import get_config
|
|
from jinja2.sandbox import SecurityError
|
|
from werkzeug.test import Client
|
|
from flask import request
|
|
|
|
|
|
def test_themes_run_in_sandbox():
|
|
"""Does get_config and set_config work properly"""
|
|
app = create_ctfd()
|
|
with app.app_context():
|
|
try:
|
|
app.jinja_env.from_string(
|
|
"{{ ().__class__.__bases__[0].__subclasses__()[40]('./test_utils.py').read() }}"
|
|
).render()
|
|
except SecurityError:
|
|
pass
|
|
except Exception as e:
|
|
raise e
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_themes_cant_access_configpy_attributes():
|
|
"""Themes should not be able to access config.py attributes"""
|
|
app = create_ctfd()
|
|
with app.app_context():
|
|
assert app.config["SECRET_KEY"] == "AAAAAAAAAAAAAAAAAAAA"
|
|
assert (
|
|
app.jinja_env.from_string("{{ get_config('SECRET_KEY') }}").render()
|
|
!= app.config["SECRET_KEY"]
|
|
)
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_themes_escape_html():
|
|
"""Themes should escape XSS properly"""
|
|
app = create_ctfd()
|
|
with app.app_context():
|
|
user = gen_user(app.db, name="<script>alert(1)</script>")
|
|
user.affiliation = "<script>alert(1)</script>"
|
|
user.website = "<script>alert(1)</script>"
|
|
user.country = "<script>alert(1)</script>"
|
|
|
|
with app.test_client() as client:
|
|
r = client.get("/users")
|
|
assert r.status_code == 200
|
|
assert "<script>alert(1)</script>" not in r.get_data(as_text=True)
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_custom_css():
|
|
"""Config should be able to properly set CSS"""
|
|
app = create_ctfd()
|
|
with app.app_context():
|
|
|
|
with login_as_user(app, "admin") as admin:
|
|
css_value = """.test{}"""
|
|
css_value2 = """.test2{}"""
|
|
r = admin.patch("/api/v1/configs", json={"css": css_value})
|
|
assert r.status_code == 200
|
|
assert get_config("css") == css_value
|
|
|
|
r = admin.get("/static/user.css")
|
|
assert r.get_data(as_text=True) == css_value
|
|
|
|
r = admin.patch("/api/v1/configs", json={"css": css_value2})
|
|
r = admin.get("/static/user.css")
|
|
assert r.get_data(as_text=True) == css_value2
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_that_ctfd_can_be_deployed_in_subdir():
|
|
"""Test that CTFd can be deployed in a subdirectory"""
|
|
# This test is quite complicated. I do not suggest modifying it haphazardly.
|
|
# Flask is automatically inserting the APPLICATION_ROOT into the
|
|
# test urls which means when we hit /setup we hit /ctf/setup.
|
|
# You can use the raw Werkzeug client to bypass this as we do below.
|
|
app = create_ctfd(setup=False, application_root="/ctf")
|
|
with app.app_context():
|
|
with app.test_client() as client:
|
|
r = client.get("/")
|
|
assert r.status_code == 302
|
|
assert r.location == "http://localhost/ctf/setup"
|
|
|
|
r = client.get("/setup")
|
|
with client.session_transaction() as sess:
|
|
data = {
|
|
"ctf_name": "CTFd",
|
|
"ctf_description": "CTF description",
|
|
"name": "admin",
|
|
"email": "admin@ctfd.io",
|
|
"password": "password",
|
|
"user_mode": "users",
|
|
"nonce": sess.get("nonce"),
|
|
}
|
|
r = client.post("/setup", data=data)
|
|
assert r.status_code == 302
|
|
assert r.location == "http://localhost/ctf/"
|
|
|
|
c = Client(app)
|
|
app_iter, status, headers = c.get("/")
|
|
headers = dict(headers)
|
|
assert status == "302 FOUND"
|
|
assert headers["Location"] == "http://localhost/ctf/"
|
|
|
|
r = client.get("/challenges")
|
|
assert r.status_code == 200
|
|
assert "Challenges" in r.get_data(as_text=True)
|
|
|
|
r = client.get("/scoreboard")
|
|
assert r.status_code == 200
|
|
assert "Scoreboard" in r.get_data(as_text=True)
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_that_request_path_hijacking_works_properly():
|
|
"""Test that the CTFdRequest subclass correctly mimics the Flask Request when it should"""
|
|
app = create_ctfd(setup=False, application_root="/ctf")
|
|
assert app.request_class.__name__ == "CTFdRequest"
|
|
with app.app_context():
|
|
# Despite loading /challenges request.path should actually be /ctf/challenges because we are
|
|
# preprending script_root and the test context already accounts for the application_root
|
|
with app.test_request_context("/challenges"):
|
|
assert request.path == "/ctf/challenges"
|
|
destroy_ctfd(app)
|
|
|
|
app = create_ctfd()
|
|
assert app.request_class.__name__ == "CTFdRequest"
|
|
with app.app_context():
|
|
# Under normal circumstances we should be an exact clone of BaseRequest
|
|
with app.test_request_context("/challenges"):
|
|
assert request.path == "/challenges"
|
|
|
|
from flask import Flask
|
|
|
|
test_app = Flask("test")
|
|
assert test_app.request_class.__name__ == "Request"
|
|
with test_app.test_request_context("/challenges"):
|
|
assert request.path == "/challenges"
|
|
destroy_ctfd(app)
|