import org.asamk.signal.manager.helper.GroupV2Helper;
import org.asamk.signal.manager.helper.PinHelper;
import org.asamk.signal.manager.helper.ProfileHelper;
+import org.asamk.signal.manager.helper.SendHelper;
import org.asamk.signal.manager.helper.UnidentifiedAccessHelper;
import org.asamk.signal.manager.jobs.Context;
import org.asamk.signal.manager.jobs.Job;
import org.signal.libsignal.metadata.ProtocolNoSessionException;
import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
import org.signal.libsignal.metadata.SelfSendException;
-import org.signal.libsignal.metadata.certificate.CertificateValidator;
import org.signal.storageservice.protos.groups.GroupChange;
import org.signal.storageservice.protos.groups.local.DecryptedGroup;
import org.signal.zkgroup.InvalidInputException;
import org.signal.zkgroup.VerificationFailedException;
import org.signal.zkgroup.groups.GroupMasterKey;
import org.signal.zkgroup.groups.GroupSecretParams;
-import org.signal.zkgroup.profiles.ClientZkProfileOperations;
import org.signal.zkgroup.profiles.ProfileKey;
import org.signal.zkgroup.profiles.ProfileKeyCredential;
import org.slf4j.Logger;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
-import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
-import org.whispersystems.signalservice.api.SignalServiceMessageSender;
+import org.whispersystems.signalservice.api.InvalidMessageStructureException;
import org.whispersystems.signalservice.api.SignalSessionLock;
-import org.whispersystems.signalservice.api.crypto.ContentHint;
-import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsInputStream;
import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOutputStream;
import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.ConflictException;
import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException;
-import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.signalservice.api.util.DeviceNameUtil;
import org.whispersystems.signalservice.api.util.InvalidNumberException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
-import org.whispersystems.signalservice.api.util.SleepTimer;
-import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException;
import org.whispersystems.signalservice.internal.contacts.crypto.Quote;
import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedQuoteException;
import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
private final static Logger logger = LoggerFactory.getLogger(Manager.class);
- private final CertificateValidator certificateValidator;
-
private final ServiceEnvironmentConfig serviceEnvironmentConfig;
- private final String userAgent;
+ private final SignalDependencies dependencies;
private SignalAccount account;
- private final SignalServiceAccountManager accountManager;
- private final GroupsV2Api groupsV2Api;
- private final GroupsV2Operations groupsV2Operations;
- private final SignalServiceMessageReceiver messageReceiver;
- private final ClientZkProfileOperations clientZkProfileOperations;
private final ExecutorService executor = Executors.newCachedThreadPool();
- private SignalServiceMessagePipe messagePipe = null;
- private SignalServiceMessagePipe unidentifiedMessagePipe = null;
-
- private final UnidentifiedAccessHelper unidentifiedAccessHelper;
private final ProfileHelper profileHelper;
private final GroupV2Helper groupV2Helper;
private final PinHelper pinHelper;
+ private final SendHelper sendHelper;
+
private final AvatarStore avatarStore;
private final AttachmentStore attachmentStore;
private final StickerPackStore stickerPackStore;
) {
this.account = account;
this.serviceEnvironmentConfig = serviceEnvironmentConfig;
- this.certificateValidator = new CertificateValidator(serviceEnvironmentConfig.getUnidentifiedSenderTrustRoot());
- this.userAgent = userAgent;
- this.groupsV2Operations = capabilities.isGv2() ? new GroupsV2Operations(ClientZkOperations.create(
- serviceEnvironmentConfig.getSignalServiceConfiguration())) : null;
- final SleepTimer timer = new UptimeSleepTimer();
- this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- new DynamicCredentialsProvider(account.getUuid(),
- account.getUsername(),
- account.getPassword(),
- account.getDeviceId()),
- userAgent,
- groupsV2Operations,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY,
- timer);
- this.groupsV2Api = accountManager.getGroupsV2Api();
- final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
- serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
- serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
- serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
- 10);
-
- this.pinHelper = new PinHelper(keyBackupService);
- this.clientZkProfileOperations = capabilities.isGv2()
- ? ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration())
- .getProfileOperations()
- : null;
- this.messageReceiver = new SignalServiceMessageReceiver(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- account.getUuid(),
+
+ final var credentialsProvider = new DynamicCredentialsProvider(account.getUuid(),
account.getUsername(),
account.getPassword(),
- account.getDeviceId(),
+ account.getDeviceId());
+ this.dependencies = new SignalDependencies(account.getSelfAddress(),
+ serviceEnvironmentConfig,
userAgent,
- null,
- timer,
- clientZkProfileOperations,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+ credentialsProvider,
+ account.getSignalProtocolStore(),
+ executor,
+ sessionLock);
+ this.pinHelper = new PinHelper(dependencies.getKeyBackupService());
- this.unidentifiedAccessHelper = new UnidentifiedAccessHelper(account::getProfileKey,
+ final var unidentifiedAccessHelper = new UnidentifiedAccessHelper(account::getProfileKey,
account.getProfileStore()::getProfileKey,
this::getRecipientProfile,
this::getSenderCertificate);
this.profileHelper = new ProfileHelper(account.getProfileStore()::getProfileKey,
unidentifiedAccessHelper::getAccessFor,
- unidentified -> unidentified ? getOrCreateUnidentifiedMessagePipe() : getOrCreateMessagePipe(),
- () -> messageReceiver,
+ dependencies::getProfileService,
+ dependencies::getMessageReceiver,
this::resolveSignalServiceAddress);
this.groupV2Helper = new GroupV2Helper(this::getRecipientProfileKeyCredential,
this::getRecipientProfile,
account::getSelfRecipientId,
- groupsV2Operations,
- groupsV2Api,
+ dependencies.getGroupsV2Operations(),
+ dependencies.getGroupsV2Api(),
this::getGroupAuthForToday,
this::resolveSignalServiceAddress);
this.avatarStore = new AvatarStore(pathConfig.getAvatarsPath());
this.attachmentStore = new AttachmentStore(pathConfig.getAttachmentsPath());
this.stickerPackStore = new StickerPackStore(pathConfig.getStickerPacksPath());
+ this.sendHelper = new SendHelper(account,
+ dependencies,
+ unidentifiedAccessHelper,
+ this::resolveSignalServiceAddress,
+ this::resolveRecipient,
+ this::handleIdentityFailure,
+ this::getGroup,
+ this::refreshRegisteredUser);
}
public String getUsername() {
days);
}
}
- if (accountManager.getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+ if (dependencies.getAccountManager().getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
refreshPreKeys();
}
if (account.getUuid() == null) {
- account.setUuid(accountManager.getOwnUuid());
+ account.setUuid(dependencies.getAccountManager().getOwnUuid());
}
updateAccountAttributes();
}
* This is used for checking a set of phone numbers for registration on Signal
*
* @param numbers The set of phone number in question
- * @return A map of numbers to booleans. True if registered, false otherwise. Should never be null
+ * @return A map of numbers to canonicalized number and uuid. If a number is not registered the uuid is null.
* @throws IOException if its unable to get the contacts to check if they're registered
*/
- public Map<String, Boolean> areUsersRegistered(Set<String> numbers) throws IOException {
+ public Map<String, Pair<String, UUID>> areUsersRegistered(Set<String> numbers) throws IOException {
+ Map<String, String> canonicalizedNumbers = numbers.stream().collect(Collectors.toMap(n -> n, n -> {
+ try {
+ return canonicalizePhoneNumber(n);
+ } catch (InvalidNumberException e) {
+ return "";
+ }
+ }));
+
// Note "contactDetails" has no optionals. It only gives us info on users who are registered
- var contactDetails = getRegisteredUsers(numbers);
+ var contactDetails = getRegisteredUsers(canonicalizedNumbers.values()
+ .stream()
+ .filter(s -> !s.isEmpty())
+ .collect(Collectors.toSet()));
- var registeredUsers = contactDetails.keySet();
+ // Store numbers as recipients so we have the number/uuid association
+ contactDetails.forEach((number, uuid) -> resolveRecipientTrusted(new SignalServiceAddress(uuid, number)));
- return numbers.stream().collect(Collectors.toMap(x -> x, registeredUsers::contains));
+ return numbers.stream().collect(Collectors.toMap(n -> n, n -> {
+ final var number = canonicalizedNumbers.get(n);
+ final var uuid = contactDetails.get(number);
+ return new Pair<>(number.isEmpty() ? null : number, uuid);
+ }));
}
public void updateAccountAttributes() throws IOException {
- accountManager.setAccountAttributes(account.getEncryptedDeviceName(),
- null,
- account.getLocalRegistrationId(),
- true,
- // set legacy pin only if no KBS master key is set
- account.getPinMasterKey() == null ? account.getRegistrationLockPin() : null,
- account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
- account.getSelfUnidentifiedAccessKey(),
- account.isUnrestrictedUnidentifiedAccess(),
- capabilities,
- account.isDiscoverableByPhoneNumber());
+ dependencies.getAccountManager()
+ .setAccountAttributes(account.getEncryptedDeviceName(),
+ null,
+ account.getLocalRegistrationId(),
+ true,
+ // set legacy pin only if no KBS master key is set
+ account.getPinMasterKey() == null ? account.getRegistrationLockPin() : null,
+ account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
+ account.getSelfUnidentifiedAccessKey(),
+ account.isUnrestrictedUnidentifiedAccess(),
+ capabilities,
+ account.isDiscoverableByPhoneNumber());
}
/**
try (final var streamDetails = avatar == null
? avatarStore.retrieveProfileAvatar(getSelfAddress())
: avatar.isPresent() ? Utils.createStreamDetailsFromFile(avatar.get()) : null) {
- accountManager.setVersionedProfile(account.getUuid(),
- account.getProfileKey(),
- newProfile.getInternalServiceName(),
- newProfile.getAbout() == null ? "" : newProfile.getAbout(),
- newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
- Optional.absent(),
- streamDetails);
+ dependencies.getAccountManager()
+ .setVersionedProfile(account.getUuid(),
+ account.getProfileKey(),
+ newProfile.getInternalServiceName(),
+ newProfile.getAbout() == null ? "" : newProfile.getAbout(),
+ newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
+ Optional.absent(),
+ streamDetails);
}
if (avatar != null) {
}
account.getProfileStore().storeProfile(account.getSelfRecipientId(), newProfile);
- try {
- sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE));
- } catch (UntrustedIdentityException ignored) {
- }
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE));
}
public void unregister() throws IOException {
// When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false.
// If this is the master device, other users can't send messages to this number anymore.
// If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.
- accountManager.setGcmId(Optional.absent());
+ dependencies.getAccountManager().setGcmId(Optional.absent());
account.setRegistered(false);
}
public void deleteAccount() throws IOException {
- accountManager.deleteAccount();
+ dependencies.getAccountManager().deleteAccount();
account.setRegistered(false);
}
public List<Device> getLinkedDevices() throws IOException {
- var devices = accountManager.getDevices();
+ var devices = dependencies.getAccountManager().getDevices();
account.setMultiDevice(devices.size() > 1);
var identityKey = account.getIdentityKeyPair().getPrivateKey();
return devices.stream().map(d -> {
}
public void removeLinkedDevices(int deviceId) throws IOException {
- accountManager.removeDevice(deviceId);
- var devices = accountManager.getDevices();
+ dependencies.getAccountManager().removeDevice(deviceId);
+ var devices = dependencies.getAccountManager().getDevices();
account.setMultiDevice(devices.size() > 1);
}
private void addDevice(String deviceIdentifier, ECPublicKey deviceKey) throws IOException, InvalidKeyException {
var identityKeyPair = getIdentityKeyPair();
- var verificationCode = accountManager.getNewDeviceVerificationCode();
-
- accountManager.addDevice(deviceIdentifier,
- deviceKey,
- identityKeyPair,
- Optional.of(account.getProfileKey().serialize()),
- verificationCode);
+ var verificationCode = dependencies.getAccountManager().getNewDeviceVerificationCode();
+
+ dependencies.getAccountManager()
+ .addDevice(deviceIdentifier,
+ deviceKey,
+ identityKeyPair,
+ Optional.of(account.getProfileKey().serialize()),
+ verificationCode);
account.setMultiDevice(true);
}
account.setRegistrationLockPin(pin.get(), masterKey);
} else {
- // Remove legacy registration lock
- accountManager.removeRegistrationLockV1();
-
// Remove KBS Pin
pinHelper.removeRegistrationLockPin();
final var identityKeyPair = getIdentityKeyPair();
var signedPreKeyRecord = generateSignedPreKey(identityKeyPair);
- accountManager.setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
+ dependencies.getAccountManager().setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
}
private List<PreKeyRecord> generatePreKeys() {
return record;
}
- private SignalServiceMessagePipe getOrCreateMessagePipe() {
- if (messagePipe == null) {
- messagePipe = messageReceiver.createMessagePipe();
- }
- return messagePipe;
- }
-
- private SignalServiceMessagePipe getOrCreateUnidentifiedMessagePipe() {
- if (unidentifiedMessagePipe == null) {
- unidentifiedMessagePipe = messageReceiver.createUnidentifiedMessagePipe();
- }
- return unidentifiedMessagePipe;
- }
-
- private SignalServiceMessageSender createMessageSender() {
- return new SignalServiceMessageSender(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- account.getUuid(),
- account.getUsername(),
- account.getPassword(),
- account.getDeviceId(),
- account.getSignalProtocolStore(),
- sessionLock,
- userAgent,
- account.isMultiDevice(),
- Optional.fromNullable(messagePipe),
- Optional.fromNullable(unidentifiedMessagePipe),
- Optional.absent(),
- clientZkProfileOperations,
- executor,
- ServiceConfig.MAX_ENVELOPE_SIZE,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY);
- }
-
public Profile getRecipientProfile(
RecipientId recipientId
) {
return null;
}
+ profile = decryptProfileIfKeyKnown(recipientId, encryptedProfile);
+ account.getProfileStore().storeProfile(recipientId, profile);
+
+ return profile;
+ }
+
+ private Profile decryptProfileIfKeyKnown(
+ final RecipientId recipientId, final SignalServiceProfile encryptedProfile
+ ) {
var profileKey = account.getProfileStore().getProfileKey(recipientId);
if (profileKey == null) {
- profile = new Profile(System.currentTimeMillis(),
+ return new Profile(System.currentTimeMillis(),
null,
null,
null,
null,
ProfileUtils.getUnidentifiedAccessMode(encryptedProfile, null),
ProfileUtils.getCapabilities(encryptedProfile));
- } else {
- profile = decryptProfileAndDownloadAvatar(recipientId, profileKey, encryptedProfile);
}
- account.getProfileStore().storeProfile(recipientId, profile);
- return profile;
+ return decryptProfileAndDownloadAvatar(recipientId, profileKey, encryptedProfile);
}
private SignalServiceProfile retrieveEncryptedProfile(RecipientId recipientId) {
return Optional.of(AttachmentUtils.createAttachment(streamDetails, Optional.absent()));
}
- private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
- var g = getGroup(groupId);
- if (g == null) {
- throw new GroupNotFoundException(groupId);
- }
- if (!g.isMember(account.getSelfRecipientId())) {
- throw new NotAGroupMemberException(groupId, g.getTitle());
- }
- return g;
- }
-
private GroupInfo getGroupForUpdating(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
var g = getGroup(groupId);
if (g == null) {
public Pair<Long, List<SendMessageResult>> sendGroupMessage(
String messageText, List<String> attachments, GroupId groupId
) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
+ final var messageBuilder = createMessageBuilder().withBody(messageText);
if (attachments != null) {
messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));
}
- return sendGroupMessage(messageBuilder, groupId);
+ return sendHelper.sendAsGroupMessage(messageBuilder, groupId);
}
public Pair<Long, List<SendMessageResult>> sendGroupMessageReaction(
remove,
resolveSignalServiceAddress(targetAuthorRecipientId),
targetSentTimestamp);
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
+ final var messageBuilder = createMessageBuilder().withReaction(reaction);
- return sendGroupMessage(messageBuilder, groupId);
- }
-
- public Pair<Long, List<SendMessageResult>> sendGroupMessage(
- SignalServiceDataMessage.Builder messageBuilder, GroupId groupId
- ) throws IOException, GroupNotFoundException, NotAGroupMemberException {
- final var g = getGroupForSending(groupId);
-
- GroupUtils.setGroupContext(messageBuilder, g);
- messageBuilder.withExpiration(g.getMessageExpirationTime());
-
- return sendMessage(messageBuilder, g.getMembersWithout(account.getSelfRecipientId()));
+ return sendHelper.sendAsGroupMessage(messageBuilder, groupId);
}
public Pair<Long, List<SendMessageResult>> sendQuitGroupMessage(
return quitGroupV1((GroupInfoV1) group);
}
- final var newAdmins = getSignalServiceAddresses(groupAdmins);
+ final var newAdmins = getRecipientIds(groupAdmins);
try {
return quitGroupV2((GroupInfoV2) group, newAdmins);
} catch (ConflictException e) {
.withId(groupInfoV1.getGroupId().serialize())
.build();
- var messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group);
+ var messageBuilder = createMessageBuilder().asGroupMessage(group);
groupInfoV1.removeMember(account.getSelfRecipientId());
account.getGroupStore().updateGroup(groupInfoV1);
- return sendMessage(messageBuilder, groupInfoV1.getMembersWithout(account.getSelfRecipientId()));
+ return sendHelper.sendGroupMessage(messageBuilder.build(),
+ groupInfoV1.getMembersIncludingPendingWithout(account.getSelfRecipientId()));
}
private Pair<Long, List<SendMessageResult>> quitGroupV2(
groupInfoV2.setGroup(groupGroupChangePair.first(), this::resolveRecipient);
var messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().toByteArray());
account.getGroupStore().updateGroup(groupInfoV2);
- return sendMessage(messageBuilder, groupInfoV2.getMembersWithout(account.getSelfRecipientId()));
+ return sendHelper.sendGroupMessage(messageBuilder.build(),
+ groupInfoV2.getMembersIncludingPendingWithout(account.getSelfRecipientId()));
}
public void deleteGroup(GroupId groupId) throws IOException {
public Pair<GroupId, List<SendMessageResult>> createGroup(
String name, List<String> members, File avatarFile
) throws IOException, AttachmentInvalidException, InvalidNumberException {
- return createGroup(name, members == null ? null : getSignalServiceAddresses(members), avatarFile);
+ return createGroup(name, members == null ? null : getRecipientIds(members), avatarFile);
}
private Pair<GroupId, List<SendMessageResult>> createGroup(
messageBuilder = getGroupUpdateMessageBuilder(gv2, null);
account.getGroupStore().updateGroup(gv2);
- final var result = sendMessage(messageBuilder, gv2.getMembersIncludingPendingWithout(selfRecipientId));
+ final var result = sendHelper.sendGroupMessage(messageBuilder.build(),
+ gv2.getMembersIncludingPendingWithout(selfRecipientId));
return new Pair<>(gv2.getGroupId(), result.second());
}
GroupPermission addMemberPermission,
GroupPermission editDetailsPermission,
File avatarFile,
- Integer expirationTimer
+ Integer expirationTimer,
+ Boolean isAnnouncementGroup
) throws IOException, GroupNotFoundException, AttachmentInvalidException, InvalidNumberException, NotAGroupMemberException {
return updateGroup(groupId,
name,
description,
- members == null ? null : getSignalServiceAddresses(members),
- removeMembers == null ? null : getSignalServiceAddresses(removeMembers),
- admins == null ? null : getSignalServiceAddresses(admins),
- removeAdmins == null ? null : getSignalServiceAddresses(removeAdmins),
+ members == null ? null : getRecipientIds(members),
+ removeMembers == null ? null : getRecipientIds(removeMembers),
+ admins == null ? null : getRecipientIds(admins),
+ removeAdmins == null ? null : getRecipientIds(removeAdmins),
resetGroupLink,
groupLinkState,
addMemberPermission,
editDetailsPermission,
avatarFile,
- expirationTimer);
+ expirationTimer,
+ isAnnouncementGroup);
}
private Pair<Long, List<SendMessageResult>> updateGroup(
final GroupPermission addMemberPermission,
final GroupPermission editDetailsPermission,
final File avatarFile,
- final Integer expirationTimer
+ final Integer expirationTimer,
+ final Boolean isAnnouncementGroup
) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {
var group = getGroupForUpdating(groupId);
addMemberPermission,
editDetailsPermission,
avatarFile,
- expirationTimer);
+ expirationTimer,
+ isAnnouncementGroup);
} catch (ConflictException e) {
// Detected conflicting update, refreshing group and trying again
group = getGroup(groupId, true);
addMemberPermission,
editDetailsPermission,
avatarFile,
- expirationTimer);
+ expirationTimer,
+ isAnnouncementGroup);
}
}
account.getGroupStore().updateGroup(gv1);
- return sendMessage(messageBuilder, gv1.getMembersIncludingPendingWithout(account.getSelfRecipientId()));
+ return sendHelper.sendGroupMessage(messageBuilder.build(),
+ gv1.getMembersIncludingPendingWithout(account.getSelfRecipientId()));
}
private void updateGroupV1Details(
final GroupPermission addMemberPermission,
final GroupPermission editDetailsPermission,
final File avatarFile,
- Integer expirationTimer
+ final Integer expirationTimer,
+ final Boolean isAnnouncementGroup
) throws IOException {
Pair<Long, List<SendMessageResult>> result = null;
if (group.isPendingMember(account.getSelfRecipientId())) {
result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
}
+ if (isAnnouncementGroup != null) {
+ var groupGroupChangePair = groupV2Helper.setIsAnnouncementGroup(group, isAnnouncementGroup);
+ result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+ }
+
if (name != null || description != null || avatarFile != null) {
var groupGroupChangePair = groupV2Helper.updateGroup(group, name, description, avatarFile);
if (avatarFile != null) {
final var messageBuilder = getGroupUpdateMessageBuilder(group, groupChange.toByteArray());
account.getGroupStore().updateGroup(group);
- return sendMessage(messageBuilder, members);
+ return sendHelper.sendGroupMessage(messageBuilder.build(), members);
}
private static int currentTimeDays() {
) throws IOException {
final var today = currentTimeDays();
// Returns credentials for the next 7 days
- final var credentials = groupsV2Api.getCredentials(today);
+ final var credentials = dependencies.getGroupsV2Api().getCredentials(today);
// TODO cache credentials until they expire
var authCredentialResponse = credentials.get(today);
try {
- return groupsV2Api.getGroupsV2AuthorizationString(account.getUuid(),
- today,
- groupSecretParams,
- authCredentialResponse);
+ return dependencies.getGroupsV2Api()
+ .getGroupsV2AuthorizationString(account.getUuid(),
+ today,
+ groupSecretParams,
+ authCredentialResponse);
} catch (VerificationFailedException e) {
throw new IOException(e);
}
GroupIdV1 groupId, SignalServiceAddress recipient
) throws IOException, NotAGroupMemberException, GroupNotFoundException, AttachmentInvalidException {
GroupInfoV1 g;
- var group = getGroupForSending(groupId);
+ var group = getGroupForUpdating(groupId);
if (!(group instanceof GroupInfoV1)) {
- throw new RuntimeException("Received an invalid group request for a v2 group!");
+ throw new IOException("Received an invalid group request for a v2 group!");
}
g = (GroupInfoV1) group;
var messageBuilder = getGroupUpdateMessageBuilder(g);
// Send group message only to the recipient who requested it
- return sendMessage(messageBuilder, Set.of(recipientId));
+ return sendHelper.sendGroupMessage(messageBuilder.build(), Set.of(recipientId));
}
private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV1 g) throws AttachmentInvalidException {
throw new AttachmentInvalidException(g.getGroupId().toBase64(), e);
}
- return SignalServiceDataMessage.newBuilder()
- .asGroupMessage(group.build())
- .withExpiration(g.getMessageExpirationTime());
+ return createMessageBuilder().asGroupMessage(group.build()).withExpiration(g.getMessageExpirationTime());
}
private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV2 g, byte[] signedGroupChange) {
var group = SignalServiceGroupV2.newBuilder(g.getMasterKey())
.withRevision(g.getGroup().getRevision())
.withSignedGroupChange(signedGroupChange);
- return SignalServiceDataMessage.newBuilder()
- .asGroupMessage(group.build())
- .withExpiration(g.getMessageExpirationTime());
+ return createMessageBuilder().asGroupMessage(group.build()).withExpiration(g.getMessageExpirationTime());
}
Pair<Long, List<SendMessageResult>> sendGroupInfoRequest(
) throws IOException {
var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO).withId(groupId.serialize());
- var messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group.build());
+ var messageBuilder = createMessageBuilder().asGroupMessage(group.build());
// Send group info request message to the recipient who sent us a message with this groupId
- return sendMessage(messageBuilder, Set.of(resolveRecipient(recipient)));
+ return sendHelper.sendGroupMessage(messageBuilder.build(), Set.of(resolveRecipient(recipient)));
}
void sendReceipt(
List.of(messageId),
System.currentTimeMillis());
- createMessageSender().sendReceipt(remoteAddress,
- unidentifiedAccessHelper.getAccessFor(resolveRecipient(remoteAddress)),
- receiptMessage);
+ sendHelper.sendReceiptMessage(receiptMessage, resolveRecipient(remoteAddress));
}
public Pair<Long, List<SendMessageResult>> sendMessage(
String messageText, List<String> attachments, List<String> recipients
) throws IOException, AttachmentInvalidException, InvalidNumberException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
+ final var messageBuilder = createMessageBuilder().withBody(messageText);
if (attachments != null) {
var attachmentStreams = AttachmentUtils.getSignalServiceAttachments(attachments);
// Upload attachments here, so we only upload once even for multiple recipients
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
for (var attachment : attachmentStreams) {
if (attachment.isStream()) {
messageBuilder.withAttachments(attachmentPointers);
}
- return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
+ return sendHelper.sendMessage(messageBuilder, getRecipientIds(recipients));
}
public Pair<Long, SendMessageResult> sendSelfMessage(
String messageText, List<String> attachments
) throws IOException, AttachmentInvalidException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
+ final var messageBuilder = createMessageBuilder().withBody(messageText);
if (attachments != null) {
messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));
}
- return sendSelfMessage(messageBuilder);
+ return sendHelper.sendSelfMessage(messageBuilder);
}
public Pair<Long, List<SendMessageResult>> sendRemoteDeleteMessage(
long targetSentTimestamp, List<String> recipients
) throws IOException, InvalidNumberException {
var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp);
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withRemoteDelete(delete);
- return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
+ final var messageBuilder = createMessageBuilder().withRemoteDelete(delete);
+ return sendHelper.sendMessage(messageBuilder, getRecipientIds(recipients));
}
public Pair<Long, List<SendMessageResult>> sendGroupRemoteDeleteMessage(
long targetSentTimestamp, GroupId groupId
) throws IOException, NotAGroupMemberException, GroupNotFoundException {
var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp);
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withRemoteDelete(delete);
- return sendGroupMessage(messageBuilder, groupId);
+ final var messageBuilder = createMessageBuilder().withRemoteDelete(delete);
+ return sendHelper.sendAsGroupMessage(messageBuilder, groupId);
}
public Pair<Long, List<SendMessageResult>> sendMessageReaction(
remove,
resolveSignalServiceAddress(targetAuthorRecipientId),
targetSentTimestamp);
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
- return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
+ final var messageBuilder = createMessageBuilder().withReaction(reaction);
+ return sendHelper.sendMessage(messageBuilder, getRecipientIds(recipients));
}
public Pair<Long, List<SendMessageResult>> sendEndSessionMessage(List<String> recipients) throws IOException, InvalidNumberException {
- var messageBuilder = SignalServiceDataMessage.newBuilder().asEndSessionMessage();
+ var messageBuilder = createMessageBuilder().asEndSessionMessage();
- final var signalServiceAddresses = getSignalServiceAddresses(recipients);
+ final var recipientIds = getRecipientIds(recipients);
try {
- return sendMessage(messageBuilder, signalServiceAddresses);
- } catch (Exception e) {
- for (var address : signalServiceAddresses) {
- handleEndSession(address);
+ return sendHelper.sendMessage(messageBuilder, recipientIds);
+ } finally {
+ for (var recipientId : recipientIds) {
+ handleEndSession(recipientId);
}
- throw e;
}
}
void renewSession(RecipientId recipientId) throws IOException {
account.getSessionStore().archiveSessions(recipientId);
if (!recipientId.equals(getSelfRecipientId())) {
- sendNullMessage(recipientId);
+ sendHelper.sendNullMessage(recipientId);
}
}
- public String getContactName(String number) throws InvalidNumberException {
- var contact = account.getContactStore().getContact(canonicalizeAndResolveRecipient(number));
- return contact == null || contact.getName() == null ? "" : contact.getName();
- }
-
public void setContactName(String number, String name) throws InvalidNumberException, NotMasterDeviceException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
}
private void sendExpirationTimerUpdate(RecipientId recipientId) throws IOException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
- sendMessage(messageBuilder, Set.of(recipientId));
+ final var messageBuilder = createMessageBuilder().asExpirationUpdate();
+ sendHelper.sendMessage(messageBuilder, Set.of(recipientId));
}
/**
}
private void sendExpirationTimerUpdate(GroupIdV1 groupId) throws IOException, NotAGroupMemberException, GroupNotFoundException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
- sendGroupMessage(messageBuilder, groupId);
+ final var messageBuilder = createMessageBuilder().asExpirationUpdate();
+ sendHelper.sendAsGroupMessage(messageBuilder, groupId);
}
/**
public String uploadStickerPack(File path) throws IOException, StickerPackInvalidException {
var manifest = StickerUtils.getSignalServiceStickerManifestUpload(path);
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
var packKey = KeyUtils.createStickerUploadKey();
var packIdString = messageSender.uploadStickerManifest(manifest, packKey);
.setType(SignalServiceProtos.SyncMessage.Request.Type.GROUPS)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private void requestSyncContacts() throws IOException {
.setType(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private void requestSyncBlocked() throws IOException {
.setType(SignalServiceProtos.SyncMessage.Request.Type.BLOCKED)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private void requestSyncConfiguration() throws IOException {
.setType(SignalServiceProtos.SyncMessage.Request.Type.CONFIGURATION)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private void requestSyncKeys() throws IOException {
.setType(SignalServiceProtos.SyncMessage.Request.Type.KEYS)
.build();
var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ sendHelper.sendSyncMessage(message);
}
private byte[] getSenderCertificate() {
byte[] certificate;
try {
if (account.isPhoneNumberShared()) {
- certificate = accountManager.getSenderCertificate();
+ certificate = dependencies.getAccountManager().getSenderCertificate();
} else {
- certificate = accountManager.getSenderCertificateForPhoneNumberPrivacy();
+ certificate = dependencies.getAccountManager().getSenderCertificateForPhoneNumberPrivacy();
}
} catch (IOException e) {
logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage());
return certificate;
}
- private void sendSyncMessage(SignalServiceSyncMessage message) throws IOException, UntrustedIdentityException {
- var messageSender = createMessageSender();
- messageSender.sendSyncMessage(message, unidentifiedAccessHelper.getAccessForSync());
- }
-
- private Set<RecipientId> getSignalServiceAddresses(Collection<String> numbers) throws InvalidNumberException {
+ private Set<RecipientId> getRecipientIds(Collection<String> numbers) throws InvalidNumberException {
final var signalServiceAddresses = new HashSet<SignalServiceAddress>(numbers.size());
final var addressesMissingUuid = new HashSet<SignalServiceAddress>();
private Map<String, UUID> getRegisteredUsers(final Set<String> numbers) throws IOException {
try {
- return accountManager.getRegisteredUsers(ServiceConfig.getIasKeyStore(),
- numbers,
- serviceEnvironmentConfig.getCdsMrenclave());
+ return dependencies.getAccountManager()
+ .getRegisteredUsers(ServiceConfig.getIasKeyStore(),
+ numbers,
+ serviceEnvironmentConfig.getCdsMrenclave());
} catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException | InvalidKeyException e) {
throw new IOException(e);
}
public void sendTypingMessage(
TypingAction action, Set<String> recipients
) throws IOException, UntrustedIdentityException, InvalidNumberException {
- sendTypingMessageInternal(action, getSignalServiceAddresses(recipients));
- }
-
- private void sendTypingMessageInternal(
- TypingAction action, Set<RecipientId> recipientIds
- ) throws IOException, UntrustedIdentityException {
final var timestamp = System.currentTimeMillis();
var message = new SignalServiceTypingMessage(action.toSignalService(), timestamp, Optional.absent());
- var messageSender = createMessageSender();
- for (var recipientId : recipientIds) {
- final var address = resolveSignalServiceAddress(recipientId);
- messageSender.sendTyping(address, unidentifiedAccessHelper.getAccessFor(recipientId), message);
- }
+ sendHelper.sendTypingMessage(message, getRecipientIds(recipients));
}
public void sendGroupTypingMessage(
TypingAction action, GroupId groupId
) throws IOException, NotAGroupMemberException, GroupNotFoundException {
final var timestamp = System.currentTimeMillis();
- final var g = getGroupForSending(groupId);
final var message = new SignalServiceTypingMessage(action.toSignalService(),
timestamp,
Optional.of(groupId.serialize()));
- final var messageSender = createMessageSender();
- final var recipientIdList = new ArrayList<>(g.getMembersWithout(account.getSelfRecipientId()));
- final var addresses = recipientIdList.stream()
- .map(this::resolveSignalServiceAddress)
- .collect(Collectors.toList());
- messageSender.sendTyping(addresses, unidentifiedAccessHelper.getAccessFor(recipientIdList), message, null);
+ sendHelper.sendGroupTypingMessage(message, groupId);
}
- private Pair<Long, List<SendMessageResult>> sendMessage(
- SignalServiceDataMessage.Builder messageBuilder, Set<RecipientId> recipientIds
- ) throws IOException {
+ private SignalServiceDataMessage.Builder createMessageBuilder() {
final var timestamp = System.currentTimeMillis();
- messageBuilder.withTimestamp(timestamp);
- getOrCreateMessagePipe();
- getOrCreateUnidentifiedMessagePipe();
- SignalServiceDataMessage message = null;
- try {
- message = messageBuilder.build();
- if (message.getGroupContext().isPresent()) {
- try {
- var messageSender = createMessageSender();
- final var isRecipientUpdate = false;
- final var recipientIdList = new ArrayList<>(recipientIds);
- final var addresses = recipientIdList.stream()
- .map(this::resolveSignalServiceAddress)
- .collect(Collectors.toList());
- var result = messageSender.sendDataMessage(addresses,
- unidentifiedAccessHelper.getAccessFor(recipientIdList),
- isRecipientUpdate,
- ContentHint.DEFAULT,
- message);
-
- for (var r : result) {
- if (r.getIdentityFailure() != null) {
- final var recipientId = resolveRecipient(r.getAddress());
- final var newIdentity = account.getIdentityKeyStore()
- .saveIdentity(recipientId, r.getIdentityFailure().getIdentityKey(), new Date());
- if (newIdentity) {
- account.getSessionStore().archiveSessions(recipientId);
- }
- }
- }
-
- return new Pair<>(timestamp, result);
- } catch (UntrustedIdentityException e) {
- return new Pair<>(timestamp, List.of());
- }
- } else {
- // Send to all individually, so sync messages are sent correctly
- messageBuilder.withProfileKey(account.getProfileKey().serialize());
- var results = new ArrayList<SendMessageResult>(recipientIds.size());
- for (var recipientId : recipientIds) {
- final var contact = account.getContactStore().getContact(recipientId);
- final var expirationTime = contact != null ? contact.getMessageExpirationTime() : 0;
- messageBuilder.withExpiration(expirationTime);
- message = messageBuilder.build();
- results.add(sendMessage(recipientId, message));
- }
- return new Pair<>(timestamp, results);
- }
- } finally {
- if (message != null && message.isEndSession()) {
- for (var recipient : recipientIds) {
- handleEndSession(recipient);
- }
- }
- }
- }
- private Pair<Long, SendMessageResult> sendSelfMessage(
- SignalServiceDataMessage.Builder messageBuilder
- ) throws IOException {
- final var timestamp = System.currentTimeMillis();
+ var messageBuilder = SignalServiceDataMessage.newBuilder();
messageBuilder.withTimestamp(timestamp);
- getOrCreateMessagePipe();
- getOrCreateUnidentifiedMessagePipe();
- final var recipientId = account.getSelfRecipientId();
-
- final var contact = account.getContactStore().getContact(recipientId);
- final var expirationTime = contact != null ? contact.getMessageExpirationTime() : 0;
- messageBuilder.withExpiration(expirationTime);
-
- var message = messageBuilder.build();
- final var result = sendSelfMessage(message);
- return new Pair<>(timestamp, result);
- }
-
- private SendMessageResult sendSelfMessage(SignalServiceDataMessage message) throws IOException {
- var messageSender = createMessageSender();
-
- var recipientId = account.getSelfRecipientId();
-
- final var unidentifiedAccess = unidentifiedAccessHelper.getAccessFor(recipientId);
- var recipient = resolveSignalServiceAddress(recipientId);
- var transcript = new SentTranscriptMessage(Optional.of(recipient),
- message.getTimestamp(),
- message,
- message.getExpiresInSeconds(),
- Map.of(recipient, unidentifiedAccess.isPresent()),
- false);
- var syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
-
- try {
- var startTime = System.currentTimeMillis();
- messageSender.sendSyncMessage(syncMessage, unidentifiedAccess);
- return SendMessageResult.success(recipient,
- unidentifiedAccess.isPresent(),
- false,
- System.currentTimeMillis() - startTime);
- } catch (UntrustedIdentityException e) {
- return SendMessageResult.identityFailure(recipient, e.getIdentityKey());
- }
- }
-
- private SendMessageResult sendMessage(
- RecipientId recipientId, SignalServiceDataMessage message
- ) throws IOException {
- var messageSender = createMessageSender();
-
- final var address = resolveSignalServiceAddress(recipientId);
- try {
- try {
- return messageSender.sendDataMessage(address,
- unidentifiedAccessHelper.getAccessFor(recipientId),
- ContentHint.DEFAULT,
- message);
- } catch (UnregisteredUserException e) {
- final var newRecipientId = refreshRegisteredUser(recipientId);
- return messageSender.sendDataMessage(resolveSignalServiceAddress(newRecipientId),
- unidentifiedAccessHelper.getAccessFor(newRecipientId),
- ContentHint.DEFAULT,
- message);
- }
- } catch (UntrustedIdentityException e) {
- return SendMessageResult.identityFailure(address, e.getIdentityKey());
- }
+ return messageBuilder;
}
- private SendMessageResult sendNullMessage(RecipientId recipientId) throws IOException {
- var messageSender = createMessageSender();
-
- final var address = resolveSignalServiceAddress(recipientId);
- try {
- try {
- return messageSender.sendNullMessage(address, unidentifiedAccessHelper.getAccessFor(recipientId));
- } catch (UnregisteredUserException e) {
- final var newRecipientId = refreshRegisteredUser(recipientId);
- final var newAddress = resolveSignalServiceAddress(newRecipientId);
- return messageSender.sendNullMessage(newAddress, unidentifiedAccessHelper.getAccessFor(newRecipientId));
- }
- } catch (UntrustedIdentityException e) {
- return SendMessageResult.identityFailure(address, e.getIdentityKey());
- }
- }
-
- private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, SelfSendException, UnsupportedDataMessageException, ProtocolUntrustedIdentityException {
- var cipher = new SignalServiceCipher(account.getSelfAddress(),
- account.getSignalProtocolStore(),
- sessionLock,
- certificateValidator);
- return cipher.decrypt(envelope);
+ private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, SelfSendException, UnsupportedDataMessageException, ProtocolUntrustedIdentityException, InvalidMessageStructureException {
+ return dependencies.getCipher().decrypt(envelope);
}
private void handleEndSession(RecipientId recipientId) {
try {
action.execute(this);
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Message action failed.", e);
}
}
boolean returnOnTimeout,
boolean ignoreAttachments,
ReceiveMessageHandler handler
- ) throws IOException {
+ ) throws IOException, InterruptedException {
retryFailedReceivedMessages(handler, ignoreAttachments);
Set<HandleAction> queuedActions = null;
- final var messagePipe = getOrCreateMessagePipe();
+ final var signalWebSocket = dependencies.getSignalWebSocket();
+ signalWebSocket.connect();
var hasCaughtUpWithOldMessages = false;
- while (true) {
+ while (!Thread.interrupted()) {
SignalServiceEnvelope envelope;
SignalServiceContent content = null;
Exception exception = null;
account.setLastReceiveTimestamp(System.currentTimeMillis());
logger.debug("Checking for new message from server");
try {
- var result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
+ var result = signalWebSocket.readOrEmpty(unit.toMillis(timeout), envelope1 -> {
final var recipientId = envelope1.hasSource()
? resolveRecipient(envelope1.getSourceIdentifier())
: null;
try {
action.execute(this);
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Message action failed.", e);
}
}
// Continue to wait another timeout for new messages
continue;
}
+ } catch (AssertionError e) {
+ if (e.getCause() instanceof InterruptedException) {
+ throw (InterruptedException) e.getCause();
+ } else {
+ throw e;
+ }
+ } catch (WebSocketUnavailableException e) {
+ logger.debug("Pipe unexpectedly unavailable, connecting");
+ signalWebSocket.connect();
+ continue;
} catch (TimeoutException e) {
if (returnOnTimeout) return;
continue;
// address/uuid in envelope is sent by server
resolveRecipientTrusted(envelope.getSourceAddress());
}
- final var notAGroupMember = isNotAGroupMember(envelope, content);
if (!envelope.isReceipt()) {
try {
content = decryptMessage(envelope);
try {
action.execute(this);
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Message action failed.", e);
}
}
queuedActions.addAll(actions);
}
}
+ final var notAllowedToSendToGroup = isNotAllowedToSendToGroup(envelope, content);
if (isMessageBlocked(envelope, content)) {
logger.info("Ignoring a message from blocked user/group: {}", envelope.getTimestamp());
- } else if (notAGroupMember) {
- logger.info("Ignoring a message from a non group member: {}", envelope.getTimestamp());
+ } else if (notAllowedToSendToGroup) {
+ logger.info("Ignoring a group message from an unauthorized sender (no member or admin): {} {}",
+ (envelope.hasSource() ? envelope.getSourceAddress() : content.getSender()).getIdentifier(),
+ envelope.getTimestamp());
} else {
handler.handleMessage(envelope, content, exception);
}
return sourceContact != null && sourceContact.isBlocked();
}
- private boolean isNotAGroupMember(
+ private boolean isNotAllowedToSendToGroup(
SignalServiceEnvelope envelope, SignalServiceContent content
) {
SignalServiceAddress source;
return false;
}
- if (content != null && content.getDataMessage().isPresent()) {
- var message = content.getDataMessage().get();
- if (message.getGroupContext().isPresent()) {
- if (message.getGroupContext().get().getGroupV1().isPresent()) {
- var groupInfo = message.getGroupContext().get().getGroupV1().get();
- if (groupInfo.getType() == SignalServiceGroup.Type.QUIT) {
- return false;
- }
- }
- var groupId = GroupUtils.getGroupId(message.getGroupContext().get());
- var group = getGroup(groupId);
- if (group != null && !group.isMember(resolveRecipient(source))) {
- return true;
- }
+ if (content == null || !content.getDataMessage().isPresent()) {
+ return false;
+ }
+
+ var message = content.getDataMessage().get();
+ if (!message.getGroupContext().isPresent()) {
+ return false;
+ }
+
+ if (message.getGroupContext().get().getGroupV1().isPresent()) {
+ var groupInfo = message.getGroupContext().get().getGroupV1().get();
+ if (groupInfo.getType() == SignalServiceGroup.Type.QUIT) {
+ return false;
}
}
- return false;
+
+ var groupId = GroupUtils.getGroupId(message.getGroupContext().get());
+ var group = getGroup(groupId);
+ if (group == null) {
+ return false;
+ }
+
+ final var recipientId = resolveRecipient(source);
+ return !group.isMember(recipientId) || (
+ group.isAnnouncementGroup() && !group.isAdmin(recipientId)
+ );
}
private List<HandleAction> handleMessage(
avatarStore.storeProfileAvatar(address,
outputStream -> retrieveProfileAvatar(avatarPath, profileKey, outputStream));
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Failed to download profile avatar, ignoring: {}", e.getMessage());
}
}
private void retrieveGroupV2Avatar(
GroupSecretParams groupSecretParams, String cdnKey, OutputStream outputStream
) throws IOException {
- var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
var tmpFile = IOUtils.createTempFile();
- try (InputStream input = messageReceiver.retrieveGroupsV2ProfileAvatar(cdnKey,
- tmpFile,
- ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
+ try (InputStream input = dependencies.getMessageReceiver()
+ .retrieveGroupsV2ProfileAvatar(cdnKey, tmpFile, ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
var encryptedData = IOUtils.readFully(input);
var decryptedData = groupOperations.decryptAvatar(encryptedData);
String avatarPath, ProfileKey profileKey, OutputStream outputStream
) throws IOException {
var tmpFile = IOUtils.createTempFile();
- try (var input = messageReceiver.retrieveProfileAvatar(avatarPath,
- tmpFile,
- profileKey,
- ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
+ try (var input = dependencies.getMessageReceiver()
+ .retrieveProfileAvatar(avatarPath,
+ tmpFile,
+ profileKey,
+ ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
// Use larger buffer size to prevent AssertionError: Need: 12272 but only have: 8192 ...
IOUtils.copyStream(input, outputStream, (int) ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE);
} finally {
private InputStream retrieveAttachmentAsStream(
SignalServiceAttachmentPointer pointer, File tmpFile
) throws IOException, InvalidMessageException, MissingConfigurationException {
- return messageReceiver.retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
+ return dependencies.getMessageReceiver()
+ .retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
}
- void sendGroups() throws IOException, UntrustedIdentityException {
+ void sendGroups() throws IOException {
var groupsFile = IOUtils.createTempFile();
try {
.withLength(groupsFile.length())
.build();
- sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
}
}
} finally {
}
}
- public void sendContacts() throws IOException, UntrustedIdentityException {
+ public void sendContacts() throws IOException {
var contactsFile = IOUtils.createTempFile();
try {
.withLength(contactsFile.length())
.build();
- sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream, true)));
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream,
+ true)));
}
}
} finally {
}
}
- void sendBlockedList() throws IOException, UntrustedIdentityException {
+ void sendBlockedList() throws IOException {
var addresses = new ArrayList<SignalServiceAddress>();
for (var record : account.getContactStore().getContacts()) {
if (record.second().isBlocked()) {
groupIds.add(record.getGroupId().serialize());
}
}
- sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
}
private void sendVerifiedMessage(
SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel
- ) throws IOException, UntrustedIdentityException {
+ ) throws IOException {
var verifiedMessage = new VerifiedMessage(destination,
identityKey,
trustLevel.toVerifiedState(),
System.currentTimeMillis());
- sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
+ sendHelper.sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
}
public List<Pair<RecipientId, Contact>> getContacts() {
try {
var address = account.getRecipientStore().resolveServiceAddress(recipientId);
sendVerifiedMessage(address, identity.getIdentityKey(), trustLevel);
- } catch (IOException | UntrustedIdentityException e) {
+ } catch (IOException e) {
logger.warn("Failed to send verification sync message: {}", e.getMessage());
}
return true;
}
- public String computeSafetyNumber(
- SignalServiceAddress theirAddress, IdentityKey theirIdentityKey
+ private void handleIdentityFailure(
+ final RecipientId recipientId, final SendMessageResult.IdentityFailure identityFailure
) {
- return Utils.computeSafetyNumber(ServiceConfig.capabilities.isUuid(),
+ final var identityKey = identityFailure.getIdentityKey();
+ if (identityKey != null) {
+ final var newIdentity = account.getIdentityKeyStore().saveIdentity(recipientId, identityKey, new Date());
+ if (newIdentity) {
+ account.getSessionStore().archiveSessions(recipientId);
+ }
+ } else {
+ // Retrieve profile to get the current identity key from the server
+ retrieveEncryptedProfile(recipientId);
+ }
+ }
+
+ public String computeSafetyNumber(SignalServiceAddress theirAddress, IdentityKey theirIdentityKey) {
+ final var fingerprint = Utils.computeSafetyNumber(capabilities.isUuid(),
account.getSelfAddress(),
getIdentityKeyPair().getPublicKey(),
theirAddress,
theirIdentityKey);
+ return fingerprint == null ? null : fingerprint.getDisplayableFingerprint().getDisplayText();
+ }
+
+ public byte[] computeSafetyNumberForScanning(SignalServiceAddress theirAddress, IdentityKey theirIdentityKey) {
+ final var fingerprint = Utils.computeSafetyNumber(capabilities.isUuid(),
+ account.getSelfAddress(),
+ getIdentityKeyPair().getPublicKey(),
+ theirAddress,
+ theirIdentityKey);
+ return fingerprint == null ? null : fingerprint.getScannableFingerprint().getSerialized();
}
@Deprecated
return account.getRecipientStore().resolveServiceAddress(recipientId);
}
- public RecipientId canonicalizeAndResolveRecipient(String identifier) throws InvalidNumberException {
- var canonicalizedNumber = UuidUtil.isUuid(identifier)
- ? identifier
- : PhoneNumberFormatter.formatNumber(identifier, account.getUsername());
+ private RecipientId canonicalizeAndResolveRecipient(String identifier) throws InvalidNumberException {
+ var canonicalizedNumber = UuidUtil.isUuid(identifier) ? identifier : canonicalizePhoneNumber(identifier);
return resolveRecipient(canonicalizedNumber);
}
+ private String canonicalizePhoneNumber(final String number) throws InvalidNumberException {
+ return PhoneNumberFormatter.formatNumber(number, account.getUsername());
+ }
+
private RecipientId resolveRecipient(final String identifier) {
var address = Utils.getSignalServiceAddressFromIdentifier(identifier);
}
private void enqueueJob(Job job) {
- var context = new Context(account, accountManager, messageReceiver, stickerPackStore);
+ var context = new Context(account,
+ dependencies.getAccountManager(),
+ dependencies.getMessageReceiver(),
+ stickerPackStore);
job.run(context);
}
void close(boolean closeAccount) throws IOException {
executor.shutdown();
- if (messagePipe != null) {
- messagePipe.shutdown();
- messagePipe = null;
- }
-
- if (unidentifiedMessagePipe != null) {
- unidentifiedMessagePipe.shutdown();
- unidentifiedMessagePipe = null;
- }
+ dependencies.getSignalWebSocket().disconnect();
if (closeAccount && account != null) {
account.close();
git.nmode.ca / signal-cli / blobdiff
