Skip to content

[v18] Fix case where renewed X509 SVIDs would not be sent via SDS #62830

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
strideynet merged 2 commits into from
Jan 15, 2026
Merged

[v18] Fix case where renewed X509 SVIDs would not be sent via SDS #62830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af80849
Fix case where renewed X509 SVIDs would not be sent via SDS
strideynet Jan 13, 2026
4e84ce7
Add comment
strideynet Jan 13, 2026
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
2 changes: 2 additions & 0 deletions lib/tbot/internal/sds/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ func (h *Handler) StreamSecrets(
case <-renewalTimer.C:
// Handle renewal time!
log.DebugContext(ctx, "Renewing SVIDs for StreamSecrets stream")
// Set svids to nil to fetching of fresh SVIDs
svids = nil
}

// Fetch the SVIDs if necessary
Expand Down
6 changes: 4 additions & 2 deletions lib/tbot/services/workloadidentity/workload_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,10 @@ func (s *WorkloadAPIService) Run(ctx context.Context) error {
)
workloadpb.RegisterSpiffeWorkloadAPIServer(srv, s)
sdsHandler, err := sds.NewHandler(sds.HandlerConfig{
Logger: s.log,
RenewalInterval: s.defaultCredentialLifetime.RenewalInterval,
Logger: s.log,
RenewalInterval: cmp.Or(
s.cfg.CredentialLifetime, s.defaultCredentialLifetime,
).RenewalInterval,
TrustBundleCache: s.trustBundleCache,
ClientAuthenticator: func(ctx context.Context) (*slog.Logger, sds.SVIDFetcher, error) {
log, attrs, err := s.authenticateClient(ctx)
Expand Down
Loading