Pass identity metadata through to plugins

logical/identity.proto

@@ -13,6 +13,9 @@ message Entity {
 
 	// Aliases contains thhe alias mappings for the given entity
 	repeated Alias aliases = 3;
+
+	// Metadata represents the custom data tied to this entity
+	map<string, string> metadata = 4;
 }
 
 message Alias {
@@ -25,5 +28,7 @@ message Alias {
 
 	// Name is the identifier of this identity in its authentication source
 	string name = 3;
-}
 
+	// Metadata represents the custom data tied to this alias
+	map<string, string> metadata = 4;
+}

logical/plugin/grpc_system_test.go

@@ -8,6 +8,7 @@ import (
 
 	"reflect"
 
+	"github.com/gogo/protobuf/proto"
 	plugin "github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/vault/helper/consts"
 	"github.com/hashicorp/vault/logical"
@@ -170,6 +171,19 @@ func TestSystem_GRPC_entityInfo(t *testing.T) {
 	sys.EntityVal = &logical.Entity{
 		ID:   "id",
 		Name: "name",
+		Metadata: map[string]string{
+			"foo": "bar",
+		},
+		Aliases: []*logical.Alias{
+			&logical.Alias{
+				MountType:     "logical",
+				MountAccessor: "accessor",
+				Name:          "name",
+				Metadata: map[string]string{
+					"zip": "zap",
+				},
+			},
+		},
 	}
 	client, _ := plugin.TestGRPCConn(t, func(s *grpc.Server) {
 		pb.RegisterSystemViewServer(s, &gRPCSystemViewServer{
@@ -183,7 +197,7 @@ func TestSystem_GRPC_entityInfo(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if sys.EntityVal.ID != actual.ID || sys.EntityVal.Name != actual.Name {
+	if !proto.Equal(sys.EntityVal, actual) {
 		t.Fatalf("expected: %v, got: %v", sys.EntityVal, actual)
 	}
 }

vault/dynamic_system_view.go

@@ -169,22 +169,40 @@ func (d dynamicSystemView) EntityInfo(entityID string) (*logical.Entity, error)
 		return nil, nil
 	}
 
+	// Return a subset of the data
+	ret := &logical.Entity{
+		ID:   entity.ID,
+		Name: entity.Name,
+	}
+
+	if entity.Metadata != nil {
+		ret.Metadata = make(map[string]string, len(entity.Metadata))
+		for k, v := range entity.Metadata {
+			ret.Metadata[k] = v
+		}
+	}
+
 	aliases := make([]*logical.Alias, len(entity.Aliases))
-	for i, alias := range entity.Aliases {
-		aliases[i] = &logical.Alias{
-			MountAccessor: alias.MountAccessor,
-			Name:          alias.Name,
+	for i, a := range entity.Aliases {
+		alias := &logical.Alias{
+			MountAccessor: a.MountAccessor,
+			Name:          a.Name,
 		}
 		// MountType is not stored with the entity and must be looked up
-		if mount := d.core.router.validateMountByAccessor(alias.MountAccessor); mount != nil {
-			aliases[i].MountType = mount.MountType
+		if mount := d.core.router.validateMountByAccessor(a.MountAccessor); mount != nil {
+			alias.MountType = mount.MountType
+		}
+
+		if a.Metadata != nil {
+			alias.Metadata = make(map[string]string, len(a.Metadata))
+			for k, v := range a.Metadata {
+				alias.Metadata[k] = v
+			}
 		}
+
+		aliases[i] = alias
 	}
+	ret.Aliases = aliases
 
-	// Only returning a subset of the data
-	return &logical.Entity{
-		ID:      entity.ID,
-		Name:    entity.Name,
-		Aliases: aliases,
-	}, nil
+	return ret, nil
 }