diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-02-25 17:53:47 +0100 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2017-02-25 17:53:47 +0100 |
| commit | 1bd9b4cd409428763f7b2b1c2a5bb4b6f5f24ef4 (patch) | |
| tree | ec25920f12a8b769ff98b26f65c6d7b65a7e1cc9 | |
| parent | 392809c4237d161da825aae95917700649c26382 (diff) | |
| parent | d6e4344f65a5d5a3d80085e9705edfb089652488 (diff) | |
| download | qutebrowser-1bd9b4cd409428763f7b2b1c2a5bb4b6f5f24ef4.tar.gz qutebrowser-1bd9b4cd409428763f7b2b1c2a5bb4b6f5f24ef4.zip | |
Merge branch 'kiryl-master'
| -rw-r--r-- | README.asciidoc | 2 | ||||
| -rw-r--r-- | qutebrowser/javascript/pac_utils.js | 10 | ||||
| -rw-r--r-- | tests/unit/browser/webkit/network/test_pac.py | 9 |
3 files changed, 15 insertions, 6 deletions
diff --git a/README.asciidoc b/README.asciidoc index 326223511..67444c9fb 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -226,6 +226,7 @@ Contributors, sorted by the number of commits in descending order: * Lucas Hoffmann * Link * Larry Hynes +* Kirill A. Shutemov * Johannes Altmanninger * Jeremy Kaplan * Ismail @@ -265,7 +266,6 @@ Contributors, sorted by the number of commits in descending order: * Matthias Lisin * Marcel Schilling * Lazlow Carmichael -* Kirill A. Shutemov * Kevin Wang * Ján Kobezda * Johannes Martinsson diff --git a/qutebrowser/javascript/pac_utils.js b/qutebrowser/javascript/pac_utils.js index a6102df9f..0aba4c070 100644 --- a/qutebrowser/javascript/pac_utils.js +++ b/qutebrowser/javascript/pac_utils.js @@ -61,7 +61,7 @@ function convert_addr(ipchars) { } function isInNet(ipaddr, pattern, maskstr) { - var test = /^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$/ + var test = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ .exec(ipaddr); if (test == null) { ipaddr = dnsResolve(ipaddr); @@ -78,7 +78,7 @@ function isInNet(ipaddr, pattern, maskstr) { } function isPlainHostName(host) { - return (host.search('\\\\.') == -1); + return (host.search('\\.') == -1); } function isResolvable(host) { @@ -92,9 +92,9 @@ function localHostOrDomainIs(host, hostdom) { } function shExpMatch(url, pattern) { - pattern = pattern.replace(/\\./g, '\\\\.'); - pattern = pattern.replace(/\\*/g, '.*'); - pattern = pattern.replace(/\\?/g, '.'); + pattern = pattern.replace(/\./g, '\\.'); + pattern = pattern.replace(/\*/g, '.*'); + pattern = pattern.replace(/\?/g, '.'); var newRe = new RegExp('^'+pattern+'$'); return newRe.test(url); } diff --git a/tests/unit/browser/webkit/network/test_pac.py b/tests/unit/browser/webkit/network/test_pac.py index dc9229dbf..e52b4e7ec 100644 --- a/tests/unit/browser/webkit/network/test_pac.py +++ b/tests/unit/browser/webkit/network/test_pac.py @@ -109,6 +109,15 @@ def test_myIpAddress(): _pac_equality_test("isResolvable(myIpAddress())", "true") +@pytest.mark.parametrize("host, expected", [ + ("example", "true"), + ("example.com", "false"), + ("www.example.com", "false"), +]) +def test_isPlainHostName(host, expected): + _pac_equality_test("isPlainHostName('{}')".format(host), expected) + + def test_proxyBindings(): _pac_equality_test("JSON.stringify(ProxyConfig.bindings)", "'{}'") |