Be stricter about JSON that is accepted by Sydent #337
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This disables the JSON extensions which Python supports by default (parsing of `Infinity` / `-Infinity` and `NaN`). These shouldn't be accepted since they're not technically valid JSON and other languages won't be able to interpret it properly. This isn't expected to have any observable effects, since no correctly-operating endpoint should be returning this invalid JSON anyway.
richvdh
force-pushed
the
rav/json-decoder
branch
from
6a48b24 to
9a3b94f
Compare
erikjohnston
approved these changes
Apr 6, 2021
benbz
added a commit
that referenced
this pull request
Apr 15, 2021
Sydent 2.3.0 (2021-04-15) ========================= **Note**: this will be the last release of Sydent to support Python 3.5 or earlier. Future releases will require at least Python 3.6. Security advisory ----------------- This release contains fixes to the following security issues: - Denial of service attack via disk space or memory exhaustion ([CVE-2021-29430](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-29430)). - SSRF due to missing validation of hostnames ([CVE-2021-29431](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-29431)). - Malicious users could control the content of invitation emails ([CVE-2021-29432](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-29432)). - Denial of service (via resource exhaustion) due to improper input validation ([CVE-2021-29433](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-29433)). Although we are not aware of these vulnerabilities being exploited in the wild, Sydent server administrators are advised to update as soon as possible. Note that as well as changes to the package, there are also changes to the default email templates. If any templates have been updated locally, they must also be updated in line with the changes to the defaults for full protection from CVE-2021-29432. Features -------- - Accept an optional `web_client_location` argument to the invite endpoint which allows customisation of the email template. ([\#326](#326)) - Move templates to a per-brand subdirectory of `/res`. Add `templates.path` and `brand.default` config options. ([\#328](#328)) Bugfixes -------- - Fix a regression in v2.2.0 where the wrong characters would be obfuscated in a 3pid invite. ([\#317](#317)) - Fix a long-standing bug where invalid JSON would be accepted over the HTTP interfaces. ([\#337](#337)) - During user registration on the identity server, validate that the MXID returned by the contacted homeserver is valid for that homeserver. ([cc97fff](cc97fff)) - Ensure that `/v2/` endpoints are correctly authenticated. ([ce04a68](ce04a68)) - Perform additional validation on the response received when requesting server signing keys. ([07e6da7](07e6da7)) - Validate the `matrix_server_name` parameter given during user registration. ([9e57334](9e57334), [8936925](8936925), [3d531ed](3d531ed), [0f00412](0f00412)) - Limit the size of requests received from HTTP clients. ([89071a1](89071a1), [0523511](0523511), [f56eee3](f56eee3)) - Limit the size of responses received from HTTP servers. ([89071a1](89071a1), [0523511](0523511), [f56eee3](f56eee3)) - In invite emails, randomise the multipart boundary, and include MXIDs where available. ([4469d1d](4469d1d), [6b405a8](6b405a8), [65a6e91](65a6e91)) - Perform additional validation on the `client_secret` and `email` parameters to various APIs. ([3175fd3](3175fd3)) Updates to the Docker image --------------------------- - Base docker image on Debian rather than Alpine Linux. ([\#335](#335)) Internal Changes ---------------- - Fix test logging to allow braces in log output. ([\#318](#318)) - Install prometheus_client in the Docker image. ([\#325](#325)) - Bump the version of signedjson to 1.1.1. ([\#334](#334))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This disables the JSON extensions which Python supports by default (parsing of
Infinity/-InfinityandNaN). These shouldn't be accepted since they'renot technically valid JSON and other languages won't be able to interpret it
properly.
This isn't expected to have any observable effects, since no
correctly-operating endpoint should be returning this invalid JSON anyway.