Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Set charset to utf-8 when adding headers for certain text content types #7044

Merged
merged 11 commits into from
Mar 17, 2020
Merged

Set charset to utf-8 when adding headers for certain text content types #7044

merged 11 commits into from
Mar 17, 2020

Conversation

TheStranjer
Copy link
Contributor

@TheStranjer TheStranjer commented Mar 6, 2020 •
edited
Loading

Fix #7043

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
  • Pull request includes a sign off
  • Code style is correct (run the linters)

Demonstration Of Fix

I have this code running on my own homeserver. Here is the file being rendered there:

https://iddqd.social/_matrix/media/r0/download/iddqd.social/bkwUKJYKmwhMvddiGpErdAmG

I uploaded the same file to matrix.org here:

https://matrix-client.matrix.org/_matrix/media/r0/download/matrix.org/pAMkdBaolnxNCwQTuBaDJYrF

Sign-Off

Signed-off-by: Bob Arctor neetzsche@protonmail.com

@TheStranjer TheStranjer changed the base branch from master to develop March 6, 2020 07:56
@TheStranjer TheStranjer marked this pull request as ready for review March 6, 2020 07:57
@richvdh
Copy link
Member

richvdh commented Mar 6, 2020

ok, but what happens if somebody uploads a file in a different character set?

@TheStranjer
Copy link
Contributor Author

TheStranjer commented Mar 6, 2020 •
edited
Loading

Then it serves it as having that character set. The way this is written is it only serves them as UTF-8 by default if there's no other charset given to Synapse at upload time. However, there's almost no argument to use anything other than UTF-8 when setting a default. What else would one use as a default? UTF-16?

However, the W3 makes it clear that it's very important (and puts it in bold like that) that you always explicitly state which charset you want to use, and suggests using UTF-8 as a default. There's a compelling reason to have a default charset and there's no reason for it to be something other than UTF-8.

richvdh
richvdh reviewed Mar 6, 2020
View reviewed changes
synapse/rest/media/v1/_base.py Outdated Show resolved Hide resolved
synapse/rest/media/v1/_base.py Show resolved Hide resolved
@TheStranjer TheStranjer requested a review from richvdh March 6, 2020 19:57
richvdh
richvdh reviewed Mar 7, 2020
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, but sorry, a bit of nitpicking.

synapse/rest/media/v1/_base.py Outdated Show resolved Hide resolved
synapse/rest/media/v1/_base.py Outdated Show resolved Hide resolved
synapse/rest/media/v1/_base.py Outdated Show resolved Hide resolved
TheStranjer and others added 4 commits March 7, 2020 12:55
@TheStranjer @richvdh
Change TEXT_CONTENT_TYPES comment
e048547 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
@TheStranjer @richvdh
Change content_type generation comment
ba05fa9 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
@TheStranjer
Remove content_type generation ternary, but keep content_type variable
f776ff5
@TheStranjer
Conform to linter (no trailing whitespace); improve comment
81e1414
@TheStranjer TheStranjer requested a review from richvdh March 7, 2020 18:28
richvdh
richvdh approved these changes Mar 10, 2020
View reviewed changes
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, looks great. thanks!

@turt2live turt2live mentioned this pull request Mar 10, 2020
Closed
@TheStranjer
Copy link
Contributor Author

@turt2live are you waiting on this PR to be merged to approve /t2bot/matrix-media-repo/pull/235 ?

@turt2live
Copy link
Member

No, I'm just busy and side projects of mine are in a different queue than dayjob work unfortunately.

@TheStranjer
Copy link
Contributor Author

That explains everything, then. Sorry for bothering you.

@richvdh richvdh merged commit 5e477c1 into matrix-org:develop Mar 17, 2020
@richvdh richvdh mentioned this pull request Mar 17, 2020
Closed
richvdh added a commit that referenced this pull request Mar 23, 2020
@richvdh
Merge tag 'v1.12.0'
229eb81 
Synapse 1.12.0 (2020-03-23)
===========================

No significant changes since 1.12.0rc1.

Debian packages and Docker images are rebuilt using the latest versions of
dependency libraries, including Twisted 20.3.0. **Please see security advisory
below**.

Security advisory
-----------------

