Skip to content

ref(grouping): Simplify security report grouping strategies #80726

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 1 commit into from
Nov 15, 2024
Merged

ref(grouping): Simplify security report grouping strategies #80726

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 26 additions & 16 deletions src/sentry/grouping/strategies/security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,55 @@
produces_variants,
strategy,
)
from sentry.interfaces.security import Csp, ExpectCT, ExpectStaple, Hpkp, SecurityReport
from sentry.interfaces.security import Csp, ExpectCT, ExpectStaple, Hpkp


def _security_v1(
reported_id: str, obj: SecurityReport, context: GroupingContext, **meta: Any
@strategy(ids=["expect-ct:v1"], interface=ExpectCT, score=1000)
@produces_variants(["default"])
def expect_ct_v1(
interface: ExpectCT, event: Event, context: GroupingContext, **meta: Any
) -> ReturnedVariants:
return {
context["variant"]: BaseGroupingComponent(
id=reported_id,
id="expect-ct",
values=[
BaseGroupingComponent(id="salt", values=[reported_id]),
BaseGroupingComponent(id="hostname", values=[obj.hostname]),
BaseGroupingComponent(id="salt", values=["expect-ct"]),
BaseGroupingComponent(id="hostname", values=[interface.hostname]),
],
)
}


@strategy(ids=["expect-ct:v1"], interface=ExpectCT, score=1000)
@produces_variants(["default"])
def expect_ct_v1(
interface: ExpectCT, event: Event, context: GroupingContext, **meta: Any
) -> ReturnedVariants:
return _security_v1("expect-ct", interface, context=context, **meta)


@strategy(ids=["expect-staple:v1"], interface=ExpectStaple, score=1001)
@produces_variants(["default"])
def expect_staple_v1(
interface: ExpectStaple, event: Event, context: GroupingContext, **meta: Any
) -> ReturnedVariants:
return _security_v1("expect-staple", interface, context=context, **meta)
return {
context["variant"]: BaseGroupingComponent(
id="expect-staple",
values=[
BaseGroupingComponent(id="salt", values=["expect-staple"]),
BaseGroupingComponent(id="hostname", values=[interface.hostname]),
],
)
}


@strategy(ids=["hpkp:v1"], interface=Hpkp, score=1002)
@produces_variants(["default"])
def hpkp_v1(
interface: Hpkp, event: Event, context: GroupingContext, **meta: Any
) -> ReturnedVariants:
return _security_v1("hpkp", interface, context=context, **meta)
return {
context["variant"]: BaseGroupingComponent(
id="hpkp",
values=[
BaseGroupingComponent(id="salt", values=["hpkp"]),
BaseGroupingComponent(id="hostname", values=[interface.hostname]),
],
)
}


@strategy(ids=["csp:v1"], interface=Csp, score=1003)
Expand Down
Loading