Commit 1b9d5385f98edbb30690c2e91e49aba4ad6540fc - golang-github-go-kit-kit

Simplify the passing of tokens by removing the metadata requirement Brian Kassouf 7 years ago

4 changed file(s) with 18 addition(s) and 31 deletion(s). Raw diff Collapse all Expand all

-4

auth/jwt/middleware.go less more

3	3	"errors"
4	4	"fmt"
5	5	"reflect"
6
7		"google.golang.org/grpc/metadata"
8	6
9	7	"golang.org/x/net/context"
10	8

31	29	if err != nil {
32	30	return nil, err
33	31	}
34		md := metadata.MD{JWTTokenContextKey: []string{tokenString}}
35		ctx = metadata.NewContext(ctx, md)
	32	ctx = context.WithValue(ctx, JWTTokenContextKey, tokenString)
36	33
37	34	return next(ctx, request)
38	35	}

-10

auth/jwt/middleware_test.go less more

1	1
2	2	import (
3	3	"testing"
4
5		"google.golang.org/grpc/metadata"
6	4
7	5	stdjwt "github.com/dgrijalva/jwt-go"
8	6

27	25	t.Fatalf("Signer returned error: %s", err)
28	26	}
29	27
30		md, ok := metadata.FromContext(ctx1.(context.Context))
31		if !ok {
32		t.Fatal("Could not retrieve metadata from context")
33		}
34
35		token, ok := md[jwt.JWTTokenContextKey]
	28	token, ok := ctx1.(context.Context).Value(jwt.JWTTokenContextKey).(string)
36	29	if !ok {
37	30	t.Fatal("Token did not exist in context")
38	31	}
39	32
40		if token[0] != signedKey {
41		t.Fatalf("JWT tokens did not match: expecting %s got %s", signedKey, token[0])
	33	if token != signedKey {
	34	t.Fatalf("JWT tokens did not match: expecting %s got %s", signedKey, token)
42	35	}
43	36	}
44	37

+13

-16

auth/jwt/transport.go less more

10	10	"google.golang.org/grpc/metadata"
11	11	)
12	12
	13	// moves JWT token from request header to context
	14	// particularly useful for servers
13	15	func ToHTTPContext() http.RequestFunc {
14	16	return func(ctx context.Context, r *stdhttp.Request) context.Context {
15	17	token, ok := extractTokenFromAuthHeader(r.Header.Get("Authorization"))

21	23	}
22	24	}
23	25
	26	// moves JWT token from context to request header
	27	// particularly useful for clients
24	28	func FromHTTPContext() http.RequestFunc {
25	29	return func(ctx context.Context, r *stdhttp.Request) context.Context {
26		md1, ok := metadata.FromContext(ctx)
27		if !ok {
28		return ctx
	30	token, ok := ctx.Value(JWTTokenContextKey).(string)
	31	if ok {
	32	r.Header.Add("Authorization", generateAuthHeaderFromToken(token))
29	33	}
30
31		token, ok := md1[JWTTokenContextKey]
32		if ok {
33		r.Header.Add("Authorization", generateAuthHeaderFromToken(token[0]))
34		}
35		fmt.Println(r.Header)
36	34	return ctx
37	35	}
38	36	}
39	37
	38	// moves JWT token from grpc metadata to context
	39	// particularly userful for servers
40	40	func ToGRPCContext() grpc.RequestFunc {
41	41	return func(ctx context.Context, md *metadata.MD) context.Context {
42	42	// capital "Key" is illegal in HTTP/2.

54	54	}
55	55	}
56	56
	57	// moves JWT token from context to grpc metadata
	58	// particularly useful for clients
57	59	func FromGRPCContext() grpc.RequestFunc {
58	60	return func(ctx context.Context, md *metadata.MD) context.Context {
59		md1, ok := metadata.FromContext(ctx)
60		if !ok {
61		return ctx
62		}
63
64		token, ok := md1[JWTTokenContextKey]
	61	token, ok := ctx.Value(JWTTokenContextKey).(string)
65	62	if ok {
66	63	// capital "Key" is illegal in HTTP/2.
67		(*md)["authorization"] = []string{generateAuthHeaderFromToken(token[0])}
	64	(*md)["authorization"] = []string{generateAuthHeaderFromToken(token)}
68	65	}
69	66
70	67	return ctx

-1

auth/jwt/transport_test.go less more

55	55	}
56	56
57	57	// Correct JWT Token is passed in the context
58		ctx = metadata.NewContext(context.Background(), metadata.MD{jwt.JWTTokenContextKey: []string{signedKey}})
	58	ctx = context.WithValue(context.Background(), jwt.JWTTokenContextKey, signedKey)
59	59	md = metadata.MD{}
60	60	reqFunc(ctx, &md)
61	61