Skip to content
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

Jump to bottom

Revert "Do not send member updates to all (#3431)" #3447

Merged
merged 2 commits into from
Jul 19, 2023
Merged

Revert "Do not send member updates to all (#3431)" #3447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ce94ca
Revert "Do not send member updates to all (#3431)"
pcapriotti Jul 18, 2023
f431cb9
Make sure that the admin table is kept up to date
pcapriotti Jul 19, 2023
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
5 changes: 2 additions & 3 deletions services/galley/src/Galley/API/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ import Galley.Effects.MemberStore
import qualified Galley.Effects.MemberStore as E
import Galley.Effects.ProposalStore
import Galley.Effects.TeamStore
import qualified Galley.Effects.TeamStore as E
import qualified Galley.Intra.Push as Intra
import Galley.Monad
import Galley.Options
Expand Down Expand Up @@ -377,8 +376,8 @@ rmUser lusr conn = do
goConvPages range newCids

leaveTeams page = for_ (pageItems page) $ \tid -> do
admins <- E.getTeamAdmins tid
uncheckedDeleteTeamMember lusr conn tid (tUnqualified lusr) admins
mems <- getTeamMembersForFanout tid
uncheckedDeleteTeamMember lusr conn tid (tUnqualified lusr) mems
page' <- listTeams @p2 (tUnqualified lusr) (Just (pageState page)) maxBound
leaveTeams page'

Expand Down
97 changes: 62 additions & 35 deletions services/galley/src/Galley/API/Teams.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,10 @@ updateTeamH zusr zcon tid updateData = do
void $ permissionCheckS SSetTeamData zusrMembership
E.setTeamData tid updateData
now <- input
admins <- E.getTeamAdmins tid
memList <- getTeamMembersForFanout tid
let e = newEvent tid now (EdTeamUpdate updateData)
let r = list1 (userRecipient zusr) (map userRecipient (filter (/= zusr) admins))
E.push1 $ newPushLocal1 ListComplete zusr (TeamEvent e) r & pushConn ?~ zcon & pushTransient .~ True
let r = list1 (userRecipient zusr) (membersToRecipients (Just zusr) (memList ^. teamMembers))
E.push1 $ newPushLocal1 (memList ^. teamMemberListType) zusr (TeamEvent e) r & pushConn ?~ zcon

deleteTeam ::
forall r.
Expand Down Expand Up @@ -737,7 +737,8 @@ addTeamMember lzusr zcon tid nmem = do
ensureConnectedToLocals zusr [uid]
(TeamSize sizeBeforeJoin) <- E.getSize tid
ensureNotTooLargeForLegalHold tid (fromIntegral sizeBeforeJoin + 1)
void $ addTeamMemberInternal tid (Just zusr) (Just zcon) nmem
memList <- getTeamMembersForFanout tid
void $ addTeamMemberInternal tid (Just zusr) (Just zcon) nmem memList

-- This function is "unchecked" because there is no need to check for user binding (invite only).
uncheckedAddTeamMember ::
Expand All @@ -759,11 +760,12 @@ uncheckedAddTeamMember ::
NewTeamMember ->
Sem r ()
uncheckedAddTeamMember tid nmem = do
mems <- getTeamMembersForFanout tid
(TeamSize sizeBeforeJoin) <- E.getSize tid
ensureNotTooLargeForLegalHold tid (fromIntegral sizeBeforeJoin + 1)
(TeamSize sizeBeforeAdd) <- addTeamMemberInternal tid Nothing Nothing nmem
owners <- E.getBillingTeamMembers tid
Journal.teamUpdate tid (sizeBeforeAdd + 1) owners
(TeamSize sizeBeforeAdd) <- addTeamMemberInternal tid Nothing Nothing nmem mems
billingUserIds <- E.getBillingTeamMembers tid
Journal.teamUpdate tid (sizeBeforeAdd + 1) billingUserIds

uncheckedUpdateTeamMember ::
forall r.
Expand Down Expand Up @@ -802,15 +804,30 @@ uncheckedUpdateTeamMember mlzusr mZcon tid newMember = do
-- update target in Cassandra
E.setTeamMemberPermissions (previousMember ^. permissions) tid targetId targetPermissions

