diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-01-13 12:41:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 12:41:51 +0000 |
| commit | feee8199734c9d8a18fa0be12fc5ec09ae140a3a (patch) | |
| tree | 7be23d4302e7f4de45bb7f14a930b62f509965f5 | |
| parent | comment for run_in_background (diff) | |
| download | synapse-feee8199734c9d8a18fa0be12fc5ec09ae140a3a.tar.xz | |
Fix exceptions on requests for non-ascii urls (#6682)
Fixes #6402
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/6682.bugfix | 2 | ||||
| -rw-r--r-- | synapse/http/site.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/6682.bugfix b/changelog.d/6682.bugfix new file mode 100644 index 0000000000..d48ea31477 --- /dev/null +++ b/changelog.d/6682.bugfix @@ -0,0 +1,2 @@ +Fix "CRITICAL" errors being logged when a request is received for a uri containing non-ascii characters. + diff --git a/synapse/http/site.py b/synapse/http/site.py index 9f2d035fa0..911251c0bc 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -88,7 +88,7 @@ class SynapseRequest(Request): def get_redacted_uri(self): uri = self.uri if isinstance(uri, bytes): - uri = self.uri.decode("ascii") + uri = self.uri.decode("ascii", errors="replace") return redact_uri(uri) def get_method(self): |