Skip to content
This repository has been archived by the owner on Sep 30, 2020. It is now read-only.

test #13

Open
wants to merge 174 commits into
base: master
Choose a base branch
from
Open

test #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
174 commits
Select commit Hold shift + click to select a range
3676d4d
Vagrant uses mariadb database rather than sqlite - Fixes #648 (#649)
cliffe Jul 29, 2018
14ea952
Update LICENSE
ColdHeat Jul 29, 2018
41933cc
Fix access to unreleased challenges through /chals/<id> endpoint (#689)
lava Oct 6, 2018
c8031b3
2.0.0 (#741)
ColdHeat Nov 20, 2018
4fde036
2.0.0 Supplementary Changes (#744)
ColdHeat Nov 22, 2018
a3bc7b3
1.2.0 -> 2.0.0 migration script (#745)
ColdHeat Nov 22, 2018
bf241eb
Auth Improvments (#746)
ColdHeat Nov 22, 2018
310475d
Finalize 2.0.0 (#747)
ColdHeat Nov 23, 2018
49ed27c
Fix Uploaders to work with imports/exports (#749)
ColdHeat Nov 23, 2018
d3621a4
Finalize 2.0.0 (#751)
ColdHeat Nov 24, 2018
3b18724
Fix update.html loading from custom folder in update view (#752)
ColdHeat Nov 25, 2018
3e8f13d
Add SAFE_MODE concept to let tests run without plugins (#753)
ColdHeat Nov 25, 2018
ae90537
Properly check SAFE_MODE and allow plugins to be loaded from tests op…
ColdHeat Nov 25, 2018
821c555
Fix challenge requirement visibility; add challenge requirements test…
ColdHeat Nov 26, 2018
2bd310b
Mark 2.0.0 (#757)
ColdHeat Nov 27, 2018
e79f32a
Fix dynamic challenges to work in user mode and team mode (#760)
ColdHeat Nov 27, 2018
a8184ed
Fix user.html when running in user mode without a team (#761)
ColdHeat Nov 28, 2018
614243d
Update mariadb to 10.4 based on #726 (#762)
ColdHeat Nov 28, 2018
825190b
Release 2.0.0 (#763)
ColdHeat Nov 29, 2018
469b640
Fix issue loading update view in Python 3. Thanks to @mayoneko (#766)
ColdHeat Nov 30, 2018
f03c304
Fix wrong column name in upgrade script (#764)
ColdHeat Nov 30, 2018
c342ca8
Use tempfile.SpooledTemporaryFile() instead of raw BytesIO (#767)
ColdHeat Nov 30, 2018
4233d68
Fix creating users, teams from the API (#768)
ColdHeat Dec 1, 2018
5617884
Only call load_user_solves if authed (#769)
ColdHeat Dec 1, 2018
fb0d887
Update CHANGELOG (#770)
ColdHeat Dec 1, 2018
e2ff705
Resolve issues with pages and caching (#771)
ColdHeat Dec 1, 2018
66c749f
Allow setting SocketIO async mode from envvar or config.py (#773)
ColdHeat Dec 2, 2018
5a14cc2
Re add view after ctf (#774)
ColdHeat Dec 2, 2018
809e4df
Update CHANGELOG (#775)
ColdHeat Dec 2, 2018
64b96d9
Fix admin cannot modify verified status in Edit User (#777)
Dec 4, 2018
473acdb
Fix smtp sendmail (#781)
ColdHeat Dec 5, 2018
547fe61
Fix syncing down an empty S3 bucket (#783)
ColdHeat Dec 6, 2018
afdfaa1
Fix CTF resets in mysql (#785)
ColdHeat Dec 7, 2018
5cedcb7
Fix hint loading for admins with /api/v1/hints/<id>?preview=true (#786)
ColdHeat Dec 7, 2018
ecd630c
Disable jinja cache properly by setting cache_size to 0 (#662) (#787)
ColdHeat Dec 7, 2018
760a8ad
Fix S3 sync function to only sync down full files (#788)
ColdHeat Dec 7, 2018
e4fd1c4
Fix downloading files as an anonymous user. (#792)
ColdHeat Dec 8, 2018
b331bb3
Fix divison-by-zero when adding requirement to dynamic challenge (#782)
ptr0x1 Dec 8, 2018
234d9ec
Fix email confirmations and password resets (#795)
ColdHeat Dec 9, 2018
f3a97f7
Mark 2.0.1 release (#796)
ColdHeat Dec 9, 2018
0874434
Allow unauthed users to attempt challenges if visibility is public bu…
ColdHeat Dec 11, 2018
0c14f6f
Disable user mode switching client side (Closes #799) (#800)
ColdHeat Dec 12, 2018
3671109
Update admin notification UI and allow for deleting notifications (#803)
ColdHeat Dec 15, 2018
f4f4bd5
Adds plugin functions to register javascript and CSS in the admin pan…
ColdHeat Dec 15, 2018
324f885
Fix subdirectory deployments in a generic manner (#802)
ColdHeat Dec 16, 2018
ae09265
Update dynamic_challenges plugin ui to disable modification of curren…
Jan 2, 2019
08c39c0
Fix wrong user mode in challenge_solves_box (#812)
Jan 2, 2019
747fa43
Pin normality version (#817)
ColdHeat Jan 3, 2019
3093aa7
Fix 500s from invalid page args (#818)
ColdHeat Jan 3, 2019
f1d0221
Mark 2.0.2 (#819)
ColdHeat Jan 4, 2019
9f7dc05
Fix insecure link to MLC (#822)
ColdHeat Jan 6, 2019
83e2940
Default SameSite session cookie setting to Lax (#824)
ColdHeat Jan 8, 2019
9ee743d
Simplify url_for calls in themes, rework CTFd.js, fix flaky test (#826)
ColdHeat Jan 10, 2019
6e8c7aa
Require CSRF-Token header on state changing API requests, require CSR…
ColdHeat Jan 11, 2019
fed0366
Mark 2.0.3 (#828)
ColdHeat Jan 12, 2019
e70c985
Fix update_check() logic (#830)
ColdHeat Jan 12, 2019
a181c0a
Consider account configs when user patches their own account (#836)
ColdHeat Jan 18, 2019
f8607c3
Call init_logs() function to add logging handlers. Move init_logs() i…
ColdHeat Jan 19, 2019
3af036b
Block new user registration if registering via MLC (#840)
ColdHeat Jan 19, 2019
92e7be2
Revert 762 log envvar (#845)
ColdHeat Jan 21, 2019
06f0715
Allow custom MySQL ports in docker entrypoint (#848)
ColdHeat Jan 22, 2019
ae8ce0b
Install gevent-websocket and use it by default until we have a better…
ColdHeat Jan 24, 2019
2935a76
Fix showing incorrect 'CTF has ended' error if view_after_ctf is set …
ColdHeat Jan 31, 2019
2f49477
Fix creating users from the admin panel while name changes disabled (…
ColdHeat Jan 31, 2019
385d128
Mark 2.0.4 (#863)
ColdHeat Jan 31, 2019
7502ace
Closes #866 (#868)
ColdHeat Feb 3, 2019
b4da3b4
Replace temfile.SpooledTemporaryFile with tempfile.NamedTemporaryFile…
ColdHeat Feb 5, 2019
1f768db
Fix for hidden teams being visible on the team listing page and score…
ColdHeat Feb 10, 2019
2f252f5
Fix for overflowing content preventing edit and deletion in admin pan…
ColdHeat Mar 1, 2019
bf799fb
Closes #861 (#889)
ColdHeat Mar 1, 2019
79b7b1d
Fix removing profile details (Closes #894) (#899)
ColdHeat Mar 17, 2019
da98bc9
Assign solves.filter query (#896)
dchanm Mar 17, 2019
39ef650
Fix incorrect UserSchema view (#902)
ColdHeat Mar 17, 2019
42fa8fe
Fix order by clause in Teams.get_solves (#901)
ColdHeat Mar 17, 2019
4f7c468
Reimplement admin send mail to users (#903)
ColdHeat Mar 18, 2019
1eb687a
Fix email confirmation log line (#913)
grant-h Mar 22, 2019
37dcfdc
Read smtp server configuration from config.py (#914)
s-nirali Mar 22, 2019
fadb827
Dont calculate hidden users in place (#918)
ColdHeat Mar 22, 2019
f75d7b6
Record a new solve before calculating the new dynamic value. (#919)
ColdHeat Mar 22, 2019
268ed85
Update CHANGELOG and bump version (#920)
ColdHeat Mar 23, 2019
7c60c69
Properly hide users/teams if they are set to banned/hidden (#932)
ColdHeat Apr 5, 2019
c0a32a8
Properly load schemas specified as strings (#943)
ColdHeat Apr 8, 2019
3336742
Mark 2.0.6 (#946)
ColdHeat Apr 8, 2019
b6d54b9
2.1.0 (#957)
ColdHeat Apr 17, 2019
b1061a3
Remove socket.io.min.js from base.html (#958)
ColdHeat Apr 18, 2019
0fa480b
Some 2.1.0a1 bugfixes (#959)
ColdHeat Apr 19, 2019
95e4060
ProxyFix changes (#960)
ColdHeat Apr 19, 2019
ad5df80
Documentation improvements (#963)
ColdHeat Apr 21, 2019
367498f
Fix logging without root in container (#966)
ColdHeat Apr 23, 2019
069d438
Mark 2.1.0 and update CHANGELOG (#967)
ColdHeat Apr 25, 2019
c4e9b70
Reduce default gunicorn worker count to reduce memory usage (#968)
ColdHeat Apr 25, 2019
376d644
Force db.create_all to happen for imports on sqlite. Force ctf_theme …
ColdHeat Apr 29, 2019
4ec45dc
Fix imports/exports and update Flask-SQLAlchemy to reduce warnings (#…
ColdHeat May 1, 2019
e7884c8
Don't insert or check Tracking on static files or custom CSS (#976)
ColdHeat May 1, 2019
3f4a242
Fix challenge preview for admins (#978)
ColdHeat May 2, 2019
6fcf143
Fix rate-limiting of flag submission when using team mode (#977)
hakatashi May 2, 2019
d2f8b40
Adds ondelete='CASCADE' to some models. (#979)
ColdHeat May 4, 2019
dc4db6f
Fix modal close buttons not working (#980)
ColdHeat May 4, 2019
b37684d
Run as root when using docker-compose to be able to write to the volu…
ColdHeat May 4, 2019
b7a19f7
Mark 2.1.1 (#982)
ColdHeat May 4, 2019
3d23ece
Fix freeze time regressions (#989)
ColdHeat May 11, 2019
6833378
Format all the things (#991)
ColdHeat May 12, 2019
387b688
Ratelimit team join attempts (#993)
ColdHeat May 14, 2019
49b48a9
Mark 2.1.2 (#994)
ColdHeat May 14, 2019
ac236e2
Docs (#1001)
ColdHeat May 19, 2019
e6b865b
Fixed updatescores() (#1000)
sctf2020 May 19, 2019
8a35557
Use /dev/shm for worker-tmp-dir in gunicorn in Docker (#1003)
ColdHeat May 25, 2019
458ce2e
Fixing issue downloading files when view_after_ctf is enabled (#1011)
ColdHeat Jun 4, 2019
4983adf
Challenge team mode improvements (#1013)
ColdHeat Jun 4, 2019
f4819fa
Redirect to /teams/new after user registers if in team mode (#1015)
ColdHeat Jun 4, 2019
41bc92d
Properly redirect to teams.private instead of teams.new (#1016)
ColdHeat Jun 4, 2019
8d91a3f
Fix hidden pages not being able to load (#1019)
ColdHeat Jun 8, 2019
6f61687
Remove data-href from pages.html to fix delete button (#1021)
ColdHeat Jun 8, 2019
e978867
Add UI code to handle team member removal (#1022)
ColdHeat Jun 9, 2019
e627391
Improve caching (#1014)
ColdHeat Jun 15, 2019
b5632f9
Cache scoreboard page (#1025)
ColdHeat Jun 16, 2019
420e4f4
Make ctfd user usable for mysql connection (#1028)
Creased Jun 21, 2019
ff0f2c2
Fixed bug that caused apache2+wsgi deployment to break (#1030)
Jun 21, 2019
447f71d
Disable foreign keys during import (#1031)
ColdHeat Jun 21, 2019
d8ca73a
Prevent browser from caching the export (#1033)
ColdHeat Jun 22, 2019
97f5275
Fix scoreboard links created by update() in user mode (#1034)
ColdHeat Jun 22, 2019
6eb0d1e
Clear standings on award creation and deletion (#1035)
ColdHeat Jun 23, 2019
2bca607
Mark 2.1.3 (#1036)
ColdHeat Jun 23, 2019
0305871
Add a Content-Disposition header to s3 downloads (#1047)
ColdHeat Jun 30, 2019
8b3bb92
Only add team_captain_id foreign key if the db backend isn't SQLite (…
ColdHeat Jul 3, 2019
78fee96
Docs scoring page (#1049)
ColdHeat Jul 4, 2019
56342be
Minor docs fix (#1050)
ColdHeat Jul 4, 2019
93170e4
Fixed minor error in plugin doc (#1053)
pwnfoo Jul 8, 2019
7eff04d
Switch Dockerfile from python:2.7-alpine to python:3.7-alpine (#1055)
ColdHeat Jul 10, 2019
9b07f4e
Revert "Switch Dockerfile from python:2.7-alpine to python:3.7-alpine…
ColdHeat Jul 11, 2019
f033f16
Fix S3 file downloads to not contain the folder name (#1056)
ColdHeat Jul 11, 2019
b453125
Fix missing Team API exceptions (#1058)
ColdHeat Jul 12, 2019
1c9e36f
Show affiliation in user and team pages in the admin panel (#1037)
ColdHeat Jul 12, 2019
bf05b30
Don't reuse used oauth_ids in populate.py (#1062)
ColdHeat Jul 17, 2019
f2e0b9e
Add argparse to populate.py and fix some lints (#1064)
ColdHeat Jul 21, 2019
2bdf7b6
Fix place ordinal calculation (#1067)
ColdHeat Jul 24, 2019
cf7959a
Attempt to fix randomly failing tests (#1071)
ColdHeat Jul 30, 2019
34bab12
Add feature to search users by IP address (#1059)
pwnfoo Jul 30, 2019
3453eaf
Flaky redis events tests (#1072)
ColdHeat Jul 30, 2019
71240bb
Require password for email change (#1077)
ColdHeat Aug 5, 2019
5c4f1d7
Remove invalid id='submit' on submit buttons and correctly set tabind…
ColdHeat Aug 8, 2019
bef5f17
Fix broken buttons by not hijacking click event without data-href att…
ColdHeat Aug 9, 2019
75a9a5a
Rename statistics.js to graphs.js (#1086)
ColdHeat Aug 18, 2019
941ca8f
The place indicator on the team page now excludes counting hidden tea…
MartinJM Aug 30, 2019
c88e055
1092 fix solve count leak during freeze (#1095)
ColdHeat Aug 30, 2019
3b1b82b
Mark 2.1.4 (#1096)
ColdHeat Aug 31, 2019
7a7595c
Fix flask run by not monkey patching for gevent in wsgi.py (#1101)
ColdHeat Sep 5, 2019
cee6fe3
Fix several issues in Vagrant provisioning (#1046)
joshuadugie Sep 8, 2019
607c517
Avoid exception on session without a valid user and force logout (#1106)
ColdHeat Sep 10, 2019
b8c1970
Fix CSV exports in Python 3 by converting StringIO to BytesIO (#1107)
ColdHeat Sep 10, 2019
b15f178
Prevent users from nulling out profile values (#1125)
ColdHeat Oct 2, 2019
a9b2fe1
Mark 2.1.5 (#1126)
ColdHeat Oct 2, 2019
6c5c63d
Don't redirect the /events endpoint to login (#1132)
ColdHeat Oct 12, 2019
97f5dca
Strip password before length check (#1155)
dwillie Nov 6, 2019
6d192a7
Fix NameError in 1_2_0_upgrade_2_0_0.py
cclauss Dec 20, 2019
b8d0f80
2.2.0 (#1188)
ColdHeat Dec 23, 2019
d5128c2
Seperate out admin theme from core more to fix #1200 (#1202)
ColdHeat Jan 4, 2020
5b65a6c
Remove CTFd Slack references in README to reference MLC Discourse (#1…
ColdHeat Jan 4, 2020
7ff6163
fix: fix import uploads (#1173)
fengkx Jan 4, 2020
dc492c9
Mark 2.2.1 (#1208)
ColdHeat Jan 4, 2020
d30bd18
Add jQuery, Moment, nunjucks, and Howl to window globals (#1209)
ColdHeat Jan 8, 2020
d37805b
Fix timezone loading in time config page (#1211)
ColdHeat Jan 9, 2020
fe85fdf
Mark 2.2.2 (#1212)
ColdHeat Jan 10, 2020
f660ed1
Strip spaces on registration and have reset password use email addres…
ColdHeat Jan 20, 2020
83efc4d
Fix error with invalid team information and team size limits (#1220)
ColdHeat Jan 21, 2020
60c46af
Sign sessions using SECRET_KEY to simplify revocation (#1219)
ColdHeat Jan 21, 2020
a2551db
Add a password change notification email (#1221)
ColdHeat Jan 21, 2020
d59bfa3
Mark 2.2.3 (#1222)
ColdHeat Jan 21, 2020
309e625
Fix dynamic challenge hint loading (#1224)
ColdHeat Jan 29, 2020
1049a14
Fix SMTP email From header and remove 'Admin' from the From header (#…
ColdHeat Feb 12, 2020
354954b
Add config manipulation to manage.py (#1233)
ColdHeat Feb 12, 2020
22c1323
2.3.0 (#1248)
ColdHeat Feb 17, 2020
7cd8d90
2.3.1 dev (#1252)
ColdHeat Feb 18, 2020
0bae69b
Prevent double confirmations from happening (#1253)
ColdHeat Feb 18, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
coverage:
status:
project:
default:
# Fail the status if coverage drops by >= 1%
threshold: 1
patch:
default:
threshold: 1
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ target/
*.db
*.log
.idea/
.vscode/
CTFd/static/uploads
CTFd/uploads
.data/
Expand All @@ -68,4 +69,7 @@ CTFd/uploads
.vagrant

# CTFd Exports
*.zip
*.zip

# JS
node_modules/
10 changes: 10 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CTFd/themes/**/vendor/
*.html
*.njk
*.png
*.svg
*.ico
*.ai
*.svg
*.mp3
*.webm
23 changes: 21 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,39 @@
language: python
dist: xenial
cache:
- pip
- yarn
services:
- mysql
- postgresql
- redis-server
addons:
apt:
sources:
- deadsnakes
packages:
- python3.6
- python3-pip
env:
- TESTING_DATABASE_URL='mysql+pymysql://root@localhost/ctfd'
- TESTING_DATABASE_URL='sqlite://'
- TESTING_DATABASE_URL='postgres://postgres@localhost/ctfd'
python:
- 2.7
- 3.6
before_install:
- sudo rm -f /etc/boto.cfg
- export AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMPLE
- export AWS_SECRET_ACCESS_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
- python3.6 -m pip install black==19.3b0
install:
- pip install -r development.txt
- yarn install --non-interactive
- yarn global add [email protected]
before_script:
- psql -c 'create database ctfd;' -U postgres
script:
- pep8 --ignore E501,E712 CTFd/ tests/
- nosetests -v -d --with-randomly
- make lint
- make test
after_success:
- codecov
614 changes: 613 additions & 1 deletion CHANGELOG.md

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
## How to contribute to CTFd

#### **Did you find a bug?**

* **Do not open up a GitHub issue if the bug is a security vulnerability in CTFd**. Instead [email the details to us at [email protected]](mailto:[email protected]).

* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/CTFd/CTFd/issues).

* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/CTFd/CTFd/issues/new). Be sure to fill out the issue template with a **title and clear description**, and as much relevant information as possible (e.g. deployment setup, browser version, etc).

#### **Did you write a patch that fixes a bug or implements a new feature?**

* Open a new pull request with the patch.

* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.

* Ensure all status checks pass. PR's with test failures will not be merged. PR's with insufficient coverage may be merged depending on the situation.

#### **Did you fix whitespace, format code, or make a purely cosmetic patch?**

Changes that are cosmetic in nature and do not add anything substantial to the stability, functionality, or testability of CTFd will generally not be accepted.
Loading