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

868 Commits (snyk-fix-5bf5e5ae56c1d7a75cab74d5ccc3892e)

Author SHA1 Message Date
Kevin Chung 3022a7a01a Closes #213 
* Fixes running CTFd under a folder
 2017-03-02 20:28:17 -05:00
Kevin Chung fdb2c34d88 Testing branch (#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 (#198)

* Fix exception on cofirmation screen (#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 (#207)

Closes (#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
 2017-02-24 21:46:25 -05:00
C0deH4cker 2e3df14764 Fix display of team websites with https:// prefixes (#209) 2017-02-24 13:31:53 -05:00
Kevin Chung 935027c55d Marking 1.0.0 (#196) 
* Use <int:xxx> in routes to prevent some errors 500 (#192)

* Use first_or_404() to prevent some errors 500 (#193)

* Add a populating script for awards. (#191)

* Creating upload_file util

* Marking 1.0.0 in __init__ and starting database migrations

* Upgrading some more HTML

* Adding CHANGELOG.md
 2017-01-24 23:06:16 -05:00
Kevin Chung 01cb189b22 Fixing scoping issues in awards rendering and not commiting .data (docker-compose) 2017-01-15 18:13:11 -05:00
Kevin Chung dc79f34509 Adding Reversing Module 2017-01-10 04:18:10 -05:00
Kevin Chung fa788fe3d0 Latest set of changes (#190) 
* PEP 8 compliance (#183)

* Group imports: standard library, third party, local
* Remove unnecessary spaces
* Comments should start with a # and a single space

* Adding tests for GETs on user facing pages

* Adding more user facing tests

51% test coverage

* Fixes #182

* Cleaning up Pages

Fixes a bug with CSS updating
 2017-01-10 03:35:48 -05:00
Kevin Chung 397eb95dd7 Adding test_user_login 2017-01-07 11:48:10 -05:00
Kevin Chung 28d8a02ec6 Starting to write tests 
test_index
test_register_user
test_user_isnt_admin
 2017-01-07 02:44:31 -05:00
Kevin Chung 0e5c7aa972 Closes #186 and fixes an issue with docker-compose 2017-01-06 18:20:56 -05:00
Kevin Chung 09398b2ab0 Changing to Ubuntu and docker-compose v2. Closes #185 2017-01-06 17:04:57 -05:00
Kevin Chung 6eee636893 Making file download button smaller 2016-12-26 20:19:19 -05:00
Kevin Chung 848c9f89c7 Fixing favicon in admin 2016-12-26 14:50:37 -05:00
Kevin Chung 293e3778ee Update README.md 2016-12-13 03:37:50 -05:00
Kevin Chung 2f355d0014 Update README.md 2016-12-13 03:36:08 -05:00
Kevin Chung 89fa7b3a90 Adding slack icon/link 2016-12-13 03:35:22 -05:00
Victor "Nate" Graf 22f57751e0 Closes #169 
Changed the /chals/colves endpoint and associated javascript to
index solves by challenge id rather than by challenge name

Closes (#169)
 2016-12-08 00:26:03 -05:00
Victor "Nate" Graf 4f4d6cae22 Added side nav pills to config page (#171) 2016-12-05 22:21:21 -05:00
海豹 62edea1c98 Changed to dyniamic argument of mail function (#170) 2016-11-30 11:35:44 -05:00
Kevin Chung 9fc83b636c Closes #164 
Adds support for unicode keys
 2016-11-29 01:02:24 -05:00
Kevin Chung 24845336dc Adding config.py documentation 2016-11-29 00:35:02 -05:00
Kevin Chung 068006874d Closes #168 2016-11-20 03:31:26 -05:00
Kevin Chung dce34af7a9 Fixing some glitches 
* Loading challenges from the location hash wouldn't have hashes because
the solves attribute wouldn't be populated.
* Making pages already be in a container so people don't need to add it.
 2016-11-20 00:24:22 -05:00
Kevin Chung 5821bad388 Seperating admin and original themes 
Also fixing a bug in setting end times
 2016-11-19 18:38:45 -05:00
Kevin Chung 4f5a0c912e Adding UI for admins to confirm users manually 2016-11-15 01:18:38 -05:00
Kevin Chung dbbd5a87ed Update README.md 
HTTPS is for winners
 2016-11-14 22:21:41 -05:00
JP Smith a27afd91c1 Update confirm.html (#165) 2016-11-11 21:02:29 -05:00
Kevin Chung 04d47d1d54 CTFTime configuration setting improvements 
Thanks MomentJS!
 2016-11-11 05:41:44 -05:00
Kevin Chung f1bf2fd4e5 Streamlining docker-compose process 2016-11-10 15:35:59 -05:00
Kevin Chung 70e7599439 Adding init_plugins (example plugin soon) 
Also fixing an issue in the docker functions
 2016-11-05 02:28:43 -04:00
Kevin Chung 52ad396db4 Adding file handler 2016-11-05 00:54:21 -04:00
Kevin Chung 11e3ef66b4 Fixing view challenges before CTF started if view_after_ctf is enabled 2016-11-04 21:02:27 -04:00
Kevin Chung a6f641dda3 Don't create two sqlite dbs 2016-11-04 00:37:41 -04:00
Kevin Chung 332bd656fd Fixing award deletion 2016-11-03 23:48:49 -04:00
Kevin Chung 19ed51421a Fixing award deletion 2016-10-25 23:15:47 -04:00
Kevin Chung f4fec18f44 Handling situation with no solves 2016-10-25 22:41:31 -04:00
Kevin Chung 3f596d87b1 Fixing a variety of glitches 
Fixing statistics reporting banned users as well
Fixing url encoding and some error messages
Ordering solves in the admin graphs
Removing banned users (includes admins) from public teams page
Fixing email regex in profile
 2016-10-20 23:31:24 -04:00
Kevin Chung 92f9d93bf9 Update LICENSE 2016-10-14 00:54:42 -04:00
Kevin Chung 0f541a5b3b Accidentally broke graphs for public viewing 2016-09-28 20:40:20 -04:00
Kevin Chung c81281f859 This is the best fix for #157 
so many tries :(
 2016-09-27 23:55:31 -04:00
Kevin Chung 10ef13e9d5 Causes some history glitches 2016-09-27 22:16:26 -04:00
Kevin Chung 9cf8dbf8ad Improving fix for #157 2016-09-27 22:10:35 -04:00
Kevin Chung 60bb118e16 Closes #157 2016-09-27 21:54:22 -04:00
Kevin Chung f1a63e18a7 Fixing ctf_ended function 2016-09-26 11:41:11 -04:00
Kevin Chung 71833c8913 Fixing wrong keys team link 2016-09-25 13:45:34 -04:00
Kevin Chung a49c4e6761 Properly fixing mailfrom_addr 2016-09-25 13:40:18 -04:00
Kevin Chung fc903dbff3 Properly setting mailfrom_addr 2016-09-25 13:29:28 -04:00
Kevin Chung 0bba203491 Fixing mail from address input 2016-09-25 13:26:07 -04:00
Kevin Chung cba7898c63 Fixing mailgun form and fixing import flask_caching 2016-09-25 13:18:40 -04:00
Kevin Chung 50043b42c5 Merging changes from various forks 
Until v1 is released all changes are fair game.

Caching support
Fixes for decoding confirmation and reset_password email tokens
Starting work on #154 specifying why challenges are not open
Adding a required parameter to HTML to sort of fix #153
Adding a column to specify when a team registered
Check static key by default in new key
Decreasing capability of pages functionality to address security
concerns
Fixing confirmations restrictions by modifying can__view_challenges()
 2016-09-24 17:56:07 -04:00