rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent using %2F as slash in a Content-Disposition header

Browse Source
This commit is contained in:
Florian Bruhin 2017-01-13 18:04:04 +01:00
parent 2f3e671578
commit cc4a8e53df
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qutebrowser/browser/webengine/webenginedownloads.py
View File

@ -137,7 +137,10 @@ def _get_suggested_filename(path):
""" """
filename = os.path.basename(path) filename = os.path.basename(path)
filename = re.sub(r'\([0-9]+\)$', '', filename) filename = re.sub(r'\([0-9]+\)$', '', filename)
# https://bugreports.qt.io/browse/QTBUG-58155
filename = urllib.parse.unquote(filename) filename = urllib.parse.unquote(filename)
# Doing basename a *second* time because there could be a %2F in there...
filename = os.path.basename(filename)
return filename return filename

8
tests/end2end/features/downloads.feature
View File

@ -118,6 +118,14 @@ Feature: Downloading things from a website.
And I wait until the download is finished And I wait until the download is finished
Then the downloaded file download with spaces.bin should exist Then the downloaded file download with spaces.bin should exist
@qtwebkit_skip
Scenario: Downloading a file with evil content-disposition header
# Content-Disposition: download; filename=..%2Ffoo
When I open response-headers?Content-Disposition=download;%20filename%3D..%252Ffoo without waiting
And I wait until the download is finished
Then the downloaded file ../foo should not exist
And the downloaded file foo should exist
## :download-retry ## :download-retry
Scenario: Retrying a failed download Scenario: Retrying a failed download

1
tests/unit/browser/webengine/test_webenginedownloads.py
View File

@ -32,6 +32,7 @@ from qutebrowser.browser.webengine import webenginedownloads
('foo(a)', 'foo(a)'), ('foo(a)', 'foo(a)'),
('foo1', 'foo1'), ('foo1', 'foo1'),
('foo%20bar', 'foo bar'), ('foo%20bar', 'foo bar'),
('foo%2Fbar', 'bar'),
]) ])
def test_get_suggested_filename(path, expected): def test_get_suggested_filename(path, expected):
assert webenginedownloads._get_suggested_filename(path) == expected assert webenginedownloads._get_suggested_filename(path) == expected