From 5d01a07a4287ee0fd1fd441d72da665a7704a382 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 1 Apr 2024 01:54:10 +0100 Subject: Don't propagate the status received from Discord to GitHub Webhook --- pydis_site/apps/api/views.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pydis_site/apps/api/views.py') diff --git a/pydis_site/apps/api/views.py b/pydis_site/apps/api/views.py index 1fa3efc2..ab7a5cf3 100644 --- a/pydis_site/apps/api/views.py +++ b/pydis_site/apps/api/views.py @@ -305,7 +305,14 @@ class GitHubWebhookFilterView(APIView): ) headers.pop('Connection', None) headers.pop('Content-Length', None) - return Response(data=body, headers=headers, status=response_status) + + response_body = { + "original_status": response_status, + "data": body.decode("utf-8"), + "headers": headers, + } + + return Response(response_body) def send_webhook( self, -- cgit v1.2.3 From 02787cd74a60df0d7254d49716764f97d034a200 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 1 Apr 2024 12:45:50 +0100 Subject: No need to remove headers in GitHub Filter Endpoint --- pydis_site/apps/api/views.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'pydis_site/apps/api/views.py') diff --git a/pydis_site/apps/api/views.py b/pydis_site/apps/api/views.py index ab7a5cf3..787f8811 100644 --- a/pydis_site/apps/api/views.py +++ b/pydis_site/apps/api/views.py @@ -303,8 +303,6 @@ class GitHubWebhookFilterView(APIView): (response_status, headers, body) = self.send_webhook( webhook_id, webhook_token, request.data, dict(request.headers), ) - headers.pop('Connection', None) - headers.pop('Content-Length', None) response_body = { "original_status": response_status, -- cgit v1.2.3 From 3d04acc24d32d82bf1d817adaae9c65a0cd7ef92 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 1 Apr 2024 12:59:00 +0100 Subject: Log failed webhook attempts to stderr in GitHub Webhook Filter --- pydis_site/apps/api/tests/test_github_webhook_filter.py | 14 ++++++++++++++ pydis_site/apps/api/views.py | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) (limited to 'pydis_site/apps/api/views.py') diff --git a/pydis_site/apps/api/tests/test_github_webhook_filter.py b/pydis_site/apps/api/tests/test_github_webhook_filter.py index a2a00d4c..649a9e64 100644 --- a/pydis_site/apps/api/tests/test_github_webhook_filter.py +++ b/pydis_site/apps/api/tests/test_github_webhook_filter.py @@ -62,3 +62,17 @@ class GitHubWebhookFilterAPITests(APITestCase): self.client.post(url, data=payload, headers=headers) logger.warning.assert_called_once() + + def test_other_error_is_logged(self): + url = reverse('api:github-webhook-filter', args=('id', 'token')) + payload = {} + headers = {'X-GitHub-Event': 'pull_request_review'} + with ( + mock.patch('urllib.request.urlopen') as urlopen, + mock.patch.object(GitHubWebhookFilterView, "logger") as logger, + ): + urlopen.side_effect = HTTPError(None, 451, 'Unavailable For Legal Reasons', {}, None) + logger.warning = mock.PropertyMock() + self.client.post(url, data=payload, headers=headers) + + logger.warning.assert_called_once() diff --git a/pydis_site/apps/api/views.py b/pydis_site/apps/api/views.py index 787f8811..a3b0016c 100644 --- a/pydis_site/apps/api/views.py +++ b/pydis_site/apps/api/views.py @@ -304,9 +304,21 @@ class GitHubWebhookFilterView(APIView): webhook_id, webhook_token, request.data, dict(request.headers), ) + body_decoded = body.decode("utf-8") + + if ( + not (status.HTTP_200_OK <= response_status < status.HTTP_300_MULTIPLE_CHOICES) + and response_status != status.HTTP_429_TOO_MANY_REQUESTS + ): + self.logger.warning( + "Failed to send GitHub webhook to Discord. Response code %d, body: %s", + response_status, + body_decoded, + ) + response_body = { "original_status": response_status, - "data": body.decode("utf-8"), + "data": body_decoded, "headers": headers, } -- cgit v1.2.3