Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from rest_framework.request import Request
from rest_framework.response import Response

from sentry import analytics, deletions
from sentry import analytics, audit_log, deletions
from sentry.analytics.events.sentry_app_installation_token_deleted import (
SentryAppInstallationTokenDeleted,
)
Expand All @@ -18,6 +18,7 @@
)
from sentry.sentry_apps.api.endpoints.sentry_app_details import PARTNERSHIP_RESTRICTED_ERROR_MESSAGE
from sentry.sentry_apps.models.sentry_app_installation_token import SentryAppInstallationToken
from sentry.utils.audit import create_audit_entry


@control_silo_endpoint
Expand Down Expand Up @@ -74,5 +75,12 @@ def delete(self, request: Request, sentry_app, api_token) -> Response:
sentry_app=sentry_app.slug,
)
)
create_audit_entry(
request=request,
organization_id=sentry_app_installation.organization_id,
target_object=api_token.id,
event=audit_log.get_event_id("INTERNAL_INTEGRATION_REMOVE_TOKEN"),
data={"sentry_app": sentry_app.name},
)

return Response(status=204)
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def post(self, request: Request, sentry_app) -> Response:
request.user, (User, RpcUser)
), "User must be authenticated to install a sentry app"
api_token = SentryAppInstallationTokenCreator(
sentry_app_installation=sentry_app_installation
sentry_app_installation=sentry_app_installation, generate_audit=True
).run(request=request, user=request.user)
except ApiTokenLimitError as e:
return Response(str(e), status=status.HTTP_403_FORBIDDEN)
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/sentry_apps/installations.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def audit(self, request: HttpRequest | None, api_token: ApiToken) -> None:
if request and self.generate_audit:
create_audit_entry(
request=request,
organization=self.organization_id,
organization_id=self.organization_id,
target_object=api_token.id,
event=audit_log.get_event_id("INTERNAL_INTEGRATION_ADD_TOKEN"),
data={"sentry_app": self.sentry_app.name},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from django.test import override_settings
from rest_framework import status

from sentry import audit_log
from sentry.models.apitoken import ApiToken
from sentry.testutils.asserts import assert_org_audit_log_exists
from sentry.testutils.cases import APITestCase
from sentry.testutils.helpers.options import override_options
from sentry.testutils.silo import control_silo_test
Expand All @@ -28,12 +30,20 @@ def setUp(self) -> None:

def test_delete_token(self) -> None:
self.login_as(user=self.user)
token_id = self.api_token.id
self.get_success_response(
self.internal_sentry_app.slug,
self.api_token.id,
token_id,
status_code=status.HTTP_204_NO_CONTENT,
)
assert not ApiToken.objects.filter(pk=self.api_token.id).exists()
assert not ApiToken.objects.filter(pk=token_id).exists()

assert_org_audit_log_exists(
organization=self.org,
event=audit_log.get_event_id("INTERNAL_INTEGRATION_REMOVE_TOKEN"),
target_object=token_id,
actor=self.user,
)

def test_delete_invalid_token(self) -> None:
self.login_as(user=self.user)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from django.test import override_settings
from rest_framework import status

from sentry import audit_log
from sentry.models.apitoken import ApiToken
from sentry.sentry_apps.models.sentry_app import MASKED_VALUE
from sentry.testutils.asserts import assert_org_audit_log_exists
from sentry.testutils.cases import APITestCase
from sentry.testutils.helpers.options import override_options
from sentry.testutils.silo import control_silo_test
Expand Down Expand Up @@ -35,7 +37,15 @@ def test_create_token(self) -> None:
self.internal_sentry_app.slug, status_code=status.HTTP_201_CREATED
)

assert ApiToken.objects.get(token=response.data["token"])
api_token = ApiToken.objects.get(token=response.data["token"])
assert api_token

assert_org_audit_log_exists(
organization=self.org,
event=audit_log.get_event_id("INTERNAL_INTEGRATION_ADD_TOKEN"),
target_object=api_token.id,
actor=self.user,
)

def test_non_internal_app(self) -> None:
sentry_app = self.create_sentry_app(name="My External App", organization=self.org)
Expand Down