Skip to content

Add hint support for jwt helper #15

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 2 commits into from
Jul 23, 2025
Merged

Add hint support for jwt helper #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9dbc7b
Add hint support for jwt helper
kfox1111 Jul 22, 2025
7b53140
Incorperate feedback
kfox1111 Jul 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
16 changes: 15 additions & 1 deletion cmd/jwt_credential_process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,24 @@ func newJWTCredentialProcessCmd() (*cobra.Command, error) {
params := jwtsvid.Params{
Audience: sf.audience,
}
svid, err := client.FetchJWTSVID(ctx, params)
svids, err := client.FetchJWTSVIDs(ctx, params)
if err != nil {
return fmt.Errorf("fetching jwt: %w", err)
}
svid := svids[0]
if sf.hint != "" {
found := false
for _, s := range svids {
if s.Hint == sf.hint {
found = true
svid = s
break
}
}
if !found {
return fmt.Errorf("could not find the specified SVID")
}
}
// TODO(strideynet): Implement SVID selection mechanism, for now,
// we'll just use the first returned SVID (a.k.a the default).
slog.Debug("Fetched JWT SVID", "svid", jwtSVIDValue(svid))
Expand Down
2 changes: 2 additions & 0 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ type sharedJWTFlags struct {
endpoint string
sessionDuration int
workloadAPIAddr string
hint string
}

func (f *sharedJWTFlags) addFlags(cmd *cobra.Command) error {
Expand All @@ -125,6 +126,7 @@ func (f *sharedJWTFlags) addFlags(cmd *cobra.Command) error {
cmd.Flags().IntVar(&f.sessionDuration, "session-duration", 3600, "The duration, in seconds, of the resulting session. Optional. Can range from 15 minutes (900) to 12 hours (43200).")
cmd.Flags().StringVar(&f.workloadAPIAddr, "workload-api-addr", "", "Overrides the address of the Workload API endpoint that will be use to fetch the X509 SVID. If unspecified, the value from the SPIFFE_ENDPOINT_SOCKET environment variable will be used.")
cmd.Flags().StringVar(&f.roleARN, "role-arn", "", "The ARN of the role to assume.")
cmd.Flags().StringVar(&f.hint, "hint", "", "Hint to use to find the SVID.")
return nil
}

Expand Down