mirror of
https://github.com/aljazceru/CTFd.git
synced 2025-12-17 22:14:25 +01:00
Alpha release of CTFd v3.
# 3.0.0a1 / 2020-07-01
**General**
- CTFd is now Python 3 only
- Render markdown with the CommonMark spec provided by `cmarkgfm`
- Render markdown stripped of any malicious JavaScript or HTML.
- This is a significant change from previous versions of CTFd where any HTML content from an admin was considered safe.
- Inject `Config`, `User`, `Team`, `Session`, and `Plugin` globals into Jinja
- User sessions no longer store any user-specific attributes.
- Sessions only store the user's ID, CSRF nonce, and an hmac of the user's password
- This allows for session invalidation on password changes
- The user facing side of CTFd now has user and team searching
- GeoIP support now available for converting IP addresses to guessed countries
**Admin Panel**
- Use EasyMDE as an improved description/text editor for Markdown enabled fields.
- Media Library button now integrated into EasyMDE enabled fields
- VueJS now used as the underlying implementation for the Media Library
- Fix setting theme color in Admin Panel
- Green outline border has been removed from the Admin Panel
**API**
- Significant overhauls in API documentation provided by Swagger UI and Swagger json
- Make almost all API endpoints provide filtering and searching capabilities
- Change `GET /api/v1/config/<config_key>` to return structured data according to ConfigSchema
**Themes**
- Themes now have access to the `Configs` global which provides wrapped access to `get_config`.
- For example, `{{ Configs.ctf_name }}` instead of `get_ctf_name()` or `get_config('ctf_name')`
- Themes must now specify a `challenge.html` which control how a challenge should look.
- The main library for charts has been changed from Plotly to Apache ECharts.
- Forms have been moved into wtforms for easier form rendering inside of Jinja.
- From Jinja you can access forms via the Forms global i.e. `{{ Forms }}`
- This allows theme developers to more easily re-use a form without having to copy-paste HTML.
- Themes can now provide a theme settings JSON blob which can be injected into the theme with `{{ Configs.theme_settings }}`
- Core theme now includes the challenge ID in location hash identifiers to always refer the right challenge despite duplicate names
**Plugins**
- Challenge plugins have changed in structure to better allow integration with themes and prevent obtrusive Javascript/XSS.
- Challenge rendering now uses `challenge.html` from the provided theme.
- Accessing the challenge view content is now provided by `/api/v1/challenges/<challenge_id>` in the `view` section. This allows for HTML to be properly sanitized and rendered by the server allowing CTFd to remove client side Jinja rendering.
- `challenge.html` now specifies what's required and what's rendered by the theme. This allows the challenge plugin to avoid having to deal with aspects of the challenge besides the description and input.
- A more complete migration guide will be provided when CTFd v3 leaves beta
- Display current attempt count in challenge view when max attempts is enabled
- `get_standings()`, `get_team_stanadings()`, `get_user_standings()` now has a fields keyword argument that allows for specificying additional fields that SQLAlchemy should return when building the response set.
- Useful for gathering additional data when building scoreboard pages
- Flags can now control the message that is shown to the user by raising `FlagException`
- Fix `override_template()` functionality
**Deployment**
- Enable SQLAlchemy's `pool_pre_ping` by default to reduce the likelihood of database connection issues
- Mailgun email settings are now deprecated. Admins should move to SMTP email settings instead.
- Postgres is now considered a second class citizen in CTFd. It is tested against but not a main database backend. If you use Postgres, you are entirely on your own with regards to supporting CTFd.
- Docker image now uses Debian instead of Alpine. See https://github.com/CTFd/CTFd/issues/1215 for rationale.
- `docker-compose.yml` now uses a non-root user to connect to MySQL/MariaDB
- `config.py` should no longer be editting for configuration, instead edit `config.ini` or the environment variables in `docker-compose.yml`
196 lines
6.3 KiB
Python
196 lines
6.3 KiB
Python
import json
|
|
from collections import defaultdict
|
|
from queue import Queue
|
|
from unittest.mock import patch
|
|
|
|
import redis
|
|
from redis.exceptions import ConnectionError
|
|
|
|
from CTFd.config import TestingConfig
|
|
from CTFd.utils.events import EventManager, RedisEventManager, ServerSentEvent
|
|
from tests.helpers import create_ctfd, destroy_ctfd, login_as_user, register_user
|
|
|
|
|
|
def test_event_manager_installed():
|
|
"""Test that EventManager is installed on the Flask app"""
|
|
app = create_ctfd()
|
|
assert type(app.events_manager) == EventManager
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_event_manager_subscription():
|
|
"""Test that EventManager subscribing works"""
|
|
with patch.object(Queue, "get") as fake_queue:
|
|
saved_data = {
|
|
"user_id": None,
|
|
"title": "asdf",
|
|
"content": "asdf",
|
|
"team_id": None,
|
|
"user": None,
|
|
"team": None,
|
|
"date": "2019-01-28T01:20:46.017649+00:00",
|
|
"id": 10,
|
|
}
|
|
saved_event = {"type": "notification", "data": saved_data}
|
|
|
|
fake_queue.return_value = saved_event
|
|
event_manager = EventManager()
|
|
events = event_manager.subscribe()
|
|
message = next(events)
|
|
assert isinstance(message, ServerSentEvent)
|
|
assert message.to_dict() == {"data": "", "type": "ping"}
|
|
assert message.__str__().startswith("event:ping")
|
|
assert len(event_manager.clients) == 1
|
|
|
|
message = next(events)
|
|
assert isinstance(message, ServerSentEvent)
|
|
assert message.to_dict() == saved_event
|
|
assert message.__str__().startswith("event:notification\ndata:")
|
|
assert len(event_manager.clients) == 1
|
|
|
|
|
|
def test_event_manager_publish():
|
|
"""Test that EventManager publishing to clients works"""
|
|
saved_data = {
|
|
"user_id": None,
|
|
"title": "asdf",
|
|
"content": "asdf",
|
|
"team_id": None,
|
|
"user": None,
|
|
"team": None,
|
|
"date": "2019-01-28T01:20:46.017649+00:00",
|
|
"id": 10,
|
|
}
|
|
|
|
event_manager = EventManager()
|
|
event_manager.clients.append(defaultdict(Queue))
|
|
event_manager.publish(data=saved_data, type="notification", channel="ctf")
|
|
|
|
event = event_manager.clients[0]["ctf"].get()
|
|
event = ServerSentEvent(**event)
|
|
assert event.data == saved_data
|
|
|
|
|
|
def test_event_endpoint_is_event_stream():
|
|
"""Test that the /events endpoint is text/event-stream"""
|
|
app = create_ctfd()
|
|
with patch.object(Queue, "get") as fake_queue:
|
|
saved_data = {
|
|
"user_id": None,
|
|
"title": "asdf",
|
|
"content": "asdf",
|
|
"team_id": None,
|
|
"user": None,
|
|
"team": None,
|
|
"date": "2019-01-28T01:20:46.017649+00:00",
|
|
"id": 10,
|
|
}
|
|
saved_event = {"type": "notification", "data": saved_data}
|
|
|
|
fake_queue.return_value = saved_event
|
|
with app.app_context():
|
|
register_user(app)
|
|
with login_as_user(app) as client:
|
|
r = client.get("/events")
|
|
assert "text/event-stream" in r.headers["Content-Type"]
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_redis_event_manager_installed():
|
|
"""Test that RedisEventManager is installed on the Flask app"""
|
|
|
|
class RedisConfig(TestingConfig):
|
|
REDIS_URL = "redis://localhost:6379/1"
|
|
CACHE_REDIS_URL = "redis://localhost:6379/1"
|
|
CACHE_TYPE = "redis"
|
|
|
|
try:
|
|
app = create_ctfd(config=RedisConfig)
|
|
except ConnectionError:
|
|
print("Failed to connect to redis. Skipping test.")
|
|
else:
|
|
with app.app_context():
|
|
assert isinstance(app.events_manager, RedisEventManager)
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_redis_event_manager_subscription():
|
|
"""Test that RedisEventManager subscribing works."""
|
|
|
|
class RedisConfig(TestingConfig):
|
|
REDIS_URL = "redis://localhost:6379/2"
|
|
CACHE_REDIS_URL = "redis://localhost:6379/2"
|
|
CACHE_TYPE = "redis"
|
|
|
|
try:
|
|
app = create_ctfd(config=RedisConfig)
|
|
except ConnectionError:
|
|
print("Failed to connect to redis. Skipping test.")
|
|
else:
|
|
with app.app_context():
|
|
saved_data = {
|
|
u"data": {
|
|
u"content": u"asdf",
|
|
u"date": u"2019-01-28T05:02:19.830906+00:00",
|
|
u"id": 13,
|
|
u"team": None,
|
|
u"team_id": None,
|
|
u"title": u"asdf",
|
|
u"user": None,
|
|
u"user_id": None,
|
|
},
|
|
u"type": u"notification",
|
|
}
|
|
|
|
saved_event = {
|
|
"pattern": None,
|
|
"type": "message",
|
|
"channel": "ctf",
|
|
"data": json.dumps(saved_data),
|
|
}
|
|
with patch.object(redis.client.PubSub, "listen") as fake_pubsub_listen:
|
|
fake_pubsub_listen.return_value = [saved_event]
|
|
event_manager = RedisEventManager()
|
|
|
|
events = event_manager.subscribe()
|
|
message = next(events)
|
|
assert isinstance(message, ServerSentEvent)
|
|
assert message.to_dict() == {"data": "", "type": "ping"}
|
|
assert message.__str__().startswith("event:ping")
|
|
|
|
message = next(events)
|
|
assert isinstance(message, ServerSentEvent)
|
|
assert message.to_dict() == saved_data
|
|
assert message.__str__().startswith("event:notification\ndata:")
|
|
destroy_ctfd(app)
|
|
|
|
|
|
def test_redis_event_manager_publish():
|
|
"""Test that RedisEventManager publishing to clients works."""
|
|
|
|
class RedisConfig(TestingConfig):
|
|
REDIS_URL = "redis://localhost:6379/3"
|
|
CACHE_REDIS_URL = "redis://localhost:6379/3"
|
|
CACHE_TYPE = "redis"
|
|
|
|
try:
|
|
app = create_ctfd(config=RedisConfig)
|
|
except ConnectionError:
|
|
print("Failed to connect to redis. Skipping test.")
|
|
else:
|
|
with app.app_context():
|
|
saved_data = {
|
|
"user_id": None,
|
|
"title": "asdf",
|
|
"content": "asdf",
|
|
"team_id": None,
|
|
"user": None,
|
|
"team": None,
|
|
"date": "2019-01-28T01:20:46.017649+00:00",
|
|
"id": 10,
|
|
}
|
|
|
|
event_manager = RedisEventManager()
|
|
event_manager.publish(data=saved_data, type="notification", channel="ctf")
|
|
destroy_ctfd(app)
|