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

814 Commits (3d652a968eb0fcb414eaf91590bd71c268458450)

Author SHA1 Message Date
Kevin Chung 3d652a968e Clean up some ui interactions 2020-05-01 21:03:15 -04:00
Kevin Chung 9003c29846 Fix up some of the tables when data is too long 2020-05-01 17:26:06 -04:00
Kevin Chung fe97385f69
Merge pull request #1371 from CTFd/ip-address-admin-modal 
* IP Tracking cache returns the IPs used by the user in the last hour. This way we can track the "Last Seen" value better for GET requests. 
* Moves IP addresses in the Admin Panel for Users and Teams into a modal
* Closes #1146
 2020-05-01 02:44:33 -04:00
Kevin Chung 512a7d546b
Merge pull request #1372 from CTFd/better-spacing-without-solves 
* Use some better utility CSS classes for better spacing when there isn't any content
 2020-05-01 02:34:50 -04:00
Kevin Chung 0614bc9cf2 Run make format and yarn build 2020-04-30 22:23:14 -04:00
Kevin Chung 95d581ed33 Add better spacing for when there aren't solves to populate dtta 2020-04-30 22:14:32 -04:00
Kevin Chung c47955ff4f Always record IP usage on non-GET and clean up HTML 2020-04-30 21:10:43 -04:00
Kevin Chung e5814592c4 Run yarn build and add empty line to end of files 2020-04-30 20:36:57 -04:00
Kevin Chung 01f2d50a34 Rewrite IP tracking code to only return recent IPs. Move IPs into a modal for admin panel. 2020-04-30 20:32:26 -04:00
Kevin Chung 1c10643537
Merge pull request #1367 from CTFd/cache-user-ips-for-tracker 
* Cache user IPs and only update IP usage on new IPs or on non-GET requests
 2020-04-30 16:04:46 -04:00
