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

Disallow {foo} in search engine URLs.

Browse Source 
This causes an KeyError otherwise when trying to use str.format to insert the
search term.
This commit is contained in:
Florian Bruhin 2015-06-24 07:46:15 +02:00
parent b21b4377a8
commit b7c3e7b959
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qutebrowser/config/configtypes.py
View File

@ -1110,8 +1110,15 @@ class SearchEngineUrl(BaseType):
return return
else: else:
raise configexc.ValidationError(value, "may not be empty!") raise configexc.ValidationError(value, "may not be empty!")
if '{}' not in value: if '{}' not in value:
raise configexc.ValidationError(value, "must contain \"{}\"") raise configexc.ValidationError(value, "must contain \"{}\"")
try:
value.format("")
except KeyError:
raise configexc.ValidationError(
value, "may not contain {...} (use {{ and }} for literal {/})")
url = QUrl(value.replace('{}', 'foobar')) url = QUrl(value.replace('{}', 'foobar'))
if not url.isValid(): if not url.isValid():
raise configexc.ValidationError(value, "invalid url, {}".format( raise configexc.ValidationError(value, "invalid url, {}".format(

5
tests/config/test_configtypes.py
View File

@ -1881,6 +1881,11 @@ class TestSearchEngineUrl:
with pytest.raises(configexc.ValidationError): with pytest.raises(configexc.ValidationError):
self.t.validate(':{}') self.t.validate(':{}')
def test_validate_format_string(self):
"""Test validate with a {foo} format string."""
with pytest.raises(configexc.ValidationError):
self.t.validate('foo{bar}baz{}')
def test_transform_empty(self): def test_transform_empty(self):
"""Test transform with an empty value.""" """Test transform with an empty value."""
assert self.t.transform('') is None assert self.t.transform('') is None