From 7ddae6244259d41257e3403d3bec0f926f654863 Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Tue, 18 Apr 2023 14:32:09 +0100 Subject: [PATCH 1/2] solver: skip sbom post processor if result is nil Signed-off-by: Justin Chadwell (cherry picked from commit 7ca2cd9859b6c289917f485b98b2469ff793f13f) --- solver/llbsolver/proc/sbom.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/solver/llbsolver/proc/sbom.go b/solver/llbsolver/proc/sbom.go index 2d7e969ba547..0a99163a3ae7 100644 --- a/solver/llbsolver/proc/sbom.go +++ b/solver/llbsolver/proc/sbom.go @@ -38,6 +38,10 @@ func SBOMProcessor(scannerRef string, useCache bool) llbsolver.Processor { if !ok { return nil, errors.Errorf("could not find ref %s", p.ID) } + if ref == nil { + continue + } + defop, err := llb.NewDefinitionOp(ref.Definition()) if err != nil { return nil, err From c48a6bc59e0831acb910508e191a69085453bbfd Mon Sep 17 00:00:00 2001 From: Vladislav Ivanov Date: Fri, 7 Apr 2023 23:46:26 +0200 Subject: [PATCH 2/2] Fix bearer token expiration check (fixes #3779) Signed-off-by: Vladislav Ivanov (cherry picked from commit fc834f5524f3c7b4baffd3408ce6c41c190e9c6e) --- util/resolver/authorizer.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/util/resolver/authorizer.go b/util/resolver/authorizer.go index 6a4140d68b1b..d97d32dd6f5d 100644 --- a/util/resolver/authorizer.go +++ b/util/resolver/authorizer.go @@ -356,7 +356,15 @@ func (ah *authHandler) fetchToken(ctx context.Context, sm *session.Manager, g se if resp.ExpiresIn == 0 { resp.ExpiresIn = defaultExpiration } - issuedAt, expires = time.Unix(resp.IssuedAt, 0), int(resp.ExpiresIn) + expires = int(resp.ExpiresIn) + // We later check issuedAt.isZero, which would return + // false if converted from zero Unix time. Therefore, + // zero time value in response is handled separately + if resp.IssuedAt == 0 { + issuedAt = time.Time{} + } else { + issuedAt = time.Unix(resp.IssuedAt, 0) + } token = resp.Token return nil, nil }