Testing branch (CTFd#211)

* Extracting key checking logic to make it more extensible

* Add missing keys __init__ file

* Adding logging access and errors to Dockerfile

* Use template inheritance for page.html (CTFd#198)

* Fix exception on cofirmation screen (CTFd#202)

When a user attempts to confirm an e-mail address, an exception is thrown because the db session is closed prior to logging.

The line db.session.close() has to move after the logging, otherwise the team parameters from the orm object are discarded and an exception is thrown.

Closing the session after logging, fixes the issue.

* Adding custom key types for challenges

* Separating out admin.py, adding challenge types

* Don't let truncate affect edit modal

* File uploads no longer refresh page (CTFd#207)

Closes (CTFd#180)

* Fixing missing import

* Fixing mistake in flag JSON response

* Removing compare_digest to support Python 2.7.6

* Fixing inconsistencies in standard challenge modal

* Passing submission input over to template js

* Handling cases where data can't be found in the DOM better

* Don't refresh modal if it's just a refresh operation

* Fixing solving challenges while scoreboard is public

Induce a redirect to make user login

* Adding missing js file and fixing migration

* Fixing some visual glitches and streamlining challenge creation

Author: ColdHeat

.gitignore

@@ -60,6 +60,5 @@ target/
 .idea/
 CTFd/static/uploads
 CTFd/uploads
-CTFd/plugins
 .data/
 .ctfd_secret_key

CTFd/__init__.py

@@ -4,7 +4,7 @@
 from flask import Flask
 from jinja2 import FileSystemLoader
 from sqlalchemy.engine.url import make_url
-from sqlalchemy.exc import OperationalError
+from sqlalchemy.exc import OperationalError, ProgrammingError
 from sqlalchemy_utils import database_exists, create_database
 
 from utils import get_config, set_config, cache, migrate, migrate_upgrade
@@ -60,15 +60,15 @@ def create_app(config='CTFd.config.Config'):
         if version and (StrictVersion(version) < StrictVersion(__version__)): ## Upgrading from an older version of CTFd
             migrate_upgrade()
             set_config('ctf_version', __version__)
-            
+
         if not get_config('ctf_theme'):
             set_config('ctf_theme', 'original')
 
         from CTFd.views import views
         from CTFd.challenges import challenges
         from CTFd.scoreboard import scoreboard
         from CTFd.auth import auth
-        from CTFd.admin import admin
+        from CTFd.admin import admin, admin_statistics, admin_challenges, admin_pages, admin_scoreboard, admin_containers, admin_keys, admin_teams
         from CTFd.utils import init_utils, init_errors, init_logs
 
         init_utils(app)
@@ -79,7 +79,15 @@ def create_app(config='CTFd.config.Config'):
         app.register_blueprint(challenges)
         app.register_blueprint(scoreboard)
         app.register_blueprint(auth)
+
         app.register_blueprint(admin)
+        app.register_blueprint(admin_statistics)
+        app.register_blueprint(admin_challenges)
+        app.register_blueprint(admin_teams)
+        app.register_blueprint(admin_scoreboard)
+        app.register_blueprint(admin_keys)
+        app.register_blueprint(admin_containers)
+        app.register_blueprint(admin_pages)
 
         from CTFd.plugins import init_plugins