Skip to content

fix(oidc): no trailing colon on non-action events in claim #1355

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
ecrupper merged 1 commit into from
Sep 17, 2025
Merged

fix(oidc): no trailing colon on non-action events in claim #1355

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
fix(oidc): no trailing colon on non-action events in claim
  • Loading branch information
@ecrupper
ecrupper committed Sep 17, 2025
commit 667c4ef5d563399084e55eb1568a9e42e4e26e83
7 changes: 6 additions & 1 deletion internal/token/mint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,19 @@ func (tm *Manager) MintIDToken(ctx context.Context, mto *MintTokenOpts, db datab
return "", errors.New("missing build sender for ID token")
}

event := mto.Build.GetEvent()
if len(mto.Build.GetEventAction()) > 0 {
event = fmt.Sprintf("%s:%s", mto.Build.GetEvent(), mto.Build.GetEventAction())
}

// set claims based on input
claims.Actor = mto.Build.GetSender()
claims.ActorSCMID = mto.Build.GetSenderSCMID()
claims.Branch = mto.Build.GetBranch()
claims.BuildNumber = strconv.FormatInt(mto.Build.GetNumber(), 10)
claims.BuildID = strconv.FormatInt(mto.Build.GetID(), 10)
claims.Repo = mto.Repo
claims.Event = fmt.Sprintf("%s:%s", mto.Build.GetEvent(), mto.Build.GetEventAction())
claims.Event = event
claims.PullFork = strconv.FormatBool(mto.Build.GetFork())
claims.SHA = mto.Build.GetCommit()
claims.Ref = mto.Build.GetRef()
Expand Down