Merge pull request #227 from jzelinskie/fixjwt

jwt: add updateKeys method and call in constructor

cmd/chihaya/config.go

@@ -78,7 +78,11 @@ func (cfg ConfigFile) CreateHooks() (preHooks, postHooks []middleware.Hook, err
 			if err != nil {
 				return nil, nil, errors.New("invalid JWT middleware config: " + err.Error())
 			}
-			preHooks = append(preHooks, jwt.NewHook(jwtCfg))
+			hook, err := jwt.NewHook(jwtCfg)
+			if err != nil {
+				return nil, nil, errors.New("invalid JWT middleware config: " + err.Error())
+			}
+			preHooks = append(preHooks, hook)
 		case "client approval":
 			var caCfg clientapproval.Config
 			err := yaml.Unmarshal(cfgBytes, &caCfg)

middleware/jwt/jwt.go

@@ -50,23 +50,37 @@ type hook struct {
 }
 
 // NewHook returns an instance of the JWT middleware.
-func NewHook(cfg Config) middleware.Hook {
+func NewHook(cfg Config) (middleware.Hook, error) {
 	h := &hook{
 		cfg:        cfg,
 		publicKeys: map[string]crypto.PublicKey{},
 		closing:    make(chan struct{}),
 	}
 
+	err := h.updateKeys()
+	if err != nil {
+		return nil, errors.New("failed to update initial JWK Set: " + err.Error())
+	}
+
 	go func() {
 		for {
 			select {
 			case <-h.closing:
 				return
 			case <-time.After(cfg.JWKUpdateInterval):
-				resp, err := http.Get(cfg.JWKSetURL)
+				h.updateKeys()
+			}
+		}
+	}()
+
+	return h, nil
+}
+
+func (h *hook) updateKeys() error {
+	resp, err := http.Get(h.cfg.JWKSetURL)
 	if err != nil {
 		log.Errorln("failed to fetch JWK Set: " + err.Error())
-					continue
+		return err
 	}
 
 	parsedJWKs := map[string]gojwk.Key{}
@@ -74,7 +88,7 @@ func NewHook(cfg Config) middleware.Hook {
 	if err != nil {
 		resp.Body.Close()
 		log.Errorln("failed to decode JWK JSON: " + err.Error())
-					continue
+		return err
 	}
 	resp.Body.Close()
 
@@ -83,16 +97,13 @@ func NewHook(cfg Config) middleware.Hook {
 		publicKey, err := parsedJWK.DecodePublicKey()
 		if err != nil {
 			log.Errorln("failed to decode JWK into public key: " + err.Error())
-						continue
+			return err
 		}
 		keys[kid] = publicKey
 	}
 	h.publicKeys = keys
-			}
-		}
-	}()
 
-	return h
+	return nil
 }
 
 func (h *hook) Stop() <-chan error {