session: Fix API leak pt2

crobinso · crobinso · commit b9eaa598a82d · 2024-02-13T14:38:22.000-05:00
Between the time 182e0b0 was written, 138caf8 was committed which inadvertently loosened up the api_key scraping. Go back to catching `Exception` so we try harder to scrape api_key from error messages. Signed-off-by: Cole Robinson <crobinso@redhat.com>
diff --git a/bugzilla/_session.py b/bugzilla/_session.py
@@ -107,12 +107,15 @@ def request(self, *args, **kwargs):
                 response.encoding = "UTF-8"
 
             response.raise_for_status()
-        except requests.HTTPError as e:
+        except Exception as e:
             # Scrape the api key out of the returned exception string
             message = str(e).replace(self._api_key or "", "")
-            response = getattr(e, "response", None)
-            raise BugzillaHTTPError(message, response=response).with_traceback(
-                sys.exc_info()[2]
-            )
+            if isinstance(e, requests.HTTPError):
+                response = getattr(e, "response", None)
+                raise BugzillaHTTPError(
+                    message, response=response).with_traceback(
+                        sys.exc_info()[2])
+            raise type(e)(message).with_traceback(sys.exc_info()[2])
+
 
         return response
