grpc: standardize auth interceptor

Author: jkralik

net/grpc/auth.go

@@ -40,10 +40,10 @@ func MakeJWTInterceptors(jwksURL string, tls *tls.Config, claims ClaimsFunc, whi
 	return MakeAuthInterceptors(ValidateJWT(jwksURL, tls, claims), whiteListedMethods...)
 }
 
-func (f AuthInterceptors) Unary() grpc.ServerOption {
+func (f AuthInterceptors) Unary() grpc.UnaryServerInterceptor {
 	return UnaryServerInterceptor(f.authFunc)
 }
-func (f AuthInterceptors) Stream() grpc.ServerOption {
+func (f AuthInterceptors) Stream() grpc.StreamServerInterceptor {
 	return StreamServerInterceptor(f.authFunc)
 }
 

net/grpc/interceptor.go

@@ -9,26 +9,34 @@ import (
 
 type Interceptor = func(ctx context.Context, method string) (context.Context, error)
 
-func UnaryServerInterceptor(intercept Interceptor) grpc.ServerOption {
-	return grpc.UnaryInterceptor(
-		func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
-			newCtx, err := intercept(ctx, info.FullMethod)
-			if err != nil {
-				return nil, err
-			}
-			return handler(newCtx, req)
-		})
+func UnaryServerInterceptorOption(intercept Interceptor) grpc.ServerOption {
+	return grpc.UnaryInterceptor(UnaryServerInterceptor(intercept))
 }
 
-func StreamServerInterceptor(intercept Interceptor) grpc.ServerOption {
-	return grpc.StreamInterceptor(
-		func(srv interface{}, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
-			newCtx, err := intercept(stream.Context(), info.FullMethod)
-			if err != nil {
-				return err
-			}
-			wrapped := grpc_middleware.WrapServerStream(stream)
-			wrapped.WrappedContext = newCtx
-			return handler(srv, wrapped)
-		})
+func StreamServerInterceptorOption(intercept Interceptor) grpc.ServerOption {
+	return grpc.StreamInterceptor(StreamServerInterceptor(intercept))
+}
+
+// StreamServerInterceptor returns a new unary server interceptors that performs per-request auth.
+func StreamServerInterceptor(intercept Interceptor) grpc.StreamServerInterceptor {
+	return func(srv interface{}, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
+		newCtx, err := intercept(stream.Context(), info.FullMethod)
+		if err != nil {
+			return err
+		}
+		wrapped := grpc_middleware.WrapServerStream(stream)
+		wrapped.WrappedContext = newCtx
+		return handler(srv, wrapped)
+	}
+}
+
+// UnaryServerInterceptor returns a new unary server interceptors that performs per-request auth.
+func UnaryServerInterceptor(intercept Interceptor) grpc.UnaryServerInterceptor {
+	return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+		newCtx, err := intercept(ctx, info.FullMethod)
+		if err != nil {
+			return nil, err
+		}
+		return handler(newCtx, req)
+	}
 }

net/grpc/interceptor_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestUnaryInterceptor(t *testing.T) {
 	m := &MockInterceptor{}
-	svr := StubGrpcServer(UnaryServerInterceptor(m.Intercept))
+	svr := StubGrpcServer(UnaryServerInterceptorOption(m.Intercept))
 	defer svr.Close()
 	go svr.Serve()
 
@@ -21,7 +21,7 @@ func TestUnaryInterceptor(t *testing.T) {
 
 func TestStreamInterceptor(t *testing.T) {
 	m := &MockInterceptor{}
-	svr := StubGrpcServer(StreamServerInterceptor(m.Intercept))
+	svr := StubGrpcServer(StreamServerInterceptorOption(m.Intercept))
 	defer svr.Close()
 	go svr.Serve()