CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't log resource staleness when no refresh token is recorded (#4503)

Browse Source
This commit is contained in:
Todd authored and GitHub committed 2024-03-08 15:48:18 -08:00
1 parent 8b8be0c1a7
commit 13d07e51fd
1 file changed
+15 -2
Download Patch File Download Diff File Expand all files Collapse all files
internal/clientcache/internal/cache/refresh.go
Vendored
+15 -2
View File
@@ -203,6 +203,11 @@ func (r *RefreshService) RefreshForSearch(ctx context.Context, authTokenid strin
return errors.Wrap(ctx, err, op)
}
if opts.withIgnoreSearchStaleness || rtv != nil && time.Since(rtv.UpdateTime) > r.maxSearchStaleness {
args := []any{"user", u.Id, "force refresh", opts.withIgnoreSearchStaleness}
if rtv != nil {
args = append(args, "alias staleness", time.Since(rtv.UpdateTime))
}
r.logger.Debug("refreshing aliases before performing search", args...)
if err := r.repo.refreshAliases(ctx, u, tokens, opt...); err != nil {
return errors.Wrap(ctx, err, op)
}
@@ -213,7 +218,11 @@ func (r *RefreshService) RefreshForSearch(ctx context.Context, authTokenid strin
return errors.Wrap(ctx, err, op, errors.WithoutEvent())
}
if opts.withIgnoreSearchStaleness || rtv != nil && time.Since(rtv.UpdateTime) > r.maxSearchStaleness {
r.logger.Debug("refreshing targets before performing search", "user", u.Id, "force refresh", opts.withIgnoreSearchStaleness, "sessions age", time.Since(rtv.UpdateTime))
args := []any{"user", u.Id, "force refresh", opts.withIgnoreSearchStaleness}
if rtv != nil {
args = append(args, "target staleness", time.Since(rtv.UpdateTime))
}
r.logger.Debug("refreshing targets before performing search", args...)
if err := r.repo.refreshTargets(ctx, u, tokens, opt...); err != nil {
return errors.Wrap(ctx, err, op, errors.WithoutEvent())
}
@@ -224,7 +233,11 @@ func (r *RefreshService) RefreshForSearch(ctx context.Context, authTokenid strin
return errors.Wrap(ctx, err, op)
}
if opts.withIgnoreSearchStaleness || rtv != nil && time.Since(rtv.UpdateTime) > r.maxSearchStaleness {
r.logger.Debug("refreshing sessions before performing search", "user", u.Id, "force refresh", opts.withIgnoreSearchStaleness, "sessions age", time.Since(rtv.UpdateTime))
args := []any{"user", u.Id, "force refresh", opts.withIgnoreSearchStaleness}
if rtv != nil {
args = append(args, "session staleness", time.Since(rtv.UpdateTime))
}
r.logger.Debug("refreshing sessions before performing search", args...)
if err := r.repo.refreshSessions(ctx, u, tokens, opt...); err != nil {
return errors.Wrap(ctx, err, op, errors.WithoutEvent())
}