aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-17 05:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,264 Commits 18 Branches 43 Tags
master
Commit Graph

1264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chung
b5c55896b0 Fix SQLAlchemy warning about back_populates (#2378) 
* Fix SQLAlchemy warning about back_populates
 2023-07-29 02:52:10 -04:00
Miłosz Skaza
56c5942259 Add email whitelist wildcard (#2375) 
* add wildcard for email whitelisting

---------

Co-authored-by: Kevin Chung <kchung@ctfd.io>
 2023-07-26 15:36:55 -04:00
Kevin Chung
c2a13e55a7 Fix eb68f277ab61_add_func_column_to_dynamic_challenges migration (#2374) 
* Fix issue in migration with some MySQL versions
 2023-07-24 00:28:30 -04:00
Kevin Chung
100eb58ac5 Add usage instructions for make translations-init (#2373) 
* Add usage instructions for make translations-init
 2023-07-22 17:07:21 -04:00
senacor-swr
a57781c616 Fix remove db from connection string (#2372) 
Fix ping.py calling .set instead of ._replace
 2023-07-21 12:37:53 -04:00
Kevin Chung
70b26b06d8 Fix translations (#2371) 
* Fix existing translations and add Spanish and Chinese
* Closes #2366
 2023-07-19 00:33:29 -04:00
Kevin Chung
f878f63c5a Bump pybluemonday to 0.0.12 (#2369) 
* Bump pybluemonday to 0.0.12 to support Apple Silicon
 2023-07-18 15:41:50 -04:00
Kevin Chung
1d5ee54da4 Set core-beta as default theme for setup (#2363) 
* Closes #2357
 2023-07-11 23:27:44 -04:00
Kevin Chung
3436a8447c Upgrading manage.py to work with Flask 2.0 (#2361) 
* Fix manage.py to work with Flask CLI 
* Support both the legacy `manage.py` CLI as well as the new `flask` CLI
* Closes #2354
* Closes #2352
 2023-07-11 17:38:06 -04:00
Kevin Chung
a3051a0bdb Fix down revision ID in eb68f277ab61_add_func_column_to_dynamic_challenges.py (#2362) 2023-07-11 17:21:02 -04:00
Kevin Chung
2d534b9f0e Switch from manage.py to flask cli in docker-entrypoint.sh (#2353) 
* Switch from manage.py to flask cli in docker-entrypoint.sh to get Docker image working again
* Closes #2352
 2023-07-04 12:13:12 -04:00
Kevin Chung
c2eca90b05 Add API interface to mark submissions as correct (#2350) 
* Add the `discard` type for submissions
* Add `PATCH /api/v1/submissions/[submission_id]` to mark submissions as correct
* Closes #181
 2023-07-04 03:21:35 -04:00
Kevin Chung
deae9e1941 Bump Dependencies (#2332) 
* Bump dependencies
* Closes #2300 
* Closes #2331
 2023-07-02 17:33:58 -04:00
Lorenzo Coppi
7b68babee6 Additional configurations for boto3 client under the S3 uploader (#2326) 
This PR adds 2 new config variables to allow for this:

- `AWS_S3_ADDRESSING_STYLE`: Support for selecting the S3 addressing style. It defaults to "auto" as when it's not set, but can also be set to **virtual** and **path**. See https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-bucket-intro.html#access-bucket-console-ex.
- `AWS_S3_CUSTOM_DOMAIN`: Domain that replaces the default one in presigned download URLs.

---------

Co-authored-by: Kevin Chung <kchung@ctfd.io>
 2023-06-30 17:51:01 -04:00
Kevin Chung
70999b4fa0 Add linear decay function to dynamic challenges (#2347) 
* Add linear decay funciton to dynamic value challenges
* Add the ability to choose between decay functions for dynamic value challenges
* Closes #2224 
* Closes #865
 2023-06-29 03:44:33 -04:00
Kevin Chung
79ae94285c Add SKIP_DB_PING to skip database availability test (#2346) 
* Add new envvar `SKIP_DB_PING` to instruct the CTFd Docker image to not test if the database server is available

---------

Co-authored-by: Smyler <smyler@hackademint.org>
 2023-06-28 00:45:57 -04:00
Kevin Chung
1226267faa Merge pull request #2344 from CTFd/1691-challenge-preview-improvements 
* Changes challenge previews to be in a full page context using `page.html`
* Closes #1691
 2023-06-27 19:03:22 -04:00
Kevin Chung
b5f8dc5e5c Add new preview option 2023-06-27 18:43:59 -04:00
Kevin Chung
cd7f2720e4 Merge branch 'master' into 1691-challenge-preview-improvements 2023-06-27 18:25:59 -04:00
Kevin Chung
950c87d8bc Merge pull request #2345 from CTFd/bump-core-beta 2023-06-27 18:19:34 -04:00
Kevin Chung
8d193ae9bd Merge commit '953a7d07608b019a2403f5628e4ee63c37a78c03' into bump-core-beta 2023-06-27 18:00:14 -04:00
Kevin Chung
953a7d0760 Squashed 'CTFd/themes/core-beta/' changes from bb4edfb6..c7b4b78f 
c7b4b78f Merge pull request #48 from CTFd/bump-ctfd-js
fa185cbb Bump CTFd.js version to 0.0.12

git-subtree-dir: CTFd/themes/core-beta
git-subtree-split: c7b4b78f8ca9bab23b1ef939c92a9c51e6f7d27d
 2023-06-27 18:00:14 -04:00
Kevin Chung
32f3d345e1 Fix challenge plugin rendering under beta theme interface 2023-06-27 12:48:40 -04:00
Kevin Chung
6c97610ea4 Fix hardcoded value 2023-06-27 04:38:24 -04:00
Kevin Chung
e2b8c2de07 Add newline 2023-06-27 04:07:57 -04:00
Kevin Chung
8837d5c955 Fix lints 2023-06-27 04:06:26 -04:00
Kevin Chung
2ec1db3537 Move challenge preview into an iframe modal 2023-06-27 04:02:07 -04:00
Kevin Chung
d138117a2e Merge branch 'master' into 1691-challenge-preview-improvements 2023-06-26 19:29:13 -04:00
Kevin Chung
79ad434d41 Add a rough implementation of improving the challenge preview 2023-06-26 19:27:27 -04:00
Kevin Chung
8cde25cab1 Merge pull request #2341 from HackademINT/pymysql-rsa 
Add the optional rsa dependency to pymysql
 2023-06-22 11:28:20 -04:00
Smyler
704e08c745 Add the optional rsa dependency to pymysql 
This dependency is required to allow compatibility with MySQL instances that enforce specific authentication protocols. This is often the case with managed databases for some public cloud providers.
PyMySQL documentation: https://pymysql.readthedocs.io/en/latest/user/installation.html
 2023-06-22 13:37:20 +02:00
Kevin Chung
dc555f70ca Merge pull request #2339 from CTFd/update-core-beta 
Update core beta
 2023-06-22 01:19:29 -04:00
Kevin Chung
6e0072b902 Squashed 'CTFd/themes/core-beta/' changes from 5ce3003b..bb4edfb6 
bb4edfb6 Add description to TokensForm
50070166 Fix issue with missing endtrans tag
34c58129 Update README.md

git-subtree-dir: CTFd/themes/core-beta
git-subtree-split: bb4edfb6d4535406f7038099501d144d0cc998da
 2023-06-22 00:24:12 -04:00
Kevin Chung
de17bef1f7 Merge commit '6e0072b9028bc7c878e3a74be66754fbbcb7d32c' into update-core-beta 2023-06-22 00:24:12 -04:00
Kevin Chung
eac44adf69 Add a description field to api tokens and make api tokens start with a 'ctfd_' prefix (#2337) 
* Add a description field for API tokens 
* API tokens now start with a `ctfd_` prefix to make them easier to identify
* Closes #2184
 2023-06-22 00:20:32 -04:00
Kevin Chung
e5518b54bd Improve rendering long submisisons admin panel (#2338) 
* Truncate submissions in the Admin Panel but have some ways to show them fully expanded and add a copy to clipboard button
* Closes #2243
 2023-06-21 20:31:25 -04:00
Kevin Chung
89cec0c5e6 Revert "Merge pull request #2334 from CTFd/2253-alpine-js-admin-panel" (#2336) 
This reverts commit fdec5bc7ab, reversing
changes made to e89d4f763c.
 2023-06-20 03:31:04 -04:00
Kevin Chung
fdec5bc7ab Merge pull request #2334 from CTFd/2253-alpine-js-admin-panel 
* Add AlpineJS to the Admin Panel as a way for plugins to add simple interactivity
* Closes #2253
 2023-06-17 04:18:30 -04:00
Kevin Chung
d8c77f19f0 Fix lint 2023-06-17 03:57:58 -04:00
Kevin Chung
ef5f41e177 Add AlpineJS to Admin Panel 2023-06-17 03:46:35 -04:00
Kevin Chung
e89d4f763c Merge pull request #2333 from CTFd/2157-free-hints-view-public 
* Free hints (those without a cost or prerequsitites) can now be viewed publicly if challenges are visible publicly
* Closes #2157
 2023-06-16 16:51:14 -04:00
Kevin Chung
cb8ea71751 Make free hints visible to unauth users if challenges are visible to unauth users 2023-06-16 16:27:31 -04:00
Kevin Chung
7bae8360c8 Merge pull request #2328 from CTFd/2308-total-user-limit 
Rough implementation of user registration limit
 2023-06-14 02:04:33 -04:00
Kevin Chung
e4b91dfe58 Add test for num_user limit via MLC 2023-06-13 20:53:07 -04:00
Kevin Chung
d5c40142fb Fix lint 2023-06-13 20:36:32 -04:00
Kevin Chung
030a6bc4d5 Merge branch 'master' into 2308-total-user-limit 2023-06-13 20:36:02 -04:00
Kevin Chung
5d055f60f6 Add test for user limit registration behavior 2023-06-13 20:02:15 -04:00
Kevin Chung
8a1c0a4b07 Merge pull request #2325 from intrigus-lgtm/patch-1 
* Enable gzip in nginx config
 2023-06-13 18:52:44 -04:00
Kevin Chung
1ae65d7b3c Remove extra space 2023-06-13 18:34:25 -04:00
Kevin Chung
4be7b9f8ed Move gzip config so location is on top 2023-06-13 18:33:35 -04:00