Skip to content

fix: guard decryptors map with RWMutex to prevent data race #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
topi314 merged 1 commit into from
Jun 19, 2026
Merged

fix: guard decryptors map with RWMutex to prevent data race #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions golibdave/golibdave.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package golibdave

import (
"log/slog"
"sync"

"github.com/disgoorg/godave"
"github.com/disgoorg/godave/libdave"
Expand Down Expand Up @@ -43,6 +44,7 @@ type session struct {
callbacks godave.Callbacks
session *libdave.Session
encryptor *libdave.Encryptor
decryptorsMu sync.RWMutex
decryptors map[godave.UserID]*libdave.Decryptor
preparedTransitions map[uint16]uint16
lastPreparedTransitionVersion uint16
Expand All @@ -69,7 +71,10 @@ func (s *session) Encrypt(ssrc uint32, frame []byte, encryptedFrame []byte) (int
}

func (s *session) MaxDecryptedFrameSize(userID godave.UserID, frameSize int) int {
if decryptor, ok := s.decryptors[userID]; ok {
s.decryptorsMu.RLock()
decryptor, ok := s.decryptors[userID]
s.decryptorsMu.RUnlock()
if ok {
return decryptor.GetMaxPlaintextByteSize(libdave.MediaTypeAudio, frameSize)
}

Expand All @@ -78,7 +83,10 @@ func (s *session) MaxDecryptedFrameSize(userID godave.UserID, frameSize int) int
}

func (s *session) Decrypt(userID godave.UserID, frame []byte, decryptedFrame []byte) (int, error) {
if decryptor, ok := s.decryptors[userID]; ok {
s.decryptorsMu.RLock()
decryptor, ok := s.decryptors[userID]
s.decryptorsMu.RUnlock()
if ok {
return decryptor.Decrypt(libdave.MediaTypeAudio, frame, decryptedFrame)
}

Expand All @@ -87,12 +95,16 @@ func (s *session) Decrypt(userID godave.UserID, frame []byte, decryptedFrame []b
}

func (s *session) AddUser(userID godave.UserID) {
s.decryptorsMu.Lock()
s.decryptors[userID] = libdave.NewDecryptor()
s.decryptorsMu.Unlock()
s.setupKeyRatchetForUser(userID, s.lastPreparedTransitionVersion)
}

func (s *session) RemoveUser(userID godave.UserID) {
s.decryptorsMu.Lock()
delete(s.decryptors, userID)
s.decryptorsMu.Unlock()
}

func (s *session) OnSelectProtocolAck(protocolVersion uint16) {
Expand Down
Loading