when (team ^. teamBinding == Binding) $ do
(TeamSize size) <- E.getSize tid
owners <- E.getBillingTeamMembers tid
Journal.teamUpdate tid size owners

now <- input
let event = newEvent tid now (EdMemberUpdate targetId (Just targetPermissions))
let pushPriv = newPush ListComplete mZusr (TeamEvent event) (map userRecipient admins')
for_ pushPriv (\p -> E.push1 (p & pushConn .~ mZcon & pushTransient .~ True))
updatedMembers <- getTeamMembersForFanout tid
updateJournal team
updatePeers mZusr targetId targetMember targetPermissions updatedMembers
where
updateJournal :: Team -> Sem r ()
updateJournal team = do
when (team ^. teamBinding == Binding) $ do
(TeamSize size) <- E.getSize tid
owners <- E.getBillingTeamMembers tid
Journal.teamUpdate tid size owners

updatePeers :: Maybe UserId -> UserId -> TeamMember -> Permissions -> TeamMemberList -> Sem r ()
updatePeers zusr targetId targetMember targetPermissions updatedMembers = do
-- inform members of the team about the change
-- some (privileged) users will be informed about which change was applied
let privileged = filter (`canSeePermsOf` targetMember) (updatedMembers ^. teamMembers)
mkUpdate = EdMemberUpdate targetId
privilegedUpdate = mkUpdate $ Just targetPermissions
privilegedRecipients = membersToRecipients Nothing privileged
now <- input
let ePriv = newEvent tid now privilegedUpdate
-- push to all members (user is privileged)
let pushPriv = newPush (updatedMembers ^. teamMemberListType) zusr (TeamEvent ePriv) $ privilegedRecipients
for_ pushPriv (\p -> E.push1 (p & pushConn .~ mZcon))

updateTeamMember ::
forall r.
Expand Down Expand Up @@ -950,6 +967,7 @@ deleteTeamMember' lusr zcon tid remove mBody = do
tm <- noteS @'TeamMemberNotFound targetMember
unless (canDeleteMember dm tm) $ throwS @'AccessDenied
team <- fmap tdTeam $ E.getTeam tid >>= noteS @'TeamNotFound
mems <- getTeamMembersForFanout tid
if team ^. teamBinding == Binding && isJust targetMember
then do
body <- mBody & note (InvalidPayload "missing request body")
Expand All @@ -967,8 +985,7 @@ deleteTeamMember' lusr zcon tid remove mBody = do
Journal.teamUpdate tid sizeAfterDelete $ filter (/= remove) owners
pure TeamMemberDeleteAccepted
else do
admins <- E.getTeamAdmins tid
uncheckedDeleteTeamMember lusr (Just zcon) tid remove admins
uncheckedDeleteTeamMember lusr (Just zcon) tid remove mems
pure TeamMemberDeleteCompleted

-- This function is "unchecked" because it does not validate that the user has the `RemoveTeamMember` permission.
Expand All @@ -985,43 +1002,47 @@ uncheckedDeleteTeamMember ::
Maybe ConnId ->
TeamId ->
UserId ->
[UserId] ->
TeamMemberList ->
Sem r ()
uncheckedDeleteTeamMember lusr zcon tid remove admins = do
uncheckedDeleteTeamMember lusr zcon tid remove mems = do
now <- input
pushMemberLeaveEvent now
E.deleteTeamMember tid remove
removeFromConvsAndPushConvLeaveEvent now
where
-- notify team admins
-- notify all team members.
pushMemberLeaveEvent :: UTCTime -> Sem r ()
pushMemberLeaveEvent now = do
let e = newEvent tid now (EdMemberLeave remove)
let r =
userRecipient
<$> list1
(tUnqualified lusr)
(filter (/= (tUnqualified lusr)) admins)
list1
(userRecipient (tUnqualified lusr))
(membersToRecipients (Just (tUnqualified lusr)) (mems ^. teamMembers))
E.push1 $
newPushLocal1 ListComplete (tUnqualified lusr) (TeamEvent e) r & pushConn .~ zcon & pushTransient .~ True
newPushLocal1 (mems ^. teamMemberListType) (tUnqualified lusr) (TeamEvent e) r & pushConn .~ zcon
-- notify all conversation members not in this team.
removeFromConvsAndPushConvLeaveEvent :: UTCTime -> Sem r ()
removeFromConvsAndPushConvLeaveEvent now = do
let tmids = Set.fromList admins
-- This may not make sense if that list has been truncated. In such cases, we still want to
-- remove the user from conversations but never send out any events. We assume that clients
-- handle nicely these missing events, regardless of whether they are in the same team or not
let tmids = Set.fromList $ map (view userId) (mems ^. teamMembers)
let edata = Conv.EdMembersLeave (Conv.QualifiedUserIdList [tUntagged (qualifyAs lusr remove)])
cc <- E.getTeamConversations tid
for_ cc $ \c ->
E.getConversation (c ^. conversationId) >>= \conv ->
for_ conv $ \dc -> when (remove `isMember` Data.convLocalMembers dc) $ do
E.deleteMembers (c ^. conversationId) (UserList [remove] [])
pushEvent tmids edata now dc
-- If the list was truncated, then the tmids list is incomplete so we simply drop these events
unless (mems ^. teamMemberListType == ListTruncated) $
pushEvent tmids edata now dc
pushEvent :: Set UserId -> Conv.EventData -> UTCTime -> Data.Conversation -> Sem r ()
pushEvent exceptTo edata now dc = do
let qconvId = tUntagged $ qualifyAs lusr (Data.convId dc)
let (bots, users) = localBotsAndUsers (Data.convLocalMembers dc)
let x = filter (\m -> not (Conv.lmId m `Set.member` exceptTo)) users
let y = Conv.Event qconvId Nothing (tUntagged lusr) now edata
for_ (newPushLocal ListComplete (tUnqualified lusr) (ConvEvent y) (recipient <$> x)) $ \p ->
for_ (newPushLocal (mems ^. teamMemberListType) (tUnqualified lusr) (ConvEvent y) (recipient <$> x)) $ \p ->
E.push1 $ p & pushConn .~ zcon
E.deliverAsync (bots `zip` repeat y)

Expand Down Expand Up @@ -1238,8 +1259,9 @@ addTeamMemberInternal ::
Maybe UserId ->
Maybe ConnId ->
NewTeamMember ->
TeamMemberList ->
Sem r TeamSize
addTeamMemberInternal tid origin originConn (ntmNewTeamMember -> new) = do
addTeamMemberInternal tid origin originConn (ntmNewTeamMember -> new) memList = do
P.debug $
Log.field "targets" (toByteString (new ^. userId))
. Log.field "action" (Log.val "Teams.addTeamMemberInternal")
Expand All @@ -1250,17 +1272,22 @@ addTeamMemberInternal tid origin originConn (ntmNewTeamMember -> new) = do
checkAdminLimit (length admins')

E.createTeamMember tid new

now <- input
let e = newEvent tid now (EdMemberJoin (new ^. userId))
let rs = case origin of
Just o -> userRecipient <$> list1 o (filter (/= o) ((new ^. userId) : admins'))
Nothing -> userRecipient <$> list1 (new ^. userId) (admins')
E.push1 $
newPushLocal1 ListComplete (new ^. userId) (TeamEvent e) rs & pushConn .~ originConn & pushTransient .~ True
newPushLocal1 (memList ^. teamMemberListType) (new ^. userId) (TeamEvent e) (recipients origin new) & pushConn .~ originConn

APITeamQueue.pushTeamEvent tid e
pure sizeBeforeAdd
where
recipients (Just o) n =
list1
(userRecipient o)
(membersToRecipients (Just o) (n : memList ^. teamMembers))
recipients Nothing n =
list1
(userRecipient (n ^. userId))
(membersToRecipients Nothing (memList ^. teamMembers))

finishCreateTeam ::
( Member GundeckAccess r,
Expand Down
Loading
Loading