Skip to content

Record audit entry when API tokens are auto-revoked #2759

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
migmartri merged 1 commit into from
Feb 19, 2026
Merged

Record audit entry when API tokens are auto-revoked #2759

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion app/controlplane/pkg/auditor/events/apitoken.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2025 The Chainloop Authors.
// Copyright 2025-2026 The Chainloop Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -95,6 +95,12 @@ type APITokenRevoked struct {
*APITokenBase
}

// RequiresActor returns false because revocations can be system-generated
// (e.g. auto-revoked due to inactivity by APITokenStaleRevoker).
func (a *APITokenRevoked) RequiresActor() bool {
return false
}

func (a *APITokenRevoked) ActionType() string {
return APITokenRevokedActionType
}
Expand Down
21 changes: 18 additions & 3 deletions app/controlplane/pkg/auditor/events/apitoken_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2025 The Chainloop Authors.
// Copyright 2025-2026 The Chainloop Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -100,16 +100,31 @@ func TestAPITokenEvents(t *testing.T) {
actor: auditor.ActorTypeAPIToken,
actorID: apiTokenUUID,
},
{
name: "API Token auto-revoked by system",
event: &events.APITokenRevoked{
APITokenBase: &events.APITokenBase{
APITokenID: uuidPtr(apiTokenUUID),
APITokenName: apiTokenName,
},
},
expected: "testdata/apitokens/api_token_revoked_by_system.json",
actor: auditor.ActorTypeSystem,
actorID: uuid.Nil,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
opts := []auditor.GeneratorOption{
auditor.WithOrgID(orgUUID),
}
if tt.actor == auditor.ActorTypeAPIToken {
switch tt.actor {
case auditor.ActorTypeAPIToken:
opts = append(opts, auditor.WithActor(auditor.ActorTypeAPIToken, tt.actorID, "", testAPITokenName))
} else {
case auditor.ActorTypeSystem:
opts = append(opts, auditor.WithActor(auditor.ActorTypeSystem, uuid.Nil, "", ""))
default:
opts = append(opts, auditor.WithActor(auditor.ActorTypeUser, tt.actorID, testEmail, testName))
}

Expand Down
16 changes: 16 additions & 0 deletions app/controlplane/pkg/auditor/events/testdata/apitokens/api_token_revoked_by_system.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"ActionType": "APITokenRevoked",
"TargetType": "APIToken",
"TargetID": "2089bb36-e27b-428b-8009-d015c8737c55",
"ActorType": "SYSTEM",
"ActorID": null,
"ActorEmail": "",
"ActorName": "",
"OrgID": "1089bb36-e27b-428b-8009-d015c8737c54",
"Description": "system@chainloop.dev has revoked the API token test-token",
"Info": {
"api_token_id": "2089bb36-e27b-428b-8009-d015c8737c55",
"api_token_name": "test-token"
},
"Digest": "sha256:f867390a401bccbb15270dd2b54bf325dc56918925da9179af10f12787f0af24"
}
Loading