Merge pull request #300 from fuller-inc/ignore-unknown-public-kyt

ignore public keys that have unknown kyt
fuller-inc · Apr 1, 2022 · 6500b41 · 6500b41
2 parents aebb39a + ffadbf1
commit 6500b41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/provider/assume-role/github/jwk/jwks.go b/provider/assume-role/github/jwk/jwks.go
@@ -16,11 +16,10 @@ func ParseSet(data []byte) (*Set, error) {
 
 	list := make([]Key, 0, len(keys.Keys))
 	for _, raw := range keys.Keys {
-		key, err := ParseKey(raw)
-		if err != nil {
-			return nil, err
+		if key, err := ParseKey(raw); err == nil {
+			list = append(list, key)
+			// Ignore keys that cannot be parsed.
 		}
-		list = append(list, key)
 	}
 	return &Set{
 		Keys: list,

diff --git a/provider/assume-role/github/oidc/jwks.go b/provider/assume-role/github/oidc/jwks.go
@@ -49,7 +49,7 @@ func (c *Client) GetJWKS(ctx context.Context, url string) (*jwk.Set, error) {
 
 		set, err := jwk.ParseSet(data)
 		if err != nil {
-
+			return nil, time.Time{}, err
 		}
 		return set, expiresAt, nil
 	})