Kevin Chung b4f39e843d
Merge pull request #1368 from CTFd/update-jquery-3.5.0 
* Update jQuery to 3.5.0 to resolve potential security issue (https://github.com/advisories/GHSA-jpcq-cgw6-v4j6)
 2020-04-30 15:57:33 -04:00
Kevin Chung 2f1b3265f8 Run make lint 2020-04-30 14:39:42 -04:00
Kevin Chung 7d35e552bc Merge remote-tracking branch 'origin/2.4.0-dev' into update-jquery-3.5.0 2020-04-30 14:34:47 -04:00
Kevin Chung c69633b479 Remove testing data 2020-04-30 03:33:55 -04:00
Kevin Chung b3b654bf03 Rebase 2.4.0-dev 2020-04-30 03:21:13 -04:00
Kevin Chung 0bd6c0d958 Merge remote-tracking branch 'origin/2.4.0-dev' into cache-user-ips-for-tracker 2020-04-30 03:10:31 -04:00
Kevin Chung 431c35cb51
Merge pull request #1363 from CTFd/is_admin_func_cache_hit 
* Make the `is_admin()` function avoid DB hits and mostly hit cache. This is accomplished by creating a cached object that mimics the actual User model object. This object should be invalidated every time that the User object is modified.
* Add `get_current_user_attrs`, `get_current_team_attrs` and `get_ip` to Jinja
* Update `flask-profiler` to 1.8.1 and fix `flask-profiler` configuration to work better
 2020-04-30 03:07:59 -04:00
Kevin Chung 0d97c3539a Update jQuery to 3.5.0 2020-04-30 02:57:22 -04:00
Kevin Chung 87895918f5 Fix tracker code to fix tests 2020-04-30 02:45:12 -04:00
Kevin Chung 232a4468b0 Run format 2020-04-30 02:22:44 -04:00
Kevin Chung e99f4f11a5 Merge remote-tracking branch 'origin/2.4.0-dev' into is_admin_func_cache_hit 2020-04-30 00:31:21 -04:00
Kevin Chung 4e28e30cb8 Fix memoize call 2020-04-29 23:10:39 -04:00
Kevin Chung 4a47805c41 Reduce attr cache to 30 seconds instead of 300 secs 2020-04-29 22:48:03 -04:00
Kevin Chung 740ea36f7a Fix tokens using too-random of a value 2020-04-29 22:45:11 -04:00
Kevin Chung 541d7e9cfa Add a wrapper for get_user_ips 2020-04-29 22:34:33 -04:00
Kevin Chung 46ca4c7283 Add newline at end of .gitignore 2020-04-29 22:27:39 -04:00
Kevin Chung 0dc42605ac Handle other cases for attrs invalidation 2020-04-29 22:24:52 -04:00
Kevin Chung 3f3109f589 Add team attrs and cache banning SQL query 2020-04-29 20:33:51 -04:00
Kevin Chung 0d8b0ee966 Merge branch 'is_admin_func_cache_hit' of github.com:CTFd/CTFd into is_admin_func_cache_hit 2020-04-29 20:19:50 -04:00
Kevin Chung 674c08c19a Switch to get_user_attrs strategy 2020-04-29 20:19:40 -04:00
Kevin Chung 805b48d00d Test clear_user_session and clear sessions on user modifications 2020-04-29 20:19:40 -04:00
Kevin Chung e1e22eddb3 Make CTFd.utils.user.is_admin wrap a cached function so we avoid a DB hit on page loads 2020-04-29 20:19:40 -04:00
Kevin Chung f86b7ae18f Switch to get_user_attrs strategy 2020-04-29 20:19:05 -04:00
Kevin Chung a9aa80af89
Merge pull request #1366 from CTFd/extract-banned-code-from-tracker 
* Extract the banning function from the IP tracking code to start moving it into cache
 2020-04-29 19:50:46 -04:00
Kevin Chung abd8aae84f Reorder code and fix tests 2020-04-29 18:41:18 -04:00
Kevin Chung 817b67d1b0 Start to refactor tracker to cache user IPs 2020-04-29 18:30:17 -04:00
Kevin Chung f7e7c3c337
Merge pull request #1365 from CTFd/remove-get-config-from-models 
* Remove the duplicated `get_config` function from `CTFd/models`
 2020-04-29 14:15:43 -04:00
Kevin Chung 7e3b1962c4 Extract user/team banning code into its own initialization function 2020-04-29 12:46:48 -04:00
Kevin Chung 57d4cb4318 Remove duplicated get_config from models and import before usage 2020-04-29 12:45:10 -04:00
Kevin Chung ff4ad5185f Test clear_user_session and clear sessions on user modifications 2020-04-29 03:58:54 -04:00
Kevin Chung 12d831a321 Make CTFd.utils.user.is_admin wrap a cached function so we avoid a DB hit on page loads 2020-04-29 03:15:20 -04:00
Kevin Chung e15e23f038
Merge pull request #1359 from CTFd/table-granular-admin-reset 
* Improve Reset functionality by allowing admins to pick what data they'd like to reset
* Closes #1355
 2020-04-28 12:29:11 -04:00
Kevin Chung 453289b0ff Run linters 2020-04-28 04:19:31 -04:00
Kevin Chung 289d7441f9 Clean up word 2020-04-28 03:54:46 -04:00
Kevin Chung a62b18fadb Fix up reset ui 2020-04-28 03:53:25 -04:00
Kevin Chung aa2dd04378 Fix reset tests so they cover file deletions 2020-04-28 03:15:28 -04:00
Kevin Chung 696872fee5 Delete files when resetting pages and challenges 2020-04-28 02:44:24 -04:00
Kevin Chung 1d33ed4cb2 Fix reset tests and enforce foreign keys on sqlite 2020-04-28 02:08:05 -04:00
Kevin Chung c7bf346ba6
Merge pull request #1349 from CTFd/in-house-export-serialization 
* Remove `datafreeze` dependency
* Closes #1348
 2020-04-27 21:41:03 -04:00
Kevin Chung cc08f03faa
Merge pull request #1357 from CTFd/admin-users-pagination 
* Make Admin Panel user searching use a Pagination object
 2020-04-27 21:39:47 -04:00