Merge branch 'master' into jwt-handling

Gopkg.toml

@@ -61,7 +61,7 @@
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.10.0"
+  version = "1.11.0"
 
 [prune]
   go-tests = true

mw/auth/options.go

@@ -2,14 +2,13 @@ package auth
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"path"
 	"strings"
 
 	jwt "github.com/dgrijalva/jwt-go"
 	pdp "github.com/infobloxopen/themis/pdp-service"
-	"google.golang.org/grpc/transport"
+	"google.golang.org/grpc"
 )
 
 // functional options for the defaultBuilder
@@ -58,11 +57,10 @@ func WithCallback(attr attributer) option {
 // called by the client (e.g. ListPersons)
 func WithRequest() option {
 	withRequestFunc := func(ctx context.Context) ([]*pdp.Attribute, error) {
-		stream, ok := transport.StreamFromContext(ctx)
-		if !ok {
-			return nil, errors.New("failed getting stream from context")
+		service, method, err := getRequestDetails(ctx)
+		if err != nil {
+			return nil, err
 		}
-		service, method := getRequestDetails(*stream)
 		service = stripPackageName(service)
 		attributes := []*pdp.Attribute{
 			&pdp.Attribute{"operation", "string", method},
@@ -83,9 +81,13 @@ func stripPackageName(service string) string {
 	return fields[len(fields)-1]
 }
 
-func getRequestDetails(stream transport.Stream) (service, method string) {
-	fullMethodString := stream.Method()
-	return path.Dir(fullMethodString)[1:], path.Base(fullMethodString)
+func getRequestDetails(ctx context.Context) (string, string, error) {
+	fullMethodString, ok := grpc.Method(ctx)
+	if !ok {
+		return "", "", ErrInternal
+	}
+	fmt.Println(fullMethodString)
+	return path.Dir(fullMethodString)[1:], path.Base(fullMethodString), nil
 }
 
 func combineAttributes(first, second []*pdp.Attribute) []*pdp.Attribute {

mw/auth/options_test.go

@@ -6,6 +6,8 @@ import (
 
 	jwt "github.com/dgrijalva/jwt-go"
 	pdp "github.com/infobloxopen/themis/pdp-service"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/metadata"
 )
 
 func TestWithJWT(t *testing.T) {
@@ -118,6 +120,60 @@ func TestWithCallback(t *testing.T) {
 	}
 }
 
+type mockTransportStream struct{ method string }
+
+func (m mockTransportStream) Method() string               { return m.method }
+func (m mockTransportStream) SetHeader(metadata.MD) error  { return nil }
+func (m mockTransportStream) SendHeader(metadata.MD) error { return nil }
+func (m mockTransportStream) SetTrailer(metadata.MD) error { return nil }
+
+func TestWithRequest(t *testing.T) {
+	var tests = []struct {
+		stream   *mockTransportStream
+		expected []*pdp.Attribute
+		err      error
+	}{
+		{
+			stream: &mockTransportStream{method: "/PetStore/ListPets"},
+			expected: []*pdp.Attribute{
+				{Id: "operation", Type: "string", Value: "ListPets"},
+				{Id: "application", Type: "string", Value: "petstore"},
+			},
+			err: nil,
+		},
+		{
+			stream: &mockTransportStream{method: "/atlas.example.PetStore/ListPets"},
+			expected: []*pdp.Attribute{
+				{Id: "operation", Type: "string", Value: "ListPets"},
+				{Id: "application", Type: "string", Value: "petstore"},
+			},
+			err: nil,
+		},
+		{
+			stream:   nil,
+			expected: []*pdp.Attribute{},
+			err:      ErrInternal,
+		},
+	}
+	for _, test := range tests {
+		ctx := context.Background()
+		if test.stream != nil {
+			ctx = grpc.NewContextWithServerTransportStream(
+				context.Background(),
+				test.stream,
+			)
+		}
+		builder := NewBuilder(WithRequest())
+		req, err := builder.build(ctx)
+		if err != test.err {
+			t.Errorf("Unexpected error when building request: %v", err)
+		}
+		if !hasMatchingAttributes(req.Attributes, test.expected) {
+			t.Errorf("Invalid request attributes: %v - expected %v", req.GetAttributes(), test.expected)
+		}
+	}
+}
+
 func TestStripPackageName(t *testing.T) {
 	var tests = []struct {
 		fullname string