Commit Graph

478 Commits (b78589d20de4abf97067c3b1c1cbfe72b498f616)

Author SHA1 Message Date
Kevin Chung b78589d20d
Update docker files (#598)
* Add redis to docker-compose, bump worker count to 4
* Add workers & missing SECRET_KEY error
* Remove uwsgi specific files
* Parse database host in `docker-entrypoint.sh`. Closes #587
2018-03-25 04:25:33 -04:00
Kevin Chung aedd753f4e
Bypass csrf plugins (#597)
* Add bypass_csrf_protection decorator
* Add beta notice
* Add test_bypass_csrf_protection
2018-03-24 22:54:12 -04:00
Kevin Chung c0e418d900
Remove static_html template code (#596) 2018-03-21 18:50:59 -04:00
Kevin Chung 0022b6978a
Force update checks on startup (#595) 2018-03-21 18:03:01 -04:00
Kevin Chung 352e2503a6
Reset flag modal when the modal is loaded (#594) 2018-03-21 17:35:50 -04:00
Kevin Chung 6a9f217cd5
Closes #592 (#593) 2018-03-21 17:05:01 -04:00
Nick Gonella 6eebd5d220 Don't display team rank in workshop mode (#590)
* Don't display team rank in workshop mode
2018-03-20 00:48:14 -04:00
balthasar-m 935e214a09 Prevent scrollbar showing on pages that are smaller than the screen size (#589)
* added one pixel distance from footer to bottom to prevent scrollbar showing
2018-03-20 00:22:52 -04:00
Kevin Chung 4dd828a3f2 Update scoreboard image (Closes #573) 2018-02-24 15:38:25 -05:00
krzys_h 62f6e6ff84 Fix scoreboard tie resolving with 0-point chals (#577) (#578)
* Fix scoreboard tie resolving with 0-point chals
* Closes #577
2018-02-19 20:26:06 -05:00
Victor "Nate" Graf 54d12460d5 Improve the flexibility and ease-of-use for docker-compose deployment (#560)
* docker-compose improvements
    * Use gevent gunicorn workers
    * Makes logs easier to access
* Customization of the logs location
* Improve secret key generation & only generate secret keys if one isn't defined (Closes #123)
* Install requirements required by plugins
2018-02-11 03:52:21 -05:00
Kevin Chung 0aefdcc162
Update requirements.txt and fix docker-compose mariadb issue (#566)
* Update dependencies in requirements.txt 
* Fix issue where mariadb would remove gunicorn database connections in docker-compose
2018-02-09 01:56:35 -05:00
Kevin Chung 643378bee9
Marking 1.1.2 (#559)
**General**

* Fixed page links on subdirectory deployments
* Fixed challenge updating on subdirectory deployments
* Fixed broken icon buttons on Safari

**Themes**

* Upgraded to Bootstrap 4.0.0
* Upgraded to jQuery 3.3.1
* Upgraded to FontAwesome 5.0.4
2018-01-23 10:19:17 -05:00
Kevin Chung 98fbad40a2
Bootstrap v4 (#558)
* Updating to Bootstrap v4
* Update jQuery to 3.3.1
* Update FontAwesome to 5.0.4 and fix icon click handlers in Safari
* Closes #555, #556
2018-01-22 06:11:52 -05:00
Kevin Chung accb561e27
Fixing issue with linking to pages in subdirectory deployments (#550) 2018-01-10 20:43:26 -05:00
Kevin Chung 01c334056b
Fix challenge updating on subdirectory deployments (#546) 2018-01-09 22:25:07 -05:00
Kevin Chung 2e2d458f36
Mark 1.1.1 (#544)
* Marking 1.1.1
2018-01-08 01:56:06 -05:00
Kevin Chung fe4ea56e92
Bootstrap beta 3, Regression fixes, bugfixes (#543)
* Upgrade to Bootstrap v4 beta 3

* Fix incorrect FontAwesome5 icon

* Fixing regressions & code quality issues. Files, Tags & Hints now appear in the admin challenge preview. Fixed color issues with file buttons and badges. Pass script_root into challenge type plugin.

* Fixing incorrect FontAwesome5 icon

* Fix test for /admin/chals/<chalid>

* Expand test to include tags, hints, files
2018-01-07 20:50:01 -05:00
Kevin Chung d25a5d529f Fix issue with making admins & verification 2018-01-06 00:24:59 -05:00
Kevin Chung 6153cc30b4 Replace load_location_hash with a callback 2018-01-04 22:50:14 -05:00
Kevin Chung 282acb4e63 Center frozen text in team page 2018-01-02 05:54:46 -05:00
Kevin Chung a87f4f962e
Fix publishing after a user saves the document by populating the ID that the page received (#540) 2017-12-30 02:44:43 -05:00
Kevin Chung d861b70603 Fixing page previews 2017-12-28 04:09:42 -05:00
Kevin Chung 20a7d6a769
Remove unnecessary data from standard-challenge-update.js (#539) 2017-12-24 17:01:47 -05:00
Kevin Chung fa9cb2498b
Guarantee ctf version (#538)
* Make sure ctf_version is set correctly
2017-12-22 16:22:31 -05:00
Kevin Chung 7e5e18fd6e
Only prompt for upgrades if there's a TTY & mark 1.1.0 (#537) 2017-12-22 13:10:40 -05:00
Kevin Chung f11b5985d3 Choose segments with import.py 2017-12-21 23:34:27 -05:00
Kevin Chung 6381a86d64 Update hint button width to fill the container 2017-12-21 23:05:18 -05:00
Kevin Chung 8532eec50f
Properly override the jinja environment (#535)
* Properly override the jinja environment
2017-12-20 10:28:52 -05:00
Kevin Chung f748d09b9c Update Changelog for recent changes 2017-12-20 00:18:02 -05:00
Kevin Chung 25698a7b6c
Sandbox themes (#534)
* Use the Jinja sandbox to render themes
* Prevent get_config from accessing config.py values
* Add get_app_config
* Add tests for sandbox
2017-12-20 00:11:42 -05:00
Kevin Chung 4772c63a8e
Use mailserver before mailgun & test mailgun behavior (#532) 2017-12-19 03:51:00 -05:00
Kevin Chung 94a29e43e9 Adding missing classes & removing unnecessary ones 2017-12-17 05:19:21 -05:00
Kevin Chung c460d61bd7 Fixing missing body tag 2017-12-16 23:08:20 -05:00
Kevin Chung 3133654478
Font Awesome 5 (#530)
* Adding fa5 and resolving glitches in HTML/JS
* Add proper cursors to icon buttons
* Update core theme slightly
2017-12-16 20:56:24 -05:00
Kevin Chung dd8e657820
Adding a cb to submitkey, delete submissions & don't reload & close #527 (#528)
* Adding a callback to submitkey
* Most deletions in the admin panel no longer cause an entire page reload
* Change border for .btn-info
2017-12-16 06:52:08 -05:00
Kevin Chung be6ec51eba
Delay update check by 12 hours each call and call update check in admin panel (#526) 2017-12-14 17:16:37 -05:00
Kevin Chung 18d6fa26d2
Adding an error message for invalid confirm/reset links (#525)
* Adding an error message for invalid confirm/reset links 
* Add tests for expired/invalid links
* Avoid non-unicode crash in base64 utilities
* Centering confirm email button
2017-12-13 22:34:53 -05:00
Kevin Chung 90b4ee03ad
Adding theme migration (#524) 2017-12-13 16:40:34 -05:00
Kevin Chung a571cf1baf
Improve imports/exports to reduce the likelihood of a conflict (#523)
* Improve imports/exports to reduce the likelihood of a conflict
* To allow previous version imports of keys to work - fill in key `type` from `key_type`. (#520)
* Adding an import_ctf test
2017-12-12 05:43:27 -05:00
Kevin Chung f23fd627ed
Update README.md 2017-12-12 00:47:14 -05:00
Kevin Chung e140c97039
Bugfixes from plugin testing (#522) 2017-12-11 21:54:02 -05:00
David Black 33710b864f When css is not set default it to an empty string instead of showing None. (#521)
Signed-off-by: David Black <dblack@atlassian.com>
2017-12-11 20:29:54 -05:00
Kevin Chung 3af98b17d5
Version 1.1 CTFd (#514)
* Bootstrap v4 (#490)
* Upgrading original theme to use Bootstrap v4 and overall improve use of utility classes
* Fixing graph issues. Colors per team & cleaner hover
* The solves tab now shows relative time instead of absolute time
* Redesign admin theme
* Updating modals and changing form name from desc to description
* Moving CSS config from Pages to Config page
* Adding IP address count to statistics
* Move control of certain modals (files, flags, tags, hints) to challenges page
* Expanding size of config page
* Combining statistics and graphs pages
* Moving percentage solved to the statistics page instead of the admin challenges page

* Rename Keys.key_type to Keys.type (#459) (#478)

* Rename keys.key_type to keys.type (#459)
* Fixing previous migration to not be worried about key_type v type

* Fixing loading of challenge type plugins

* Switching from Handlebars to Nunjucks (#491)

* Switching from Handlebars to Nunjucks
* Allow admins to unlock hints before CTF begins and test that this is not allowed for regular users

* Authed only (#492)

* Adding authed_only decorator and adding next to url_for

* Adding a basic preview to hints (#494)

* Hints have a preview now for creating and updating hints. HTML and markdown are still allowed.

* Ezq (#495)

* Adding ezq as a simple wrapper around bootstrap modals

* Use tabs not spaces and remove gray background on inputs

* Adding title & draft to Pages. Making page preview open a new tab (#497)

* Adding title & draft to Pages.
* Making page preview open a new tab instead of render in the existing tab
* Draft pages cannot be seen without a preview

* Update check (#499)

* Add update_check function
* Notify user that a CTFd update is available in the admin panel
* Adding update_check tests

* Ratelimit (#500)

* Implementing a ratelimit function 
* Fix error page formatting
* Add rate limiting tests
* Rate limit authentication functions and rate limit admin send email function

* Load user solves before we load challenges to avoid unstyled buttons (#502)

* Add a challenge preview (#503)

* Adding a challenge preview to the admin panel
* Change /admin/chals/<int:chalid> to /admin/chal/<int:chalid>

* Adding codecov (#504)

* Test coverage at https://codecov.io/gh/CTFd/CTFd

* Sendmail improvements (#505)

* Add get_smtp timeout, add sendmail error messages
* Adding more error handling to sendmail

* Adding Flask-Script (#507)

* Pause ctf (#508)

* Implement CTF pausing
* Test CTF pausing

* Fix loading challenges for users (#510)

* Fix loading challenges for users
* Temporarily switch themes in test

* Pause help text (#509)

* Adding pause help text

* Pages authed (#511)

* Adding authentication options to pages
* Adding tests for accessing pages while draft & auth_required

* Merging master into 1.1 (#513)

* Name the core theme and remove the original theme
2017-12-11 06:42:07 -05:00
Kevin Chung 4c0ae9f3b5
Fix migration upgrades (#512)
* Fixing migrations to not stamp before upgrading and fixing stamping CTFd from before migrations

* Making functions for upgrades

* Move migration stamp into confirm block
2017-12-07 03:06:48 -05:00
Kevin Chung db2e3b5684
Profile insertion check (#484)
* Test setting profile
* Fix issue with app_context altering database connections/state
2017-11-26 04:22:15 -05:00
Kevin Chung 46544e5729
Switching to Bento Ubuntu for VMWare support (#481) 2017-11-25 05:39:01 -05:00
uqam-fob 06b2856205 fix uploads folder detection (#433)
* Fix UPLOAD_FOLDER detection when run outside of repo directory
2017-11-23 03:53:01 -05:00
Kevin Chung 18dd715276
Workshop mode (#477)
* Implementing workshop mode
* Fixing a bug in /chals/solves where challenges with 0 solves weren't hidden.
* Spinner errors are now 20vh down instead of 210px down
* Users now use their private team endpoint at /team instead of /team/<id>
2017-11-22 03:33:48 -05:00
Kevin Chung e34902c491
Update downloaded fonts and use GoogleCDN for fonts if we are online (#476)
* Update the Lato and Raleway fonts and use Google Fonts if we're online but fallback if we're not
2017-11-22 01:27:15 -05:00