From 1df8d071113026d1572bf05d64202ccd3e4c845a Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Fri, 16 Jun 2023 14:08:07 +0200 Subject: [PATCH 1/3] fix(user-feedback-dialog): Set header on user feedback dialog embed response --- src/sentry/web/frontend/error_page_embed.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sentry/web/frontend/error_page_embed.py b/src/sentry/web/frontend/error_page_embed.py index c7242c88309c56..12588a3b1a76cd 100644 --- a/src/sentry/web/frontend/error_page_embed.py +++ b/src/sentry/web/frontend/error_page_embed.py @@ -227,6 +227,11 @@ def dispatch(self, request: Request) -> Response: ), } - return render_to_response( + response = render_to_response( "sentry/error-page-embed.js", context, request, content_type="text/javascript" ) + + # User feedback dialog should be available regardless of cross-origin policy + response["Access-Control-Allow-Origin"] = "*" + + return response From 0e18aedf0e73b88ae5eb9e02e66232974b82e096 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Fri, 16 Jun 2023 14:12:48 +0200 Subject: [PATCH 2/3] Rename response var --- src/sentry/web/frontend/error_page_embed.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sentry/web/frontend/error_page_embed.py b/src/sentry/web/frontend/error_page_embed.py index 12588a3b1a76cd..cc2ceabcdd922b 100644 --- a/src/sentry/web/frontend/error_page_embed.py +++ b/src/sentry/web/frontend/error_page_embed.py @@ -227,11 +227,11 @@ def dispatch(self, request: Request) -> Response: ), } - response = render_to_response( + errorPageEmbedResponse = render_to_response( "sentry/error-page-embed.js", context, request, content_type="text/javascript" ) # User feedback dialog should be available regardless of cross-origin policy - response["Access-Control-Allow-Origin"] = "*" + errorPageEmbedResponse["Access-Control-Allow-Origin"] = "*" - return response + return errorPageEmbedResponse From f3eff30acf4740daacf6e21c11772d36cb9c8af9 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 21 Jun 2023 11:16:38 +0200 Subject: [PATCH 3/3] Add test assertion for Access-Control-Allow-Origin header --- tests/sentry/web/frontend/test_error_page_embed.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sentry/web/frontend/test_error_page_embed.py b/tests/sentry/web/frontend/test_error_page_embed.py index c75ba5f10aaa63..db984d18a7d12b 100644 --- a/tests/sentry/web/frontend/test_error_page_embed.py +++ b/tests/sentry/web/frontend/test_error_page_embed.py @@ -71,6 +71,7 @@ def test_renders(self): HTTP_ACCEPT="text/html, text/javascript", ) assert resp.status_code == 200, resp.content + assert resp["Access-Control-Allow-Origin"] == "*" self.assertTemplateUsed(resp, "sentry/error-page-embed.html") def test_uses_locale_from_header(self):