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

remove hidden forward_to_web in _map_decrypted_uri and rely on except

Browse Source
This commit is contained in:
Andrea Spacca 2021-01-11 16:37:46 +01:00
parent 266b049cfc
commit 6ece7020de
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pantalaimon/daemon.py
View File

@ -855,22 +855,18 @@ class ProxyDaemon:
return upload_info, media_info return upload_info, media_info
async def _map_decrypted_uri(self, content_key, content, request, client): async def _map_decrypted_uri(self, content_key, content, request, client):
try:
upload_info, media_info = self._get_upload_and_media_info(content_key, content) upload_info, media_info = self._get_upload_and_media_info(content_key, content)
if not upload_info or not media_info: if not upload_info or not media_info:
return await self.forward_to_web(request, token=client.access_token) raise ValueError
response, decrypted_file = await self._load_decrypted_file(media_info.mxc_server, media_info.mxc_path, upload_info.filename) response, decrypted_file = await self._load_decrypted_file(media_info.mxc_server, media_info.mxc_path,
upload_info.filename)
if response is None and decrypted_file is None: if response is None and decrypted_file is None:
return await self.forward_to_web(request, token=client.access_token) raise ValueError
except ClientConnectionError as e:
return web.Response(status=500, text=str(e))
except KeyError:
return await self.forward_to_web(request, token=client.access_token)
if not isinstance(response, DownloadResponse): if not isinstance(response, DownloadResponse):
return await self.forward_to_web(request, token=client.access_token) raise ValueError
decrypted_upload, _ = await client.upload( decrypted_upload, _ = await client.upload(
data_provider=BufferedReader(BytesIO(decrypted_file)), data_provider=BufferedReader(BytesIO(decrypted_file)),
@ -926,6 +922,10 @@ class ProxyDaemon:
try: try:
content = await self._map_decrypted_uri("url", content, request, client) content = await self._map_decrypted_uri("url", content, request, client)
return await self.forward_to_web(request, data=json.dumps(content), token=client.access_token) return await self.forward_to_web(request, data=json.dumps(content), token=client.access_token)
except ClientConnectionError as e:
return web.Response(status=500, text=str(e))
except KeyError:
return await self.forward_to_web(request, token=client.access_token)
except ValueError: except ValueError:
return await self.forward_to_web(request, token=client.access_token) return await self.forward_to_web(request, token=client.access_token)
@ -1239,6 +1239,10 @@ class ProxyDaemon:
try: try:
content = await self._map_decrypted_uri("avatar_url", content, request, client) content = await self._map_decrypted_uri("avatar_url", content, request, client)
return await self.forward_to_web(request, data=json.dumps(content), token=client.access_token) return await self.forward_to_web(request, data=json.dumps(content), token=client.access_token)
except ClientConnectionError as e:
return web.Response(status=500, text=str(e))
except KeyError:
return await self.forward_to_web(request, token=client.access_token)
except ValueError: except ValueError:
return await self.forward_to_web(request, token=client.access_token) return await self.forward_to_web(request, token=client.access_token)