Fixe concurrent map read and map write for XMPP remote roster request.

gateway/gateway.go

@@ -1,6 +1,8 @@
 package gateway
 
 import (
+	"sync"
+
 	"github.com/Philipp15b/go-steam"
 )
 
@@ -23,20 +25,35 @@ type GatewayInfo struct {
 	SteamLoginInfo  *steam.LogOnDetails
 	SteamClient     *steam.Client
 	SentryFile      string
-	FriendSteamId   map[string]*StatusSteamFriend
+	friendSteamId   *FriendSteam
 	SteamConnecting bool
 	Deleting        bool
 
 	// XMPP
 	XMPP_JID_Client              string
 	XMPP_Out                     chan interface{}
-	XMPP_Connected_Client        map[string]bool
+	xmpp_Connected_Client        *XmppConnectedClient
 	DebugMessage                 bool
-	XMPP_IQ_RemoteRoster_Request map[string]string
+	xmpp_IQ_RemoteRoster_Request *XmppRemoteRosterRequest
 	AllowEditRoster              bool
 	ChatstateNotificationData    chan string
 }
 
+type FriendSteam struct {
+	steamId map[string]*StatusSteamFriend
+	sync.RWMutex
+}
+
+type XmppConnectedClient struct {
+	client map[string]bool
+	sync.RWMutex
+}
+
+type XmppRemoteRosterRequest struct {
+	request map[string]string
+	sync.RWMutex
+}
+
 type StatusSteamFriend struct {
 	XMPP_Status   string
 	XMPP_Type     string
@@ -68,3 +85,82 @@ func (g *GatewayInfo) Delete() {
 
 	g.Disconnect()
 }
+
+func (s *GatewayInfo) CreateSteamIds() {
+	s.friendSteamId = &FriendSteam{steamId: make(map[string]*StatusSteamFriend)}
+}
+
+func (s *GatewayInfo) GetFriendSteamId(steamId string) *StatusSteamFriend {
+	s.friendSteamId.RLock()
+	defer s.friendSteamId.RUnlock()
+	return s.friendSteamId.steamId[steamId]
+}
+
+func (s *GatewayInfo) GetAllFriendSteamId() []string {
+	s.friendSteamId.RLock()
+	defer s.friendSteamId.RUnlock()
+	allSteamIds := make([]string, len(s.friendSteamId.steamId))
+
+	i := 0
+	for steamId := range s.friendSteamId.steamId {
+		allSteamIds[i] = steamId
+		i++
+	}
+	return allSteamIds
+}
+
+func (s *GatewayInfo) SetFriendSteamId(steamId string, status *StatusSteamFriend) {
+	s.friendSteamId.Lock()
+	s.friendSteamId.steamId[steamId] = status
+	s.friendSteamId.Unlock()
+}
+
+func (s *GatewayInfo) RemoveFriendSteamId(steamId string) {
+	s.friendSteamId.Lock()
+	delete(s.friendSteamId.steamId, steamId)
+	s.friendSteamId.Unlock()
+}
+
+func (s *GatewayInfo) CreateXmppConnectedClient() {
+	s.xmpp_Connected_Client = &XmppConnectedClient{client: make(map[string]bool)}
+}
+
+func (s *GatewayInfo) SetXmppConnectedClient(jid string) {
+	s.xmpp_Connected_Client.Lock()
+	s.xmpp_Connected_Client.client[jid] = true
+	s.xmpp_Connected_Client.Unlock()
+}
+
+func (s *GatewayInfo) RemoveXmppConnectedClient(jid string) {
+	s.xmpp_Connected_Client.Lock()
+	delete(s.xmpp_Connected_Client.client, jid)
+	s.xmpp_Connected_Client.Unlock()
+}
+
+func (s *GatewayInfo) GetLenXmppConnectedClient() int {
+	s.xmpp_Connected_Client.RLock()
+	defer s.xmpp_Connected_Client.RUnlock()
+	return len(s.xmpp_Connected_Client.client)
+}
+
+func (s *GatewayInfo) CreateXmppRemoteRosterRequest() {
+	s.xmpp_IQ_RemoteRoster_Request = &XmppRemoteRosterRequest{request: make(map[string]string)}
+}
+
+func (s *GatewayInfo) SetXmppRemoteRosterRequest(iqId, value string) {
+	s.xmpp_IQ_RemoteRoster_Request.Lock()
+	s.xmpp_IQ_RemoteRoster_Request.request[iqId] = value
+	s.xmpp_IQ_RemoteRoster_Request.Unlock()
+}
+
+func (s *GatewayInfo) RemoveXmppRemoteRosterRequest(iqId string) {
+	s.xmpp_IQ_RemoteRoster_Request.Lock()
+	delete(s.xmpp_IQ_RemoteRoster_Request.request, iqId)
+	s.xmpp_IQ_RemoteRoster_Request.Unlock()
+}
+
+func (s *GatewayInfo) GetXmppRemoteRosterRequest(iqId string) string {
+	s.xmpp_IQ_RemoteRoster_Request.RLock()
+	defer s.xmpp_IQ_RemoteRoster_Request.RUnlock()
+	return s.xmpp_IQ_RemoteRoster_Request.request[iqId]
+}

gateway/steam.go

@@ -127,15 +127,16 @@ func (g *GatewayInfo) mainSteam() {
 				status = Status_extended_away
 				tpye = Type_available
 			}
-			if _, ok := g.FriendSteamId[steamId]; !ok {
+			steamFriendId := g.GetFriendSteamId(steamId)
+			if steamFriendId == nil {
 				// Send subscribsion
 				g.SendXmppPresence(status, Type_subscribe, "", steamId+"@"+XmppJidComponent, gameName, name)
-				g.FriendSteamId[steamId] = &StatusSteamFriend{XMPP_Status: status, XMPP_Type: tpye}
+				g.SetFriendSteamId(steamId, &StatusSteamFriend{XMPP_Status: status, XMPP_Type: tpye})
 			} else {
-				g.FriendSteamId[steamId].XMPP_Status = status
+				steamFriendId.XMPP_Status = status
-				g.FriendSteamId[steamId].XMPP_Type = tpye
+				steamFriendId.XMPP_Type = tpye
-				g.FriendSteamId[steamId].SteamGameName = gameName
+				steamFriendId.SteamGameName = gameName
-				g.FriendSteamId[steamId].SteamName = name
+				steamFriendId.SteamName = name
 			}
 			g.SendXmppPresence(status, tpye, "", steamId+"@"+XmppJidComponent, gameName, name)
 
@@ -226,9 +227,9 @@ func (g *GatewayInfo) SteamDisconnect() {
 
 func (g *GatewayInfo) DisconnectAllSteamFriend() {
 	logger.Debug.Printf("[%s] Disconnect all Steam friend", g.XMPP_JID_Client)
-	for sid := range g.FriendSteamId {
+	for _, sid := range g.GetAllFriendSteamId() {
 		g.SendXmppPresence(Status_offline, Type_unavailable, "", sid+"@"+XmppJidComponent, "", "")
-		delete(g.FriendSteamId, sid)
+		g.RemoveFriendSteamId(sid)
 	}
 }
 

gateway/xmpp.go

@@ -56,14 +56,14 @@ func (g *GatewayInfo) ReceivedXMPP_Presence(presence *xmpp.Presence) {
 	if len(jid) == 2 {
 		// Resource exist —> client speaking
 		if presence.Type == Type_available {
-			g.XMPP_Connected_Client[presence.From] = true
+			g.SetXmppConnectedClient(presence.From)
 		} else if presence.Type == Type_unavailable {
-			delete(g.XMPP_Connected_Client, presence.From)
+			g.RemoveXmppConnectedClient(presence.From)
 		}
 	}
 
 	if presence.Type == Type_probe {
-		steamFriendStatus := g.FriendSteamId[steamJid[0]]
+		steamFriendStatus := g.GetFriendSteamId(steamJid[0])
 		if steamFriendStatus != nil {
 			g.SendXmppPresence(steamFriendStatus.XMPP_Status, steamFriendStatus.XMPP_Type, "", steamJid[0]+"@"+XmppJidComponent, steamFriendStatus.SteamGameName, steamFriendStatus.SteamName)
 		}
@@ -79,7 +79,7 @@ func (g *GatewayInfo) ReceivedXMPP_Presence(presence *xmpp.Presence) {
 		// Destination is gateway itself
 		if presence.Type == Type_unavailable {
 			// Disconnect
-			if len(g.XMPP_Connected_Client) <= 0 {
+			if g.GetLenXmppConnectedClient() <= 0 {
 				g.Disconnect()
 			}
 		} else {
@@ -138,8 +138,9 @@ func (g *GatewayInfo) ReceivedXMPP_Message(message *xmpp.Message) {
 
 func (g *GatewayInfo) ReceivedXMPP_IQ(iq *xmpp.IQ) bool {
 	ret := false
-	if g.XMPP_IQ_RemoteRoster_Request[iq.ID] == RemoteRosterRequestPermission {
+	remoteRosterRequestValue := g.GetXmppRemoteRosterRequest(iq.ID)
-		delete(g.XMPP_IQ_RemoteRoster_Request, iq.ID)
+	if remoteRosterRequestValue == RemoteRosterRequestPermission {
+		g.RemoveXmppRemoteRosterRequest(iq.ID)
 
 		if iq.Type == xmpp.IQTypeError && iq.Error.Condition() == xmpp.ErrorForbidden {
 			g.AllowEditRoster = false
@@ -160,15 +161,15 @@ func (g *GatewayInfo) ReceivedXMPP_IQ(iq *xmpp.IQ) bool {
 			logger.Info.Printf("Check roster edition authorisation by querying roster's user")
 			// Remote roster namespace may not be supported (like prosody), so we send a roster query
 			iqId := NextIqId()
-			g.XMPP_IQ_RemoteRoster_Request[iqId] = RemoteRosterRequestRoster
+			g.SetXmppRemoteRosterRequest(iqId, RemoteRosterRequestRoster)
 			iqSend := &xmpp.IQ{ID: iqId, Type: xmpp.IQTypeGet, From: iq.To, To: iq.From}
 			iqSend.PayloadEncode(&xmpp.RosterQuery{})
 			g.XMPP_Out <- iqSend
 		}
 		ret = true
 
-	} else if g.XMPP_IQ_RemoteRoster_Request[iq.ID] == RemoteRosterRequestRoster {
+	} else if remoteRosterRequestValue == RemoteRosterRequestRoster {
-		delete(g.XMPP_IQ_RemoteRoster_Request, iq.ID)
+		g.RemoveXmppRemoteRosterRequest(iq.ID)
 		if iq.Type == xmpp.IQTypeResult && iq.PayloadName().Space == xmpp.NSRoster {
 			g.AllowEditRoster = true
 		} else {

xmpp/xmpp.go

@@ -277,13 +277,13 @@ func AddNewUser(jidUser, steamLogin, steamPwd string, debugMessage bool) {
 	g.SteamPassword = steamPwd
 	g.XMPP_JID_Client = jidUser
 	g.SentryFile = gateway.SentryDirectory + jidUser
-	g.FriendSteamId = make(map[string]*gateway.StatusSteamFriend)
+	g.CreateSteamIds()
 	g.Deleting = false
 
 	g.XMPP_Out = comp.Out
-	g.XMPP_Connected_Client = make(map[string]bool)
+	g.CreateXmppConnectedClient()
 	g.DebugMessage = debugMessage
-	g.XMPP_IQ_RemoteRoster_Request = make(map[string]string)
+	g.CreateXmppRemoteRosterRequest()
 	g.AllowEditRoster = false
 
 	MapGatewayInfo[jidUser] = g
@@ -292,7 +292,7 @@ func AddNewUser(jidUser, steamLogin, steamPwd string, debugMessage bool) {
 	logger.Info.Printf("Check roster edition by asking with remote roster manager namespace")
 	// Ask if remote roster is allow
 	iqId := gateway.NextIqId()
-	g.XMPP_IQ_RemoteRoster_Request[iqId] = gateway.RemoteRosterRequestPermission
+	g.SetXmppRemoteRosterRequest(iqId, gateway.RemoteRosterRequestPermission)
 	iq := xmpp.IQ{To: jidUser, From: jid.Domain, Type: xmpp.IQTypeGet, ID: iqId}
 	// iq.PayloadEncode(&xmpp.RosterQuery{})
 	iq.PayloadEncode(&xmpp.RemoteRosterManagerQuery{Reason: "Manage contacts in the Steam contact list", Type: xmpp.RemoteRosterManagerTypeRequest})