From c3d8c6e0eac880ab773ec812e393965d24c8998d Mon Sep 17 00:00:00 2001
From: Jo <joao.guerreiro@grafana.com>
Date: Mon, 8 Jan 2024 16:02:31 +0100
Subject: [PATCH] JWT: Fallthrough to fetch keyset in case of cache error
 (#80081)

fallthrough to fetch keyset in case of cache error. Fixes #67582
---
 pkg/services/auth/jwt/key_sets.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/services/auth/jwt/key_sets.go b/pkg/services/auth/jwt/key_sets.go
index 6c9597c895b..cd6fac5c30b 100644
--- a/pkg/services/auth/jwt/key_sets.go
+++ b/pkg/services/auth/jwt/key_sets.go
@@ -194,7 +194,11 @@ func (ks *keySetHTTP) getJWKS(ctx context.Context) (keySetJWKS, error) {
 	if ks.cacheExpiration > 0 {
 		if val, err := ks.cache.Get(ctx, ks.cacheKey); err == nil {
 			err := json.Unmarshal(val, &jwks)
-			return jwks, err
+			if err != nil {
+				ks.log.Warn("Failed to unmarshal key set from cache", "err", err)
+			} else {
+				return jwks, err
+			}
 		}
 	}