diff --git a/cps/web.py b/cps/web.py index e0224b7c..8445196f 100644 --- a/cps/web.py +++ b/cps/web.py @@ -91,10 +91,10 @@ def add_security_headers(resp): if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive: csp += " *;" elif request.endpoint == "web.read_book": - csp += " style-src-elem 'self' blob: 'unsafe-inline';" + csp += " blob:; style-src-elem 'self' blob: 'unsafe-inline';" else: csp += ";" - csp += "object-src: 'none';" + csp += " object-src 'none';" resp.headers['Content-Security-Policy'] = csp resp.headers['X-Content-Type-Options'] = 'nosniff' resp.headers['X-Frame-Options'] = 'SAMEORIGIN' diff --git a/setup.cfg b/setup.cfg index 0b07ca25..3b208345 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,7 +38,7 @@ console_scripts = [options] include_package_data = True install_requires = - APScheduler>=3.6.3,<3.10.0 + APScheduler>=3.6.3,<3.11.0 werkzeug<2.1.0 Babel>=1.3,<3.0 Flask-Babel>=0.11.1,<3.1.0 diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index a2c53d30..00d5d287 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2023-02-05 20:51:25

+

Start Time: 2023-02-09 19:47:18

-

Stop Time: 2023-02-06 03:15:11

+

Stop Time: 2023-02-10 02:15:25

-

Duration: 5h 28 min

+

Duration: 5h 32 min

@@ -1797,11 +1797,9 @@
Traceback (most recent call last):
-  File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 230, in test_edit_title
-    self.assertEqual(ele.text, u'Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters')
-AssertionError: 'Pipo|;.:' != 'Very long extra super turbo cool title wi[54 chars]ters'
-- Pipo|;.:
-+ Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters
+ File "/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 225, in test_edit_title + self.assertEqual(u'Pipo|;.:', title.get_attribute('value')) +AssertionError: 'Pipo|;.:' != None
@@ -2339,12 +2337,12 @@ AssertionError: 'Pipo|;.:' != 'Very long extra super turbo cool titl - + TestLdapLogin 13 - 11 - 1 - 1 + 13 + 0 + 0 0 Detail @@ -2452,71 +2450,20 @@ AssertionError: 'Pipo|;.:' != 'Very long extra super turbo cool titl - +
TestLdapLogin - test_ldap_opds_anonymous
- -
- FAIL -
- - - - + PASS - +
TestLdapLogin - test_ldap_opds_download_book
- -
- ERROR -
- - - - + PASS @@ -2740,11 +2687,11 @@ element.find/</<@chrome://remote/content/marionette/element.sys.mjs:275:16 - + TestLogin 16 - 15 - 1 + 16 + 0 0 0 @@ -2808,31 +2755,11 @@ element.find/</<@chrome://remote/content/marionette/element.sys.mjs:275:16 - +
TestLogin - test_login_protected
- -
- FAIL -
- - - - + PASS @@ -2985,11 +2912,11 @@ AssertionError: 2 != 1 - + TestOPDSFeed 23 - 21 - 2 + 23 + 0 0 0 @@ -3071,31 +2998,11 @@ AssertionError: 2 != 1 - +
TestOPDSFeed - test_opds_guest_user
- -
- FAIL -
- - - - + PASS @@ -3163,31 +3070,11 @@ AssertionError: 200 != 401 - +
TestOPDSFeed - test_opds_search
- -
- FAIL -
- - - - + PASS @@ -3247,63 +3134,6 @@ AssertionError: 401 != 200 - - _ErrorHolder - 1 - 0 - 0 - 1 - 0 - - Detail - - - - - - - -
tearDownClass (test_opds_feed)
- - -
- ERROR -
- - - - - - - - - TestUploadPDF 1 @@ -3312,13 +3142,13 @@ element.find/</<@chrome://remote/content/marionette/element.sys.mjs:275:16 0 0 - Detail + Detail - +
TestUploadPDF - test_upload_invalid_pdf
@@ -3336,13 +3166,13 @@ element.find/</<@chrome://remote/content/marionette/element.sys.mjs:275:16 0 0 - Detail + Detail - +
TestPipInstall - test_command_start
@@ -3351,7 +3181,7 @@ element.find/</<@chrome://remote/content/marionette/element.sys.mjs:275:16 - +
TestPipInstall - test_foldername_database_location
@@ -3360,7 +3190,7 @@ element.find/</<@chrome://remote/content/marionette/element.sys.mjs:275:16 - +
TestPipInstall - test_module_start
@@ -3370,21 +3200,21 @@ element.find/</<@chrome://remote/content/marionette/element.sys.mjs:275:16 - + TestReader 5 - 4 + 5 + 0 0 - 1 0 - Detail + Detail - +
TestReader - test_comic_reader
@@ -3393,42 +3223,16 @@ element.find/</<@chrome://remote/content/marionette/element.sys.mjs:275:16 - +
TestReader - test_epub_reader
- -
- ERROR -
- - - - + PASS - +
TestReader - test_pdf_reader
@@ -3437,7 +3241,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestReader - test_sound_listener
@@ -3446,7 +3250,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestReader - test_txt_reader
@@ -3464,13 +3268,13 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match 0 0 - Detail + Detail - +
TestReadOnlyDatabase - test_readonly_path
@@ -3488,13 +3292,13 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match 0 0 - Detail + Detail - +
TestRegister - test_forgot_password
@@ -3503,7 +3307,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestRegister - test_illegal_email
@@ -3512,7 +3316,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestRegister - test_limit_domain
@@ -3521,7 +3325,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestRegister - test_register_no_server
@@ -3530,7 +3334,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestRegister - test_registering_only_email
@@ -3539,7 +3343,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestRegister - test_registering_user
@@ -3548,7 +3352,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestRegister - test_registering_user_fail
@@ -3557,7 +3361,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestRegister - test_user_change_password
@@ -3575,13 +3379,13 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match 0 0 - Detail + Detail - +
TestReverseProxy - test_logout
@@ -3590,7 +3394,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestReverseProxy - test_move_page
@@ -3599,7 +3403,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestReverseProxy - test_reverse_about
@@ -3617,13 +3421,13 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match 0 1 - Detail + Detail - +
TestShelf - test_access_shelf
@@ -3632,7 +3436,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_add_shelf_from_search
@@ -3641,7 +3445,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_adv_search_shelf
@@ -3650,7 +3454,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_arrange_shelf
@@ -3659,7 +3463,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_create_public_shelf
@@ -3668,7 +3472,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_create_public_shelf_no_permission
@@ -3677,7 +3481,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_delete_book_of_shelf
@@ -3686,7 +3490,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_private_shelf
@@ -3695,7 +3499,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_public_private_shelf
@@ -3704,7 +3508,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_public_shelf
@@ -3713,7 +3517,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_rename_shelf
@@ -3722,7 +3526,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_shelf_action_non_shelf_edit_role
@@ -3731,7 +3535,7 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_shelf_anonymous
@@ -3740,19 +3544,19 @@ selenium.common.exceptions.InvalidArgumentException: Message: data did not match - +
TestShelf - test_shelf_database_change
- SKIP + SKIP
-