Issue #10 - refactoring

serg-kovalev · Jun 16, 2022 · 2ccf44d · 2ccf44d
1 parent 9d49915
commit 2ccf44d
Showing 1 changed file with 41 additions and 40 deletions.
diff --git a/rsa2jwk.go b/rsa2jwk.go
@@ -12,7 +12,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	jwt "github.com/golang-jwt/jwt/v4"
 	jwk "github.com/lestrrat-go/jwx/v2/jwk"
 )
 
@@ -58,39 +57,51 @@ func main() {
 	jwkPubSet := map[string][]jwkPubKey{"keys": {}}
 	fmt.Printf("%43s\t%s\n", "Kid", "Filename")
 	for _, f := range filePaths {
-		privKey, err := parseRSAPrivateKeyFromPEM(f)
+		jwkSet, err := jwk.ReadFile(f, jwk.WithPEM(true))
 		if err != nil {
 			log.Fatal(err)
 		}
-		pubKey := privKey.Public()
-
-		privJwk, err := jwk.FromRaw(privKey)
-		if err != nil {
-			log.Fatal(err)
+		for i := 0; i < jwkSet.Len(); i++ {
+			var rawKey interface{}
+			jwkKey, _ := jwkSet.Key(i)
+			err = jwkKey.Raw(&rawKey)
+			if err != nil {
+				log.Fatal(err)
+			}
+			privKey, ok := rawKey.(*rsa.PrivateKey)
+			if !ok {
+				log.Fatal("provided key is not private one")
+			}
+			pubKey := privKey.Public()
+
+			privJwk, err := jwk.FromRaw(privKey)
+			if err != nil {
+				log.Fatal(err)
+			}
+			// generates Kid using Key.Thumbprint method with crypto.SHA256
+			jwk.AssignKeyID(privJwk) //nolint:errcheck
+
+			jwkPub := jwkPubKey{
+				Kty: jwkKtyRsa,
+				Alg: jwkAlgRs256,
+				Use: jwkUseSig,
+				Kid: privJwk.KeyID(),
+				N:   safeEncode(pubKey.(*rsa.PublicKey).N.Bytes()),
+				E:   safeEncode(big.NewInt(int64(pubKey.(*rsa.PublicKey).E)).Bytes()),
+			}
+			jwkPriv := jwkPrivAndPubKeyPair{
+				jwkPubKey: jwkPub,
+				P:         safeEncode(privKey.Primes[0].Bytes()),
+				Q:         safeEncode(privKey.Primes[1].Bytes()),
+				D:         safeEncode(privKey.D.Bytes()),
+				Qi:        safeEncode(privKey.Precomputed.Qinv.Bytes()),
+				Dp:        safeEncode(privKey.Precomputed.Dp.Bytes()),
+				Dq:        safeEncode(privKey.Precomputed.Dq.Bytes()),
+			}
+			jwkPrivSet["keys"] = append(jwkPrivSet["keys"], jwkPriv)
+			jwkPubSet["keys"] = append(jwkPubSet["keys"], jwkPub)
+			fmt.Printf("%s\t%s\n", jwkPub.Kid, f)
 		}
-		// generates Kid using Key.Thumbprint method with crypto.SHA256
-		jwk.AssignKeyID(privJwk) //nolint:errcheck
-
-		jwkPub := jwkPubKey{
-			Kty: jwkKtyRsa,
-			Alg: jwkAlgRs256,
-			Use: jwkUseSig,
-			Kid: privJwk.KeyID(),
-			N:   safeEncode(pubKey.(*rsa.PublicKey).N.Bytes()),
-			E:   safeEncode(big.NewInt(int64(pubKey.(*rsa.PublicKey).E)).Bytes()),
-		}
-		jwkPriv := jwkPrivAndPubKeyPair{
-			jwkPubKey: jwkPub,
-			P:         safeEncode(privKey.Primes[0].Bytes()),
-			Q:         safeEncode(privKey.Primes[1].Bytes()),
-			D:         safeEncode(privKey.D.Bytes()),
-			Qi:        safeEncode(privKey.Precomputed.Qinv.Bytes()),
-			Dp:        safeEncode(privKey.Precomputed.Dp.Bytes()),
-			Dq:        safeEncode(privKey.Precomputed.Dq.Bytes()),
-		}
-		jwkPrivSet["keys"] = append(jwkPrivSet["keys"], jwkPriv)
-		jwkPubSet["keys"] = append(jwkPubSet["keys"], jwkPub)
-		fmt.Printf("%s\t%s\n", jwkPub.Kid, f)
 	}
 
 	if err := marshalAndSave(jwkPrivSet, filepath.Join(dir, jsonJwkPrivFilename)); err != nil {
@@ -109,16 +120,6 @@ func marshalAndSave(v interface{}, path string) error {
 	return ioutil.WriteFile(path, bytes, 0644)
 }
 
-// parsing a PEM encoded PKCS1 or PKCS8 private key
-func parseRSAPrivateKeyFromPEM(path string) (*rsa.PrivateKey, error) {
-	key, err := ioutil.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return jwt.ParseRSAPrivateKeyFromPEM(key)
-}
-
 func lookupPemFiles(dirName string) ([]string, error) {
 	fileInfos, err := ioutil.ReadDir(dirName)
 	if err != nil {