Commit Graph

959 Commits

Author SHA1 Message Date
Kevin Chung
2bc66c1ecb Pool pubsub connections for notifications (#1626)
* Add a `listen()` method to `CTFd.utils.events.EventManager` and `CTFd.utils.events.RedisEventManager`. 
  * This method should implement subscription for a CTFd worker to whatever underlying notification system there is. This should be implemented with gevent or a background thread.
  * The `subscribe()` method (which used to also implement the functionality of the new `listen()` function) now only handles passing notifications from CTFd to the browser. This should also be implemented with gevent or a background thread. 
* Pool PubSub connections to Redis behind gevent. This improves the notification system by not having a pubsub connection per browser but instead per CTFd worker. This should reduce the difficulty in deploying the Notification system.
* Closes #1622 
* Make gevent default in serve.py and add a `--disable-gevent` switch in serve.py
* Revert to recommending `serve.py` first in README. `flask run` works but we don't get a lot of control.
* Add `tenacity` library for retrying logic
* Add `pytest-sugar` for slightly prettier pytest output
2020-09-01 12:37:03 -04:00
Kevin Chung
f628f26495 Run yarn build 2020-08-31 16:58:41 -04:00
Kevin Chung
695ed23d19 Merge branch 'master' into 3.1.0-dev 2020-08-31 16:56:35 -04:00
Kevin Chung
c1d7910920 Don't provide extra time config values and prevent invalid dates during setup (#1627)
* Don't provide extra time config values when updating times in the Admin Panel
* Prevent invalid dates during setup
2020-08-31 12:30:56 -04:00
Connor Nelson
dddec84d7f Fix config default logic (#1623)
* Fix default logic in `config.py`

Co-authored-by: Kevin Chung <kchung@nyu.edu>
2020-08-28 15:57:12 -04:00
Kevin Chung
5b2926b18b Fix potential issue preventing a user from finishing setup (#1620)
* Fix a potential issue where setup could not be completed b/c next buttons were unclickable
2020-08-25 23:40:29 -04:00
Kevin Chung
c9fd529264 Mark 3.0.2 (#1617)
# 3.0.2 / 2020-08-23

**Admin Panel**

- Fix submission searching in Admin Panel
- Fix update banner being hidden behind navbar

**Plugins**

- Change default `input` & `submit` blocks in `challenge.html` to use the default values specified in the original challenge type plugins
3.0.2
2020-08-23 18:54:40 -04:00
Kevin Chung
e474c9dcc4 Move update banner to prpoer location (#1616)
* Move update banner to proper location in Admin Panel
2020-08-23 03:12:49 -04:00
Connor Nelson
cc190aa05b Match challenges and dynamic challenges (#1609)
* Change default `input` & `submit` blocks in `challenge.html` to use the default values specified in the original challenge type plugins
2020-08-22 19:31:08 -04:00
Kevin Chung
c1672d1506 Add fields to team forms (#1615)
* Adds custom fields for teams
* Closes #756
2020-08-21 02:49:28 -04:00
Kevin Chung
fb454b8262 756 generic data fields (#1608)
* Adds the ability to add custom user fields for registration/profile settings
* Admins can create fields that users can optionally edit 
* Works on #756
2020-08-19 20:18:37 -04:00
Kevin Chung
0bc58d5af1 Add pagination to /api/v1/comments (#1614)
* Add pagination to `/api/v1/comments` 
* Update CommentBox component to have pagination buttons
* Closes #1599
2020-08-19 19:42:56 -04:00
Kevin Chung
b29d928459 Stop using deprecated func 2020-08-19 16:28:37 -04:00
Kevin Chung
976b191b53 Fix submission search (#1605)
* Fix submission searching in Admin Panel
2020-08-14 12:20:41 -04:00
Kevin Chung
5215db995f Fix GitHub actions and add comments table (#1604)
* Fix MySQL and Postgres GitHub actions to properly test databases
* Add migration to add `comments` table
2020-08-14 03:13:12 -04:00
Kevin Chung
b9831d96b5 Try to access the mysql container port 2020-08-14 01:51:21 -04:00
Kevin Chung
12a83bebea Update database hostnames 2020-08-14 01:30:14 -04:00
Kevin Chung
c9de517966 Properly test under other databases with Github Actions 2020-08-14 01:21:04 -04:00
Kevin Chung
92a40b6eff Loosen team password confirmation to also accept team captain password (#1598)
* Loosen team password confirmation to also accept team captain password
* Make team settings modal larger in the core theme
* Add help text in team settings form
* Closes #1545
2020-08-13 14:08:44 -04:00
Kevin Chung
da4357b07b Make scoreboard caching only cache the score table (#1586)
* Make scoreboard caching only cache the score table instead of the entire page
* Closes #1584
2020-08-13 11:53:36 -04:00
Kevin Chung
58e38c4bde Add page comments (#1601)
* Add comments to Page editors
2020-08-13 11:52:14 -04:00
Kevin Chung
fab661d144 Add comments section to admin users/teams pages. (#1600)
* Add a comments section for a user's page in the Admin Panel
* Move user graphs into a modal for Admin Panel
* Create a new webpack JS chunk for the admin section for the Vue components (`components.js`)
  - Not really sure why webpack needed this to be separated out
* Closes #1052
2020-08-13 11:15:12 -04:00
Kevin Chung
b73433e1c9 321 comments functionality (#1596)
* Add a comments functionality for admins to discuss challenges, users, teams, pages
* Adds `/api/v1/comments`
* Adds a `CommentBox.vue` component for the Admin Panel
* Closes #321
2020-08-12 19:55:47 -04:00
Kevin Chung
6559846452 Mark 3.0.1 (#1594)
# 3.0.1 / 2020-08-12

**General**

- Fix issue where admins could not see user graphs/api data if score visibility was set to hidden

**Admin Panel**

- Allow the Admin Panel Submissions page to filter by Account IDs, Challenge IDs, and Challenge Names
- Link to correct submissions for challenge from the challenge page

**API**

- Fix regression for creating hints via ctfcli. See #1582 for details. https://github.com/CTFd/CTFd/issues/1582.
- Deprecate `CTFd.api.v1.helpers.models.build_model_filters` and wrap it to `CTFd.utils.helpers.models.build_model_filters`

**Themes**

- Fix team pages to use the correct core errors component

**Plugins**

- Fix issues with previewing challenges under some challenge type plugins

**Deployment**

- Values specified in `config.ini` will now supercede values specified via environment variable. Config behavior is as follows:
  1. Config Key exists in `config.ini` and is set to a value. That value becomes the app config.
  2. Config Key exists in `config.ini` but is set to an empty string. An envvar with the same name is looked up. The envvar's value is used as the app config.
  3. If the envvar is not found, fall back to the default specified value in `config.py`
  4. If there is no default, use None or an empty string
3.0.1
2020-08-12 12:35:32 -04:00
Kevin Chung
2b0fb28f28 Update icon for link to correct submissions in challenge page (#1593)
* Update icon for link to correct submissions to `fa-tasks`
2020-08-12 03:03:17 -04:00
Kevin Chung
f4c9d1e2e8 1569 submission filter by challenge (#1590)
* Allow the Admin Panel Submissions page to filter by Account IDs, Challenge IDs, and Challenge Names
* Deprecate `CTFd.api.v1.helpers.models.build_model_filters` and wrap it to `CTFd.utils.helpers.models.build_model_filters`
* Clean up some miscellaneous Submissions code 
* Closes #1569
2020-08-09 03:40:11 -04:00
Kevin Chung
69b4aafeac Make team profile pages use the shared errors component (#1589)
* Fix team pages to use the core errors alert component
* Closes #1585
2020-08-08 04:09:13 -04:00
Kevin Chung
f597332c90 Fix regression from ded612d46b and fix https://github.com/CTFd/ctfcli/pull/20 (#1583)
* Fix regression for creating hints via ctfcli

See #1582 for details. 
Closes https://github.com/CTFd/ctfcli/pull/20.
2020-08-06 15:49:29 -04:00
Kevin Chung
5d7e0e39c7 1580 fix hidden admin scores (#1581)
* Fix issue where admins could not see user graphs/api data if score visibility was set to hidden
* Closes #1580
2020-08-04 13:23:46 -04:00
Kevin Chung
324fdeda4a Fix issue with previewing some challenge plugins (#1579) 2020-08-03 18:16:02 -04:00
dependabot[bot]
08f2f810fe Bump elliptic from 6.5.0 to 6.5.3 (#1577)
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.0 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.0...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-02 15:24:45 -04:00
Kevin Chung
02438852de Add a better fallback for environment variables through config interpolation (#1574)
* Make config.ini properly supercede environment variables
* Add ability for all config.ini values to fallback to environment variables. 
* Closes #1573 

Config Behavior should be as follows:

1. Key exists in `config.ini` and is set to a value. That value becomes the app config.
2. Key exists in `config.ini` but is set to empty string. An envvar the same name is looked up. The envvar's value is used as the app config. 
3. If the envvar is not found, fall back to the default specified value in `config.py`
4. If there is no default, use None or an empty string
2020-07-29 04:18:53 -04:00
Kevin Chung
0a17c73e6d Mark 3.0.0 (#1572)
# 3.0.0 / 2020-07-27

## Changelog Summary

The CTFd v3 Changelog represents the changes from v2.5.0 to v3. It is a summarized version of the changes that occured in all CTFd v3 beta/alpha releases.

CTFd v3 contains some breaking changes but many plugins remain compatible. Themes will need some minor changes to be compatible with v3.

These changes are made with great consideration to existing installations and for the health of the overall CTFd project. If you rely on specific behavior, you can always download the last CTFd v2 release on Github. Official plugin/theme updates will be sent to the email addresses on file.

The major changes in CTFd v3 are as follows with the detailed changelog beneath:

- ### Server Side HTML/Markdown Rendering

HTML rendering in some cases (challenge description rendering, hint content rendering) has been moved to the server side. Previously it was rendered by the browser but this led to a lot of duplicated behavior and complexity in some plugins. Rendering that HTML content on the server allows CTFd to take more advantage of theme content and reduce duplicated code across themes.

In addition, HTML sanitization can be enabled on the CTFd installation to prevent the injection of malicious scripts in HTML content.

- ### CommonMark

CTFd now uses [CommonMark](https://commonmark.org/) for HTML/Markdown rendering. This leads to much more consistent rendering of HTML/Markdown content.

In some cases, this can break your HTML output. You can use our [development testing script](https://gist.github.com/ColdHeat/085c47359ab86c18864135a198cbe505) to check if your HTML output will change and correct it accordingly.

- ### Forms, Nonces, Sessions

CTFd no longer directly injects values into the global session object for a theme. You may have used this as `{{ nonce }}` or `{{ id }}`. Instead these values should be accessed via the `Session` global as so: `{{ Session.nonce }}`.

All of the public facing forms in CTFd have been converted to form globals with WTForms. You can access them via the `Form` global in Jinja. For example, `{{ Forms.auth.LoginForm() }}`. A `{{ form.nonce() }}` function is available on all forms for easier access to the CSRF nonce as well.

Old forms will still work if the nonce used in the form is updated to `{{ Session.nonce }}`.

Values provided by configuration and plugins can now be accessed via the `Configs` and `Plugins` globals. For example `{{ Configs.ctf_name }}` and `{{ Plugins.scripts }}`. See the `base.html` file of the core theme to get an idea of how to use these values.

- ### Challenge Type Plugin Enhancements

Challenge type plugins now have better re-useability with the rest of CTFd. Plugin code no longer needs to copy unchanged methods over from the base challenge plugin classes.

In addition, challenge HTML is now rendered on the server side using a new `challenge.html` file provided by the current theme. This means that the theme effectively controls how a challenge should look overall, but the challenge plugin controls the overall content.

- ### Python 3

CTFd v3 is Python 3 only.

- ### Docker image based on Debian

The Docker image used in CTFd is now based on Debian.

- ### config.ini

Instead of editting `config.py` directly, it's now a better idea to edit `config.ini` or provide your configuration via environment variables

## Detailed Changelog

**General**

- CTFd is now Python 3 only
- Render markdown with the CommonMark spec provided by `cmarkgfm`
- HTML/Markdown content is now rendered on the server side in most cases.
  - This includes challenge descriptions, hint content, and page content
- Ability to render markdown stripped of any malicious JavaScript or HTML.
  - Controlled via the `HTML_SANITIZATION` server side configuration value
- Inject `Config`, `User`, `Team`, `Session`, and `Plugin` globals into Jinja
- User sessions no longer store any user-specific attributes.
  - Sessions only store the user's ID, CSRF nonce, and an hmac of the user's password
  - This allows for session invalidation on password changes
- The user facing side of CTFd now has user and team searching
- Accept additional profile fields during registration (affiliation, website, country)
  - This does not add additional inputs. Themes or additional JavaScript can add the form inputs.

**Admin Panel**

- Use EasyMDE as an improved description/text editor for Markdown enabled fields.
- Media Library button now integrated into EasyMDE enabled fields
- VueJS now used as the underlying implementation for the Media Library
- Fix setting theme color in Admin Panel
- Green outline border has been removed from the Admin Panel
- GeoIP support now available for converting IP addresses to guessed countries
- Redesign the challenge creation form to use a radio button with challenge type selection instead of a select input

**API**

- Significant overhauls in API documentation provided by Swagger UI and Swagger json
- Make almost all API endpoints provide filtering and searching capabilities
- Change `GET /api/v1/config/<config_key>` to return structured data according to ConfigSchema
- Admins can no longer ban themselves through `PATCH /api/v1/users/[user_id]`
- Add `html` item for `GET /api/v1/hints/[hint_id]` which contains the rendered HTML of the Hint content
- Remove `content` from `GET /api/v1/hints`

**Themes**

- Themes now have access to the `Configs` global which provides wrapped access to `get_config`.
  - For example, `{{ Configs.ctf_name }}` instead of `get_ctf_name()` or `get_config('ctf_name')`
- Themes must now specify a `challenge.html` which control how a challenge should look.
- The main library for charts has been changed from Plotly to Apache ECharts.
- Forms have been moved into wtforms for easier form rendering inside of Jinja.
  - From Jinja you can access forms via the Forms global i.e. `{{ Forms }}`
  - This allows theme developers to more easily re-use a form without having to copy-paste HTML.
- Themes can now provide a theme settings JSON blob which can be injected into the theme with `{{ Configs.theme_settings }}`
- Core theme now includes the challenge ID in location hash identifiers to always refer the right challenge despite duplicate names
- Spinner centering has been switched from a hard coded margin in CSS to flexbox CSS classes from Bootstrap

**Plugins**

- Challenge plugins have changed in structure to better allow integration with themes and prevent obtrusive Javascript/XSS.
  - Challenge rendering now uses `challenge.html` from the provided theme.
  - Accessing the challenge view content is now provided by `/api/v1/challenges/<challenge_id>` in the `view` section. This allows for HTML to be properly sanitized and rendered by the server allowing CTFd to remove client side Jinja rendering.
  - `challenge.html` now specifies what's required and what's rendered by the theme. This allows the challenge plugin to avoid having to deal with aspects of the challenge besides the description and input.
  - A more complete migration guide will be provided when CTFd v3 leaves beta
- Display current attempt count in challenge view when max attempts is enabled
- `get_standings()`, `get_team_stanadings()`, `get_user_standings()` now has a fields keyword argument that allows for specificying additional fields that SQLAlchemy should return when building the response set.
  - Useful for gathering additional data when building scoreboard pages
- Flags can now control the message that is shown to the user by raising `FlagException`
- Fix `override_template()` functionality

**Deployment**

- Enable SQLAlchemy's `pool_pre_ping` by default to reduce the likelihood of database connection issues
- Mailgun email settings are now deprecated. Admins should move to SMTP email settings instead.
- Postgres is now considered a second class citizen in CTFd. It is tested against but not a main database backend. If you use Postgres, you are entirely on your own with regards to supporting CTFd.
- Docker image now uses Debian instead of Alpine. See https://github.com/CTFd/CTFd/issues/1215 for rationale.
- `docker-compose.yml` now uses a non-root user to connect to MySQL/MariaDB
- `config.py` should no longer be editting for configuration, instead edit `config.ini` or the environment variables in `docker-compose.yml`

**Miscellaneous**

- Fix an issue where email sending would be broken if the CTF name contained a colon
- Lint Markdown files with Prettier
- Lint Dockerfile and docker-compose.yml in Github Actions
- Lint JavaScript files with eslint
- Certain static strings have been converted into Enums for better re-useability throughout the code base
- Switch to using Github Actions for testing and linting
- Better handling of missing challenge types. Missing challenge types no longer bring down all other challenges.
- Documentation has been seperated out into a seperate repo (https://github.com/CTFd/docs).
- Documentation hosting has moved from ReadTheDocs to Netlify
- Any links in the codebase to help.ctfd.io have been changed to docs.ctfd.io.
3.0.0
2020-07-27 03:08:25 -04:00
Kevin Chung
dc3a4d275b Fix issue with previewing certain pages (#1571)
* Fix previewing pages when page attributes are set
2020-07-24 14:52:35 -04:00
Kevin Chung
6062b980fc Return better errors on invalid API parameters (#1570)
* Return better errors on invalid API parameters

For example:
```
{
    "success": false,
    "errors": {
        "user_id": "value is not a valid integer"
    }
}
```
2020-07-24 13:43:27 -04:00
Kevin Chung
4d4097a267 Add channel to update check and use new endpoint (#1568)
* Add a channel key to update check and use a new GET based update check endpoint
* Bump `black` version to `19.10b0`
2020-07-24 01:59:14 -04:00
Kevin Chung
1e2160bcb6 Update README (#1567) 2020-07-23 22:17:08 -04:00
Kevin Chung
7787c329c0 Extra config ini fields (#1566)
* Move server setting documentation from `config.py` to `config.ini`
* Add support for adding additional config values to `config.ini`
* Rename `CTFd.config.ServerConfig` to `CTFd.config.Config` so that we can instantiate an actual `Config` class and add attributes to it. 
* Closes #565
2020-07-23 16:38:21 -04:00
Kevin Chung
43de097f0e Bump version, update links (#1565)
# 3.0.0b3 / 2020-07-22

**General**

- Render Hint content on the server side and provide it in the Hint API response
  - In a sense this would deprecate the `content` field but it's left in for backwards compatability

**API**

- Add `html` item for `GET /api/v1/hints/[hint_id]` which contains the rendered HTML of the Hint content
- Remove `content` from `GET /api/v1/hints`

**Admin Panel**

- Fix an issue where an admin couldn't submit more than once on a challenge preview
- Fix an issue where the theme settings editor wouldn't load if the theme settings JSON was malformed

**Miscellaneous**

- Fix an issue where email sending would be broken if the CTF name contained a colon
2020-07-22 17:09:26 -04:00
Kevin Chung
ded612d46b Render hints on server side and don't render them client side (#1564)
* Render hints on the server side inline with challenge descriptions and Pages
* Clean up some of the API responses for hints to include the right data
* Closes #1563
2020-07-22 16:04:45 -04:00
Kevin Chung
bea74c2068 Handle invalid JSON input in the theme settings editor (#1562)
* Handle invalid JSON input in the theme settings editor
2020-07-22 01:45:37 -04:00
Kevin Chung
98b9dda58c Fix sending emails when CTF name contains colons (#1560)
* Fixes issue with sending emails if the CTF name has a colon
* Closes #1558
2020-07-21 19:53:28 -04:00
Kevin Chung
5cbab768db Fix re-submitting a challenge submission (#1559)
* Fixes an issue preventing submitting a challenge answer in challenge preview window
2020-07-21 17:59:07 -04:00
Kevin Chung
04280eda32 Mark 3.0.0b2 (#1557)
# 3.0.0b2 / 2020-07-19

**General**

- Make HTML Sanitization an optional setting that's configurable via `HTML_SANITIZATION` in config.ini
- Allow HTML comments through sanitization
- Allow Bootstrap data attributes through sanitization

**Admin Panel**

- Fix an unclickable label in the Challenge creation interface

**Plugins**

- Fix bug preventing deleting alternative challenge types

**Miscellaneous**

- Switch to using Github Actions for testing and linting
2020-07-19 23:14:02 -04:00
Kevin Chung
a1e4f15bdc Make HTML sanitization an optional setting (#1556)
* Add new `HTML_SANITIZATION` server config to make HTML sanitization optional
2020-07-19 21:56:53 -04:00
Kevin Chung
559306ee4f Allow comments in HTML (#1555)
* Re-allow HTML comments in sanitized HTML
2020-07-19 21:07:20 -04:00
Kevin Chung
9a2f46e182 Fix unclickable label in challenge creation ui (#1554)
* Fix unclickable label in challenge creation ui
2020-07-19 20:17:59 -04:00
Kevin Chung
421dfc169a Allow bootstrap data attributes through the HTML sanitizer (#1553)
* Allow bootstrap data attributes through the HTML sanitizer
2020-07-19 17:19:33 -04:00
Kevin Chung
e5d6d8b36c Codecov GitHub actions (#1551)
* Run workflows more frequently to build status badges
* Add Github status badges to README
2020-07-17 23:31:28 -04:00
Kevin Chung
ddf7ba1cb0 Use codecov-action for codecov and remove travis-ci (#1550)
* Use codecov via a Github Action
* Remove Travis CI as CI provider
2020-07-17 22:35:17 -04:00