Merge pull request #42 from xmidt-org/fix-jwt-parser

Added map function

basculehttp/constructor.go

@@ -8,7 +8,9 @@ import (
 	"net/textproto"
 	"strings"
 
+	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
+	"github.com/goph/emperror"
 	"github.com/xmidt-org/bascule"
 )
 
@@ -67,7 +69,7 @@ func (c *constructor) decorate(next http.Handler) http.Handler {
 		ctx := request.Context()
 		token, err := tf.ParseAndValidate(ctx, request, key, authorization[i+len(c.headerDelimiter):])
 		if err != nil {
-			c.error(logger, ParseFailed, authorization, err)
+			c.error(logger, ParseFailed, authorization, emperror.Wrap(err, "failed to parse and validate token"))
 			WriteResponse(response, http.StatusForbidden, err)
 			return
 		}
@@ -91,7 +93,7 @@ func (c *constructor) decorate(next http.Handler) http.Handler {
 }
 
 func (c *constructor) error(logger bascule.Logger, e ErrorResponseReason, auth string, err error) {
-	logger.Log(level.Key(), level.ErrorValue(), bascule.ErrorKey, err.Error(), "auth", auth)
+	log.With(logger, emperror.Context(err)...).Log(level.Key(), level.ErrorValue(), bascule.ErrorKey, err.Error(), "auth", auth)
 	c.onErrorResponse(e, err)
 }
 

basculehttp/tokenFactory.go

@@ -117,16 +117,20 @@ func (btf BearerTokenFactory) ParseAndValidate(ctx context.Context, _ *http.Requ
 		return nil, ErrorInvalidToken
 	}
 
-	claims, ok := jwsToken.Claims.(*jwt.MapClaims)
+	claims, ok := jwsToken.Claims.(*bascule.ClaimsWithLeeway)
 	if !ok {
 		return nil, emperror.Wrap(ErrorUnexpectedClaims, "failed to parse JWS")
 	}
 
-	payload := bascule.Attributes(*claims)
+	claimsMap, err := claims.GetMap()
+	if err != nil {
+		return nil, emperror.WrapWith(err, "failed to get map of claims", "claims struct", claims)
+	}
+	payload := bascule.Attributes(claimsMap)
 
 	principal, ok := payload[jwtPrincipalKey].(string)
 	if !ok {
-		return nil, ErrorUnexpectedPrincipal
+		return nil, emperror.WrapWith(ErrorUnexpectedPrincipal, "failed to get and convert principal", "principal", payload[jwtPrincipalKey], "payload", payload)
 	}
 
 	return bascule.NewToken("jwt", principal, payload), nil

jws.go

@@ -1,6 +1,7 @@
 package bascule
 
 import (
+	"encoding/json"
 	"errors"
 
 	jwt "github.com/dgrijalva/jwt-go"
@@ -65,3 +66,13 @@ func (c *ClaimsWithLeeway) Valid() error {
 
 	return vErr
 }
+
+func (c *ClaimsWithLeeway) UnmarshalJSON(data []byte) error {
+	c.MapClaims = make(jwt.MapClaims) // just to be sure it's clean before each unmarshal
+	return json.Unmarshal(data, &c.MapClaims)
+}
+
+// GetMap returns a map of string to interfaces of the values in the ClaimsWithLeeway
+func (c *ClaimsWithLeeway) GetMap() (map[string]interface{}, error) {
+	return c.MapClaims, nil
+}