Rework how groups are auto-whitelisted.
This commit is contained in:
Matthew Chen
parent
df2a4e8824
commit
98f7b2cfbf
@ -736,14 +736,14 @@ public class GroupV2UpdatesImpl: NSObject, GroupV2UpdatesSwift {
|
||||
let changeAuthorUuid = try groupV2Params.uuid(forUserId: changeAuthorUuidData)
|
||||
let groupUpdateSourceAddress = SignalServiceAddress(uuid: changeAuthorUuid)
|
||||
let newDisappearingMessageToken = snapshot.disappearingMessageToken
|
||||
let mightBeAddingLocalUserToGroup = self.mightBeAddingLocalUserToGroup(groupChange: firstGroupChange,
|
||||
groupV2Params: groupV2Params)
|
||||
let didAddLocalUserToV2Group = self.didAddLocalUserToV2Group(groupChange: firstGroupChange,
|
||||
groupV2Params: groupV2Params)
|
||||
|
||||
let result = try GroupManager.tryToUpsertExistingGroupThreadInDatabaseAndCreateInfoMessage(newGroupModel: newGroupModel,
|
||||
newDisappearingMessageToken: newDisappearingMessageToken,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
canInsert: true,
|
||||
mightBeAddingLocalUserToGroup: mightBeAddingLocalUserToGroup,
|
||||
didAddLocalUserToV2Group: didAddLocalUserToV2Group,
|
||||
transaction: transaction)
|
||||
|
||||
// NOTE: We don't need to worry about profile keys here. This method is
|
||||
@ -757,8 +757,8 @@ public class GroupV2UpdatesImpl: NSObject, GroupV2UpdatesSwift {
|
||||
}
|
||||
}
|
||||
|
||||
private func mightBeAddingLocalUserToGroup(groupChange: GroupV2Change,
|
||||
groupV2Params: GroupV2Params) -> Bool {
|
||||
private func didAddLocalUserToV2Group(groupChange: GroupV2Change,
|
||||
groupV2Params: GroupV2Params) -> Bool {
|
||||
guard let localUuid = tsAccountManager.localUuid else {
|
||||
return false
|
||||
}
|
||||
@ -866,7 +866,7 @@ public class GroupV2UpdatesImpl: NSObject, GroupV2UpdatesSwift {
|
||||
newDisappearingMessageToken: newDisappearingMessageToken,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
canInsert: true,
|
||||
mightBeAddingLocalUserToGroup: false,
|
||||
didAddLocalUserToV2Group: false,
|
||||
transaction: transaction)
|
||||
|
||||
GroupManager.storeProfileKeysFromGroupProtos(groupV2Snapshot.profileKeys)
|
||||
|
||||
@ -367,7 +367,7 @@ public class GroupManager: NSObject {
|
||||
return self.insertGroupThreadInDatabaseAndCreateInfoMessage(groupModel: groupModel,
|
||||
disappearingMessageToken: disappearingMessageToken,
|
||||
groupUpdateSourceAddress: localAddress,
|
||||
mightBeAddingLocalUserToGroup: false,
|
||||
shouldAttributeAuthor: true,
|
||||
transaction: transaction)
|
||||
}
|
||||
|
||||
@ -660,24 +660,15 @@ public class GroupManager: NSObject {
|
||||
groupUpdateSourceAddress: SignalServiceAddress?,
|
||||
infoMessagePolicy: InfoMessagePolicy = .always,
|
||||
transaction: SDSAnyWriteTransaction) throws -> UpsertGroupResult {
|
||||
let mightBeAddingLocalUserToGroup = try mightBeAddingLocalUserToV1Group(groupModel: groupModel)
|
||||
return try self.tryToUpsertExistingGroupThreadInDatabaseAndCreateInfoMessage(newGroupModel: groupModel,
|
||||
newDisappearingMessageToken: disappearingMessageToken,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
canInsert: true,
|
||||
mightBeAddingLocalUserToGroup: mightBeAddingLocalUserToGroup,
|
||||
didAddLocalUserToV2Group: false,
|
||||
infoMessagePolicy: infoMessagePolicy,
|
||||
transaction: transaction)
|
||||
}
|
||||
|
||||
private static func mightBeAddingLocalUserToV1Group(groupModel: TSGroupModel) throws -> Bool {
|
||||
guard let localAddress = tsAccountManager.localAddress else {
|
||||
throw OWSAssertionError("Missing localAddress.")
|
||||
}
|
||||
return (groupModel.groupsVersion == .V1 &&
|
||||
groupModel.groupMembership.isMemberOfAnyKind(localAddress))
|
||||
}
|
||||
|
||||
// MARK: - Update Existing Group (Remote)
|
||||
|
||||
// Unlike remoteUpsertExistingGroupV1(), this method never inserts.
|
||||
@ -701,12 +692,11 @@ public class GroupManager: NSObject {
|
||||
return UpsertGroupResult(action: .unchanged, groupThread: groupThread)
|
||||
}
|
||||
let newGroupModel = updateInfo.newGroupModel
|
||||
let mightBeAddingLocalUserToGroup = try mightBeAddingLocalUserToV1Group(groupModel: newGroupModel)
|
||||
return try self.tryToUpsertExistingGroupThreadInDatabaseAndCreateInfoMessage(newGroupModel: newGroupModel,
|
||||
newDisappearingMessageToken: disappearingMessageToken,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
canInsert: false,
|
||||
mightBeAddingLocalUserToGroup: mightBeAddingLocalUserToGroup,
|
||||
didAddLocalUserToV2Group: false,
|
||||
transaction: transaction)
|
||||
}
|
||||
|
||||
@ -763,12 +753,11 @@ public class GroupManager: NSObject {
|
||||
dmConfiguration: dmConfiguration,
|
||||
transaction: transaction)
|
||||
let newGroupModel = updateInfo.newGroupModel
|
||||
let mightBeAddingLocalUserToGroup = try mightBeAddingLocalUserToV1Group(groupModel: newGroupModel)
|
||||
let upsertGroupResult = try self.tryToUpsertExistingGroupThreadInDatabaseAndCreateInfoMessage(newGroupModel: newGroupModel,
|
||||
newDisappearingMessageToken: dmConfiguration?.asToken,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
canInsert: false,
|
||||
mightBeAddingLocalUserToGroup: mightBeAddingLocalUserToGroup,
|
||||
didAddLocalUserToV2Group: false,
|
||||
transaction: transaction)
|
||||
|
||||
if let dmConfiguration = dmConfiguration {
|
||||
@ -1765,22 +1754,26 @@ public class GroupManager: NSObject {
|
||||
public static func insertGroupThreadInDatabaseAndCreateInfoMessage(groupModel: TSGroupModel,
|
||||
disappearingMessageToken: DisappearingMessageToken?,
|
||||
groupUpdateSourceAddress: SignalServiceAddress?,
|
||||
mightBeAddingLocalUserToGroup: Bool,
|
||||
shouldAttributeAuthor: Bool,
|
||||
infoMessagePolicy: InfoMessagePolicy = .always,
|
||||
transaction: SDSAnyWriteTransaction) -> TSGroupThread {
|
||||
let groupThread = TSGroupThread(groupModelPrivate: groupModel)
|
||||
groupThread.anyInsert(transaction: transaction)
|
||||
|
||||
let sourceAddress: SignalServiceAddress? = (shouldAttributeAuthor
|
||||
? groupUpdateSourceAddress
|
||||
: nil)
|
||||
|
||||
let newDisappearingMessageToken = disappearingMessageToken ?? DisappearingMessageToken.disabledToken
|
||||
_ = updateDisappearingMessagesInDatabaseAndCreateMessages(token: newDisappearingMessageToken,
|
||||
thread: groupThread,
|
||||
shouldInsertInfoMessage: false,
|
||||
groupUpdateSourceAddress: nil,
|
||||
groupUpdateSourceAddress: sourceAddress,
|
||||
transaction: transaction)
|
||||
|
||||
updateProfileWhitelistIfNecessary(withGroupThread: groupThread,
|
||||
updateProfileWhitelistIfNecessary(oldGroupModel: nil,
|
||||
newGroupModel: groupModel,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
mightBeAddingLocalUserToGroup: mightBeAddingLocalUserToGroup,
|
||||
transaction: transaction)
|
||||
|
||||
switch infoMessagePolicy {
|
||||
@ -1790,7 +1783,7 @@ public class GroupManager: NSObject {
|
||||
newGroupModel: groupModel,
|
||||
oldDisappearingMessageToken: nil,
|
||||
newDisappearingMessageToken: newDisappearingMessageToken,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
groupUpdateSourceAddress: sourceAddress,
|
||||
transaction: transaction)
|
||||
default:
|
||||
break
|
||||
@ -1811,9 +1804,9 @@ public class GroupManager: NSObject {
|
||||
// If newDisappearingMessageToken is nil, don't update the disappearing messages configuration.
|
||||
public static func tryToUpsertExistingGroupThreadInDatabaseAndCreateInfoMessage(newGroupModel: TSGroupModel,
|
||||
newDisappearingMessageToken: DisappearingMessageToken?,
|
||||
groupUpdateSourceAddress groupUpdateSourceAddressParam: SignalServiceAddress?,
|
||||
groupUpdateSourceAddress: SignalServiceAddress?,
|
||||
canInsert: Bool,
|
||||
mightBeAddingLocalUserToGroup: Bool,
|
||||
didAddLocalUserToV2Group: Bool,
|
||||
infoMessagePolicy: InfoMessagePolicy = .always,
|
||||
transaction: SDSAnyWriteTransaction) throws -> UpsertGroupResult {
|
||||
|
||||
@ -1823,15 +1816,6 @@ public class GroupManager: NSObject {
|
||||
throw OWSAssertionError("Missing groupThread.")
|
||||
}
|
||||
|
||||
// This thread didn't previously exist, so if we're a member we
|
||||
// have to assume we were just added.
|
||||
var wasAddedToGroup = false
|
||||
if newGroupModel.groupsVersion == .V1,
|
||||
let localAddress = tsAccountManager.localAddress,
|
||||
newGroupModel.groupMembers.contains(localAddress) {
|
||||
newGroupModel.addedByAddress = groupUpdateSourceAddressParam
|
||||
wasAddedToGroup = true
|
||||
}
|
||||
// When inserting a v2 group into the database for the
|
||||
// first time, we don't want to attribute all of the group
|
||||
// state to the author of the most recent revision.
|
||||
@ -1839,35 +1823,28 @@ public class GroupManager: NSObject {
|
||||
// We only want to attribute the changes if we've just been
|
||||
// added, so that we can say "Alice added you to the group,"
|
||||
// etc.
|
||||
var groupUpdateSourceAddress = groupUpdateSourceAddressParam
|
||||
var shouldAttributeAuthor = true
|
||||
if newGroupModel.groupsVersion == .V2 {
|
||||
if let localAddress = tsAccountManager.localAddress,
|
||||
newGroupModel.groupMembers.contains(localAddress),
|
||||
mightBeAddingLocalUserToGroup {
|
||||
// Do not touch groupUpdateSourceAddress.
|
||||
didAddLocalUserToV2Group {
|
||||
// Do attribute.
|
||||
} else {
|
||||
// Discard groupUpdateSourceAddress.
|
||||
groupUpdateSourceAddress = nil
|
||||
// Don't attribute.
|
||||
shouldAttributeAuthor = false
|
||||
}
|
||||
}
|
||||
|
||||
let thread = insertGroupThreadInDatabaseAndCreateInfoMessage(groupModel: newGroupModel,
|
||||
disappearingMessageToken: newDisappearingMessageToken,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
mightBeAddingLocalUserToGroup: mightBeAddingLocalUserToGroup,
|
||||
shouldAttributeAuthor: shouldAttributeAuthor,
|
||||
infoMessagePolicy: infoMessagePolicy,
|
||||
transaction: transaction)
|
||||
|
||||
// Auto-accept the message request for this group if we were added by someone we trust.
|
||||
if wasAddedToGroup, let addedByAddress = groupUpdateSourceAddress,
|
||||
profileManager.isUser(inProfileWhitelist: addedByAddress, transaction: transaction) {
|
||||
profileManager.addGroupId(toProfileWhitelist: newGroupModel.groupId, wasLocallyInitiated: true, transaction: transaction)
|
||||
}
|
||||
|
||||
return UpsertGroupResult(action: .inserted, groupThread: thread)
|
||||
}
|
||||
|
||||
let groupUpdateSourceAddress = groupUpdateSourceAddressParam
|
||||
return try updateExistingGroupThreadInDatabaseAndCreateInfoMessage(newGroupModel: newGroupModel,
|
||||
newDisappearingMessageToken: newDisappearingMessageToken,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
@ -1940,20 +1917,10 @@ public class GroupManager: NSObject {
|
||||
|
||||
let hasUserFacingChange = !oldGroupModel.isEqual(to: newGroupModel, ignoreRevision: true)
|
||||
|
||||
// If we weren't previously a member and are now a member, assume whoever
|
||||
// triggered this update added us to the group.
|
||||
if newGroupModel.groupsVersion == .V1,
|
||||
let localAddress = tsAccountManager.localAddress,
|
||||
!oldGroupModel.groupMembers.contains(localAddress),
|
||||
newGroupModel.groupMembers.contains(localAddress) {
|
||||
newGroupModel.addedByAddress = groupUpdateSourceAddress
|
||||
|
||||
// Auto-accept the message request for this group if we were added by someone we trust.
|
||||
if let addedByAddress = groupUpdateSourceAddress,
|
||||
profileManager.isUser(inProfileWhitelist: addedByAddress, transaction: transaction) {
|
||||
profileManager.addGroupId(toProfileWhitelist: newGroupModel.groupId, wasLocallyInitiated: true, transaction: transaction)
|
||||
}
|
||||
}
|
||||
updateProfileWhitelistIfNecessary(oldGroupModel: oldGroupModel,
|
||||
newGroupModel: newGroupModel,
|
||||
groupUpdateSourceAddress: groupUpdateSourceAddress,
|
||||
transaction: transaction)
|
||||
|
||||
groupThread.update(with: newGroupModel, transaction: transaction)
|
||||
|
||||
@ -2099,46 +2066,44 @@ public class GroupManager: NSObject {
|
||||
|
||||
// MARK: - Profiles
|
||||
|
||||
private static func updateProfileWhitelistIfNecessary(withGroupThread groupThread: TSGroupThread,
|
||||
private static func updateProfileWhitelistIfNecessary(oldGroupModel: TSGroupModel?,
|
||||
newGroupModel: TSGroupModel,
|
||||
groupUpdateSourceAddress: SignalServiceAddress?,
|
||||
mightBeAddingLocalUserToGroup: Bool,
|
||||
transaction: SDSAnyWriteTransaction) {
|
||||
let shouldAddToWhitelist: Bool = {
|
||||
guard let groupUpdateSourceAddress = groupUpdateSourceAddress else {
|
||||
Logger.verbose("No groupUpdateSourceAddress.")
|
||||
return false
|
||||
}
|
||||
if groupUpdateSourceAddress.isLocalAddress {
|
||||
return true
|
||||
}
|
||||
guard mightBeAddingLocalUserToGroup else {
|
||||
return false
|
||||
}
|
||||
if self.contactsManager.isSystemContact(address: groupUpdateSourceAddress) {
|
||||
return true
|
||||
}
|
||||
if self.profileManager.isUser(inProfileWhitelist: groupUpdateSourceAddress, transaction: transaction) {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}()
|
||||
guard shouldAddToWhitelist else {
|
||||
Logger.verbose("Not adding to whitelist.")
|
||||
return
|
||||
}
|
||||
|
||||
guard let localAddress = self.tsAccountManager.localAddress else {
|
||||
owsFailDebug("Missing localAddress.")
|
||||
return
|
||||
}
|
||||
|
||||
// Ensure the thread and all members of the group are in our profile whitelist
|
||||
// if we're a member of the group. We don't want to do this if we're just a
|
||||
// pending member or are leaving/have already left the group.
|
||||
let groupMembership = groupThread.groupModel.groupMembership
|
||||
guard groupMembership.isMemberOfAnyKind(localAddress) else {
|
||||
if let oldGroupModel = oldGroupModel {
|
||||
guard !oldGroupModel.groupMembership.isFullMember(localAddress) else {
|
||||
// Local user already was a member.
|
||||
return
|
||||
}
|
||||
}
|
||||
guard newGroupModel.groupMembership.isFullMember(localAddress) else {
|
||||
// Local user is not a member.
|
||||
return
|
||||
}
|
||||
profileManager.addThread(toProfileWhitelist: groupThread, transaction: transaction)
|
||||
|
||||
guard let groupUpdateSourceAddress = groupUpdateSourceAddress else {
|
||||
Logger.verbose("No groupUpdateSourceAddress.")
|
||||
return
|
||||
}
|
||||
|
||||
let shouldAddToWhitelist = (contactsManager.isSystemContact(address: groupUpdateSourceAddress) ||
|
||||
profileManager.isUser(inProfileWhitelist: groupUpdateSourceAddress, transaction: transaction))
|
||||
guard shouldAddToWhitelist else {
|
||||
Logger.verbose("Not adding to whitelist.")
|
||||
return
|
||||
}
|
||||
|
||||
// Ensure the thread is in our profile whitelist if we're a member of the group.
|
||||
// We don't want to do this if we're just a pending member or are leaving/have
|
||||
// already left the group.
|
||||
self.profileManager.addGroupId(toProfileWhitelist: newGroupModel.groupId,
|
||||
wasLocallyInitiated: true,
|
||||
transaction: transaction)
|
||||
}
|
||||
|
||||
@objc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user