MM-64531: [Shared Channels] Users on different remote servers should not communicate unless the remotes have established secure connection. (#30985) (#33434)

Automatic Merge

server/public/model/shared_channel.go

@@ -12,8 +12,10 @@ import (
 )
 
 const (
-	UserPropsKeyRemoteUsername = "RemoteUsername"
-	UserPropsKeyRemoteEmail    = "RemoteEmail"
+	UserPropsKeyRemoteUsername   = "RemoteUsername"
+	UserPropsKeyRemoteEmail      = "RemoteEmail"
+	UserPropsKeyOriginalRemoteId = "OriginalRemoteId"
+	UserOriginalRemoteIdUnknown  = "UNKNOWN"
 )
 
 var (

server/public/model/user.go

@@ -936,6 +936,22 @@ func (u *User) GetRemoteID() string {
 	return SafeDereference(u.RemoteId)
 }
 
+func (u *User) GetOriginalRemoteID() string {
+	if u.Props == nil {
+		if u.IsRemote() {
+			return UserOriginalRemoteIdUnknown
+		}
+		return "" // Local user
+	}
+	if originalId, exists := u.Props[UserPropsKeyOriginalRemoteId]; exists && originalId != "" {
+		return originalId
+	}
+	if u.IsRemote() {
+		return UserOriginalRemoteIdUnknown
+	}
+	return "" // Local user
+}
+
 func (u *User) GetAuthData() string {
 	return SafeDereference(u.AuthData)
 }