Merge branch 'netrc' of https://github.com/paretje/qutebrowser into paretje-netrc

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

doc/help/settings.asciidoc

@@ -69,6 +69,7 @@
 |<<network-ssl-strict,ssl-strict>>|Whether to validate SSL handshakes.
 |<<network-dns-prefetch,dns-prefetch>>|Whether to try to pre-fetch DNS entries to speed up browsing.
 |<<network-custom-headers,custom-headers>>|Set custom headers for qutebrowser HTTP requests.
+|<<network-netrc-file,netrc-file>>|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.
 

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

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
         )),