Commit Graph

485 Commits

Author SHA1 Message Date
Kevin Chung
06d0e00cf5 Fixes Python 3 compatibility for testing (#230)
* Testing 3.6

* Fixing Python 3 testing

* Fixing both kinds of tests :)

* PEP8 lint project and add linting checks to build process (#229)

* Revert "PEP8 lint project and add linting checks to build process (#229)"

This reverts commit 15d89d2b66030cdc2a6276b0a73acaa4912c06ab.
2017-03-12 19:53:26 -04:00
Kevin Chung
57de89fc57 Removing functionality from the update keys button
This makes the button do nothing but ultimately the issue is that the
buttons should automatically update the database through AJAX or
similar. This is a temporary fix so the Keys modal isn’t an outlier in
design and doesn’t cause an error.
2017-03-12 11:12:44 -04:00
mschwager
7cbbeb0843 Fix undefined variable (#228) 2017-03-10 11:19:27 -05:00
Kevin Chung
15171f1140 setup now automatically logs in 2017-03-10 11:12:58 -05:00
Kevin Chung
967129a009 Closes #225
Also removes unnecessary pip install from travis config
2017-03-10 01:17:17 -05:00
Kevin Chung
613ede5738 Max attmpts (#227)
* Making max_attempts use the Challenge value instead of the Config value
2017-03-09 23:47:08 -05:00
mschwager
92c7f2e293 Added CI integration with Travis-CI (#226)
Next steps:

* Go to https://travis-ci.org/
* Click "Sign in with GitHub"
* Click your user icon and click "Accounts"
* Enable for CTFd
2017-03-09 22:00:01 -05:00
Kevin Chung
72913b1a70 Marking 1.0.1 1.0.1 2017-03-08 01:44:12 -05:00
Thomas Gerot
a390a06861 Added Python3 compatibility to print statements (#220) 2017-03-08 00:43:52 -05:00
Kevin Chung
41eaa56232 Fixes #214
Python3 compatability
2017-03-08 00:45:33 -05:00
Kevin Chung
05ff3afe8c Delete config.html 2017-03-08 00:35:09 -05:00
Kevin Chung
d0cb92c644 Hide scores (#224)
* Starting work on hide_scores functionality

* Hide teams in more views

* Starting work on hide_scores functionality

* Hide teams in more views
2017-03-08 00:21:39 -05:00
mschwager
e9df6bf803 Pin third-party Python packages (#223) 2017-03-07 13:34:50 -05:00
Kevin Chung
c1e9cffc94 Adding a rudimentary plugin configuration page (#219)
* Adding a rudimentary plugin configuration page

* Streamlining changes
2017-03-07 01:07:32 -05:00
mschwager
e237715b33 Pin Ubuntu version and follow Dockerfile best practices (#218)
Docker provides some useful resources for Ubuntu as a base image
and installing software via apt-get:

https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#apt-get

It's also useful to pin the Ubuntu version to 16.04 so we have a good
idea of what OS we're using in the image. To that end, I think we can
also avoid performing an upgrade so we can even further control which
versions of software we're using. If we do an upgrade then you'll have
different versions of software depending on when you build the image.
2017-03-06 20:17:31 -05:00
Kevin Chung
4b077dfa37 Working on #187
Improvements to Dockerfile.
2017-03-03 01:37:46 -05:00
Kevin Chung
e3fd784d91 Merging PR #206 into master (#215)
* 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

* Fixed hard coded upload directory (#206)
2017-03-03 00:36:00 -05:00
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
1.0.0
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