Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Properly log FAKE_PROTOCOL failed requests

Browse Source
This commit is contained in:
Kovid Goyal 2019-10-16 07:12:37 +05:30
parent df2756faa3
commit 04d3066594
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calibre/gui2/viewer/web_view.py
View File

@ -121,17 +121,14 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
def requestStarted(self, rq): def requestStarted(self, rq):
if bytes(rq.requestMethod()) != b'GET': if bytes(rq.requestMethod()) != b'GET':
rq.fail(rq.RequestDenied) return self.fail_request(rq, rq.RequestDenied)
return
url = rq.requestUrl() url = rq.requestUrl()
host = url.host() host = url.host()
if host not in self.allowed_hosts or url.scheme() != FAKE_PROTOCOL: if host not in self.allowed_hosts or url.scheme() != FAKE_PROTOCOL:
rq.fail(rq.UrlNotFound) return self.fail_request(rq)
return
name = url.path()[1:] name = url.path()[1:]
if host == SANDBOX_HOST and not name.startswith('book/'): if host == SANDBOX_HOST and not name.startswith('book/'):
rq.fail(rq.UrlNotFound) return self.fail_request(rq)
return
if name.startswith('book/'): if name.startswith('book/'):
name = name.partition('/')[2] name = name.partition('/')[2]
if name == '__index__': if name == '__index__':
@ -156,7 +153,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
except Exception: except Exception:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
rq.fail(rq.RequestFailed) return self.fail_request(rq, rq.RequestFailed)
elif name == 'manifest': elif name == 'manifest':
data = b'[' + set_book_path.manifest + b',' + set_book_path.metadata + b']' data = b'[' + set_book_path.manifest + b',' + set_book_path.metadata + b']'
send_reply(rq, set_book_path.manifest_mime, data) send_reply(rq, set_book_path.manifest_mime, data)
@ -183,8 +180,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
raw = f.read() raw = f.read()
except EnvironmentError as err: except EnvironmentError as err:
prints("Failed to get mathjax file: {} with error: {}".format(name, err)) prints("Failed to get mathjax file: {} with error: {}".format(name, err))
rq.fail(rq.RequestFailed) return self.fail_request(rq, rq.RequestFailed)
return
if 'MathJax.js' in name: if 'MathJax.js' in name:
# raw = open(os.path.expanduser('~/work/mathjax/unpacked/MathJax.js')).read() # raw = open(os.path.expanduser('~/work/mathjax/unpacked/MathJax.js')).read()
raw = monkeypatch_mathjax(raw.decode('utf-8')).encode('utf-8') raw = monkeypatch_mathjax(raw.decode('utf-8')).encode('utf-8')
@ -192,6 +188,14 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
send_reply(rq, mt, raw) send_reply(rq, mt, raw)
elif not name: elif not name:
send_reply(rq, 'text/html', viewer_html()) send_reply(rq, 'text/html', viewer_html())
else:
return self.fail_request(rq)
def fail_request(self, rq, fail_code=None):
if fail_code is None:
fail_code = rq.UrlNotFound
rq.fail(fail_code)
prints("Blocking FAKE_PROTOCOL request: {}".format(rq.requestUrl().toString()))
# }}} # }}}