Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
9ec3ddd4
Commit
9ec3ddd4
authored
Dec 22, 2019
by
Michael Shavit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the HandleCoverImage endpoint so that it requires login, and doesn't
take unused parameters.
parent
d81dbb13
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
11 deletions
+23
-11
kobo.py
cps/kobo.py
+14
-9
kobo_auth.py
cps/kobo_auth.py
+9
-2
No files found.
cps/kobo.py
View file @
9ec3ddd4
...
@@ -23,6 +23,10 @@ import uuid
...
@@ -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):
...
@@ -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):
...
@@ -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():
...
@@ -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
)
cps/kobo_auth.py
View file @
9ec3ddd4
...
@@ -81,10 +81,17 @@ def disable_failed_auth_redirect_for_blueprint(bp):
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment