Skip to content

chore(aci): handle OrganizationMember.DoesNotExist when getting target #102113

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 28, 2025
Merged

chore(aci): handle OrganizationMember.DoesNotExist when getting target #102113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4611a0
fix
mifu67 Oct 24, 2025
9bb8788
handle org member/team not existing
mifu67 Oct 28, 2025
bf01de7
do this instead
mifu67 Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/sentry/incidents/endpoints/serializers/alert_rule_trigger_action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ def human_desc(
return "Send a notification to " + target.get_email()
elif target_type == AlertRuleTriggerAction.TargetType.TEAM.value:
return "Send an email to members of #" + target.slug
else:
return "Send a notification to [removed]"
Copy link
Contributor

@cursor cursor bot Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: EMAIL Action Missing in Dictionary

The added else clause for EMAIL action type creates a logic gap. When action_target is truthy but target_type is neither USER nor TEAM, the function doesn't return anything from the EMAIL block and falls through to the final else statement (line 48), which tries to access action_type_to_string[action_type]. However, EMAIL is not in the action_type_to_string dictionary (lines 22-27), causing a KeyError. The else clause should be moved inside the if action_target: block to properly handle cases where action_target exists but target_type doesn't match expected values.

Fix in Cursor Fix in Web

elif action_type == AlertRuleTriggerAction.Type.OPSGENIE.value:
if priority:
return f"Send a {priority} Opsgenie notification to {target_display}"
Expand Down
12 changes: 8 additions & 4 deletions ...ication_action/group_type_notification_registry/handlers/metric_alert_registry_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@ def target(action: Action) -> OrganizationMember | Team | str | None:
target_type = action.config.get("target_type")
if target_type == ActionTarget.USER.value:
dcga = DataConditionGroupAction.objects.get(action=action)
return OrganizationMember.objects.get(
user_id=int(target_identifier),
organization=dcga.condition_group.organization,
)
try:
return OrganizationMember.objects.get(
user_id=int(target_identifier),
organization=dcga.condition_group.organization,
)
except OrganizationMember.DoesNotExist:
# user is no longer a member of the organization
pass
Comment on lines +49 to +56
Copy link

@sentry sentry bot Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: human_desc() receives None for target from MetricAlertRegistryHandler.target() and attempts to access attributes, causing an AttributeError.
Severity: CRITICAL | Confidence: 0.98

🔍 Detailed Analysis

When MetricAlertRegistryHandler.target() returns None due to a caught OrganizationMember.DoesNotExist exception, the WorkflowEngineActionSerializer passes this None value to human_desc(). If the action is an email type (AlertRuleTriggerAction.Type.EMAIL.value) targeting a user or team (AlertRuleTriggerAction.TargetType.USER.value or AlertRuleTriggerAction.TargetType.TEAM.value), human_desc() attempts to call target.get_email() or target.slug on the None object. This occurs when an email action is configured for a user or team member who is subsequently deleted, leading to an AttributeError.

💡 Suggested Fix

Modify human_desc() to check if target is None before attempting to access target.get_email() or target.slug when action_type is email and target_type is user or team.

🤖 Prompt for AI Agent 
Fix this bug. In
src/sentry/notifications/notification_action/group_type_notification_registry/handlers/metric_alert_registry_handler.py
at lines 49-56: When `MetricAlertRegistryHandler.target()` returns `None` due to a
caught `OrganizationMember.DoesNotExist` exception, the `WorkflowEngineActionSerializer`
passes this `None` value to `human_desc()`. If the action is an email type
(`AlertRuleTriggerAction.Type.EMAIL.value`) targeting a user or team
(`AlertRuleTriggerAction.TargetType.USER.value` or
`AlertRuleTriggerAction.TargetType.TEAM.value`), `human_desc()` attempts to call
`target.get_email()` or `target.slug` on the `None` object. This occurs when an email
action is configured for a user or team member who is subsequently deleted, leading to
an `AttributeError`.

Did we get this right? 👍 / 👎 to inform future reviews.

elif target_type == ActionTarget.TEAM.value:
try:
return Team.objects.get(id=int(target_identifier))
Expand Down
Loading