include authmethod and authextra in meta session API (#264)

* include authmethod and authextra in meta session API

* potentially fix tests

* make sure session count is in sync eventually

Author: om26er

acceptor.go

@@ -157,7 +157,7 @@ func Accept(peer Peer, hello *messages.Hello, serializer serializers.Serializer,
 
 Welcomed:
 	d, _ := a.SessionDetails()
-	details := NewBaseSession(d.ID(), d.Realm(), d.AuthID(), d.AuthRole(), peer, serializer)
+	details := NewBaseSession(d.ID(), d.Realm(), d.AuthID(), d.AuthRole(), d.AuthMethod(), d.AuthExtra(), peer, serializer)
 	return details, nil
 }
 

client.go

@@ -132,6 +132,8 @@ func ConnectInMemoryBase(router *Router, realm, authID, authRole string,
 		realm,
 		authID,
 		authRole,
+		"",
+		map[string]any{},
 		routerPeer,
 		serializer,
 	)
@@ -145,6 +147,8 @@ func ConnectInMemoryBase(router *Router, realm, authID, authRole string,
 		realm,
 		authID,
 		authRole,
+		"",
+		map[string]any{},
 		clientPeer,
 		serializer,
 	)

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.10.0
-	github.com/xconnio/wampproto-go v0.0.0-20251103160710-51d26611527b
+	github.com/xconnio/wampproto-go v0.0.0-20251105154130-632905d8a3d9
 	golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -43,8 +43,8 @@ github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAh
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-github.com/xconnio/wampproto-go v0.0.0-20251103160710-51d26611527b h1:MAJwfVEdTvbfGHbZef1DS+LhJ8rSrzPJ1DxJhfQEDyk=
-github.com/xconnio/wampproto-go v0.0.0-20251103160710-51d26611527b/go.mod h1:k2I4x+dOyJq5XW6SHbnwrqJEuRf/lO9rbF5habINuMM=
+github.com/xconnio/wampproto-go v0.0.0-20251105154130-632905d8a3d9 h1:2eGfp79Yjj8gf1uNONKVp9FG5U/XhcoAaT1p6kbNJRU=
+github.com/xconnio/wampproto-go v0.0.0-20251105154130-632905d8a3d9/go.mod h1:k2I4x+dOyJq5XW6SHbnwrqJEuRf/lO9rbF5habINuMM=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=

joiner.go

@@ -194,7 +194,8 @@ func Join(cl Peer, realm string, serializer serializers.Serializer,
 				return nil, err
 			}
 
-			base := NewBaseSession(details.ID(), details.Realm(), details.AuthID(), details.AuthRole(), cl, serializer)
+			base := NewBaseSession(details.ID(), details.Realm(), details.AuthID(), details.AuthRole(),
+				details.AuthMethod(), details.AuthExtra(), cl, serializer)
 			return base, nil
 		}
 

meta.go

@@ -63,7 +63,8 @@ func (m *meta) onJoin(base BaseSession) {
 		"session":      base.ID(),
 		"authid":       base.AuthID(),
 		"authrole":     base.AuthRole(),
-		"authmethod":   "",
+		"authmethod":   base.AuthMethod(),
+		"authextra":    base.AuthExtra(),
 		"authprovider": "",
 	}
 
@@ -263,7 +264,8 @@ func (m *meta) handleSessionGet(_ context.Context, invocation *Invocation) *Invo
 		"session":      client.ID(),
 		"authid":       client.AuthID(),
 		"authrole":     client.AuthRole(),
-		"authmethod":   "",
+		"authmethod":   client.AuthMethod(),
+		"authextra":    client.AuthExtra(),
 		"authprovider": "",
 	}
 	return NewInvocationResult(details)

peer.go

@@ -23,22 +23,27 @@ const (
 	RouterOutQueueSizeDefault = 64
 )
 
-func NewBaseSession(id uint64, realm, authID, authRole string, cl Peer, serializer serializers.Serializer) BaseSession {
+func NewBaseSession(id uint64, realm, authID, authRole, authMethod string, authExtra map[string]any, cl Peer,
+	serializer serializers.Serializer) BaseSession {
 	return &baseSession{
 		id:         id,
 		realm:      realm,
 		authID:     authID,
 		authRole:   authRole,
+		authMethod: authMethod,
+		authExtra:  authExtra,
 		client:     cl,
 		serializer: serializer,
 	}
 }
 
 type baseSession struct {
-	id       uint64
-	realm    string
-	authID   string
-	authRole string
+	id         uint64
+	realm      string
+	authID     string
+	authRole   string
+	authMethod string
+	authExtra  map[string]any
 
 	client     Peer
 	serializer serializers.Serializer
@@ -50,6 +55,14 @@ type baseSession struct {
 	sync.Mutex
 }
 
+func (b *baseSession) AuthMethod() string {
+	return b.authMethod
+}
+
+func (b *baseSession) AuthExtra() map[string]any {
+	return b.authExtra
+}
+
 func (b *baseSession) EnableLogPublishing(session *Session, topic string) {
 	b.Lock()
 	defer b.Unlock()

realm.go

@@ -32,7 +32,7 @@ func (r *Realm) AttachClient(base BaseSession) error {
 	r.clients.Store(base.ID(), base)
 
 	details := wampproto.NewSessionDetails(base.ID(), base.Realm(), base.AuthID(), base.AuthRole(),
-		base.Serializer().Static(), wampproto.RouterRoles)
+		base.AuthMethod(), base.Serializer().Static(), wampproto.RouterRoles, base.AuthExtra())
 
 	if err := r.broker.AddSession(details); err != nil {
 		return err

router_test.go

@@ -222,9 +222,11 @@ func TestRouterMetaSessionCount(t *testing.T) {
 	require.NoError(t, session2.Leave())
 
 	t.Run("CountAfterAdminSessionLeaves", func(t *testing.T) {
-		resp := session.Call(xconn.MetaProcedureSessionCount).Do()
-		require.NoError(t, resp.Err)
-		require.Equal(t, uint64(2), resp.ArgUInt64Or(0, 0))
+		require.Eventually(t, func() bool {
+			resp := session.Call(xconn.MetaProcedureSessionCount).Do()
+			require.NoError(t, resp.Err)
+			return uint64(2) == resp.Args()[0]
+		}, time.Second, 10*time.Millisecond)
 	})
 }
 
@@ -286,7 +288,7 @@ func TestRouterMetaSessionGet(t *testing.T) {
 	require.NoError(t, err)
 
 	expectedDetails := map[string]any{"authid": session.Details().AuthID(), "authmethod": "", "authprovider": "",
-		"authrole": "trusted", "session": session.ID()}
+		"authrole": "trusted", "session": session.ID(), "authextra": map[string]any{}}
 	resp := session.Call(xconn.MetaProcedureSessionGet).Arg(session.ID()).Do()
 	require.NoError(t, resp.Err)
 	require.Equal(t, expectedDetails, resp.Args()[0])

session.go

@@ -77,7 +77,8 @@ func NewSession(base BaseSession, serializer serializers.Serializer) *Session {
 
 		leaveChan: make(chan struct{}, 1),
 
-		details:   NewSessionDetails(base.ID(), base.Realm(), base.AuthID(), base.AuthRole()),
+		details: NewSessionDetails(base.ID(), base.Realm(), base.AuthID(), base.AuthRole(), base.AuthMethod(),
+			base.AuthExtra()),
 		connected: true,
 	}