AaronFiore/electrum
1
0
Fork 0
Code Activity

network: log original error text in catch_server_exceptions

Browse Source 
related: https://github.com/spesmilo/electrum/issues/8439
This commit is contained in:
SomberNight
2023-05-16 15:10:12 +00:00
parent fc7c5dde6e
commit fd41308c6b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/network.py
View File

@@ -891,12 +891,18 @@ class Network(Logger, NetworkRetryManager[ServerAddr]):
return make_reliable_wrapper return make_reliable_wrapper
def catch_server_exceptions(func): def catch_server_exceptions(func):
"""Decorator that wraps server errors in UntrustedServerReturnedError,
to avoid showing untrusted arbitrary text to users.
"""
@functools.wraps(func) @functools.wraps(func)
async def wrapper(self, *args, **kwargs): async def wrapper(self, *args, **kwargs):
try: try:
return await func(self, *args, **kwargs) return await func(self, *args, **kwargs)
except aiorpcx.jsonrpc.CodeMessageError as e: except aiorpcx.jsonrpc.CodeMessageError as e:
raise UntrustedServerReturnedError(original_exception=e) from e wrapped_exc = UntrustedServerReturnedError(original_exception=e)
# log (sanitized) untrusted error text now, to ease debugging
self.logger.debug(f"got error from server for {func.__qualname__}: {wrapped_exc!r}")
raise wrapped_exc from e
return wrapper return wrapper
@best_effort_reliable @best_effort_reliable