From 364cc3e68245aa9d7598313fce2420d57d34464d Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Wed, 27 May 2026 11:56:21 +0100
Subject: [PATCH] Rewrap InvalidResponseError to a 502

---
 synapse/handlers/room_policy.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/synapse/handlers/room_policy.py b/synapse/handlers/room_policy.py
index f9dd2fb39e..21e462c88f 100644
--- a/synapse/handlers/room_policy.py
+++ b/synapse/handlers/room_policy.py
@@ -22,7 +22,12 @@ from signedjson.key import decode_verify_key_bytes
 from unpaddedbase64 import decode_base64
 
 from synapse.api.constants import EventTypes
-from synapse.api.errors import Codes, HttpResponseException, SynapseError
+from synapse.api.errors import (
+    Codes,
+    HttpResponseException,
+    InvalidResponseError,
+    SynapseError,
+)
 from synapse.crypto.keyring import VerifyJsonRequest
 from synapse.events import EventBase
 from synapse.util.stringutils import parse_and_validate_server_name
@@ -276,7 +281,7 @@ class RoomPolicyHandler:
                         key_id,
                         event.event_id,
                     )
-        except HttpResponseException as ex:
+        except (HttpResponseException, InvalidResponseError) as ex:
             # re-wrap HTTP errors as `SynapseError` so they can be proxied to clients directly
             raise ex.to_synapse_error() from ex