Don't fail on unknown session

There may be a race condition if a user disconnects and the other peer just sent a p2p message. Fixes #14
screego · Oct 23, 2020 · 3191988 · 3191988
1 parent 6365bf6
commit 3191988
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/ws/event_clientanswer.go b/ws/event_clientanswer.go
@@ -2,7 +2,7 @@ package ws
 
 import (
 	"fmt"
-
+	"github.com/rs/zerolog/log"
 	"github.com/screego/server/ws/outgoing"
 )
 
@@ -26,8 +26,13 @@ func (e *ClientAnswer) Execute(rooms *Rooms, current ClientInfo) error {
 
 	session, ok := room.Sessions[e.SID]
 
-	if !ok || session.Client != current.ID {
-		return fmt.Errorf("session with id %s does not exist", current.RoomID)
+	if !ok {
+		log.Debug().Str("id", e.SID.String()).Msg("unknown session")
+		return nil
+	}
+
+	if session.Client != current.ID {
+		return fmt.Errorf("permission denied for session %s", e.SID)
 	}
 
 	room.Users[session.Host].Write <- outgoing.ClientAnswer(*e)

diff --git a/ws/event_clientice.go b/ws/event_clientice.go
@@ -2,7 +2,7 @@ package ws
 
 import (
 	"fmt"
-
+	"github.com/rs/zerolog/log"
 	"github.com/screego/server/ws/outgoing"
 )
 
@@ -26,8 +26,13 @@ func (e *ClientICE) Execute(rooms *Rooms, current ClientInfo) error {
 
 	session, ok := room.Sessions[e.SID]
 
-	if !ok || session.Client != current.ID {
-		return fmt.Errorf("session with id %s does not exist", current.RoomID)
+	if !ok {
+		log.Debug().Str("id", e.SID.String()).Msg("unknown session")
+		return nil
+	}
+
+	if session.Client != current.ID {
+		return fmt.Errorf("permission denied for session %s", e.SID)
 	}
 
 	room.Users[session.Host].Write <- outgoing.ClientICE(*e)

diff --git a/ws/event_hostice.go b/ws/event_hostice.go
@@ -2,7 +2,7 @@ package ws
 
 import (
 	"fmt"
-
+	"github.com/rs/zerolog/log"
 	"github.com/screego/server/ws/outgoing"
 )
 
@@ -26,8 +26,13 @@ func (e *HostICE) Execute(rooms *Rooms, current ClientInfo) error {
 
 	session, ok := room.Sessions[e.SID]
 
-	if !ok || session.Host != current.ID {
-		return fmt.Errorf("session with id %s does not exist", current.RoomID)
+	if !ok {
+		log.Debug().Str("id", e.SID.String()).Msg("unknown session")
+		return nil
+	}
+
+	if session.Host != current.ID {
+		return fmt.Errorf("permission denied for session %s", e.SID)
 	}
 
 	room.Users[session.Client].Write <- outgoing.HostICE(*e)

diff --git a/ws/event_hostoffer.go b/ws/event_hostoffer.go
@@ -2,7 +2,7 @@ package ws
 
 import (
 	"fmt"
-
+	"github.com/rs/zerolog/log"
 	"github.com/screego/server/ws/outgoing"
 )
 
@@ -26,8 +26,13 @@ func (e *HostOffer) Execute(rooms *Rooms, current ClientInfo) error {
 
 	session, ok := room.Sessions[e.SID]
 
-	if !ok || session.Host != current.ID {
-		return fmt.Errorf("session with id %s does not exist", current.RoomID)
+	if !ok {
+		log.Debug().Str("id", e.SID.String()).Msg("unknown session")
+		return nil
+	}
+
+	if session.Host != current.ID {
+		return fmt.Errorf("permission denied for session %s", e.SID)
 	}
 
 	room.Users[session.Client].Write <- outgoing.HostOffer(*e)