Added code to force authentication on first request instead of authentication-challenge

python2/httplib2/__init__.py

@@ -1404,6 +1404,7 @@ def __init__(
         ca_certs=None,
         disable_ssl_certificate_validation=False,
         ssl_version=None,
+        forceauth=False,
     ):
         """If 'cache' is a string then it is used as a directory name for
         a disk cache. Otherwise it must be an object that supports the
@@ -1453,6 +1454,9 @@ def __init__(
         # authorization objects
         self.authorizations = []
 
+        # Whether to use auth on first try
+        self.forceauth = forceauth
+
         # If set to False then no redirects are followed, even safe ones.
         self.follow_redirects = True
 
@@ -1511,6 +1515,13 @@ def _auth_from_challenge(self, host, request_uri, headers, response, content):
                 if scheme in challenges:
                     yield AUTH_SCHEME_CLASSES[scheme](cred, host, request_uri, headers, response, content, self)
 
+    def _auth_from_definition(self, host, request_uri, headers, scheme):
+        """A generator that creates an Authorization object
+           based on a scheme specification.
+        """
+        for cred in self.credentials.iter(host):
+            yield AUTH_SCHEME_CLASSES[scheme](cred, host, request_uri, headers, '', '', self)
+
     def add_credentials(self, name, password, domain=""):
         """Add a name and password that will be used
         any time a request requires authentication."""
@@ -1610,6 +1621,10 @@ def _request(
         """Do the actual request using the connection object
         and also follow one level of redirects if necessary"""
 
+        if self.forceauth:
+            for authorization in self._auth_from_definition(host, request_uri, headers, self.forceauth):
+                authorization.request(method, request_uri, headers, body)
+
         auths = [(auth.depth(request_uri), auth) for auth in self.authorizations if auth.inscope(host, request_uri)]
         auth = auths and sorted(auths)[0][1] or None
         if auth:

python3/httplib2/__init__.py

@@ -1088,6 +1088,7 @@ def __init__(
         tls_maximum_version=None,
         tls_minimum_version=None,
         key_password=None,
+        forceauth=False,
     ):
 
         self.disable_ssl_certificate_validation = disable_ssl_certificate_validation
@@ -1282,6 +1283,9 @@ def __init__(
         # authorization objects
         self.authorizations = []
 
+        # Whether to use auth on first try
+        self.forceauth = forceauth
+
         # If set to False then no redirects are followed, even safe ones.
         self.follow_redirects = True
 
@@ -1340,6 +1344,13 @@ def _auth_from_challenge(self, host, request_uri, headers, response, content):
                 if scheme in challenges:
                     yield AUTH_SCHEME_CLASSES[scheme](cred, host, request_uri, headers, response, content, self)
 
+    def _auth_from_definition(self, host, request_uri, headers, scheme):
+        """A generator that creates an Authorization object
+           based on a scheme specification.
+        """
+        for cred in self.credentials.iter(host):
+            yield AUTH_SCHEME_CLASSES[scheme](cred, host, request_uri, headers, '', '', self)
+
     def add_credentials(self, name, password, domain=""):
         """Add a name and password that will be used
         any time a request requires authentication."""
@@ -1436,6 +1447,11 @@ def _request(
         """Do the actual request using the connection object
         and also follow one level of redirects if necessary"""
 
+        if self.forceauth:
+            for authorization in self._auth_from_definition(
+                host, request_uri, headers, self.forceauth):
+                authorization.request(method, request_uri, headers, body)
+
         auths = [(auth.depth(request_uri), auth) for auth in self.authorizations if auth.inscope(host, request_uri)]
         auth = auths and sorted(auths)[0][1] or None
         if auth: