Matrix-Mirrors/pantalaimon
1
0
Fork 0
mirror of https://github.com/matrix-org/pantalaimon.git synced 2025-02-08 02:55:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

daemon: Don't use the text method to get the content.

Browse Source 
The content doesn't necessarily have to be unicode (e.g. for media
content) and the text() method tries to decode the body of the request.

Use read() instead, this way we get the raw bytes of the body, we also
set the content header manually.

This fixes #8.
This commit is contained in:
Damir Jelić 2019-05-02 14:46:53 +02:00
parent d90eebf1e0
commit a996d4acd3
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pantalaimon/daemon.py
View File

@ -272,7 +272,7 @@ class ProxyDaemon:
data = data data = data
headers.pop("Content-Length", None) headers.pop("Content-Length", None)
else: else:
data = await request.text() data = await request.read()
return await session.request( return await session.request(
method, method,
@ -319,7 +319,8 @@ class ProxyDaemon:
) )
return web.Response( return web.Response(
status=response.status, status=response.status,
text=await response.text() content_type=response.content_type,
body=await response.read()
) )
except ClientConnectionError as e: except ClientConnectionError as e:
return web.Response(status=500, text=str(e)) return web.Response(status=500, text=str(e))
@ -427,7 +428,8 @@ class ProxyDaemon:
return web.Response( return web.Response(
status=response.status, status=response.status,
text=await response.text() content_type=response.content_type,
body=await response.read()
) )
@property @property
@ -529,11 +531,12 @@ class ProxyDaemon:
status=response.status, status=response.status,
text=json.dumps(json_response) text=json.dumps(json_response)
) )
else:
return web.Response( return web.Response(
status=response.status, status=response.status,
text=await response.text() content_type=response.content_type,
) body=await response.read()
)
async def messages(self, request): async def messages(self, request):
access_token = self.get_access_token(request) access_token = self.get_access_token(request)
@ -560,11 +563,12 @@ class ProxyDaemon:
status=response.status, status=response.status,
text=json.dumps(json_response) text=json.dumps(json_response)
) )
else:
return web.Response( return web.Response(
status=response.status, status=response.status,
text=await response.text() content_type=response.content_type,
) body=await response.read()
)
async def send_message(self, request): async def send_message(self, request):
access_token = self.get_access_token(request) access_token = self.get_access_token(request)
@ -609,7 +613,8 @@ class ProxyDaemon:
return web.Response( return web.Response(
status=response.transport_response.status, status=response.transport_response.status,
text=await response.transport_response.text() content_type=response.transport_response.content_type,
body=await response.transport_response.read()
) )
async def filter(self, request): async def filter(self, request):