Commit Graph

41 Commits

Author SHA1 Message Date
Ozzie Isaacs 3c4ed0de1a Added ratelimiterbackends 2024-02-25 09:00:49 +01:00
Ozzie Isaacs ce48e06c45 Improved limiter 2023-02-12 13:10:00 +01:00
Ozzie Isaacs f241b260d7 Updated requirements
Bugfix from testrun
Testresults
2023-01-29 09:52:25 +01:00
Ozzie Isaacs 508e2b4d0a Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/search.py
#	cps/templates/admin.html
#	cps/web.py
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html
2023-01-28 18:52:50 +01:00
Ozzie Isaacs 8022b1bb36 Merge remote-tracking branch 'english/master' 2023-01-21 15:19:59 +01:00
Ozzieisaacs 2472e03a69 Bugfix ratelimiter kobo 2022-09-05 18:45:24 +02:00
Ozzie Isaacs f85b587d0a Prevent converting of kepub on every new user (#2446)
Added error logging message if convert fails
If convert only task, only convert book message is logged
2022-06-13 17:05:00 +02:00
Ozzie Isaacs 2e007a160e reenable startup logging
Bugfixes from refactoring and merge
2022-04-26 14:45:06 +02:00
Ozzie Isaacs d759df0df6 Kobo sync token is now also created if accessed from localhost(fixes #1990)
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
2022-01-22 18:23:43 +01:00
Ozzieisaacs 785726deee Migrated some routes to POST
- delete shelf, import ldap users
- delete_kobo token, kobo force full sync
- shutdown, reconnect, shutdown
2021-12-30 14:45:30 +01:00
Ozzie Isaacs 9864d932e0 Changed user.nickname to user.name
Added function to view downloads of all users for admins
2021-03-21 18:55:02 +01:00
Ozzie Isaacs b75247ea3a Suppress some errors 2021-03-15 13:48:05 +01:00
Ozzie Isaacs 7fa5865cf6 Merge remote-tracking branch 'autoconv/kepub_autoconv' into development
# Conflicts:
#	cps/kobo.py
#	cps/kobo_auth.py
2021-01-30 14:47:18 +01:00
jvoisin b8ab66369e Remove some unused imports 2021-01-07 17:59:08 +01:00
Ozzieisaacs 5cce01215f Code refactoring ub.session.commit()
Code cosmentics admin.py
2021-01-03 09:53:34 +01:00
Ozzieisaacs 1905e0ee6f refactoring to prevent web.py being the middle of the universe 2020-12-12 11:23:17 +01:00
OzzieIsaacs 8f36128fe3 Merge branch 'session' into Develop 2020-12-08 11:49:39 +01:00
Ozzieisaacs 5e3618716d Fix missing session rollback on commit error 2020-12-07 19:53:34 +01:00
Ozzieisaacs 777c2726d3 Changed session_handing 2020-12-07 08:52:52 +01:00
norangebit bdf6052388
Conversion to kepub when creating a sync token 2020-09-03 21:57:14 +02:00
Ozzieisaacs d0e603e62d Better detection of localhost for kobo sync 2020-05-17 21:42:25 +02:00
Ozzieisaacs 2d92818613 Code cosmetics 2020-04-27 20:01:13 +02:00
Ozzieisaacs fc4436f091 Update Translation 2020-02-23 20:07:21 +01:00
Ozzieisaacs 32a6beae65 Merge remote-tracking branch 'fix/kobo'
# Conflicts:
#	cps/kobo.py
2020-02-23 13:17:59 +01:00
Ozzieisaacs 372c284ad4 Merge branch 'master' into Develop 2020-02-22 16:24:06 +01:00
Ozzieisaacs 6893635251 Handle kobo auth request
Handle access from localhost for kobo
2020-02-18 20:36:32 +01:00
Ozzieisaacs e3ddc16657 Fix opds login not working anymore (due to kobo sync protocol) 2020-02-16 14:25:15 +01:00
Ozzieisaacs 317e59df4b Bugfixes from tests 2020-02-15 16:02:31 +01:00
Ozzieisaacs 0411d4a8c9 Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
2020-01-26 16:52:40 +01:00
Michael Shavit d30b44ee0f Minor formatting changes per codacy review. 2020-01-26 01:12:52 -05:00
Ozzieisaacs 79a9ef4859 Make Kobo optional
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
2020-01-12 13:42:39 +01:00
Ozzieisaacs 1c630eb604 fixes from tests 2019-12-30 15:16:09 +01:00
Ozzieisaacs 288944db2c Merge remote-tracking branch 'kobo_sync/kobo' into Develop
# Conflicts:
#	cps.py
#	cps/kobo.py
#	cps/kobo_auth.py
#	cps/ub.py
2019-12-20 19:24:31 +01:00
Michael Shavit 2118d920f5 Formatter. 2019-12-20 01:04:12 -05:00
Michael Shavit 27d084ce39 Remove the KoboUserKey-based Authentication.
Instead, the user generates the api_endpoint url to set on their device
by visiting http://.../kobo_auth/generate_auth_token.
The generated url will contain a RemoteAuthorizationToken that will be
included on all subsequent requests from the device to the kobo/
endpoints. (In contrast, the device is authenticated using a session cookie on
requests to the download endpoint).

Also use Flask.url_for to generate download urls.
2019-12-20 00:55:53 -05:00
Ozzieisaacs f705889c23 Inital Kobo 2019-12-17 20:28:20 +01:00
Michael Shavit 040d7d9ae3 Remove unused import and fix python3 compatibility, as per Ozielsaacs comments. 2019-12-11 00:12:35 -05:00
Michael Shavit 2b55b9b250 Use the login_user Cookie to authorize download requests instead of
passing the UserKey over url params.
2019-12-08 15:33:57 -05:00
Michael Shavit fffa2d5a1b Support passing the Auth token as a url param.
This is required to support ebook downloads which the Kobo device emits
without any auth headers.

* Also some other small bug fixes discovered during device testing.
2019-12-07 22:55:07 -05:00
Michael Shavit b5da2c4199 Clean-up: Fix import order in kobo.py, and other minor formatting
changes.
2019-12-07 19:54:49 -05:00
Michael Shavit 9ede01f130 * Add a UserKeyToken to the User table for Kobo authorization.
* Add proper authorization checks on the new Kobo endpoints.

Important Note: As a side-effect, all CalibreWeb API calls can be
authorized using this token (i.e without a username&password).
2019-12-07 19:54:44 -05:00