IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

when sync'ing users make sure the user's remoteid matches the remote issuing the update (#27203)

Browse Source
This commit is contained in:
Doug Lauder 2024-06-04 05:30:18 -04:00 committed by GitHub
parent 11c2951afa
commit 5114c3b7cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/platform/services/sharedchannel/sync_recv.go
View File

@ -17,6 +17,10 @@ import (
"github.com/mattermost/mattermost/server/v8/platform/services/remotecluster"
)
var (
ErrRemoteIDMismatch = errors.New("remoteID mismatch")
)
func (scs *Service) onReceiveSyncMessage(msg model.RemoteClusterMsg, rc *model.RemoteCluster, response *remotecluster.Response) error {
if msg.Topic != TopicSync {
return fmt.Errorf("wrong topic, expected `%s`, got `%s`", TopicSync, msg.Topic)
@ -167,7 +171,7 @@ func (scs *Service) processSyncMessage(c request.CTX, syncMsg *model.SyncMsg, rc
func (scs *Service) upsertSyncUser(c request.CTX, user *model.User, channel *model.Channel, rc *model.RemoteCluster) (*model.User, error) {
var err error
if user.RemoteId == nil || *user.RemoteId == "" {
if SafeString(user.RemoteId) == "" {
user.RemoteId = model.NewString(rc.RemoteId)
}
@ -185,6 +189,16 @@ func (scs *Service) upsertSyncUser(c request.CTX, user *model.User, channel *mod
return nil, err
}
} else {
// check if existing user belongs to the remote that issued the update
if SafeString(euser.RemoteId) != SafeString(user.RemoteId) {
scs.server.Log().Log(mlog.LvlSharedChannelServiceError, "RemoteID mismatch sync'ing user",
mlog.String("remote", rc.Name),
mlog.String("user_id", user.Id),
mlog.String("existing_user_remote_id", SafeString(euser.RemoteId)),
mlog.String("update_user_remote_id", SafeString(user.RemoteId)),
)
return nil, fmt.Errorf("error updating user: %w", ErrRemoteIDMismatch)
}
patch := &model.UserPatch{
Username: &user.Username,
Nickname: &user.Nickname,

7
server/platform/services/sharedchannel/util.go
View File

@ -148,3 +148,10 @@ func reducePostsSliceInCache(posts []*model.Post, cache map[string]*model.Post)
}
return reduced
}
func SafeString(p *string) string {
if p == nil {
return ""
}
return *p
}