Synapse may be vulnerable to request-smuggling attacks when it is used with a
reverse-proxy. The vulnerabilties are fixed in Twisted 20.3.0, and are
described in
[CVE-2020-10108](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10108)
and
[CVE-2020-10109](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10109).
For a good introduction to this class of request-smuggling attacks, see
https://portswigger.net/research/http-desync-attacks-request-smuggling-reborn.

We are not aware of these vulnerabilities being exploited in the wild, and
do not believe that they are exploitable with current versions of any reverse
proxies. Nevertheless, we recommend that all Synapse administrators ensure that
they have the latest versions of the Twisted library to ensure that their
installation remains secure.

* Administrators using the [`matrix.org` Docker
  image](https://hub.docker.com/r/matrixdotorg/synapse/) or the [Debian/Ubuntu
  packages from
  `matrix.org`](https://github.com/matrix-org/synapse/blob/master/INSTALL.md#matrixorg-packages)
  should ensure that they have version 1.12.0 installed: these images include
  Twisted 20.3.0.
* Administrators who have [installed Synapse from
  source](https://github.com/matrix-org/synapse/blob/master/INSTALL.md#installing-from-source)
  should upgrade Twisted within their virtualenv by running:
  ```sh
  <path_to_virtualenv>/bin/pip install 'Twisted>=20.3.0'
  ```
* Administrators who have installed Synapse from distribution packages should
  consult the information from their distributions.

The `matrix.org` Synapse instance was not vulnerable to these vulnerabilities.

Advance notice of change to the default `git` branch for Synapse
----------------------------------------------------------------

Currently, the default `git` branch for Synapse is `master`, which tracks the
latest release.

After the release of Synapse 1.13.0, we intend to change this default to
`develop`, which is the development tip. This is more consistent with common
practice and modern `git` usage.

Although we try to keep `develop` in a stable state, there may be occasions
where regressions creep in. Developers and distributors who have scripts which
run builds using the default branch of `Synapse` should therefore consider
pinning their scripts to `master`.

Synapse 1.12.0rc1 (2020-03-19)
==============================

Features
--------

- Changes related to room alias management ([MSC2432](matrix-org/matrix-spec-proposals#2432)):
  - Publishing/removing a room from the room directory now requires the user to have a power level capable of modifying the canonical alias, instead of the room aliases. ([\#6965](#6965))
  - Validate the `alt_aliases` property of canonical alias events. ([\#6971](#6971))
  - Users with a power level sufficient to modify the canonical alias of a room can now delete room aliases. ([\#6986](#6986))
  - Implement updated authorization rules and redaction rules for aliases events, from [MSC2261](matrix-org/matrix-spec-proposals#2261) and [MSC2432](matrix-org/matrix-spec-proposals#2432). ([\#7037](#7037))
  - Stop sending m.room.aliases events during room creation and upgrade. ([\#6941](#6941))
  - Synapse no longer uses room alias events to calculate room names for push notifications. ([\#6966](#6966))
  - The room list endpoint no longer returns a list of aliases. ([\#6970](#6970))
  - Remove special handling of aliases events from [MSC2260](matrix-org/matrix-spec-proposals#2260) added in v1.10.0rc1. ([\#7034](#7034))
- Expose the `synctl`, `hash_password` and `generate_config` commands in the snapcraft package. Contributed by @devec0. ([\#6315](#6315))
- Check that server_name is correctly set before running database updates. ([\#6982](#6982))
- Break down monthly active users by `appservice_id` and emit via Prometheus. ([\#7030](#7030))
- Render a configurable and comprehensible error page if something goes wrong during the SAML2 authentication process. ([\#7058](#7058), [\#7067](#7067))
- Add an optional parameter to control whether other sessions are logged out when a user's password is modified. ([\#7085](#7085))
- Add prometheus metrics for the number of active pushers. ([\#7103](#7103), [\#7106](#7106))
- Improve performance when making HTTPS requests to sygnal, sydent, etc, by sharing the SSL context object between connections. ([\#7094](#7094))

Bugfixes
--------

- When a user's profile is updated via the admin API, also generate a displayname/avatar update for that user in each room. ([\#6572](#6572))
- Fix a couple of bugs in email configuration handling. ([\#6962](#6962))
- Fix an issue affecting worker-based deployments where replication would stop working, necessitating a full restart, after joining a large room. ([\#6967](#6967))
- Fix `duplicate key` error which was logged when rejoining a room over federation. ([\#6968](#6968))
- Prevent user from setting 'deactivated' to anything other than a bool on the v2 PUT /users Admin API. ([\#6990](#6990))
- Fix py35-old CI by using native tox package. ([\#7018](#7018))
- Fix a bug causing `org.matrix.dummy_event` to be included in responses from `/sync`. ([\#7035](#7035))
- Fix a bug that renders UTF-8 text files incorrectly when loaded from media. Contributed by @TheStranjer. ([\#7044](#7044))
- Fix a bug that would cause Synapse to respond with an error about event visibility if a client tried to request the state of a room at a given token. ([\#7066](#7066))
- Repair a data-corruption issue which was introduced in Synapse 1.10, and fixed in Synapse 1.11, and which could cause `/sync` to return with 404 errors about missing events and unknown rooms. ([\#7070](#7070))
- Fix a bug causing account validity renewal emails to be sent even if the feature is turned off in some cases. ([\#7074](#7074))

Improved Documentation
----------------------

- Updated CentOS8 install instructions. Contributed by Richard Kellner. ([\#6925](#6925))
- Fix `POSTGRES_INITDB_ARGS` in the `contrib/docker/docker-compose.yml` example docker-compose configuration. ([\#6984](#6984))
- Change date in [INSTALL.md](./INSTALL.md#tls-certificates) for last date of getting TLS certificates to November 2019. ([\#7015](#7015))
- Document that the fallback auth endpoints must be routed to the same worker node as the register endpoints. ([\#7048](#7048))

Deprecations and Removals
-------------------------

- Remove the unused query_auth federation endpoint per [MSC2451](matrix-org/matrix-spec-proposals#2451). ([\#7026](#7026))

Internal Changes
----------------

- Add type hints to `logging/context.py`. ([\#6309](#6309))
- Add some clarifications to `README.md` in the database schema directory. ([\#6615](#6615))
- Refactoring work in preparation for changing the event redaction algorithm. ([\#6874](#6874), [\#6875](#6875), [\#6983](#6983), [\#7003](#7003))
- Improve performance of v2 state resolution for large rooms. ([\#6952](#6952), [\#7095](#7095))
- Reduce time spent doing GC, by freezing objects on startup. ([\#6953](#6953))
- Minor perfermance fixes to `get_auth_chain_ids`. ([\#6954](#6954))
- Don't record remote cross-signing keys in the `devices` table. ([\#6956](#6956))
- Use flake8-comprehensions to enforce good hygiene of list/set/dict comprehensions. ([\#6957](#6957))
- Merge worker apps together. ([\#6964](#6964), [\#7002](#7002), [\#7055](#7055), [\#7104](#7104))
- Remove redundant `store_room` call from `FederationHandler._process_received_pdu`. ([\#6979](#6979))
- Update warning for incorrect database collation/ctype to include link to documentation. ([\#6985](#6985))
- Add some type annotations to the database storage classes. ([\#6987](#6987))
- Port `synapse.handlers.presence` to async/await. ([\#6991](#6991), [\#7019](#7019))
- Add some type annotations to the federation base & client classes. ([\#6995](#6995))
- Port `synapse.rest.keys` to async/await. ([\#7020](#7020))
- Add a type check to `is_verified` when processing room keys. ([\#7045](#7045))
- Add type annotations and comments to the auth handler. ([\#7063](#7063))
phil-flex pushed a commit to phil-flex/synapse that referenced this pull request Apr 15, 2020
@TheStranjer @phil-flex
Set charset to utf-8 when adding headers for certain text content typ…
025b37f 
…es (matrix-org#7044)

Fixes matrix-org#7043
babolivier pushed a commit that referenced this pull request Sep 1, 2021
@anoadragon453
Set charset to utf-8 when adding headers for certain text content typ…
695cc41 
…es (#7044)

* commit '5e477c1de':
  Set charset to utf-8 when adding headers for certain text content types (#7044)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@richvdh richvdh richvdh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

media repo serves utf-8 files with no charset info, leading to incorrect in-browser rendering
3 participants
@TheStranjer @richvdh @turt2live