add a few missing raise_for_status()es

fixes (kind of) https://console.cloud.google.com/errors/CKiml7rk7vy96gE
snarfed · Mar 29, 2021 · 277133c · 277133c
1 parent 608bd7c
commit 277133c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/oauth_dropins/github.py b/oauth_dropins/github.py
@@ -162,7 +162,9 @@ def get(self):
       'redirect_uri': self.request.path_url,
       }
     resp = util.requests_post(GET_ACCESS_TOKEN_URL,
-                              data=urllib.parse.urlencode(data)).text
+                              data=urllib.parse.urlencode(data))
+    resp.raise_for_status()
+    resp = resp.text
     logging.debug('Access token response: %s', resp)
 
     resp = urllib.parse.parse_qs(resp)

diff --git a/oauth_dropins/mastodon.py b/oauth_dropins/mastodon.py
@@ -222,6 +222,7 @@ def redirect_url(self, state=None, instance=None):
     # actually a Mastodon instance)
     try:
       resp = util.requests_get(urljoin(instance, INSTANCE_API))
+      resp.raise_for_status()
     except requests.RequestException as e:
       logging.info('Error', stack_info=True)
       resp = None

diff --git a/oauth_dropins/webutil b/oauth_dropins/webutil
diff --git a/oauth_dropins/wordpress_rest.py b/oauth_dropins/wordpress_rest.py
@@ -139,10 +139,11 @@ def get(self):
       'grant_type': 'authorization_code',
     }
     resp = util.requests_post(GET_ACCESS_TOKEN_URL, data=data)
+    resp.raise_for_status()
     logging.debug('Access token response: %s', resp.text)
 
     try:
-      resp = json_loads(resp.text)
+      resp = resp.json()
       error = resp.get('error')
       if error:
         raise exc.HTTPBadRequest('Error: %s %s ' %
@@ -153,7 +154,7 @@ def get(self):
       blog_domain = util.domain_from_link(resp['blog_url'])
       access_token = resp['access_token']
     except:
-      logging.error('Could not decode JSON', stack_info=True)
+      logging.error(f'Could not decode JSON: {resp.text}', stack_info=True)
       raise
 
     auth = WordPressAuth(id=blog_domain,