internal/wayland: reimplement connect/bind code

The old implementation is relocated to system/wayland/deprecated.go.

Signed-off-by: Ophestra <cat@gensokyo.uk>

internal/system/dispatcher.go

@@ -6,9 +6,11 @@ import (
 	"log"
 	"os"
 
+	"hakurei.app/container/check"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/dbus"
+	"hakurei.app/internal/wayland"
 	"hakurei.app/internal/xcb"
 )
 
@@ -45,6 +47,8 @@ type syscallDispatcher interface {
 	// aclUpdate provides [acl.Update].
 	aclUpdate(name string, uid int, perms ...acl.Perm) error
 
+	waylandNew(displayPath, bindPath *check.Absolute, appID, instanceID string) (*wayland.SecurityContext, error)
+
 	// xcbChangeHosts provides [xcb.ChangeHosts].
 	xcbChangeHosts(mode xcb.HostMode, family xcb.Family, address string) error
 
@@ -76,6 +80,10 @@ func (k direct) aclUpdate(name string, uid int, perms ...acl.Perm) error {
 	return acl.Update(name, uid, perms...)
 }
 
+func (k direct) waylandNew(displayPath, bindPath *check.Absolute, appID, instanceID string) (*wayland.SecurityContext, error) {
+	return wayland.New(displayPath, bindPath, appID, instanceID)
+}
+
 func (k direct) xcbChangeHosts(mode xcb.HostMode, family xcb.Family, address string) error {
 	return xcb.ChangeHosts(mode, family, address)
 }

internal/system/dispatcher_test.go

@@ -8,10 +8,12 @@ import (
 	"testing"
 	"unsafe"
 
+	"hakurei.app/container/check"
 	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/dbus"
+	"hakurei.app/internal/wayland"
 	"hakurei.app/internal/xcb"
 )
 
@@ -268,6 +270,15 @@ func (k *kstub) aclUpdate(name string, uid int, perms ...acl.Perm) error {
 		stub.CheckArgReflect(k.Stub, "perms", perms, 2))
 }
 
+func (k *kstub) waylandNew(displayPath, bindPath *check.Absolute, appID, instanceID string) (*wayland.SecurityContext, error) {
+	k.Helper()
+	return nil, k.Expects("waylandNew").Error(
+		stub.CheckArgReflect(k.Stub, "displayPath", displayPath, 0),
+		stub.CheckArgReflect(k.Stub, "bindPath", bindPath, 1),
+		stub.CheckArg(k.Stub, "appID", appID, 2),
+		stub.CheckArg(k.Stub, "instanceID", instanceID, 3))
+}
+
 func (k *kstub) xcbChangeHosts(mode xcb.HostMode, family xcb.Family, address string) error {
 	k.Helper()
 	return k.Expects("xcbChangeHosts").Error(

internal/system/wayland.go

@@ -8,83 +8,74 @@ import (
 	"hakurei.app/container/check"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
-	"hakurei.app/system/wayland"
+	"hakurei.app/internal/wayland"
 )
 
-type waylandConn interface {
-	Attach(p string) (err error)
-	Bind(pathname, appID, instanceID string) (*os.File, error)
-	Close() error
-}
-
 // Wayland maintains a wayland socket with security-context-v1 attached via [wayland].
 // The socket stops accepting connections once the pipe referred to by sync is closed.
 // The socket is pathname only and is destroyed on revert.
 func (sys *I) Wayland(dst, src *check.Absolute, appID, instanceID string) *I {
 	sys.ops = append(sys.ops, &waylandOp{nil,
-		dst.String(), src.String(),
-		appID, instanceID,
-		new(wayland.Conn)})
+		dst, src, appID, instanceID})
 	return sys
 }
 
 // waylandOp implements [I.Wayland].
 type waylandOp struct {
-	sync              *os.File
-	dst, src          string
+	ctx               *wayland.SecurityContext
+	dst, src          *check.Absolute
 	appID, instanceID string
-
-	conn waylandConn
 }
 
 func (w *waylandOp) Type() hst.Enablement { return Process }
 
-func (w *waylandOp) apply(sys *I) error {
-	if err := w.conn.Attach(w.src); err != nil {
+func (w *waylandOp) apply(sys *I) (err error) {
+	if w.ctx, err = sys.waylandNew(w.src, w.dst, w.appID, w.instanceID); err != nil {
 		return newOpError("wayland", err, false)
 	} else {
-		sys.msg.Verbosef("wayland attached on %q", w.src)
-	}
+		sys.msg.Verbosef("wayland pathname socket on %q via %q", w.dst, w.src)
 
-	if sp, err := w.conn.Bind(w.dst, w.appID, w.instanceID); err != nil {
-		return newOpError("wayland", err, false)
-	} else {
-		w.sync = sp
-		sys.msg.Verbosef("wayland listening on %q", w.dst)
-		if err = sys.chmod(w.dst, 0); err != nil {
+		if err = sys.chmod(w.dst.String(), 0); err != nil {
+			if closeErr := w.ctx.Close(); closeErr != nil {
+				return newOpError("wayland", errors.Join(err, closeErr), false)
+			}
 			return newOpError("wayland", err, false)
 		}
-		return newOpError("wayland", sys.aclUpdate(w.dst, sys.uid, acl.Read, acl.Write, acl.Execute), false)
+
+		if err = sys.aclUpdate(w.dst.String(), sys.uid, acl.Read, acl.Write, acl.Execute); err != nil {
+			if closeErr := w.ctx.Close(); closeErr != nil {
+				return newOpError("wayland", errors.Join(err, closeErr), false)
+			}
+			return newOpError("wayland", err, false)
+		}
+
+		return nil
 	}
 }
 
 func (w *waylandOp) revert(sys *I, _ *Criteria) error {
 	var (
 		hangupErr error
-		closeErr  error
 		removeErr error
 	)
 
-	sys.msg.Verbosef("detaching from wayland on %q", w.src)
-	if w.sync != nil {
-		hangupErr = w.sync.Close()
+	sys.msg.Verbosef("hanging up wayland socket on %q", w.dst)
+	if w.ctx != nil {
+		hangupErr = w.ctx.Close()
 	}
-	closeErr = w.conn.Close()
-
-	sys.msg.Verbosef("removing wayland socket on %q", w.dst)
-	if err := sys.remove(w.dst); err != nil && !errors.Is(err, os.ErrNotExist) {
+	if err := sys.remove(w.dst.String()); err != nil && !errors.Is(err, os.ErrNotExist) {
 		removeErr = err
 	}
 
-	return newOpError("wayland", errors.Join(hangupErr, closeErr, removeErr), true)
+	return newOpError("wayland", errors.Join(hangupErr, removeErr), true)
 }
 
 func (w *waylandOp) Is(o Op) bool {
 	target, ok := o.(*waylandOp)
 	return ok && w != nil && target != nil &&
-		w.dst == target.dst && w.src == target.src &&
+		w.dst.Is(target.dst) && w.src.Is(target.src) &&
 		w.appID == target.appID && w.instanceID == target.instanceID
 }
 
-func (w *waylandOp) Path() string   { return w.dst }
+func (w *waylandOp) Path() string   { return w.dst.String() }
 func (w *waylandOp) String() string { return fmt.Sprintf("wayland socket at %q", w.dst) }

internal/system/wayland_test.go

@@ -7,196 +7,62 @@ import (
 
 	"hakurei.app/container/stub"
 	"hakurei.app/internal/acl"
-	"hakurei.app/system/wayland"
 )
 
-type stubWaylandConn struct {
-	t *testing.T
-
-	wantAttach string
-	attachErr  error
-	attached   bool
-
-	wantBind [3]string
-	bindErr  error
-	bound    bool
-
-	closeErr error
-	closed   bool
-}
-
-func (conn *stubWaylandConn) Attach(p string) (err error) {
-	conn.t.Helper()
-
-	if conn.attached {
-		conn.t.Fatal("Attach called twice")
-	}
-	conn.attached = true
-
-	err = conn.attachErr
-	if p != conn.wantAttach {
-		conn.t.Errorf("Attach: p = %q, want %q", p, conn.wantAttach)
-		err = stub.ErrCheck
-	}
-	return
-}
-
-func (conn *stubWaylandConn) Bind(pathname, appID, instanceID string) (*os.File, error) {
-	conn.t.Helper()
-
-	if !conn.attached {
-		conn.t.Fatal("Bind called before Attach")
-	}
-
-	if conn.bound {
-		conn.t.Fatal("Bind called twice")
-	}
-	conn.bound = true
-
-	if pathname != conn.wantBind[0] {
-		conn.t.Errorf("Attach: pathname = %q, want %q", pathname, conn.wantBind[0])
-		return nil, stub.ErrCheck
-	}
-	if appID != conn.wantBind[1] {
-		conn.t.Errorf("Attach: appID = %q, want %q", appID, conn.wantBind[1])
-		return nil, stub.ErrCheck
-	}
-	if instanceID != conn.wantBind[2] {
-		conn.t.Errorf("Attach: instanceID = %q, want %q", instanceID, conn.wantBind[2])
-		return nil, stub.ErrCheck
-	}
-	return nil, conn.bindErr
-}
-
-func (conn *stubWaylandConn) Close() error {
-	conn.t.Helper()
-
-	if !conn.attached {
-		conn.t.Fatal("Close called before Attach")
-	}
-	if !conn.bound {
-		conn.t.Fatal("Close called before Bind")
-	}
-
-	if conn.closed {
-		conn.t.Fatal("Close called twice")
-	}
-	conn.closed = true
-	return conn.closeErr
-}
-
 func TestWaylandOp(t *testing.T) {
 	t.Parallel()
 
 	checkOpBehaviour(t, []opBehaviourTestCase{
-		{"attach", 0xbeef, 0xff, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
-			"org.chromium.Chromium",
-			"ebf083d1b175911782d413369b64ce7c",
-			&stubWaylandConn{t: t, wantAttach: "/run/user/1971/wayland-0", wantBind: [3]string{
-				"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-				"org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"},
-				attachErr: stub.UniqueError(5)},
-		}, nil, &OpError{Op: "wayland", Err: stub.UniqueError(5)}, nil, nil},
-
-		{"bind", 0xbeef, 0xff, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
-			"org.chromium.Chromium",
-			"ebf083d1b175911782d413369b64ce7c",
-			&stubWaylandConn{t: t, wantAttach: "/run/user/1971/wayland-0", wantBind: [3]string{
-				"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-				"org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"},
-				bindErr: stub.UniqueError(4)},
-		}, []stub.Call{
-			call("verbosef", stub.ExpectArgs{"wayland attached on %q", []any{"/run/user/1971/wayland-0"}}, nil, nil),
-		}, &OpError{Op: "wayland", Err: stub.UniqueError(4)}, nil, nil},
-
 		{"chmod", 0xbeef, 0xff, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			&stubWaylandConn{t: t, wantAttach: "/run/user/1971/wayland-0", wantBind: [3]string{
-				"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-				"org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"}},
 		}, []stub.Call{
-			call("verbosef", stub.ExpectArgs{"wayland attached on %q", []any{"/run/user/1971/wayland-0"}}, nil, nil),
-			call("verbosef", stub.ExpectArgs{"wayland listening on %q", []any{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}}, nil, nil),
+			call("waylandNew", stub.ExpectArgs{m("/run/user/1971/wayland-0"), m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"), "org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"}, nil, nil),
+			call("verbosef", stub.ExpectArgs{"wayland pathname socket on %q via %q", []any{m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"), m("/run/user/1971/wayland-0")}}, nil, nil),
 			call("chmod", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland", os.FileMode(0)}, nil, stub.UniqueError(3)),
-		}, &OpError{Op: "wayland", Err: stub.UniqueError(3)}, nil, nil},
+		}, &OpError{Op: "wayland", Err: errors.Join(stub.UniqueError(3), os.ErrInvalid)}, nil, nil},
 
 		{"aclUpdate", 0xbeef, 0xff, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			&stubWaylandConn{t: t, wantAttach: "/run/user/1971/wayland-0", wantBind: [3]string{
-				"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-				"org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"}},
 		}, []stub.Call{
-			call("verbosef", stub.ExpectArgs{"wayland attached on %q", []any{"/run/user/1971/wayland-0"}}, nil, nil),
-			call("verbosef", stub.ExpectArgs{"wayland listening on %q", []any{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}}, nil, nil),
+			call("waylandNew", stub.ExpectArgs{m("/run/user/1971/wayland-0"), m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"), "org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"}, nil, nil),
+			call("verbosef", stub.ExpectArgs{"wayland pathname socket on %q via %q", []any{m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"), m("/run/user/1971/wayland-0")}}, nil, nil),
 			call("chmod", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland", os.FileMode(0)}, nil, nil),
 			call("aclUpdate", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland", 0xbeef, []acl.Perm{acl.Read, acl.Write, acl.Execute}}, nil, stub.UniqueError(2)),
-		}, &OpError{Op: "wayland", Err: stub.UniqueError(2)}, nil, nil},
+		}, &OpError{Op: "wayland", Err: errors.Join(stub.UniqueError(2), os.ErrInvalid)}, nil, nil},
 
 		{"remove", 0xbeef, 0xff, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			&stubWaylandConn{t: t, wantAttach: "/run/user/1971/wayland-0", wantBind: [3]string{
-				"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-				"org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"}},
 		}, []stub.Call{
-			call("verbosef", stub.ExpectArgs{"wayland attached on %q", []any{"/run/user/1971/wayland-0"}}, nil, nil),
-			call("verbosef", stub.ExpectArgs{"wayland listening on %q", []any{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}}, nil, nil),
+			call("waylandNew", stub.ExpectArgs{m("/run/user/1971/wayland-0"), m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"), "org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"}, nil, nil),
+			call("verbosef", stub.ExpectArgs{"wayland pathname socket on %q via %q", []any{m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"), m("/run/user/1971/wayland-0")}}, nil, nil),
 			call("chmod", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland", os.FileMode(0)}, nil, nil),
 			call("aclUpdate", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland", 0xbeef, []acl.Perm{acl.Read, acl.Write, acl.Execute}}, nil, nil),
 		}, nil, []stub.Call{
-			call("verbosef", stub.ExpectArgs{"detaching from wayland on %q", []any{"/run/user/1971/wayland-0"}}, nil, nil),
-			call("verbosef", stub.ExpectArgs{"removing wayland socket on %q", []any{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}}, nil, nil),
+			call("verbosef", stub.ExpectArgs{"hanging up wayland socket on %q", []any{m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland")}}, nil, nil),
 			call("remove", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}, nil, stub.UniqueError(1)),
 		}, &OpError{Op: "wayland", Err: errors.Join(stub.UniqueError(1)), Revert: true}},
 
-		{"close", 0xbeef, 0xff, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
-			"org.chromium.Chromium",
-			"ebf083d1b175911782d413369b64ce7c",
-			&stubWaylandConn{t: t, wantAttach: "/run/user/1971/wayland-0", wantBind: [3]string{
-				"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-				"org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"},
-				closeErr: stub.UniqueError(0)},
-		}, []stub.Call{
-			call("verbosef", stub.ExpectArgs{"wayland attached on %q", []any{"/run/user/1971/wayland-0"}}, nil, nil),
-			call("verbosef", stub.ExpectArgs{"wayland listening on %q", []any{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}}, nil, nil),
-			call("chmod", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland", os.FileMode(0)}, nil, nil),
-			call("aclUpdate", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland", 0xbeef, []acl.Perm{acl.Read, acl.Write, acl.Execute}}, nil, nil),
-		}, nil, []stub.Call{
-			call("verbosef", stub.ExpectArgs{"detaching from wayland on %q", []any{"/run/user/1971/wayland-0"}}, nil, nil),
-			call("verbosef", stub.ExpectArgs{"removing wayland socket on %q", []any{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}}, nil, nil),
-			call("remove", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}, nil, nil),
-		}, &OpError{Op: "wayland", Err: errors.Join(stub.UniqueError(0)), Revert: true}},
-
 		{"success", 0xbeef, 0xff, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			&stubWaylandConn{t: t, wantAttach: "/run/user/1971/wayland-0", wantBind: [3]string{
-				"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-				"org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"}},
 		}, []stub.Call{
-			call("verbosef", stub.ExpectArgs{"wayland attached on %q", []any{"/run/user/1971/wayland-0"}}, nil, nil),
-			call("verbosef", stub.ExpectArgs{"wayland listening on %q", []any{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}}, nil, nil),
+			call("waylandNew", stub.ExpectArgs{m("/run/user/1971/wayland-0"), m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"), "org.chromium.Chromium", "ebf083d1b175911782d413369b64ce7c"}, nil, nil),
+			call("verbosef", stub.ExpectArgs{"wayland pathname socket on %q via %q", []any{m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"), m("/run/user/1971/wayland-0")}}, nil, nil),
 			call("chmod", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland", os.FileMode(0)}, nil, nil),
 			call("aclUpdate", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland", 0xbeef, []acl.Perm{acl.Read, acl.Write, acl.Execute}}, nil, nil),
 		}, nil, []stub.Call{
-			call("verbosef", stub.ExpectArgs{"detaching from wayland on %q", []any{"/run/user/1971/wayland-0"}}, nil, nil),
-			call("verbosef", stub.ExpectArgs{"removing wayland socket on %q", []any{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}}, nil, nil),
+			call("verbosef", stub.ExpectArgs{"hanging up wayland socket on %q", []any{m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland")}}, nil, nil),
 			call("remove", stub.ExpectArgs{"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"}, nil, nil),
 		}, nil},
 	})
@@ -210,93 +76,81 @@ func TestWaylandOp(t *testing.T) {
 				"ebf083d1b175911782d413369b64ce7c",
 			)
 		}, []Op{&waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}}, stub.Expect{}},
 	})
 
 	checkOpIs(t, []opIsTestCase{
 		{"dst differs", &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7d/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7d/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, false},
 
 		{"src differs", &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-1",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-1"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, false},
 
 		{"appID differs", &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, false},
 
 		{"instanceID differs", &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7d",
-			new(wayland.Conn),
 		}, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, false},
 
 		{"equals", &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, true},
 	})
 
 	checkOpMeta(t, []opMetaTestCase{
 		{"chromium", &waylandOp{nil,
-			"/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
-			"/run/user/1971/wayland-0",
+			m("/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"),
+			m("/run/user/1971/wayland-0"),
 			"org.chromium.Chromium",
 			"ebf083d1b175911782d413369b64ce7c",
-			new(wayland.Conn),
 		}, Process, "/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland",
 			`wayland socket at "/tmp/hakurei.1971/ebf083d1b175911782d413369b64ce7c/wayland"`},
 	})