NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the HandleCoverImage endpoint so that it requires login, and doesn't

Browse Source 
take unused parameters.
This commit is contained in:
Michael Shavit 2019-12-22 16:28:19 -05:00
parent d81dbb13e4
commit 9ec3ddd492
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cps/kobo.py
View File

@ -23,6 +23,10 @@ import uuid
from base64 import b64decode, b64encode from base64 import b64decode, b64encode
from datetime import datetime from datetime import datetime
from time import gmtime, strftime from time import gmtime, strftime
try:
from urllib import unquote
except ImportError:
from urllib.parse import unquote
from jsonschema import validate, exceptions from jsonschema import validate, exceptions
from flask import ( from flask import (
@ -442,9 +446,10 @@ def reading_state(book):
@kobo.route( @kobo.route(
"/<book_uuid>/<horizontal>/<vertical>/<jpeg_quality>/<monochrome>/image.jpg" "/<book_uuid>/image.jpg"
) )
def HandleCoverImageRequest(book_uuid, horizontal, vertical, jpeg_quality, monochrome): @login_required
def HandleCoverImageRequest(book_uuid):
book_cover = helper.get_book_cover_with_uuid( book_cover = helper.get_book_cover_with_uuid(
book_uuid, use_generic_cover_on_failure=False book_uuid, use_generic_cover_on_failure=False
) )
@ -476,6 +481,7 @@ def handle_404(err):
@kobo.route("/v1/initialization") @kobo.route("/v1/initialization")
@login_required
def HandleInitRequest(): def HandleInitRequest():
outgoing_headers = Headers(request.headers) outgoing_headers = Headers(request.headers)
outgoing_headers.remove("Host") outgoing_headers.remove("Host")
@ -492,12 +498,11 @@ def HandleInitRequest():
calibre_web_url = url_for("web.index", _external=True).strip("/") calibre_web_url = url_for("web.index", _external=True).strip("/")
kobo_resources["image_host"] = calibre_web_url kobo_resources["image_host"] = calibre_web_url
kobo_resources["image_url_quality_template"] = ( kobo_resources["image_url_quality_template"] = unquote(url_for("kobo.HandleCoverImageRequest", _external=True,
calibre_web_url auth_token = kobo_auth.get_auth_token(),
+ "/{ImageId}/{Width}/{Height}/{Quality}/{IsGreyscale}/image.jpg" book_uuid="{ImageId}"))
) kobo_resources["image_url_template"] = unquote(url_for("kobo.HandleCoverImageRequest", _external=True,
kobo_resources["image_url_template"] = ( auth_token = kobo_auth.get_auth_token(),
calibre_web_url + "/{ImageId}/{Width}/{Height}/false/image.jpg" book_uuid="{ImageId}"))
)
return make_response(store_response_json, store_response.status_code) return make_response(store_response_json, store_response.status_code)

11
cps/kobo_auth.py
View File

@ -81,10 +81,17 @@ def disable_failed_auth_redirect_for_blueprint(bp):
lm.blueprint_login_views[bp.name] = None lm.blueprint_login_views[bp.name] = None
def get_auth_token():
if "auth_token" in g:
return g.get("auth_token")
else:
return None
@lm.request_loader @lm.request_loader
def load_user_from_kobo_request(request): def load_user_from_kobo_request(request):
if "auth_token" in g: auth_token = get_auth_token()
auth_token = g.get("auth_token") if auth_token is not None:
user = ( user = (
ub.session.query(ub.User) ub.session.query(ub.User)
.join(ub.RemoteAuthToken) .join(ub.RemoteAuthToken)