authorization header doesn't have a colon in it's value, requests' auth parameter overrides custom authorization header

deanrock · deanrock · commit f19f959f4795 · 2016-10-27T01:33:25.000+02:00
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
@@ -358,7 +358,7 @@ def set_token(self, token=None, oauth_token=None):
 
         if oauth_token:
             self.headers.pop("PRIVATE-TOKEN", None)
-            self.headers["Authorization"] = "Bearer: %s" % oauth_token
+            self.headers["Authorization"] = "Bearer %s" % oauth_token
         elif token:
             self.headers.pop("Authorization", None)
             self.headers["PRIVATE-TOKEN"] = token
@@ -397,16 +397,22 @@ def _raw_get(self, path_, content_type=None, streamed=False, **kwargs):
             url = '%s%s' % (self._url, path_)
 
         headers = self._create_headers(content_type)
+
+        if 'Authorization' in self.headers:
+            auth = None
+        else:
+            auth = requests.auth.HTTPBasicAuth(
+                self.http_username,
+                self.http_password)
+
         try:
             return self.session.get(url,
                                     params=kwargs,
                                     headers=headers,
                                     verify=self.ssl_verify,
                                     timeout=self.timeout,
                                     stream=streamed,
-                                    auth=requests.auth.HTTPBasicAuth(
-                                        self.http_username,
-                                        self.http_password))
+                                    auth=auth)
         except Exception as e:
             raise GitlabConnectionError(
                 "Can't connect to GitLab server (%s)" % e)
@@ -438,7 +444,7 @@ def _raw_list(self, path_, cls, extra_attrs={}, **kwargs):
         results = [cls(self, item, **params) for item in r.json()
                    if item is not None]
         if ('next' in r.links and 'url' in r.links['next']
-           and get_all_results is True):
+                and get_all_results is True):
             args = kwargs.copy()
             args['next_url'] = r.links['next']['url']
             results.extend(self.list(cls, **args))
