deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-04 14:53:10 +02:00
Code Issues Releases Wiki Activity

Improve detection of decodable sessions that were created on a different server.

Browse source
This commit is contained in:
Joachim Bauch 2022-06-28 14:31:23 +02:00
parent 25dabf910d
commit 36710c8aa9
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hub.go
View file

@ -592,9 +592,9 @@ func (h *Hub) GetSessionByPublicId(sessionId string) Session {
return nil
}
h.mu.Lock()
h.mu.RLock()
defer h.mu.RUnlock()
session := h.sessions[data.Sid]
h.mu.Unlock()
if session != nil && session.PublicId() != sessionId {
// Session was created on different server.
return nil
@ -1284,7 +1284,7 @@ func (h *Hub) processMessageMsg(client *Client, message *ClientMessage) {
recipientSessionId = msg.Recipient.SessionId
h.mu.RLock()
sess, found := h.sessions[data.Sid]
if found {
if found && sess.PublicId() == msg.Recipient.SessionId {
if sess, ok := sess.(*ClientSession); ok {
recipient = sess
}
@ -1441,7 +1441,7 @@ func (h *Hub) processControlMsg(client *Client, message *ClientMessage) {
return
}
var recipient *Client
var recipient *ClientSession
var subject string
var serverRecipient *MessageClientMessageRecipient
var recipientSessionId string
@ -1458,16 +1458,19 @@ func (h *Hub) processControlMsg(client *Client, message *ClientMessage) {
subject = "session." + msg.Recipient.SessionId
recipientSessionId = msg.Recipient.SessionId
h.mu.RLock()
recipient = h.clients[data.Sid]
if recipient == nil {
sess, found := h.sessions[data.Sid]
if found && sess.PublicId() == msg.Recipient.SessionId {
if sess, ok := sess.(*ClientSession); ok {
recipient = sess
}
// Send to client connection for virtual sessions.
sess := h.sessions[data.Sid]
if sess != nil && sess.ClientType() == HelloClientTypeVirtual {
if sess.ClientType() == HelloClientTypeVirtual {
virtualSession := sess.(*VirtualSession)
clientSession := virtualSession.Session()
subject = "session." + clientSession.PublicId()
recipientSessionId = clientSession.PublicId()
recipient = clientSession.GetClient()
recipient = clientSession
// The client should see his session id as recipient.
serverRecipient = &MessageClientMessageRecipient{
Type: "session",