ipc,naming: Servers generate V4 endpoints now.
Server.Listen and endpoints in server.Status now are in V4 format,
including the server's blessing names. These endpoints are the ones
that are published in the mounttable as well.
This allows for servers to specify their "identity" in the same string
as their "address", a fact which will be utilized in a subsequent change
to make server authentication easier - clients will not share any
information with servers which present blessings inconsistent with
the endpoint.
Change-Id: Ib84e5ccd495c84a0ab1b79849d9f882bb874db2e
diff --git a/profiles/internal/ipc/stream/manager/manager_test.go b/profiles/internal/ipc/stream/manager/manager_test.go
index 222387f..e5b6cb6 100644
--- a/profiles/internal/ipc/stream/manager/manager_test.go
+++ b/profiles/internal/ipc/stream/manager/manager_test.go
@@ -14,6 +14,7 @@
"v.io/v23/ipc"
"v.io/v23/naming"
+ "v.io/v23/options"
"v.io/v23/security"
"v.io/x/lib/vlog"
"v.io/x/ref/profiles/internal/ipc/stream"
@@ -185,6 +186,10 @@
if err != nil {
t.Fatal(err)
}
+ // And the server blessing should be in the endpoint.
+ if got, want := ep.BlessingNames(), []string{"server"}; !reflect.DeepEqual(got, want) {
+ t.Errorf("Got blessings %v from endpoint, want %v", got, want)
+ }
errs := make(chan error)
@@ -646,3 +651,57 @@
t.Fatal("expected error is missing (%v)", err)
}
}
+
+func TestBlessingNamesInEndpoint(t *testing.T) {
+ var (
+ p = newPrincipal("default")
+ b1, _ = p.Principal.BlessSelf("dev.v.io/users/foo@bar.com/devices/desktop/app/myapp")
+ b2, _ = p.Principal.BlessSelf("otherblessing")
+ b, _ = security.UnionOfBlessings(b1, b2)
+ bopt = options.ServerBlessings{b}
+
+ server = InternalNew(naming.FixedRoutingID(0x1))
+
+ tests = []struct {
+ opts []stream.ListenerOpt
+ blessings []string
+ err bool
+ }{
+ {
+ // Use the default blessings when only a principal is provided
+ opts: []stream.ListenerOpt{p},
+ blessings: []string{"default"},
+ },
+ {
+ // Respect options.ServerBlessings if provided
+ opts: []stream.ListenerOpt{p, bopt},
+ blessings: []string{"dev.v.io/users/foo@bar.com/devices/desktop/app/myapp", "otherblessing"},
+ },
+ {
+ // It is an error to provide options.ServerBlessings without vc.LocalPrincipal
+ opts: []stream.ListenerOpt{bopt},
+ err: true,
+ },
+ {
+ // It is an error to provide inconsistent options.ServerBlessings and vc.LocalPrincipal
+ opts: []stream.ListenerOpt{newPrincipal("random"), bopt},
+ err: true,
+ },
+ }
+ )
+ // p must recognize its own blessings!
+ p.AddToRoots(bopt.Blessings)
+ for idx, test := range tests {
+ ln, ep, err := server.Listen("tcp", "127.0.0.1:0", test.opts...)
+ if (err != nil) != test.err {
+ t.Errorf("test #%d: Got error %v, wanted error: %v", idx, err, test.err)
+ }
+ if err != nil {
+ continue
+ }
+ ln.Close()
+ if got, want := ep.BlessingNames(), test.blessings; !reflect.DeepEqual(got, want) {
+ t.Errorf("test #%d: Got %v, want %v", idx, got, want)
+ }
+ }
+}
