mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-08-08 06:53:50 +00:00
Code Issues Releases Wiki Activity

Better error handling during proxying kobo requests (fix for #3334)

Browse Source
This commit is contained in:
Ozzie Isaacs 2025-03-23 07:56:14 +01:00
parent efc7ce31d2
commit 46f111cd6e
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cps/kobo.py
View File

@ -106,24 +106,29 @@ def make_request_to_kobo_store(sync_token=None):
return store_response return store_response
def redirect_or_proxy_request(): def redirect_or_proxy_request(auth=False):
if config.config_kobo_proxy: if config.config_kobo_proxy:
if request.method == "GET": try:
return redirect(get_store_url_for_current_request(), 307) if request.method == "GET":
else: alfa = redirect(get_store_url_for_current_request(), 307)
# The Kobo device turns other request types into GET requests on redirects, return alfa
# so we instead proxy to the Kobo store ourselves. else:
store_response = make_request_to_kobo_store() # The Kobo device turns other request types into GET requests on redirects,
# so we instead proxy to the Kobo store ourselves.
store_response = make_request_to_kobo_store()
response_headers = store_response.headers response_headers = store_response.headers
for header_key in CONNECTION_SPECIFIC_HEADERS: for header_key in CONNECTION_SPECIFIC_HEADERS:
response_headers.pop(header_key, default=None) response_headers.pop(header_key, default=None)
return make_response( return make_response(
store_response.content, store_response.status_code, response_headers.items() store_response.content, store_response.status_code, response_headers.items()
) )
else: except Exception as e:
return make_response(jsonify({})) log.error("Failed to receive or parse response from Kobo's endpoint: {}".format(e))
if auth:
return make_calibre_web_auth_response()
return make_response(jsonify({}))
def convert_to_kobo_timestamp_string(timestamp): def convert_to_kobo_timestamp_string(timestamp):
@ -1042,7 +1047,7 @@ def HandleAuthRequest():
log.debug('Kobo Auth request') log.debug('Kobo Auth request')
if config.config_kobo_proxy: if config.config_kobo_proxy:
try: try:
return redirect_or_proxy_request() return redirect_or_proxy_request(auth=True)
except Exception: except Exception:
log.error("Failed to receive or parse response from Kobo's auth endpoint. Falling back to un-proxied mode.") log.error("Failed to receive or parse response from Kobo's auth endpoint. Falling back to un-proxied mode.")
return make_calibre_web_auth_response() return make_calibre_web_auth_response()