{"repo": "getsentry/sentry", "pull_number": 16863, "instance_id": "getsentry__sentry-16863", "issue_numbers": "", "base_commit": "f9d8aada50224fe21d992b76909db12235aa7a7f", "patch": "diff --git a/src/social_auth/backends/__init__.py b/src/social_auth/backends/__init__.py\n--- a/src/social_auth/backends/__init__.py\n+++ b/src/social_auth/backends/__init__.py\n@@ -16,6 +16,7 @@\n import six\n import threading\n \n+from requests_oauthlib import OAuth1\n from django.contrib.auth import authenticate\n from django.utils.crypto import get_random_string, constant_time_compare\n from six.moves.urllib.error import HTTPError\n@@ -29,6 +30,7 @@\n     clean_partial_pipeline,\n     url_add_parameters,\n     dsa_urlopen,\n+    parse_qs,\n )\n from social_auth.exceptions import (\n     StopPipeline,\n@@ -41,8 +43,6 @@\n     AuthStateForbidden,\n     BackendError,\n )\n-from social_auth.backends.utils import build_consumer_oauth_request\n-from oauth2 import Consumer as OAuthConsumer, Token, Request as OAuthRequest\n \n from sentry.utils import json\n \n@@ -359,7 +359,7 @@ def build_absolute_uri(self, path=None):\n         return uri\n \n \n-class BaseOAuth(BaseAuth):\n+class OAuthAuth(BaseAuth):\n     \"\"\"OAuth base class\"\"\"\n \n     SETTINGS_KEY_NAME = \"\"\n@@ -371,7 +371,7 @@ class BaseOAuth(BaseAuth):\n \n     def __init__(self, request, redirect):\n         \"\"\"Init method\"\"\"\n-        super(BaseOAuth, self).__init__(request, redirect)\n+        super(OAuthAuth, self).__init__(request, redirect)\n         self.redirect_uri = self.build_absolute_uri(self.redirect)\n \n     @classmethod\n@@ -405,7 +405,7 @@ def user_data(self, access_token, *args, **kwargs):\n         return {}\n \n \n-class ConsumerBasedOAuth(BaseOAuth):\n+class BaseOAuth1(OAuthAuth):\n     \"\"\"Consumer based mechanism OAuth authentication, fill the needed\n     parameters to communicate properly with authentication service.\n \n@@ -426,7 +426,7 @@ def auth_url(self):\n             self.request.session[name] = []\n         self.request.session[name].append(token.to_string())\n         self.request.session.modified = True\n-        return self.oauth_authorization_request(token).to_url()\n+        return self.oauth_authorization_request(token)\n \n     def auth_complete(self, *args, **kwargs):\n         \"\"\"Return user, might be logged in\"\"\"\n@@ -437,8 +437,10 @@ def auth_complete(self, *args, **kwargs):\n         if not unauthed_tokens:\n             raise AuthTokenError(self, \"Missing unauthorized token\")\n         for unauthed_token in unauthed_tokens:\n-            token = Token.from_string(unauthed_token)\n-            if token.key == self.data.get(\"oauth_token\", \"no-token\"):\n+            token = unauthed_token\n+            if not isinstance(unauthed_token, dict):\n+                token = parse_qs(unauthed_token)\n+            if token.get(\"oauth_token\") == self.data.get(\"oauth_token\"):\n                 unauthed_tokens = list(set(unauthed_tokens) - set([unauthed_token]))\n                 self.request.session[name] = unauthed_tokens\n                 self.request.session.modified = True\n@@ -457,9 +459,6 @@ def auth_complete(self, *args, **kwargs):\n \n     def do_auth(self, access_token, *args, **kwargs):\n         \"\"\"Finish the auth process once the access_token was retrieved\"\"\"\n-        if isinstance(access_token, six.string_types):\n-            access_token = Token.from_string(access_token)\n-\n         data = self.user_data(access_token)\n         if data is not None:\n             data[\"access_token\"] = access_token.to_string()\n@@ -469,29 +468,42 @@ def do_auth(self, access_token, *args, **kwargs):\n \n     def unauthorized_token(self):\n         \"\"\"Return request for unauthorized token (first stage)\"\"\"\n-        request = self.oauth_request(\n-            token=None,\n+        params = self.request_token_extra_arguments()\n+        params.update(self.get_scope_argument())\n+        key, secret = self.get_key_and_secret()\n+        response = self.request(\n             url=self.REQUEST_TOKEN_URL,\n-            extra_params=self.request_token_extra_arguments(),\n+            params=params,\n+            auth=OAuth1(key, secret, callback_uri=self.redirect_uri),\n         )\n-        return Token.from_string(self.fetch_response(request))\n+        return response.content\n \n     def oauth_authorization_request(self, token):\n         \"\"\"Generate OAuth request to authorize token.\"\"\"\n+        if not isinstance(token, dict):\n+            token = parse_qs(token)\n         params = self.auth_extra_arguments() or {}\n         params.update(self.get_scope_argument())\n-        return OAuthRequest.from_token_and_callback(\n-            token=token,\n-            callback=self.redirect_uri,\n-            http_url=self.AUTHORIZATION_URL,\n-            parameters=params,\n+        params[\"oauth_token\"] = token.get(\"oauth_token\")\n+        params[\"redirect_uri\"] = self.redirect_uri\n+        return self.AUTHORIZATION_URL + \"?\" + urlencode(params)\n+\n+    def oauth_auth(self, token=None, oauth_verifier=None):\n+        key, secret = self.get_key_and_secret()\n+        oauth_verifier = oauth_verifier or self.data.get(\"oauth_verifier\")\n+        token = token or {}\n+        return OAuth1(\n+            key,\n+            secret,\n+            resource_owner_key=token.get(\"oauth_token\"),\n+            resource_owner_secret=token.get(\"oauth_token_secret\"),\n+            callback_uri=self.redirect_uri,\n+            verifier=oauth_verifier,\n         )\n \n-    def oauth_request(self, token, url, extra_params=None):\n+    def oauth_request(self, token, url, extra_params=None, method=\"GET\"):\n         \"\"\"Generate OAuth request, setups callback url\"\"\"\n-        return build_consumer_oauth_request(\n-            self, token, url, self.redirect_uri, self.data.get(\"oauth_verifier\"), extra_params\n-        )\n+        return self.request(url, auth=self.oauth_auth(token))\n \n     def fetch_response(self, request):\n         \"\"\"Executes request and fetchs service response\"\"\"\n@@ -500,16 +512,10 @@ def fetch_response(self, request):\n \n     def access_token(self, token):\n         \"\"\"Return request for access token value\"\"\"\n-        request = self.oauth_request(token, self.ACCESS_TOKEN_URL)\n-        return Token.from_string(self.fetch_response(request))\n-\n-    @property\n-    def consumer(self):\n-        \"\"\"Setups consumer\"\"\"\n-        return OAuthConsumer(*self.get_key_and_secret())\n+        return self.get_querystring(self.ACCESS_TOKEN_URL, auth=self.oauth_auth(token))\n \n \n-class BaseOAuth2(BaseOAuth):\n+class BaseOAuth2(OAuthAuth):\n     \"\"\"Base class for OAuth2 providers.\n \n     OAuth2 draft details at:\ndiff --git a/src/social_auth/backends/bitbucket.py b/src/social_auth/backends/bitbucket.py\n--- a/src/social_auth/backends/bitbucket.py\n+++ b/src/social_auth/backends/bitbucket.py\n@@ -14,7 +14,7 @@\n \n import simplejson\n \n-from social_auth.backends import ConsumerBasedOAuth, OAuthBackend\n+from social_auth.backends import BaseOAuth1, OAuthBackend\n from social_auth.utils import dsa_urlopen\n \n # Bitbucket configuration\n@@ -67,7 +67,7 @@ def tokens(cls, instance):\n         return token\n \n \n-class BitbucketAuth(ConsumerBasedOAuth):\n+class BitbucketAuth(BaseOAuth1):\n     \"\"\"Bitbucket OAuth authentication mechanism\"\"\"\n \n     AUTHORIZATION_URL = BITBUCKET_AUTHORIZATION_URL\ndiff --git a/src/social_auth/backends/utils.py b/src/social_auth/backends/utils.py\ndeleted file mode 100644\n--- a/src/social_auth/backends/utils.py\n+++ /dev/null\n@@ -1,52 +0,0 @@\n-from __future__ import absolute_import\n-\n-from oauth2 import (\n-    Consumer as OAuthConsumer,\n-    Token,\n-    Request as OAuthRequest,\n-    SignatureMethod_HMAC_SHA1,\n-    HTTP_METHOD,\n-)\n-\n-import simplejson\n-\n-from social_auth.models import UserSocialAuth\n-from social_auth.utils import dsa_urlopen\n-\n-\n-def consumer_oauth_url_request(backend, url, user_or_id, redirect_uri=\"/\", json=True):\n-    \"\"\"Builds and retrieves an OAuth signed response.\"\"\"\n-    user = UserSocialAuth.resolve_user_or_id(user_or_id)\n-    oauth_info = user.social_auth.filter(provider=backend.AUTH_BACKEND.name)[0]\n-    token = Token.from_string(oauth_info.tokens[\"access_token\"])\n-    request = build_consumer_oauth_request(backend, token, url, redirect_uri)\n-    response = \"\\n\".join(dsa_urlopen(request.to_url()).readlines())\n-\n-    if json:\n-        response = simplejson.loads(response)\n-    return response\n-\n-\n-def build_consumer_oauth_request(\n-    backend,\n-    token,\n-    url,\n-    redirect_uri=\"/\",\n-    oauth_verifier=None,\n-    extra_params=None,\n-    method=HTTP_METHOD,\n-):\n-    \"\"\"Builds a Consumer OAuth request.\"\"\"\n-    params = {\"oauth_callback\": redirect_uri}\n-    if extra_params:\n-        params.update(extra_params)\n-\n-    if oauth_verifier:\n-        params[\"oauth_verifier\"] = oauth_verifier\n-\n-    consumer = OAuthConsumer(*backend.get_key_and_secret())\n-    request = OAuthRequest.from_consumer_and_token(\n-        consumer, token=token, http_method=method, http_url=url, parameters=params\n-    )\n-    request.sign_request(SignatureMethod_HMAC_SHA1(), consumer, token)\n-    return request\ndiff --git a/src/social_auth/utils.py b/src/social_auth/utils.py\n--- a/src/social_auth/utils.py\n+++ b/src/social_auth/utils.py\n@@ -3,6 +3,8 @@\n import random\n import logging\n from importlib import import_module\n+import six\n+from six.moves.urllib.parse import parse_qs as urlparse_parse_qs\n \n from cgi import parse_qsl\n from django.conf import settings\n@@ -131,6 +133,15 @@ def module_member(name):\n     return getattr(module, member)\n \n \n+def parse_qs(value):\n+    \"\"\"Like urlparse.parse_qs but transform list values to single items\"\"\"\n+    return drop_lists(urlparse_parse_qs(value))\n+\n+\n+def drop_lists(value):\n+    return dict((key, val[0]) for key, val in six.iteritems(value))\n+\n+\n if __name__ == \"__main__\":\n     import doctest\n \n", "test_patch": "", "problem_statement": "", "hints_text": "", "created_at": "2020-02-07T00:02:09Z"}