diff --git a/README.asciidoc b/README.asciidoc index ee420eac8..27fc8df56 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -163,9 +163,9 @@ Contributors, sorted by the number of commits in descending order: * Corentin Julé * meles5 * Philipp Hansch +* Kevin Velghe * Daniel Karbach * Panagiotis Ktistakis -* Kevin Velghe * Artur Shaik * Nathan Isom * Thorsten Wißmann diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 8f416d3a4..8b1803fb2 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -69,6 +69,7 @@ |<>|Whether to validate SSL handshakes. |<>|Whether to try to pre-fetch DNS entries to speed up browsing. |<>|Set custom headers for qutebrowser HTTP requests. +|<>|Set location of netrc-file for HTTP authentication. |============== .Quick reference for section ``completion'' @@ -808,6 +809,12 @@ Set custom headers for qutebrowser HTTP requests. Default: empty +[[network-netrc-file]] +=== netrc-file +Set location of netrc-file for HTTP authentication. + +Default: empty + == completion Options related to completion and command history. diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index 04ce58975..d28bd6be4 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -330,7 +330,7 @@ class NetworkManager(QNetworkAccessManager): # altogether. reply.netrc_used = True try: - net = netrc.netrc() + net = netrc.netrc(config.get('network', 'netrc-file')) authenticators = net.authenticators(reply.url().host()) if authenticators is not None: (user, _account, password) = authenticators diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index 3b62f3183..e503c3e45 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -438,6 +438,10 @@ def data(readonly=False): SettingValue(typ.HeaderDict(none_ok=True), ''), "Set custom headers for qutebrowser HTTP requests."), + ('netrc-file', + SettingValue(typ.File(none_ok=True), ''), + "Set location of netrc-file for HTTP authentication."), + readonly=readonly )),