JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
688 Commits
36 Branches
35 Tags
16 MiB
Commit Graph

688 Commits (96f317293fdb737c0e2d973d7d032e475c2a3947)

Author SHA1 Message Date
Kevin Chung 51d098080f
Merge Dev into Master (#591) 
* Chals endpoint seperation (#572)

* Separate the logic of ctftime and email confirmations and admin checking into decorators
* Separate the chals endpoint into /chals and /chals/:id. Closes #552, #435.
* Challenges are now loaded directly from the server before being displayed to the user. 
* Challenge modals now use `{{ description }}` instead of `{{ desc }}`.
* 403 is now a more common status code and can indicate that a CTF has not begun or that you are not logged in. This is in addition to CSRF failures. 
* Update tests to new behavior

* Fixing glitch if an entry chal or team id isn't defined

* Markdown it (#574)

* Replace Marked with Markdown-It

* Update modal change (#576)

* Switch update modals to use nunjucks instead of JS to load in data. 
* Fix previewing challenges after hitting the challenge update button.
* Fix edit-files issue with an unnecessary request.

* Fix solves button

* Closes #592
 2018-04-16 00:24:04 -04:00
Kevin Chung d17e599193
Closes #613 (#614) 2018-04-15 17:01:48 -04:00
Kevin Chung 5cc89e47bb Fix argv mistake 2018-04-15 16:18:16 -04:00
Olivier Bilodeau f4d89e25ab import.py: Proper check for second argument (#612) 2018-04-15 16:05:45 -04:00
Kevin Chung 8c4f915cb4
Fix imports issue (#611) 
* Add fix for zip issue
* Properly restrict by MAX_CONTENT_LENGTH
 2018-04-14 13:46:35 -04:00
Kevin Chung 995cf6a920
Add ezpg and jquery PATCH wrapper (#609) 2018-04-13 14:52:18 -04:00
Kevin Chung 96a3d2c9bd
Marking 1.1.4 (#605) 
* Marking 1.1.4
 2018-04-05 14:24:27 -04:00
Kevin Chung 25fb6d3df5
Remove svg based fontawesome in favor of webfont based fontawesome (#604) 2018-04-05 13:33:59 -04:00
Kevin Chung f8674f40ec
Fix deleting chals when they have a hint (#601) 2018-04-02 11:06:11 -04:00
Kevin Chung 0efda80006
Marking 1.1.3 (#599) 
* Version 1.1.3
 2018-03-27 12:20:58 -04:00
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