From 6ff99e3bea481790782c252c5433e9a88f65c4b0 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Wed, 18 May 2022 20:10:21 +0100
Subject: [PATCH] Downgrade some OIDC exceptions to warnings (#12723)

---
 changelog.d/12723.misc   | 1 +
 synapse/handlers/oidc.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/12723.misc

diff --git a/changelog.d/12723.misc b/changelog.d/12723.misc
new file mode 100644
index 0000000000..4f5bffeda6
--- /dev/null
+++ b/changelog.d/12723.misc
@@ -0,0 +1 @@
+Downgrade some OIDC errors to warnings in the logs, to reduce the noise of Sentry reports.
diff --git a/synapse/handlers/oidc.py b/synapse/handlers/oidc.py
index f6ffb7d18d..9de61d554f 100644
--- a/synapse/handlers/oidc.py
+++ b/synapse/handlers/oidc.py
@@ -224,7 +224,7 @@ class OidcHandler:
             self._sso_handler.render_error(request, "invalid_session", str(e))
             return
         except MacaroonInvalidSignatureException as e:
-            logger.exception("Could not verify session for OIDC callback")
+            logger.warning("Could not verify session for OIDC callback: %s", e)
             self._sso_handler.render_error(request, "mismatching_session", str(e))
             return
 
@@ -827,7 +827,7 @@ class OidcProvider:
             logger.debug("Exchanging OAuth2 code for a token")
             token = await self._exchange_code(code)
         except OidcError as e:
-            logger.exception("Could not exchange OAuth2 code")
+            logger.warning("Could not exchange OAuth2 code: %s", e)
             self._sso_handler.render_error(request, e.error, e.error_description)
             return
 
-- 
GitLab