Using keys bundled in the package

Type: Feat

- Makes generation much faster

Makefile

@@ -1,3 +1,3 @@
 .PHONY: keys_file
 keys_file:
-	go-bindata -o pkg/keys/data.go keys/...	
+	go-bindata -o pkg/keys/data.go -pkg keys -prefix keys/ keys/...	

cmd/root.go

@@ -41,7 +41,7 @@ var rootCmd = &cobra.Command{
 			}
 		} else {
 			var err error
-			_, privateKey, err = url.ReturnJWKSAndPrivateKey(key)
+			_, privateKey, err = url.ReturnJWKSAndPrivateKeyFromData(key)
 			if err != nil {
 				log.Fatal(err)
 			}

pkg/server/server.go

@@ -2,7 +2,6 @@ package server
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 	"strconv"
 
@@ -28,19 +27,21 @@ func handler(letter string) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case http.MethodGet:
-			jwks, _, err := url.ReturnJWKSAndPrivateKey(letter)
+			jwks, _, err := url.ReturnJWKSAndPrivateKeyFromData(letter)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
 			jsonbuf, err := json.MarshalIndent(jwks, "", "  ")
 			if err != nil {
-				log.Fatalf("failed to generate JSON: %s", err)
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
 			}
 			w.WriteHeader(http.StatusOK)
 			w.Write(jsonbuf)
 			return
 		default:
+			w.WriteHeader(http.StatusNotFound)
 			return
 		}
 	}

pkg/url/bytes.go

@@ -4,14 +4,51 @@ import (
 	"context"
 	"crypto"
 	"encoding/json"
-	"github.com/benfdking/jen/pkg/rsapem"
-	"github.com/lestrrat-go/jwx/jwk"
-	"golang.org/x/sync/errgroup"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"time"
+
+	"github.com/benfdking/jen/pkg/keys"
+	"github.com/benfdking/jen/pkg/rsapem"
+	"github.com/lestrrat-go/jwx/jwk"
+	"golang.org/x/sync/errgroup"
 )
 
+func ReturnJWKSAndPrivateKeyFromData(version string) (jwk.Set, crypto.PrivateKey, error) {
+	if !IsVersion(version) {
+		return jwk.Set{}, nil, fmt.Errorf("version %s is invalid", version)
+	}
+
+	g, _ := errgroup.WithContext(context.Background())
+	var set jwk.Set
+	g.Go(func() error {
+		data, err := keys.Asset(version + "/jwks.json")
+		if err != nil {
+			return err
+		}
+		return json.Unmarshal(data, &set)
+	})
+
+	var private crypto.PrivateKey
+	g.Go(func() error {
+		data, err := keys.Asset(version + "/private.pem")
+		if err != nil {
+			return err
+		}
+		private, err = rsapem.RSAPrivateFromPen(data)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+
+	if err := g.Wait(); err != nil {
+		return jwk.Set{}, nil, err
+	}
+	return set, private, nil
+}
+
 func ReturnJWKSAndPrivateKey(version string) (jwk.Set, crypto.PrivateKey, error) {
 	jwksURL, cryptoURL, err := ReturnJWKSAndPrivatePEMURL(version)
 	if err != nil {