Skip to content
Snippets Groups Projects
Commit fc4f8f33 authored by Matthew Hodgson's avatar Matthew Hodgson
Browse files

replace invalid utf8 with \ufffd

parent 1c867f53
No related branches found
No related tags found
No related merge requests found
...@@ -111,7 +111,7 @@ class SynapseRequest(Request): ...@@ -111,7 +111,7 @@ class SynapseRequest(Request):
# from a IDN servname in an auth header # from a IDN servname in an auth header
authenticated_entity = self.authenticated_entity authenticated_entity = self.authenticated_entity
if authenticated_entity is not None: if authenticated_entity is not None:
authenticated_entity = authenticated_entity.decode("utf-8") authenticated_entity = authenticated_entity.decode("utf-8", "replace")
# ...or could be raw utf-8 bytes in the User-Agent header. # ...or could be raw utf-8 bytes in the User-Agent header.
# N.B. if you don't do this, the logger explodes cryptically # N.B. if you don't do this, the logger explodes cryptically
...@@ -120,7 +120,7 @@ class SynapseRequest(Request): ...@@ -120,7 +120,7 @@ class SynapseRequest(Request):
# c.f. https://github.com/matrix-org/synapse/issues/3471 # c.f. https://github.com/matrix-org/synapse/issues/3471
user_agent = self.get_user_agent() user_agent = self.get_user_agent()
if user_agent is not None: if user_agent is not None:
user_agent = user_agent.decode("utf-8") user_agent = user_agent.decode("utf-8", "replace")
self.site.access_logger.info( self.site.access_logger.info(
"%s - %s - {%s}" "%s - %s - {%s}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment