update libs and use go 1.16 (#7)

Author: vshiva

api/Readme.md

@@ -3,5 +3,5 @@
 to generate use a protoc version that is atleast >= 3.12.3 and make sure you have `protoc-gen-go` plugin installed at `${GOPATH}/bin/`
 
 ```bash
-protoc -I. -I /usr/local/include/google/protobuf/ --go_out=paths=source_relative,plugins="grpc:$PWD"  --plugin=protoc-gen-go="${GOPATH}/bin/protoc-gen-go" api/*.proto
+protoc -I. -I /usr/local/include/google/protobuf/ --go_out "." --go_opt paths=source_relative --plugin=protoc-gen-go="${GOPATH}/bin/protoc-gen-go" api/*.proto
 ```

api/annotations.pb.go

@@ -12,21 +12,61 @@ func (c contextKey) String() string {
 }
 
 var (
-	// contextKeyAuthtoken   = contextKey("auth-token")
-	contextKeyCurrentUser = contextKey("current-user")
+	contextKeyAuthenticated = contextKey("authn")
+	contextKeyAuthorized    = contextKey("authz")
+
+	userName   = "current-user"
+	userClaims = "claims"
+	userRoles  = "roles"
 )
 
 // CurrentUser for the request
 func CurrentUser(ctx context.Context) string {
 
-	if v, ok := ctx.Value(contextKeyCurrentUser).(string); ok {
-		return v
+	if v, ok := ctx.Value(contextKeyAuthenticated).(map[string]interface{}); ok {
+		if u, ok := v[userName]; ok {
+			return u.(string)
+		}
 	}
 
 	return Anonymous
 }
 
-// newContext returns a new context with the given user attached
-func newContext(parent context.Context, user string) context.Context {
-	return context.WithValue(parent, contextKeyCurrentUser, user)
+// CurrentUserClaims for the request
+func CurrentUserClaims(ctx context.Context) Claims {
+
+	if v, ok := ctx.Value(contextKeyAuthenticated).(map[string]interface{}); ok {
+		if u, ok := v[userClaims]; ok {
+			return u.(Claims)
+		}
+	}
+
+	return nil
+}
+
+// CurrentUserRoles for the request
+func CurrentUserRoles(ctx context.Context) []string {
+
+	if v, ok := ctx.Value(contextKeyAuthorized).(map[string]interface{}); ok {
+		if u, ok := v[userRoles]; ok {
+			return u.([]string)
+		}
+	}
+
+	return nil
+}
+
+// returns a new context with the given user and the claims attached
+func newAuthenticatedContext(parent context.Context, user string, cl Claims) context.Context {
+	return context.WithValue(parent, contextKeyAuthenticated, map[string]interface{}{
+		userName:   user,
+		userClaims: cl,
+	})
+}
+
+// returns a new context with the given authz result attached
+func newAuthorizedContext(parent context.Context, roles []string) context.Context {
+	return context.WithValue(parent, contextKeyAuthorized, map[string]interface{}{
+		userRoles: roles,
+	})
 }

api/authz.pb.go

@@ -111,11 +111,7 @@ func NewRuntime(ctx context.Context, options ...Option) (Runtime, error) {
 		opt.apply(r)
 	}
 	if r.logger == nil {
-		logger, err := log.NewNop()
-		if err != nil {
-			return nil, err
-		}
-		r.logger = logger
+		r.logger = log.NewNop()
 	}
 
 	verifier, err := newOIDCVerifier(ctx, r.issuer, r.aud)
@@ -199,8 +195,7 @@ func (r *runtime) Authorize(ctx context.Context, claims Claims, resource string,
 
 	ar, err = r.authorizer(ctx, authzReq)
 
-	// TODO copy certain information into context and cache the authz result with a TTL
-	return ctx, ar, err
+	return newAuthorizedContext(ctx, roles), ar, err
 }
 
 func (r *runtime) Verify(ctx context.Context, token string) (context.Context, Claims, error) {
@@ -223,7 +218,7 @@ func (r *runtime) Verify(ctx context.Context, token string) (context.Context, Cl
 		cl.AdditionalClaims = additionalClaims
 	}
 
-	return newContext(ctx, r.idResolver(cl)), cl, nil
+	return newAuthenticatedContext(ctx, r.idResolver(cl), cl), cl, nil
 }
 
 func newOIDCVerifier(ctx context.Context, issuer, audience string) (*oidc.IDTokenVerifier, error) {

auth/context.go

@@ -1,34 +1,33 @@
 module github.com/cnative/pkg
 
-go 1.15
+go 1.16
 
 require (
 	contrib.go.opencensus.io/exporter/ocagent v0.7.0
-	contrib.go.opencensus.io/exporter/prometheus v0.2.0
+	contrib.go.opencensus.io/exporter/prometheus v0.3.0
+	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
 	github.com/coreos/go-oidc v2.2.1+incompatible
-	github.com/golang/protobuf v1.4.3
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.0
-	github.com/jhump/protoreflect v1.7.0
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.4.0
+	github.com/jhump/protoreflect v1.8.2
 	github.com/pkg/errors v0.9.1
-	github.com/pquerna/cachecontrol v0.0.0-20200921180117-858c6e7e6b7e // indirect
-	github.com/prometheus/client_golang v1.8.0 // indirect
-	github.com/prometheus/statsd_exporter v0.18.0 // indirect
-	github.com/rollbar/rollbar-go v1.2.0
-	github.com/sirupsen/logrus v1.7.0 // indirect
-	github.com/soheilhy/cmux v0.1.4
-	go.opencensus.io v0.22.5
-	go.uber.org/multierr v1.6.0 // indirect
+	github.com/pquerna/cachecontrol v0.1.0 // indirect
+	github.com/prometheus/client_golang v1.10.0 // indirect
+	github.com/prometheus/common v0.25.0 // indirect
+	github.com/prometheus/statsd_exporter v0.20.2 // indirect
+	github.com/rollbar/rollbar-go v1.4.0
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/soheilhy/cmux v0.1.5
+	go.opencensus.io v0.23.0
+	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.16.0
-	golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee
-	golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0
-	golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 // indirect
-	golang.org/x/sys v0.0.0-20201016160150-f659759dc4ca // indirect
-	google.golang.org/api v0.33.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20201015140912-32ed001d685c // indirect
-	google.golang.org/grpc v1.33.0
-	google.golang.org/grpc/examples v0.0.0-20200807164945-d3e3e7a46f57 // indirect
-	google.golang.org/protobuf v1.25.0
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
+	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
+	golang.org/x/term v0.0.0-20210503060354-a79de5458b56
+	google.golang.org/api v0.47.0 // indirect
+	google.golang.org/genproto v0.0.0-20210520160233-290a1ae68a05 // indirect
+	google.golang.org/grpc v1.38.0
+	google.golang.org/protobuf v1.26.0
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 )