diff options
author | Florian Bruhin <git@the-compiler.org> | 2018-07-09 23:38:47 +0200 |
---|---|---|
committer | Florian Bruhin <git@the-compiler.org> | 2018-07-11 17:06:40 +0200 |
commit | ff686ff7f395d83e5ac48507ecfae0b0e97a61ef (patch) | |
tree | 10465c0cea2939fe9458254968fda49a3e004132 /qutebrowser/browser/webkit/network/networkmanager.py | |
parent | 8486efa940d8349176237dec47a5fbd8694e0375 (diff) | |
download | qutebrowser-v1.1.x.tar.gz qutebrowser-v1.1.x.zip |
CVE-2018-10895: Fix CSRF issues with qute://settings/set URLv1.1.x
In ffc29ee043ae7336d9b9dcc029a05bf7a3f994e8 (part of v1.0.0), a
qute://settings/set URL was added to change settings.
Contrary to what I apparently believed at the time, it *is* possible for
websites to access `qute://*` URLs (i.e., neither QtWebKit nor QtWebEngine
prohibit such requests, other than the usual cross-origin rules).
In other words, this means a website can e.g. have an `<img>` tag which loads a
`qute://settings/set` URL, which then sets `editor.command` to a bash script.
The result of that is arbitrary code execution.
Fixes #4060
See #2332
(cherry picked from commit 43e58ac865ff862c2008c510fc5f7627e10b4660)
Diffstat (limited to 'qutebrowser/browser/webkit/network/networkmanager.py')
-rw-r--r-- | qutebrowser/browser/webkit/network/networkmanager.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index a19687eb1..64debed3f 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -384,13 +384,6 @@ class NetworkManager(QNetworkAccessManager): req, proxy_error, QNetworkReply.UnknownProxyError, self) - scheme = req.url().scheme() - if scheme in self._scheme_handlers: - result = self._scheme_handlers[scheme].createRequest( - op, req, outgoing_data) - if result is not None: - return result - for header, value in shared.custom_headers(): req.setRawHeader(header, value) @@ -418,5 +411,12 @@ class NetworkManager(QNetworkAccessManager): # the webpage shutdown here. current_url = QUrl() + scheme = req.url().scheme() + if scheme in self._scheme_handlers: + result = self._scheme_handlers[scheme].createRequest( + op, req, outgoing_data, current_url) + if result is not None: + return result + self.set_referer(req, current_url) return super().createRequest(op, req, outgoing_data) |