Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Handle exceptions raised when fetching Django request data #758

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion google/cloud/logging_v2/handlers/_helpers.py
Expand Up @@ -104,10 +104,17 @@ def get_request_data_from_django():
if request is None:
return None, None, None, False

# Django can raise django.core.exceptions.DisallowedHost here for a
# malformed HTTP_HOST header. But we don't want to import Django modules.
try:
request_url = request.build_absolute_uri()
except Exception:
request_url = None

# build http_request
http_request = {
"requestMethod": request.method,
"requestUrl": request.build_absolute_uri(),
"requestUrl": request_url,
"userAgent": request.META.get(_DJANGO_USERAGENT_HEADER),
"protocol": request.META.get(_PROTOCOL_HEADER),
}
Expand Down
13 changes: 13 additions & 0 deletions tests/unit/handlers/test__helpers.py
Expand Up @@ -242,6 +242,19 @@ def test_http_request_sparse(self):
self.assertEqual(http_request["requestUrl"], expected_path)
self.assertEqual(http_request["protocol"], "HTTP/1.1")

def test_invalid_host_header(self):
from django.test import RequestFactory
from google.cloud.logging_v2.handlers.middleware import request

invalid_http_host = "testserver%7d"
django_request = RequestFactory().put("/", HTTP_HOST=invalid_http_host)
middleware = request.RequestMiddleware(None)
middleware(django_request)
http_request, *_ = self._call_fut()
self.assertEqual(http_request["requestMethod"], "PUT")
self.assertIsNone(http_request["requestUrl"])
self.assertEqual(http_request["protocol"], "HTTP/1.1")


class Test_get_request_data(unittest.TestCase):
@staticmethod
Expand Down