Skip to content

fix(aci): simplify DetectorWorkflow connection permission requirements #103799

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+28 −258
Draft

fix(aci): simplify DetectorWorkflow connection permission requirements #103799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48dd0b9
fix(aci): simplify DetectorWorkflow connection permission requirements
ameliahsu Nov 21, 2025
9743ffe
fix tests, remove unnecessary tests
ameliahsu Nov 22, 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: 1 addition & 1 deletion src/sentry/workflow_engine/endpoints/validators/detector_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def can_edit_detector_workflow_connections(detector: Detector, request: Request)
Anyone with alert write access to the project can connect/disconnect detectors of any type,
which is slightly different from full edit access which differs by detector type.
"""
return can_edit_user_created_detectors(request, detector.project)
return request.access.has_scope("alerts:write")


def validate_detectors_exist_and_have_permissions(
Expand Down
91 changes: 1 addition & 90 deletions tests/sentry/workflow_engine/endpoints/test_organization_detector_workflow_details.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,77 +103,8 @@ def test_does_not_exist(self) -> None:
object_id=self.detector_workflow.id,
).exists()

def test_team_admin_can_disconnect_user_detectors(self) -> None:
self.login_as(user=self.team_admin_user)

detector = self.create_detector(
project=self.create_project(organization=self.organization),
created_by_id=self.user.id,
)
detector_workflow = self.create_detector_workflow(
detector=detector,
workflow=self.workflow,
)
with outbox_runner():
self.get_success_response(
self.organization.slug,
detector_workflow.id,
)

def test_team_admin_can_disconnect_sentry_detectors(self) -> None:
self.login_as(user=self.team_admin_user)

sentry_detector = self.create_detector(
project=self.create_project(organization=self.organization),
)
detector_workflow = self.create_detector_workflow(
detector=sentry_detector,
workflow=self.workflow,
)
with outbox_runner():
self.get_success_response(
self.organization.slug,
detector_workflow.id,
)

def test_team_admin_can_disconnect_detectors_for_accessible_projects(self) -> None:
self.login_as(user=self.team_admin_user)
self.organization.update_option("sentry:alerts_member_write", False)

project_detector = self.create_detector(
project=self.create_project(organization=self.organization, teams=[self.team]),
created_by_id=self.user.id,
)
detector_workflow = self.create_detector_workflow(
detector=project_detector,
workflow=self.workflow,
)
with outbox_runner():
self.get_success_response(
self.organization.slug,
detector_workflow.id,
)

def test_team_admin_cannot_disconnect_detectors_for_other_projects(self) -> None:
self.login_as(user=self.team_admin_user)
self.organization.update_option("sentry:alerts_member_write", False)

other_detector = self.create_detector(
project=self.create_project(organization=self.organization, teams=[]),
created_by_id=self.user.id,
)
detector_workflow = self.create_detector_workflow(
detector=other_detector,
workflow=self.workflow,
)
with outbox_runner():
self.get_error_response(
self.organization.slug,
detector_workflow.id,
status_code=403,
)

def test_member_can_disconnect_user_detectors(self) -> None:
self.organization.update_option("sentry:alerts_member_write", True)
self.organization.flags.allow_joinleave = False
self.organization.save()
self.login_as(user=self.member_user)
Expand All @@ -192,26 +123,6 @@ def test_member_can_disconnect_user_detectors(self) -> None:
detector_workflow.id,
)

def test_member_cannot_disconnect_detectors_for_other_projects(self) -> None:
self.organization.flags.allow_joinleave = False
self.organization.save()
self.login_as(user=self.member_user)

other_detector = self.create_detector(
project=self.create_project(organization=self.organization, teams=[]),
created_by_id=self.user.id,
)
detector_workflow = self.create_detector_workflow(
detector=other_detector,
workflow=self.workflow,
)
with outbox_runner():
self.get_error_response(
self.organization.slug,
detector_workflow.id,
status_code=403,
)

def test_member_cannot_disconnect_detectors_when_alerts_member_write_disabled(self) -> None:
self.organization.update_option("sentry:alerts_member_write", False)
self.organization.flags.allow_joinleave = True
Expand Down
173 changes: 11 additions & 162 deletions tests/sentry/workflow_engine/endpoints/test_organization_detector_workflow_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

from sentry import audit_log
from sentry.deletions.tasks.scheduled import run_scheduled_deletions
from sentry.grouping.grouptype import ErrorGroupType
from sentry.testutils.cases import APITestCase
from sentry.testutils.silo import region_silo_test
from sentry.workflow_engine.models.detector_workflow import DetectorWorkflow
Expand Down Expand Up @@ -195,40 +194,10 @@ def test_missing_body_params(self) -> None:
self.organization.slug,
)

def test_team_admin_can_connect_detectors(self) -> None:
self.login_as(user=self.team_admin_user)
self.organization.update_option("sentry:alerts_member_write", False)

detector = self.create_detector(
project=self.create_project(organization=self.organization, teams=[self.team]),
created_by_id=self.user.id,
)
body_params = {
"detectorId": detector.id,
"workflowId": self.unconnected_workflow.id,
}
self.get_success_response(
self.organization.slug,
**body_params,
)

def test_team_admin_cannot_connect_detectors_for_other_projects(self) -> None:
self.login_as(user=self.team_admin_user)
self.organization.update_option("sentry:alerts_member_write", False)

other_detector = self.create_detector(
project=self.create_project(organization=self.organization, teams=[]),
created_by_id=self.user.id,
)
body_params = {
"detectorId": other_detector.id,
"workflowId": self.unconnected_workflow.id,
}
self.get_error_response(self.organization.slug, **body_params, status_code=403)

def test_member_can_connect_user_created_detectors(self) -> None:
def test_member_can_connect_detectors_with_alerts_write(self) -> None:
self.organization.flags.allow_joinleave = False
self.organization.save()
self.organization.update_option("sentry:alerts_member_write", True)
self.login_as(user=self.member_user)

detector = self.create_detector(
Expand All @@ -244,28 +213,10 @@ def test_member_can_connect_user_created_detectors(self) -> None:
**body_params,
)

def test_member_can_connect_system_created_detectors(self) -> None:
self.organization.flags.allow_joinleave = False
self.organization.save()
self.login_as(user=self.member_user)

detector = self.create_detector(
project=self.create_project(organization=self.organization),
created_by_id=None,
type=ErrorGroupType.slug,
)
body_params = {
"detectorId": detector.id,
"workflowId": self.unconnected_workflow.id,
}
self.get_success_response(
self.organization.slug,
**body_params,
)

def test_member_cannot_connect_detectors_for_other_projects(self) -> None:
def test_member_can_connect_detectors_for_other_projects_with_alerts_write(self) -> None:
self.organization.flags.allow_joinleave = False
self.organization.save()
self.organization.update_option("sentry:alerts_member_write", True)
self.login_as(user=self.member_user)

other_detector = self.create_detector(
Expand All @@ -276,9 +227,9 @@ def test_member_cannot_connect_detectors_for_other_projects(self) -> None:
"detectorId": other_detector.id,
"workflowId": self.unconnected_workflow.id,
}
self.get_error_response(self.organization.slug, **body_params, status_code=403)
self.get_success_response(self.organization.slug, **body_params)

def test_member_cannot_connect_detectors_when_alerts_member_write_disabled(self) -> None:
def test_member_cannot_connect_detectors_without_alerts_write(self) -> None:
self.organization.update_option("sentry:alerts_member_write", False)
self.organization.flags.allow_joinleave = True
self.organization.save()
Expand Down Expand Up @@ -371,75 +322,10 @@ def test_missing_ids(self) -> None:
self.organization.slug,
)

def test_team_admin_can_disconnect_user_detectors(self) -> None:
self.login_as(user=self.team_admin_user)

detector = self.create_detector(
project=self.create_project(organization=self.organization),
created_by_id=self.user.id,
)
self.create_detector_workflow(
detector=detector,
workflow=self.workflow_1,
)
self.get_success_response(
self.organization.slug,
qs_params={"detector_id": detector.id, "workflow_id": self.workflow_1.id},
)

def test_team_admin_can_disconnect_sentry_detectors(self) -> None:
self.login_as(user=self.team_admin_user)

sentry_detector = self.create_detector(
project=self.create_project(organization=self.organization),
)
self.create_detector_workflow(
detector=sentry_detector,
workflow=self.workflow_1,
)
self.get_success_response(
self.organization.slug,
qs_params={"detector_id": sentry_detector.id, "workflow_id": self.workflow_1.id},
)

def test_team_admin_can_disconnect_detectors_for_accessible_projects(self) -> None:
self.login_as(user=self.team_admin_user)
self.organization.update_option("sentry:alerts_member_write", False)

project_detector = self.create_detector(
project=self.create_project(organization=self.organization, teams=[self.team]),
created_by_id=self.user.id,
)
self.create_detector_workflow(
detector=project_detector,
workflow=self.workflow_1,
)
self.get_success_response(
self.organization.slug,
qs_params={"detector_id": project_detector.id, "workflow_id": self.workflow_1.id},
)

def test_team_admin_cannot_disconnect_detectors_for_other_projects(self) -> None:
self.login_as(user=self.team_admin_user)
self.organization.update_option("sentry:alerts_member_write", False)

other_detector = self.create_detector(
project=self.create_project(organization=self.organization, teams=[]),
created_by_id=self.user.id,
)
self.create_detector_workflow(
detector=other_detector,
workflow=self.workflow_1,
)
self.get_error_response(
self.organization.slug,
qs_params={"detector_id": other_detector.id, "workflow_id": self.workflow_1.id},
status_code=403,
)

def test_member_can_disconnect_user_detectors(self) -> None:
def test_member_can_disconnect_detectors_with_alerts_write(self) -> None:
self.organization.flags.allow_joinleave = False
self.organization.save()
self.organization.update_option("sentry:alerts_member_write", True)
self.login_as(user=self.member_user)

detector = self.create_detector(
Expand All @@ -455,9 +341,10 @@ def test_member_can_disconnect_user_detectors(self) -> None:
qs_params={"detector_id": detector.id, "workflow_id": self.workflow_1.id},
)

def test_member_cannot_disconnect_detectors_for_other_projects(self) -> None:
def test_member_cannot_disconnect_detectors_without_alerts_write(self) -> None:
self.organization.flags.allow_joinleave = False
self.organization.save()
self.organization.update_option("sentry:alerts_member_write", False)
self.login_as(user=self.member_user)

other_detector = self.create_detector(
Expand All @@ -474,45 +361,6 @@ def test_member_cannot_disconnect_detectors_for_other_projects(self) -> None:
status_code=403,
)

def test_member_can_disconnect_system_created_detectors(self) -> None:
self.organization.flags.allow_joinleave = False
self.organization.save()
self.login_as(user=self.member_user)

sentry_detector = self.create_detector(
project=self.create_project(organization=self.organization),
type=ErrorGroupType.slug,
created_by_id=None,
)
self.create_detector_workflow(
detector=sentry_detector,
workflow=self.workflow_1,
)
self.get_success_response(
self.organization.slug,
qs_params={"detector_id": sentry_detector.id, "workflow_id": self.workflow_1.id},
)

def test_member_cannot_disconnect_detectors_when_alerts_member_write_disabled(self) -> None:
self.organization.update_option("sentry:alerts_member_write", False)
self.organization.flags.allow_joinleave = True
self.organization.save()
self.login_as(user=self.member_user)

detector = self.create_detector(
project=self.create_project(organization=self.organization, teams=[self.team]),
created_by_id=self.user.id,
)
self.create_detector_workflow(
detector=detector,
workflow=self.workflow_1,
)
self.get_error_response(
self.organization.slug,
qs_params={"detector_id": detector.id, "workflow_id": self.workflow_1.id},
status_code=403,
)

def test_batch_delete_no_permission(self) -> None:
self.organization.update_option("sentry:alerts_member_write", False)
self.login_as(user=self.member_user)
Expand All @@ -526,6 +374,7 @@ def test_batch_delete_no_permission(self) -> None:
detector=detector,
workflow=self.workflow_1,
)
# Member lacks alerts:write because alerts_member_write is disabled
self.get_error_response(
self.organization.slug,
qs_params={"workflow_id": self.workflow_1.id},
Expand Down
20 changes: 15 additions & 5 deletions tests/sentry/workflow_engine/endpoints/test_organization_workflow_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,8 @@ def test_create_workflow_with_invalid_detector_ids(self) -> None:

assert Workflow.objects.count() == 0

def test_create_workflow_with_unauthorized_detectors(self) -> None:
def test_create_workflow_with_other_project_detector(self) -> None:
self.organization.update_option("sentry:alerts_member_write", True)
self.organization.flags.allow_joinleave = False
self.organization.save()

Expand All @@ -693,15 +694,24 @@ def test_create_workflow_with_unauthorized_detectors(self) -> None:
"detectorIds": [other_detector.id],
}

self.get_error_response(
self.get_success_response(
self.organization.slug,
raw_data=workflow_data,
status_code=403,
)

# Verify no detector-workflow connections were created
# Verify detector-workflow connections was created
created_detector_workflows = DetectorWorkflow.objects.all()
assert created_detector_workflows.count() == 0
assert created_detector_workflows.count() == 1

def test_cannot_create_workflow_without_alerts_write(self) -> None:
self.organization.update_option("sentry:alerts_member_write", False)
self.login_as(user=self.member_user)

self.get_error_response(
self.organization.slug,
raw_data=self.valid_workflow,
status_code=403,
)


@region_silo_test
Expand Down
Loading