Merge pull request #2418 from h2zh/support-jwk-ext-key

patrickbrophy · web-flow · commit 6b72174668c3 · 2025-06-18T14:04:25.000-05:00
Support key files with `.jwk` extension in `IssuerKeysDirectory`
diff --git a/config/init_server_creds.go b/config/init_server_creds.go
@@ -623,7 +623,7 @@ func loadPEMFiles(dir string) (jwk.Key, error) {
 			if (path != dir) && dirEnt.IsDir() {
 				return filepath.SkipDir
 			}
-			if dirEnt.Type().IsRegular() && filepath.Ext(dirEnt.Name()) == ".pem" {
+			if dirEnt.Type().IsRegular() && (filepath.Ext(dirEnt.Name()) == ".pem" || filepath.Ext(dirEnt.Name()) == ".jwk") {
 				// Parse the private key in this file and add to the in-memory keys map
 				key, err := LoadSinglePEM(path)
 				if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ func loadPEMFiles(dir string) (jwk.Key, error) {`
`623`	`623`	`if (path != dir) && dirEnt.IsDir() {`
`624`	`624`	`return filepath.SkipDir`
`625`	`625`	`}`
`626`		`- if dirEnt.Type().IsRegular() && filepath.Ext(dirEnt.Name()) == ".pem" {`
	`626`	`+ if dirEnt.Type().IsRegular() && (filepath.Ext(dirEnt.Name()) == ".pem" \|\| filepath.Ext(dirEnt.Name()) == ".jwk") {`
`627`	`627`	`// Parse the private key in this file and add to the in-memory keys map`
`628`	`628`	`key, err := LoadSinglePEM(path)`
`629`	`629`	`if err != nil {`