Fixed #36267 -- Fixed contenttypes shortcut() view crash with an invalid object_id for a UUIDField pk. #19296
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Thank you @AhmedNassar7 for picking this up. I left some suggestions
django/contrib/contenttypes/views.py
Outdated
Comment on lines
27
to
42
There was a problem hiding this comment.
I don't think we want to special case UUIDField in this way here. Such validation is delegated to the ORM and is not at issue here.
There was a problem hiding this comment.
Rather, we want to catch the uncaught ValidationError in the same way we are catching ValueError and ObjectDoesNotExist and return a 404
django/contrib/contenttypes/views.py
Outdated
Comment on lines
70
to
75
There was a problem hiding this comment.
Don't catch bare Exception
timgraham
reviewed
Mar 23, 2025
django/contrib/contenttypes/views.py
Outdated
Comment on lines
21
to
28
There was a problem hiding this comment.
Suggested change
| try: | |
| obj = content_type.get_object_for_this_type(pk=object_id) | |
| except (ObjectDoesNotExist, ValueError, ValidationError): | |
| raise Http404( | |
| _("Content type %(ct_id)s object %(obj_id)s doesn't exist") | |
| % {"ct_id": content_type_id, "obj_id": object_id} | |
| ) | |
| except ContentType.DoesNotExist: | |
| obj = content_type.get_object_for_this_type(pk=object_id) | |
| except (ObjectDoesNotExist, ValueError, ValidationError): |
the try block we already have should do 👍🏾
django/contrib/contenttypes/views.py
Outdated
There was a problem hiding this comment.
Suggested change
| _("Content type %(ct_id)s doesn’t exist") % {"ct_id": content_type_id} | |
| _("Content type %(ct_id)s object %(obj_id)s doesn’t exist") | |
| % {"ct_id": content_type_id, "obj_id": object_id} |
cliffordgama
approved these changes
Apr 1, 2025
sarahboyce
changed the title
content_type.views.shortcut
timgraham
reviewed
Apr 1, 2025
…lid object_id for a UUIDField pk.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trac ticket number
ticket-36267
Branch description
Addressed an issue in
content_type.views.shortcut, where passing an invalid UUID to the view results in an unhandledValidationError. This occurs when attempting to access the "View on Site" button in the Django admin panel with an incorrect UUID format.Checklist
mainbranch.