mirror of
https://github.com/aljazceru/CTFd.git
synced 2025-12-17 22:14:25 +01:00
* Fix user and admin panel user/team graphs * Closes #682 * Unify login and logout under specific functions * Closes #659 * Rename Challenges.hidden to Challenges.state * Start to clean up API and front end integration starting with profile updating * Slightly cleaner code * Clean API to respond with success, data, and status codes * Simpler COUNTRIES_LIST and update profile to use COUNTRIES_LIST * Lookup country code in users page. Update front end calls to get API data properly * Fix some API endpoints and fix JS to process new responses * Update config.py to support new values * Closes #635 * Update some code to handle user types, add email domain whitelisting * Write a logging wrapper * Use logging wrapper for submissions * Close #656 * Break up config.html to make it easier to maintain * Fix logging, domain_whitelist, and config * Improving views.py, starting to add Announcements * Starting announcements front end * Make it easier to see large images, clean up some more REST API differences * Closes #668 * Update Proxyfix config to REVERSE_PROXY * Add announcements front end * Move creation/edit modals into seperate files. Start moving user updating into their admin profile pages. * Update font-awesome to 5.4.1 * Switch to user-edit icon * Update the update_check function to send up more anonymous data for statistics purposes. * Start work on #640 * Add the user action modals and update API to fix responses * Fix admin teams page * Add challenge requirements * Implement anonymous locked challenges * Team editting from admin panel * Switch from simple cache to filesystem cache * Implements a Cache backed server side session (#658) and fixes Users editting endpoint * Add our messaging for docs * Closes #700 * Remove invalid import * Move challenge enditting around a whole lot and probably break a bunch of things * Show challenge names in prerequisites instead of challenge IDs * Closes #661 * Change user templates to use url_for * Remove extra function * Rewrite admin panel to use url_for * Fix events to work under subdirectories * Start cleaning up config panel * Fix filesystem uploader; deprecate view_challenges_unregistered, view_scoreboard_if_authed, prevent_registration, view_after_ctf; implement new visibility decorators * Remove workshop mode, fix some glitches with the new visibility settings * Fix ctf_logo on core theme * Fix setup errors * Removing default from get_config b/c of memoization issues and getting some tests working * Relax email regex validation rule (#693) * Update to pycodestyle and fix new lint errors * Add a ctf_id to update_check * Change challenge plugin layout. Rename mailgun configs to be more descriptive (Closes #702) * Detect if people try to set routes with '/' to simplify #690 * Closes #690 * Clean up some code * Clean up challenge submit to rate limit * Fix js version compatability issue * Close some TODOs * Hide challenges if not authenticated * Make set_config reset the cache for those config values * Return 404 on empty challenges for /api/v1/<challenge_id>/solves * Fix setting boolean configs * Properly change account config settings * Move datetimes to isoformat (Closes #703) * Remove all .isoformat() calls because it isn't UTC aware (ends in Z). Switch to isoformat function & filter * Make /v1/submissions endpoint work for admin submission creation * Make oauth_id unique for Users and Teams * Move challenge submission endpoint and implement mark solved. Fix some isoformat issues. * Only show team's missing challenges if in team mode * Adding support for Hints & Unlocks * Update challenge submission url * Fix encoding functions in Python3 * Fix hexencode in Python3 * Added functional tests for challenges API for non-admin users (#705) * Set hint default type to be standard * Fix some JS issues. Closes #704 * Implement session.regenerate on top of the CachingSessionInterface * Challenge challenge attempt responses from numbers to strings * Fix password updating for UserSchema * Remove leftover challenge submission code * Remove old migrations :(, resolve challenge requirements not loading correctly, move migration functions * Added functional tests for challenges/hints/admin API (#710) * Fix helpers and re-add JSONLite * Install MySQL 5.7 * Try more mysql * Update password for mysql * Fixing issuse in Users.get_solves * Add new import/export code * Switch to CTFdSerializer for Python 3 * Re-implement import exports and add a very flaky test * Redesign submissions API response * Get export to roundtrip in tests * Int score b/c Decimal is not JSON serializeable * Remove unused route methods * Fix POST /api/v1/configs and start adding admin tests * Add user_id and team_id to top/10 * Fix admin creating Teams * Fix Team website validation * Change admins_only to reply with a 403 if the request is JSON * Organize admin tests and fix authed_only to return 403 on unauthed * Adding check_account_visibility, check_score_visibility for /api/v1/teams/<team_id>/(solves|awards|fails) * Fix teams/me endpoints again * Fix users/me endpoints to return 403 if unauthed * Fix Python 3 config API * Add fetch and promise polyfills. (#712) * Add exec to docker-entrypoint.sh (#713) * Display import_ctf Exceptions via repr (#651) - Wraps exceptions on `/admin/import` returned to users in a `repr()`, making debugging easier. * Add error messages to the admin panel, fix schemas for users, start working on UI for imports/exports * Make unauthed challenge submission attempt return 403 instead of 302, Fix user deletion, fix associated tests, remove TODOs * Remove old means of creating solves * Remove most of the content from teams.js and users.js * Remove extra code from /challenges.js * Fix POST'ing & PATCH'ing pages * Make (users|teams)/fails return only count to users. Fix public score graphs to factor in awards * Fix admin side scoregraphs. Fix Awardschemas for admins * Add requirements to db migration * Adding some team decorators * Fix require_team_mode decorator * Make verified emails decorator return 403 on JSON requests * Redo initial revision * Add SQLiteJSON back * Adding ratelimit to /redirect and removing POST from /oauth * Fix PATCH tags * Actually fix PATCH tags * Simplify 500.html * Added tests for challenges, awards, files, flags, hints ... (#723) * Added tests for challenges, awards, files, flags, hints, notifications, pages, submissions, tags * Fix user data validation functions, Fix hidden challenges and include test * Add a locked state to attempt * OAuth teams get verified, use logging functions in redirect route * Removing extra print call * Update requirements.txt * Fix possible AttributeError * Start work on #716 * Closes #717 * Fix issue patching teams * Rename .j2 to .html, implement preview for challenges if admin * Move admin/challenge.html to admin/challenges/challenge.html * Remove old modals * Add Reset CTF button (#639) * Add Reset link to config.html * Delete Tracking * files handler should return a 404 on files it cant find * Denote official teams (#729), make scoregraph fill to zero * Remove old javascript files, make some challenge elements refresh by reloading * Fix team editting modals to work more reliably * Fix rendering of CTF paused * Remove hide_scores funtion and roll it into scores visibility * Log to stdout/stderr by default (#719) * Fix user searching * Remove searching for users/teams by country * Add badges to admin team and user pages, implement user banning (#643) * Remove shell.py, clean up admin team.html, add tests for banned users, teams * Start cleaning up dynamic_challenges to meet new challenge type plugin format * Remove POST method from teams.public * Add credentials: 'same-origin' to all fetch calls (#734) * Add challenge preview, add challenge deletion, fix file deletions when deleting challenges * Fix imports UI (#735) * Show prerequisites before adding a blank one (#738), Refresh all challenges after a submission (#739) * Admins can see hidden challenges * Fix some UI elements, fix loading location hash, set version to be 2.0.0 * Clean up some challenge plugin pages * Add default for flag type * Fix Python3 bytes/str issues * Add in MLC urls and support user mode for oauth * Fix seeing user graphs when scores are hidden, clean up setup.html, add links to MLC oauth * Add state parameter support * Use URLSafeTimedSerializer wrapper for sending token based emails * setting APPLICATION_ROOT from env var (#732) * Rearrange config.py and update README * Updating README
274 lines
11 KiB
Python
274 lines
11 KiB
Python
"""Initial Revision
|
|
|
|
Revision ID: 8369118943a1
|
|
Revises:
|
|
Create Date: 2018-11-05 01:06:24.495010
|
|
|
|
"""
|
|
from alembic import op
|
|
import sqlalchemy as sa
|
|
from sqlalchemy import TypeDecorator, String, func, types, CheckConstraint, and_
|
|
from sqlalchemy.sql.expression import union_all
|
|
from sqlalchemy.types import JSON, NullType
|
|
from sqlalchemy.orm import validates, column_property
|
|
from sqlalchemy.ext.hybrid import hybrid_property, hybrid_method
|
|
import json
|
|
|
|
|
|
# revision identifiers, used by Alembic.
|
|
revision = '8369118943a1'
|
|
down_revision = None
|
|
branch_labels = None
|
|
depends_on = None
|
|
|
|
|
|
class SQLiteJson(TypeDecorator):
|
|
impl = String
|
|
|
|
class Comparator(String.Comparator):
|
|
def __getitem__(self, index):
|
|
if isinstance(index, tuple):
|
|
index = "$%s" % (
|
|
"".join([
|
|
"[%s]" % elem if isinstance(elem, int)
|
|
else '."%s"' % elem for elem in index
|
|
])
|
|
)
|
|
elif isinstance(index, int):
|
|
index = "$[%s]" % index
|
|
else:
|
|
index = '$."%s"' % index
|
|
|
|
# json_extract does not appear to return JSON sub-elements
|
|
# which is weird.
|
|
return func.json_extract(self.expr, index, type_=NullType)
|
|
|
|
comparator_factory = Comparator
|
|
|
|
def process_bind_param(self, value, dialect):
|
|
if value is not None:
|
|
value = json.dumps(value)
|
|
return value
|
|
|
|
def process_result_value(self, value, dialect):
|
|
if value is not None:
|
|
value = json.loads(value)
|
|
return value
|
|
|
|
|
|
JSON = types.JSON().with_variant(SQLiteJson, 'sqlite')
|
|
|
|
|
|
def upgrade():
|
|
# ### commands auto generated by Alembic - please adjust! ###
|
|
op.create_table('challenges',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('name', sa.String(length=80), nullable=True),
|
|
sa.Column('description', sa.Text(), nullable=True),
|
|
sa.Column('max_attempts', sa.Integer(), nullable=True),
|
|
sa.Column('value', sa.Integer(), nullable=True),
|
|
sa.Column('category', sa.String(length=80), nullable=True),
|
|
sa.Column('type', sa.String(length=80), nullable=True),
|
|
sa.Column('state', sa.String(length=80), nullable=False),
|
|
sa.Column('requirements', JSON, nullable=True),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('config',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('key', sa.Text(), nullable=True),
|
|
sa.Column('value', sa.Text(), nullable=True),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('pages',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('title', sa.String(length=80), nullable=True),
|
|
sa.Column('route', sa.String(length=128), nullable=True),
|
|
sa.Column('content', sa.Text(), nullable=True),
|
|
sa.Column('draft', sa.Boolean(), nullable=True),
|
|
sa.Column('hidden', sa.Boolean(), nullable=True),
|
|
sa.Column('auth_required', sa.Boolean(), nullable=True),
|
|
sa.PrimaryKeyConstraint('id'),
|
|
sa.UniqueConstraint('route')
|
|
)
|
|
op.create_table('teams',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('oauth_id', sa.Integer(), nullable=True),
|
|
sa.Column('name', sa.String(length=128), nullable=True),
|
|
sa.Column('email', sa.String(length=128), nullable=True),
|
|
sa.Column('password', sa.String(length=128), nullable=True),
|
|
sa.Column('secret', sa.String(length=128), nullable=True),
|
|
sa.Column('website', sa.String(length=128), nullable=True),
|
|
sa.Column('affiliation', sa.String(length=128), nullable=True),
|
|
sa.Column('country', sa.String(length=32), nullable=True),
|
|
sa.Column('bracket', sa.String(length=32), nullable=True),
|
|
sa.Column('hidden', sa.Boolean(), nullable=True),
|
|
sa.Column('banned', sa.Boolean(), nullable=True),
|
|
sa.Column('created', sa.DateTime(), nullable=True),
|
|
sa.PrimaryKeyConstraint('id'),
|
|
sa.UniqueConstraint('email'),
|
|
sa.UniqueConstraint('id', 'oauth_id'),
|
|
sa.UniqueConstraint('oauth_id')
|
|
)
|
|
op.create_table('dynamic_challenge',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('initial', sa.Integer(), nullable=True),
|
|
sa.Column('minimum', sa.Integer(), nullable=True),
|
|
sa.Column('decay', sa.Integer(), nullable=True),
|
|
sa.ForeignKeyConstraint(['id'], ['challenges.id'], ),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('files',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('type', sa.String(length=80), nullable=True),
|
|
sa.Column('location', sa.Text(), nullable=True),
|
|
sa.Column('challenge_id', sa.Integer(), nullable=True),
|
|
sa.Column('page_id', sa.Integer(), nullable=True),
|
|
sa.ForeignKeyConstraint(['challenge_id'], ['challenges.id'], ),
|
|
sa.ForeignKeyConstraint(['page_id'], ['pages.id'], ),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('flags',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('challenge_id', sa.Integer(), nullable=True),
|
|
sa.Column('type', sa.String(length=80), nullable=True),
|
|
sa.Column('content', sa.Text(), nullable=True),
|
|
sa.Column('data', sa.Text(), nullable=True),
|
|
sa.ForeignKeyConstraint(['challenge_id'], ['challenges.id'], ),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('hints',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('type', sa.String(length=80), nullable=True),
|
|
sa.Column('challenge_id', sa.Integer(), nullable=True),
|
|
sa.Column('content', sa.Text(), nullable=True),
|
|
sa.Column('cost', sa.Integer(), nullable=True),
|
|
sa.Column('requirements', JSON, nullable=True),
|
|
sa.ForeignKeyConstraint(['challenge_id'], ['challenges.id'], ),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('tags',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('challenge_id', sa.Integer(), nullable=True),
|
|
sa.Column('value', sa.String(length=80), nullable=True),
|
|
sa.ForeignKeyConstraint(['challenge_id'], ['challenges.id'], ),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('users',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('oauth_id', sa.Integer(), nullable=True),
|
|
sa.Column('name', sa.String(length=128), nullable=True),
|
|
sa.Column('password', sa.String(length=128), nullable=True),
|
|
sa.Column('email', sa.String(length=128), nullable=True),
|
|
sa.Column('type', sa.String(length=80), nullable=True),
|
|
sa.Column('secret', sa.String(length=128), nullable=True),
|
|
sa.Column('website', sa.String(length=128), nullable=True),
|
|
sa.Column('affiliation', sa.String(length=128), nullable=True),
|
|
sa.Column('country', sa.String(length=32), nullable=True),
|
|
sa.Column('bracket', sa.String(length=32), nullable=True),
|
|
sa.Column('hidden', sa.Boolean(), nullable=True),
|
|
sa.Column('banned', sa.Boolean(), nullable=True),
|
|
sa.Column('verified', sa.Boolean(), nullable=True),
|
|
sa.Column('team_id', sa.Integer(), nullable=True),
|
|
sa.Column('created', sa.DateTime(), nullable=True),
|
|
sa.ForeignKeyConstraint(['team_id'], ['teams.id'], ),
|
|
sa.PrimaryKeyConstraint('id'),
|
|
sa.UniqueConstraint('email'),
|
|
sa.UniqueConstraint('id', 'oauth_id'),
|
|
sa.UniqueConstraint('oauth_id')
|
|
)
|
|
op.create_table('awards',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('user_id', sa.Integer(), nullable=True),
|
|
sa.Column('team_id', sa.Integer(), nullable=True),
|
|
sa.Column('name', sa.String(length=80), nullable=True),
|
|
sa.Column('description', sa.Text(), nullable=True),
|
|
sa.Column('date', sa.DateTime(), nullable=True),
|
|
sa.Column('value', sa.Integer(), nullable=True),
|
|
sa.Column('category', sa.String(length=80), nullable=True),
|
|
sa.Column('icon', sa.Text(), nullable=True),
|
|
sa.Column('requirements', JSON, nullable=True),
|
|
sa.ForeignKeyConstraint(['team_id'], ['teams.id'], ),
|
|
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('notifications',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('title', sa.Text(), nullable=True),
|
|
sa.Column('content', sa.Text(), nullable=True),
|
|
sa.Column('date', sa.DateTime(), nullable=True),
|
|
sa.Column('user_id', sa.Integer(), nullable=True),
|
|
sa.Column('team_id', sa.Integer(), nullable=True),
|
|
sa.ForeignKeyConstraint(['team_id'], ['teams.id'], ),
|
|
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('submissions',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('challenge_id', sa.Integer(), nullable=True),
|
|
sa.Column('user_id', sa.Integer(), nullable=True),
|
|
sa.Column('team_id', sa.Integer(), nullable=True),
|
|
sa.Column('ip', sa.String(length=46), nullable=True),
|
|
sa.Column('provided', sa.Text(), nullable=True),
|
|
sa.Column('type', sa.String(length=32), nullable=True),
|
|
sa.Column('date', sa.DateTime(), nullable=True),
|
|
sa.ForeignKeyConstraint(['challenge_id'], ['challenges.id'], ondelete='CASCADE'),
|
|
sa.ForeignKeyConstraint(['team_id'], ['teams.id'], ondelete='CASCADE'),
|
|
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('tracking',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('type', sa.String(length=32), nullable=True),
|
|
sa.Column('ip', sa.String(length=46), nullable=True),
|
|
sa.Column('user_id', sa.Integer(), nullable=True),
|
|
sa.Column('date', sa.DateTime(), nullable=True),
|
|
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('unlocks',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('user_id', sa.Integer(), nullable=True),
|
|
sa.Column('team_id', sa.Integer(), nullable=True),
|
|
sa.Column('target', sa.Integer(), nullable=True),
|
|
sa.Column('date', sa.DateTime(), nullable=True),
|
|
sa.Column('type', sa.String(length=32), nullable=True),
|
|
sa.ForeignKeyConstraint(['team_id'], ['teams.id'], ),
|
|
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_table('solves',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('challenge_id', sa.Integer(), nullable=True),
|
|
sa.Column('user_id', sa.Integer(), nullable=True),
|
|
sa.Column('team_id', sa.Integer(), nullable=True),
|
|
sa.ForeignKeyConstraint(['challenge_id'], ['challenges.id'], ondelete='CASCADE'),
|
|
sa.ForeignKeyConstraint(['id'], ['submissions.id'], ondelete='CASCADE'),
|
|
sa.ForeignKeyConstraint(['team_id'], ['teams.id'], ondelete='CASCADE'),
|
|
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
|
|
sa.PrimaryKeyConstraint('id'),
|
|
sa.UniqueConstraint('challenge_id', 'team_id'),
|
|
sa.UniqueConstraint('challenge_id', 'user_id')
|
|
)
|
|
# ### end Alembic commands ###
|
|
|
|
|
|
def downgrade():
|
|
# ### commands auto generated by Alembic - please adjust! ###
|
|
op.drop_table('solves')
|
|
op.drop_table('unlocks')
|
|
op.drop_table('tracking')
|
|
op.drop_table('submissions')
|
|
op.drop_table('notifications')
|
|
op.drop_table('awards')
|
|
op.drop_table('users')
|
|
op.drop_table('tags')
|
|
op.drop_table('hints')
|
|
op.drop_table('flags')
|
|
op.drop_table('files')
|
|
op.drop_table('dynamic_challenge')
|
|
op.drop_table('teams')
|
|
op.drop_table('pages')
|
|
op.drop_table('config')
|
|
op.drop_table('challenges')
|
|
# ### end Alembic commands ###
|