fix(integrations): Handle ValueError for non-numeric organization_id in webhook parsers#112716
Draft
sentry[bot] wants to merge 1 commit intomasterfrom
Draft
fix(integrations): Handle ValueError for non-numeric organization_id in webhook parsers#112716sentry[bot] wants to merge 1 commit intomasterfrom
sentry[bot] wants to merge 1 commit intomasterfrom
Conversation
…in webhook parsers
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR addresses SENTRY-5M2H, where webhook endpoints for integrations (specifically Bitbucket and legacy plugins) were crashing due to
ValueError: invalid literal for int() with base 10.Root Cause:
The URL patterns for these webhooks use
(?P<organization_id>[^/]+)to capture theorganization_id. While this allows for both numeric IDs and alphanumeric slugs, it also permits malformed values like'1,2,3'. When such a value was passed toOrganizationMapping.objects.get(organization_id=organization_id), the Django ORM attempted to convert'1,2,3'to an integer, resulting in aValueError.Solution:
Instead of tightening the URL regex (which could break legitimate slug usage), the fix involves gracefully handling the
ValueErrorat the application level. TheOrganizationMapping.objects.get()calls inBitbucketRequestParser.get_bitbucket_webhook_response()andPluginRequestParser.get_response()are now wrapped in atry-exceptblock that catches bothOrganizationMapping.DoesNotExistandValueError. This ensures that if a non-numericorganization_idis provided, it's treated as aLegal Boilerplate
Look, I get it. The entity doing business as "Sentry" was incorporated in the State of Delaware in 2015 as Functional Software, Inc. and is gonna need some rights from me in order to utilize my contributions in this here PR. So here's the deal: I retain all rights, title and interest in and to my contributions, and by keeping this boilerplate intact I confirm that Sentry can use, modify, copy, and redistribute my contributions, under Sentry's choice of terms.
Fixes SENTRY-5M2H