Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace invalid utf8 with \ufffd

This commit is contained in:
Matthew Hodgson 2018-07-02 11:33:02 +01:00
parent 1c867f5391
commit fc4f8f33be
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/http/site.py
View File

@ -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):
# 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}"