*/
package org.asamk.signal.manager;
+import org.asamk.signal.manager.actions.HandleAction;
import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.SendGroupMessageResults;
+import org.asamk.signal.manager.api.SendMessageResults;
+import org.asamk.signal.manager.api.TypingAction;
import org.asamk.signal.manager.config.ServiceConfig;
import org.asamk.signal.manager.config.ServiceEnvironment;
import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdV1;
import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
+import org.asamk.signal.manager.groups.GroupLinkState;
import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupUtils;
+import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.groups.LastGroupAdminException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.helper.AttachmentHelper;
+import org.asamk.signal.manager.helper.ContactHelper;
import org.asamk.signal.manager.helper.GroupHelper;
+import org.asamk.signal.manager.helper.GroupV2Helper;
+import org.asamk.signal.manager.helper.IncomingMessageHandler;
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.StorageHelper;
+import org.asamk.signal.manager.helper.SyncHelper;
import org.asamk.signal.manager.helper.UnidentifiedAccessHelper;
+import org.asamk.signal.manager.jobs.Context;
import org.asamk.signal.manager.storage.SignalAccount;
import org.asamk.signal.manager.storage.groups.GroupInfo;
-import org.asamk.signal.manager.storage.groups.GroupInfoV1;
-import org.asamk.signal.manager.storage.groups.GroupInfoV2;
import org.asamk.signal.manager.storage.identities.IdentityInfo;
+import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
import org.asamk.signal.manager.storage.messageCache.CachedMessage;
import org.asamk.signal.manager.storage.recipients.Contact;
import org.asamk.signal.manager.storage.recipients.Profile;
import org.asamk.signal.manager.storage.recipients.RecipientId;
import org.asamk.signal.manager.storage.stickers.Sticker;
import org.asamk.signal.manager.storage.stickers.StickerPackId;
-import org.asamk.signal.manager.util.AttachmentUtils;
-import org.asamk.signal.manager.util.IOUtils;
import org.asamk.signal.manager.util.KeyUtils;
-import org.asamk.signal.manager.util.ProfileUtils;
import org.asamk.signal.manager.util.StickerUtils;
import org.asamk.signal.manager.util.Utils;
-import org.signal.libsignal.metadata.InvalidMetadataMessageException;
-import org.signal.libsignal.metadata.InvalidMetadataVersionException;
-import org.signal.libsignal.metadata.ProtocolDuplicateMessageException;
-import org.signal.libsignal.metadata.ProtocolInvalidKeyException;
-import org.signal.libsignal.metadata.ProtocolInvalidKeyIdException;
-import org.signal.libsignal.metadata.ProtocolInvalidMessageException;
-import org.signal.libsignal.metadata.ProtocolInvalidVersionException;
-import org.signal.libsignal.metadata.ProtocolLegacyMessageException;
-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.slf4j.LoggerFactory;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair;
import org.whispersystems.libsignal.InvalidKeyException;
-import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.ecc.ECPublicKey;
+import org.whispersystems.libsignal.fingerprint.Fingerprint;
+import org.whispersystems.libsignal.fingerprint.FingerprintParsingException;
+import org.whispersystems.libsignal.fingerprint.FingerprintVersionMismatchException;
import org.whispersystems.libsignal.state.PreKeyRecord;
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.crypto.SignalServiceCipher;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
+import org.whispersystems.signalservice.api.SignalSessionLock;
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.SignalServiceAttachmentRemoteId;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
import org.whispersystems.signalservice.api.messages.SignalServiceContent;
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsInputStream;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsOutputStream;
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroup;
-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.profiles.ProfileAndCredential;
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
+import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-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;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
-import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
import org.whispersystems.signalservice.internal.util.Hex;
import org.whispersystems.signalservice.internal.util.Util;
import java.io.Closeable;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
import java.security.SignatureException;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Base64;
import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Function;
import java.util.stream.Collectors;
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 GroupHelper groupHelper;
private final PinHelper pinHelper;
- private final AvatarStore avatarStore;
- private final AttachmentStore attachmentStore;
+ private final StorageHelper storageHelper;
+ private final SendHelper sendHelper;
+ private final SyncHelper syncHelper;
+ private final AttachmentHelper attachmentHelper;
+ private final GroupHelper groupHelper;
+ private final ContactHelper contactHelper;
+ private final IncomingMessageHandler incomingMessageHandler;
+
+ private final Context context;
+ private boolean hasCaughtUpWithOldMessages = false;
Manager(
SignalAccount account,
) {
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());
+ final var sessionLock = new SignalSessionLock() {
+ private final ReentrantLock LEGACY_LOCK = new ReentrantLock();
+
+ @Override
+ public Lock acquire() {
+ LEGACY_LOCK.lock();
+ return LEGACY_LOCK::unlock;
+ }
+ };
+ this.dependencies = new SignalDependencies(serviceEnvironmentConfig,
userAgent,
- null,
- timer,
- clientZkProfileOperations,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY);
-
- this.unidentifiedAccessHelper = new UnidentifiedAccessHelper(account::getProfileKey,
+ credentialsProvider,
+ account.getSignalProtocolStore(),
+ executor,
+ sessionLock);
+ final var avatarStore = new AvatarStore(pathConfig.getAvatarsPath());
+ final var attachmentStore = new AttachmentStore(pathConfig.getAttachmentsPath());
+ final var stickerPackStore = new StickerPackStore(pathConfig.getStickerPacksPath());
+
+ this.attachmentHelper = new AttachmentHelper(dependencies, attachmentStore);
+ this.pinHelper = new PinHelper(dependencies.getKeyBackupService());
+ final var unidentifiedAccessHelper = new UnidentifiedAccessHelper(account::getProfileKey,
account.getProfileStore()::getProfileKey,
this::getRecipientProfile,
this::getSenderCertificate);
- this.profileHelper = new ProfileHelper(account.getProfileStore()::getProfileKey,
+ this.profileHelper = new ProfileHelper(account,
+ dependencies,
+ avatarStore,
+ account.getProfileStore()::getProfileKey,
unidentifiedAccessHelper::getAccessFor,
- unidentified -> unidentified ? getOrCreateUnidentifiedMessagePipe() : getOrCreateMessagePipe(),
- () -> messageReceiver,
this::resolveSignalServiceAddress);
- this.groupHelper = new GroupHelper(this::getRecipientProfileKeyCredential,
+ final GroupV2Helper groupV2Helper = new GroupV2Helper(profileHelper::getRecipientProfileKeyCredential,
this::getRecipientProfile,
account::getSelfRecipientId,
- groupsV2Operations,
- groupsV2Api,
- this::getGroupAuthForToday,
+ dependencies.getGroupsV2Operations(),
+ dependencies.getGroupsV2Api(),
this::resolveSignalServiceAddress);
- this.avatarStore = new AvatarStore(pathConfig.getAvatarsPath());
- this.attachmentStore = new AttachmentStore(pathConfig.getAttachmentsPath());
+ this.sendHelper = new SendHelper(account,
+ dependencies,
+ unidentifiedAccessHelper,
+ this::resolveSignalServiceAddress,
+ account.getRecipientStore(),
+ this::handleIdentityFailure,
+ this::getGroup,
+ this::refreshRegisteredUser);
+ this.groupHelper = new GroupHelper(account,
+ dependencies,
+ attachmentHelper,
+ sendHelper,
+ groupV2Helper,
+ avatarStore,
+ this::resolveSignalServiceAddress,
+ account.getRecipientStore());
+ this.storageHelper = new StorageHelper(account, dependencies, groupHelper);
+ this.contactHelper = new ContactHelper(account);
+ this.syncHelper = new SyncHelper(account,
+ attachmentHelper,
+ sendHelper,
+ groupHelper,
+ avatarStore,
+ this::resolveSignalServiceAddress);
+
+ this.context = new Context(account,
+ dependencies,
+ stickerPackStore,
+ sendHelper,
+ groupHelper,
+ syncHelper,
+ profileHelper,
+ storageHelper);
+ var jobExecutor = new JobExecutor(context);
+
+ this.incomingMessageHandler = new IncomingMessageHandler(account,
+ dependencies,
+ account.getRecipientStore(),
+ this::resolveSignalServiceAddress,
+ groupHelper,
+ contactHelper,
+ attachmentHelper,
+ syncHelper,
+ jobExecutor);
}
public String getUsername() {
return account.getUsername();
}
- public SignalServiceAddress getSelfAddress() {
- return account.getSelfAddress();
- }
-
public RecipientId getSelfRecipientId() {
return account.getSelfRecipientId();
}
}
public static Manager init(
- String username, File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
+ String username,
+ File settingsPath,
+ ServiceEnvironment serviceEnvironment,
+ String userAgent,
+ final TrustNewIdentity trustNewIdentity
) throws IOException, NotRegisteredException {
var pathConfig = PathConfig.createDefault(settingsPath);
throw new NotRegisteredException();
}
- var account = SignalAccount.load(pathConfig.getDataPath(), username, true);
+ var account = SignalAccount.load(pathConfig.getDataPath(), username, true, trustNewIdentity);
if (!account.isRegistered()) {
throw new NotRegisteredException();
}
public void checkAccountState() throws IOException {
- if (accountManager.getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+ if (account.getLastReceiveTimestamp() == 0) {
+ logger.info("The Signal protocol expects that incoming messages are regularly received.");
+ } else {
+ var diffInMilliseconds = System.currentTimeMillis() - account.getLastReceiveTimestamp();
+ long days = TimeUnit.DAYS.convert(diffInMilliseconds, TimeUnit.MILLISECONDS);
+ if (days > 7) {
+ logger.warn(
+ "Messages have been last received {} days ago. The Signal protocol expects that incoming messages are regularly received.",
+ days);
+ }
+ }
+ if (dependencies.getAccountManager().getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
refreshPreKeys();
}
if (account.getUuid() == null) {
- account.setUuid(accountManager.getOwnUuid());
+ account.setUuid(dependencies.getAccountManager().getOwnUuid());
}
- updateAccountAttributes();
+ updateAccountAttributes(null);
}
/**
* 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 {
- // Note "contactDetails" has no optionals. It only gives us info on users who are registered
- var contactDetails = getRegisteredUsers(numbers);
+ 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 PhoneNumberFormatter.formatNumber(n, account.getUsername());
+ } catch (InvalidNumberException e) {
+ return "";
+ }
+ }));
- var registeredUsers = contactDetails.keySet();
+ // Note "registeredUsers" has no optionals. It only gives us info on users who are registered
+ var registeredUsers = getRegisteredUsers(canonicalizedNumbers.values()
+ .stream()
+ .filter(s -> !s.isEmpty())
+ .collect(Collectors.toSet()));
- 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 = registeredUsers.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());
+ public void updateAccountAttributes(String deviceName) throws IOException {
+ final String encryptedDeviceName;
+ if (deviceName == null) {
+ encryptedDeviceName = account.getEncryptedDeviceName();
+ } else {
+ final var privateKey = account.getIdentityKeyPair().getPrivateKey();
+ encryptedDeviceName = DeviceNameUtil.encryptDeviceName(deviceName, privateKey);
+ account.setEncryptedDeviceName(encryptedDeviceName);
+ }
+ dependencies.getAccountManager()
+ .setAccountAttributes(encryptedDeviceName,
+ null,
+ account.getLocalRegistrationId(),
+ true,
+ null,
+ account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
+ account.getSelfUnidentifiedAccessKey(),
+ account.isUnrestrictedUnidentifiedAccess(),
+ capabilities,
+ account.isDiscoverableByPhoneNumber());
}
/**
public void setProfile(
String givenName, final String familyName, String about, String aboutEmoji, Optional<File> avatar
) throws IOException {
- var profile = getRecipientProfile(account.getSelfRecipientId());
- var builder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile);
- if (givenName != null) {
- builder.withGivenName(givenName);
- }
- if (familyName != null) {
- builder.withFamilyName(familyName);
- }
- if (about != null) {
- builder.withAbout(about);
- }
- if (aboutEmoji != null) {
- builder.withAboutEmoji(aboutEmoji);
- }
- var newProfile = builder.build();
-
- 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(),
- streamDetails);
- }
-
- if (avatar != null) {
- if (avatar.isPresent()) {
- avatarStore.storeProfileAvatar(getSelfAddress(),
- outputStream -> IOUtils.copyFileToStream(avatar.get(), outputStream));
- } else {
- avatarStore.deleteProfileAvatar(getSelfAddress());
- }
- }
- account.getProfileStore().storeProfile(account.getSelfRecipientId(), newProfile);
-
- try {
- sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE));
- } catch (UntrustedIdentityException ignored) {
- }
+ profileHelper.setProfile(givenName, familyName, about, aboutEmoji, avatar);
+ syncHelper.sendSyncFetchProfileMessage();
}
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();
+ try {
+ pinHelper.removeRegistrationLockPin();
+ } catch (UnauthenticatedResponseException e) {
+ logger.warn("Failed to remove registration lock pin");
+ }
+ account.setRegistrationLockPin(null, null);
+
+ dependencies.getAccountManager().deleteAccount();
account.setRegistered(false);
}
+ public void submitRateLimitRecaptchaChallenge(String challenge, String captcha) throws IOException {
+ dependencies.getAccountManager().submitRateLimitRecaptchaChallenge(challenge, captcha);
+ }
+
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(),
- 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 getRecipientProfile(recipientId, false);
- }
-
- private final Set<RecipientId> pendingProfileRequest = new HashSet<>();
-
- Profile getRecipientProfile(
- RecipientId recipientId, boolean force
- ) {
- var profile = account.getProfileStore().getProfile(recipientId);
-
- var now = new Date().getTime();
- // Profiles are cached for 24h before retrieving them again, unless forced
- if (!force && profile != null && now - profile.getLastUpdateTimestamp() < 24 * 60 * 60 * 1000) {
- return profile;
- }
-
- synchronized (pendingProfileRequest) {
- if (pendingProfileRequest.contains(recipientId)) {
- return profile;
- }
- pendingProfileRequest.add(recipientId);
- }
- final SignalServiceProfile encryptedProfile;
- try {
- encryptedProfile = retrieveEncryptedProfile(recipientId);
- } finally {
- synchronized (pendingProfileRequest) {
- pendingProfileRequest.remove(recipientId);
- }
- }
- if (encryptedProfile == null) {
- return null;
- }
-
- var profileKey = account.getProfileStore().getProfileKey(recipientId);
- if (profileKey == null) {
- profile = new Profile(new Date().getTime(),
- null,
- null,
- null,
- null,
- ProfileUtils.getUnidentifiedAccessMode(encryptedProfile, null),
- ProfileUtils.getCapabilities(encryptedProfile));
- } else {
- profile = decryptProfileAndDownloadAvatar(recipientId, profileKey, encryptedProfile);
- }
- account.getProfileStore().storeProfile(recipientId, profile);
-
- return profile;
- }
-
- private SignalServiceProfile retrieveEncryptedProfile(RecipientId recipientId) {
- try {
- return retrieveProfileAndCredential(recipientId, SignalServiceProfile.RequestType.PROFILE).getProfile();
- } catch (IOException e) {
- logger.warn("Failed to retrieve profile, ignoring: {}", e.getMessage());
- return null;
- }
- }
-
- private ProfileAndCredential retrieveProfileAndCredential(
- final RecipientId recipientId, final SignalServiceProfile.RequestType requestType
- ) throws IOException {
- final var profileAndCredential = profileHelper.retrieveProfileSync(recipientId, requestType);
- final var profile = profileAndCredential.getProfile();
-
- try {
- var newIdentity = account.getIdentityKeyStore()
- .saveIdentity(recipientId,
- new IdentityKey(Base64.getDecoder().decode(profile.getIdentityKey())),
- new Date());
-
- if (newIdentity) {
- account.getSessionStore().archiveSessions(recipientId);
- }
- } catch (InvalidKeyException ignored) {
- logger.warn("Got invalid identity key in profile for {}",
- resolveSignalServiceAddress(recipientId).getLegacyIdentifier());
- }
- return profileAndCredential;
- }
-
- private ProfileKeyCredential getRecipientProfileKeyCredential(RecipientId recipientId) {
- var profileKeyCredential = account.getProfileStore().getProfileKeyCredential(recipientId);
- if (profileKeyCredential != null) {
- return profileKeyCredential;
- }
-
- ProfileAndCredential profileAndCredential;
- try {
- profileAndCredential = retrieveProfileAndCredential(recipientId,
- SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL);
- } catch (IOException e) {
- logger.warn("Failed to retrieve profile key credential, ignoring: {}", e.getMessage());
- return null;
- }
-
- profileKeyCredential = profileAndCredential.getProfileKeyCredential().orNull();
- account.getProfileStore().storeProfileKeyCredential(recipientId, profileKeyCredential);
-
- var profileKey = account.getProfileStore().getProfileKey(recipientId);
- if (profileKey != null) {
- final var profile = decryptProfileAndDownloadAvatar(recipientId,
- profileKey,
- profileAndCredential.getProfile());
- account.getProfileStore().storeProfile(recipientId, profile);
- }
-
- return profileKeyCredential;
- }
-
- private Profile decryptProfileAndDownloadAvatar(
- final RecipientId recipientId, final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
- ) {
- if (encryptedProfile.getAvatar() != null) {
- downloadProfileAvatar(resolveSignalServiceAddress(recipientId), encryptedProfile.getAvatar(), profileKey);
- }
-
- return ProfileUtils.decryptProfile(profileKey, encryptedProfile);
- }
-
- private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(GroupId groupId) throws IOException {
- final var streamDetails = avatarStore.retrieveGroupAvatar(groupId);
- if (streamDetails == null) {
- return Optional.absent();
- }
-
- return Optional.of(AttachmentUtils.createAttachment(streamDetails, Optional.absent()));
- }
-
- private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(SignalServiceAddress address) throws IOException {
- final var streamDetails = avatarStore.retrieveContactAvatar(address);
- if (streamDetails == null) {
- return Optional.absent();
- }
-
- 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) {
- throw new GroupNotFoundException(groupId);
- }
- if (!g.isMember(account.getSelfRecipientId()) && !g.isPendingMember(account.getSelfRecipientId())) {
- throw new NotAGroupMemberException(groupId, g.getTitle());
- }
- return g;
+ public Profile getRecipientProfile(RecipientId recipientId) {
+ return profileHelper.getRecipientProfile(recipientId);
}
public List<GroupInfo> getGroups() {
return account.getGroupStore().getGroups();
}
- 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);
- if (attachments != null) {
- messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));
- }
-
- return sendGroupMessage(messageBuilder, groupId);
- }
-
- public Pair<Long, List<SendMessageResult>> sendGroupMessageReaction(
- String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, GroupId groupId
- ) throws IOException, InvalidNumberException, NotAGroupMemberException, GroupNotFoundException {
- var targetAuthorRecipientId = canonicalizeAndResolveRecipient(targetAuthor);
- var reaction = new SignalServiceDataMessage.Reaction(emoji,
- remove,
- resolveSignalServiceAddress(targetAuthorRecipientId),
- targetSentTimestamp);
- final var messageBuilder = SignalServiceDataMessage.newBuilder().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()));
+ public SendGroupMessageResults quitGroup(
+ GroupId groupId, Set<RecipientIdentifier.Single> groupAdmins
+ ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException {
+ final var newAdmins = resolveRecipients(groupAdmins);
+ return groupHelper.quitGroup(groupId, newAdmins);
}
- public Pair<Long, List<SendMessageResult>> sendQuitGroupMessage(GroupId groupId) throws GroupNotFoundException, IOException, NotAGroupMemberException {
- SignalServiceDataMessage.Builder messageBuilder;
-
- final var g = getGroupForUpdating(groupId);
- if (g instanceof GroupInfoV1) {
- var groupInfoV1 = (GroupInfoV1) g;
- var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT).withId(groupId.serialize()).build();
- messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group);
- groupInfoV1.removeMember(account.getSelfRecipientId());
- account.getGroupStore().updateGroup(groupInfoV1);
- } else {
- final var groupInfoV2 = (GroupInfoV2) g;
- final var groupGroupChangePair = groupHelper.leaveGroup(groupInfoV2);
- groupInfoV2.setGroup(groupGroupChangePair.first(), this::resolveRecipient);
- messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().toByteArray());
- account.getGroupStore().updateGroup(groupInfoV2);
- }
-
- return sendMessage(messageBuilder, g.getMembersWithout(account.getSelfRecipientId()));
+ public void deleteGroup(GroupId groupId) throws IOException {
+ groupHelper.deleteGroup(groupId);
}
- public Pair<GroupId, List<SendMessageResult>> updateGroup(
- GroupId groupId, String name, List<String> members, File avatarFile
- ) throws IOException, GroupNotFoundException, AttachmentInvalidException, InvalidNumberException, NotAGroupMemberException {
- return sendUpdateGroupMessage(groupId,
+ public Pair<GroupId, SendGroupMessageResults> createGroup(
+ String name, Set<RecipientIdentifier.Single> members, File avatarFile
+ ) throws IOException, AttachmentInvalidException {
+ return groupHelper.createGroup(name, members == null ? null : resolveRecipients(members), avatarFile);
+ }
+
+ public SendGroupMessageResults updateGroup(
+ GroupId groupId,
+ String name,
+ String description,
+ Set<RecipientIdentifier.Single> members,
+ Set<RecipientIdentifier.Single> removeMembers,
+ Set<RecipientIdentifier.Single> admins,
+ Set<RecipientIdentifier.Single> removeAdmins,
+ boolean resetGroupLink,
+ GroupLinkState groupLinkState,
+ GroupPermission addMemberPermission,
+ GroupPermission editDetailsPermission,
+ File avatarFile,
+ Integer expirationTimer,
+ Boolean isAnnouncementGroup
+ ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException {
+ return groupHelper.updateGroup(groupId,
name,
- members == null ? null : getSignalServiceAddresses(members),
- avatarFile);
- }
-
- private Pair<GroupId, List<SendMessageResult>> sendUpdateGroupMessage(
- GroupId groupId, String name, Set<RecipientId> members, File avatarFile
- ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {
- GroupInfo g;
- SignalServiceDataMessage.Builder messageBuilder;
- if (groupId == null) {
- // Create new group
- var gv2Pair = groupHelper.createGroupV2(name == null ? "" : name,
- members == null ? Set.of() : members,
- avatarFile);
- if (gv2Pair == null) {
- var gv1 = new GroupInfoV1(GroupIdV1.createRandom());
- gv1.addMembers(List.of(account.getSelfRecipientId()));
- updateGroupV1(gv1, name, members, avatarFile);
- messageBuilder = getGroupUpdateMessageBuilder(gv1);
- g = gv1;
- } else {
- final var gv2 = gv2Pair.first();
- final var decryptedGroup = gv2Pair.second();
-
- gv2.setGroup(decryptedGroup, this::resolveRecipient);
- if (avatarFile != null) {
- avatarStore.storeGroupAvatar(gv2.getGroupId(),
- outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
- }
- messageBuilder = getGroupUpdateMessageBuilder(gv2, null);
- g = gv2;
- }
- } else {
- var group = getGroupForUpdating(groupId);
- if (group instanceof GroupInfoV2) {
- final var groupInfoV2 = (GroupInfoV2) group;
-
- Pair<Long, List<SendMessageResult>> result = null;
- if (groupInfoV2.isPendingMember(account.getSelfRecipientId())) {
- var groupGroupChangePair = groupHelper.acceptInvite(groupInfoV2);
- result = sendUpdateGroupMessage(groupInfoV2,
- groupGroupChangePair.first(),
- groupGroupChangePair.second());
- }
-
- if (members != null) {
- final var newMembers = new HashSet<>(members);
- newMembers.removeAll(group.getMembers());
- if (newMembers.size() > 0) {
- var groupGroupChangePair = groupHelper.updateGroupV2(groupInfoV2, newMembers);
- result = sendUpdateGroupMessage(groupInfoV2,
- groupGroupChangePair.first(),
- groupGroupChangePair.second());
- }
- }
- if (result == null || name != null || avatarFile != null) {
- var groupGroupChangePair = groupHelper.updateGroupV2(groupInfoV2, name, avatarFile);
- if (avatarFile != null) {
- avatarStore.storeGroupAvatar(groupInfoV2.getGroupId(),
- outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
- }
- result = sendUpdateGroupMessage(groupInfoV2,
- groupGroupChangePair.first(),
- groupGroupChangePair.second());
- }
-
- return new Pair<>(group.getGroupId(), result.second());
- } else {
- var gv1 = (GroupInfoV1) group;
- updateGroupV1(gv1, name, members, avatarFile);
- messageBuilder = getGroupUpdateMessageBuilder(gv1);
- g = gv1;
- }
- }
-
- account.getGroupStore().updateGroup(g);
-
- final var result = sendMessage(messageBuilder,
- g.getMembersIncludingPendingWithout(account.getSelfRecipientId()));
- return new Pair<>(g.getGroupId(), result.second());
- }
-
- private void updateGroupV1(
- final GroupInfoV1 g, final String name, final Collection<RecipientId> members, final File avatarFile
- ) throws IOException {
- if (name != null) {
- g.name = name;
- }
-
- if (members != null) {
- final var newMemberAddresses = members.stream()
- .filter(member -> !g.isMember(member))
- .map(this::resolveSignalServiceAddress)
- .collect(Collectors.toList());
- final var newE164Members = new HashSet<String>();
- for (var member : newMemberAddresses) {
- if (!member.getNumber().isPresent()) {
- continue;
- }
- newE164Members.add(member.getNumber().get());
- }
-
- final var registeredUsers = getRegisteredUsers(newE164Members);
- if (registeredUsers.size() != newE164Members.size()) {
- // Some of the new members are not registered on Signal
- newE164Members.removeAll(registeredUsers.keySet());
- throw new IOException("Failed to add members "
- + String.join(", ", newE164Members)
- + " to group: Not registered on Signal");
- }
-
- g.addMembers(members);
- }
-
- if (avatarFile != null) {
- avatarStore.storeGroupAvatar(g.getGroupId(),
- outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
- }
- }
-
- public Pair<GroupId, List<SendMessageResult>> joinGroup(
- GroupInviteLinkUrl inviteLinkUrl
- ) throws IOException, GroupLinkNotActiveException {
- return sendJoinGroupMessage(inviteLinkUrl);
- }
-
- private Pair<GroupId, List<SendMessageResult>> sendJoinGroupMessage(
+ description,
+ members == null ? null : resolveRecipients(members),
+ removeMembers == null ? null : resolveRecipients(removeMembers),
+ admins == null ? null : resolveRecipients(admins),
+ removeAdmins == null ? null : resolveRecipients(removeAdmins),
+ resetGroupLink,
+ groupLinkState,
+ addMemberPermission,
+ editDetailsPermission,
+ avatarFile,
+ expirationTimer,
+ isAnnouncementGroup);
+ }
+
+ public Pair<GroupId, SendGroupMessageResults> joinGroup(
GroupInviteLinkUrl inviteLinkUrl
) throws IOException, GroupLinkNotActiveException {
- final var groupJoinInfo = groupHelper.getDecryptedGroupJoinInfo(inviteLinkUrl.getGroupMasterKey(),
- inviteLinkUrl.getPassword());
- final var groupChange = groupHelper.joinGroup(inviteLinkUrl.getGroupMasterKey(),
- inviteLinkUrl.getPassword(),
- groupJoinInfo);
- final var group = getOrMigrateGroup(inviteLinkUrl.getGroupMasterKey(),
- groupJoinInfo.getRevision() + 1,
- groupChange.toByteArray());
-
- if (group.getGroup() == null) {
- // Only requested member, can't send update to group members
- return new Pair<>(group.getGroupId(), List.of());
- }
-
- final var result = sendUpdateGroupMessage(group, group.getGroup(), groupChange);
-
- return new Pair<>(group.getGroupId(), result.second());
- }
-
- private static int currentTimeDays() {
- return (int) TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis());
- }
-
- private GroupsV2AuthorizationString getGroupAuthForToday(
- final GroupSecretParams groupSecretParams
- ) throws IOException {
- final var today = currentTimeDays();
- // Returns credentials for the next 7 days
- final var credentials = groupsV2Api.getCredentials(today);
- // TODO cache credentials until they expire
- var authCredentialResponse = credentials.get(today);
- try {
- return groupsV2Api.getGroupsV2AuthorizationString(account.getUuid(),
- today,
- groupSecretParams,
- authCredentialResponse);
- } catch (VerificationFailedException e) {
- throw new IOException(e);
- }
+ return groupHelper.joinGroup(inviteLinkUrl);
}
- private Pair<Long, List<SendMessageResult>> sendUpdateGroupMessage(
- GroupInfoV2 group, DecryptedGroup newDecryptedGroup, GroupChange groupChange
- ) throws IOException {
- group.setGroup(newDecryptedGroup, this::resolveRecipient);
- final var messageBuilder = getGroupUpdateMessageBuilder(group, groupChange.toByteArray());
- account.getGroupStore().updateGroup(group);
- return sendMessage(messageBuilder, group.getMembersIncludingPendingWithout(account.getSelfRecipientId()));
- }
-
- Pair<Long, List<SendMessageResult>> sendGroupInfoMessage(
- GroupIdV1 groupId, SignalServiceAddress recipient
- ) throws IOException, NotAGroupMemberException, GroupNotFoundException, AttachmentInvalidException {
- GroupInfoV1 g;
- var group = getGroupForSending(groupId);
- if (!(group instanceof GroupInfoV1)) {
- throw new RuntimeException("Received an invalid group request for a v2 group!");
- }
- g = (GroupInfoV1) group;
-
- final var recipientId = resolveRecipient(recipient);
- if (!g.isMember(recipientId)) {
- throw new NotAGroupMemberException(groupId, g.name);
+ public SendMessageResults sendMessage(
+ SignalServiceDataMessage.Builder messageBuilder, Set<RecipientIdentifier> recipients
+ ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
+ long timestamp = System.currentTimeMillis();
+ messageBuilder.withTimestamp(timestamp);
+ for (final var recipient : recipients) {
+ if (recipient instanceof RecipientIdentifier.Single) {
+ final var recipientId = resolveRecipient((RecipientIdentifier.Single) recipient);
+ final var result = sendHelper.sendMessage(messageBuilder, recipientId);
+ results.put(recipient, List.of(result));
+ } else if (recipient instanceof RecipientIdentifier.NoteToSelf) {
+ final var result = sendHelper.sendSelfMessage(messageBuilder);
+ results.put(recipient, List.of(result));
+ } else if (recipient instanceof RecipientIdentifier.Group) {
+ final var groupId = ((RecipientIdentifier.Group) recipient).groupId;
+ final var result = sendHelper.sendAsGroupMessage(messageBuilder, groupId);
+ results.put(recipient, result);
+ }
}
-
- var messageBuilder = getGroupUpdateMessageBuilder(g);
-
- // Send group message only to the recipient who requested it
- return sendMessage(messageBuilder, Set.of(recipientId));
+ return new SendMessageResults(timestamp, results);
}
- private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV1 g) throws AttachmentInvalidException {
- var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
- .withId(g.getGroupId().serialize())
- .withName(g.name)
- .withMembers(g.getMembers()
- .stream()
- .map(this::resolveSignalServiceAddress)
- .collect(Collectors.toList()));
-
- try {
- final var attachment = createGroupAvatarAttachment(g.getGroupId());
- if (attachment.isPresent()) {
- group.withAvatar(attachment.get());
+ public void sendTypingMessage(
+ SignalServiceTypingMessage.Action action, Set<RecipientIdentifier> recipients
+ ) throws IOException, UntrustedIdentityException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ final var timestamp = System.currentTimeMillis();
+ for (var recipient : recipients) {
+ if (recipient instanceof RecipientIdentifier.Single) {
+ final var message = new SignalServiceTypingMessage(action, timestamp, Optional.absent());
+ final var recipientId = resolveRecipient((RecipientIdentifier.Single) recipient);
+ sendHelper.sendTypingMessage(message, recipientId);
+ } else if (recipient instanceof RecipientIdentifier.Group) {
+ final var groupId = ((RecipientIdentifier.Group) recipient).groupId;
+ final var message = new SignalServiceTypingMessage(action, timestamp, Optional.of(groupId.serialize()));
+ sendHelper.sendGroupTypingMessage(message, groupId);
}
- } catch (IOException e) {
- throw new AttachmentInvalidException(g.getGroupId().toBase64(), e);
}
-
- return SignalServiceDataMessage.newBuilder()
- .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());
- }
-
- Pair<Long, List<SendMessageResult>> sendGroupInfoRequest(
- GroupIdV1 groupId, SignalServiceAddress recipient
- ) throws IOException {
- var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO).withId(groupId.serialize());
-
- var messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group.build());
+ public void sendReadReceipt(
+ RecipientIdentifier.Single sender, List<Long> messageIds
+ ) throws IOException, UntrustedIdentityException {
+ var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.READ,
+ messageIds,
+ System.currentTimeMillis());
- // Send group info request message to the recipient who sent us a message with this groupId
- return sendMessage(messageBuilder, Set.of(resolveRecipient(recipient)));
+ sendHelper.sendReceiptMessage(receiptMessage, resolveRecipient(sender));
}
- void sendReceipt(
- SignalServiceAddress remoteAddress, long messageId
+ public void sendViewedReceipt(
+ RecipientIdentifier.Single sender, List<Long> messageIds
) throws IOException, UntrustedIdentityException {
- var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.DELIVERY,
- List.of(messageId),
+ var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.VIEWED,
+ messageIds,
System.currentTimeMillis());
- createMessageSender().sendReceipt(remoteAddress,
- unidentifiedAccessHelper.getAccessFor(resolveRecipient(remoteAddress)),
- receiptMessage);
+ sendHelper.sendReceiptMessage(receiptMessage, resolveRecipient(sender));
}
- 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);
- if (attachments != null) {
- var attachmentStreams = AttachmentUtils.getSignalServiceAttachments(attachments);
-
- // Upload attachments here, so we only upload once even for multiple recipients
- var messageSender = createMessageSender();
- var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
- for (var attachment : attachmentStreams) {
- if (attachment.isStream()) {
- attachmentPointers.add(messageSender.uploadAttachment(attachment.asStream()));
- } else if (attachment.isPointer()) {
- attachmentPointers.add(attachment.asPointer());
- }
- }
-
- messageBuilder.withAttachments(attachmentPointers);
- }
- return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
+ public SendMessageResults sendMessage(
+ Message message, Set<RecipientIdentifier> recipients
+ ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ final var messageBuilder = SignalServiceDataMessage.newBuilder();
+ applyMessage(messageBuilder, message);
+ return sendMessage(messageBuilder, recipients);
}
- public Pair<Long, SendMessageResult> sendSelfMessage(
- String messageText, List<String> attachments
- ) throws IOException, AttachmentInvalidException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().withBody(messageText);
+ private void applyMessage(
+ final SignalServiceDataMessage.Builder messageBuilder, final Message message
+ ) throws AttachmentInvalidException, IOException {
+ messageBuilder.withBody(message.getMessageText());
+ final var attachments = message.getAttachments();
if (attachments != null) {
- messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));
+ messageBuilder.withAttachments(attachmentHelper.uploadAttachments(attachments));
}
- return sendSelfMessage(messageBuilder);
}
- public Pair<Long, List<SendMessageResult>> sendRemoteDeleteMessage(
- long targetSentTimestamp, List<String> recipients
- ) throws IOException, InvalidNumberException {
+ public SendMessageResults sendRemoteDeleteMessage(
+ long targetSentTimestamp, Set<RecipientIdentifier> recipients
+ ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp);
final var messageBuilder = SignalServiceDataMessage.newBuilder().withRemoteDelete(delete);
- return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
+ return sendMessage(messageBuilder, 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);
- }
-
- public Pair<Long, List<SendMessageResult>> sendMessageReaction(
- String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List<String> recipients
- ) throws IOException, InvalidNumberException {
- var targetAuthorRecipientId = canonicalizeAndResolveRecipient(targetAuthor);
+ public SendMessageResults sendMessageReaction(
+ String emoji,
+ boolean remove,
+ RecipientIdentifier.Single targetAuthor,
+ long targetSentTimestamp,
+ Set<RecipientIdentifier> recipients
+ ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ var targetAuthorRecipientId = resolveRecipient(targetAuthor);
var reaction = new SignalServiceDataMessage.Reaction(emoji,
remove,
resolveSignalServiceAddress(targetAuthorRecipientId),
targetSentTimestamp);
final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
- return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
+ return sendMessage(messageBuilder, recipients);
}
- public Pair<Long, List<SendMessageResult>> sendEndSessionMessage(List<String> recipients) throws IOException, InvalidNumberException {
+ public SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException {
var messageBuilder = SignalServiceDataMessage.newBuilder().asEndSessionMessage();
- final var signalServiceAddresses = getSignalServiceAddresses(recipients);
try {
- return sendMessage(messageBuilder, signalServiceAddresses);
- } catch (Exception e) {
- for (var address : signalServiceAddresses) {
- handleEndSession(address);
+ return sendMessage(messageBuilder,
+ recipients.stream().map(RecipientIdentifier.class::cast).collect(Collectors.toSet()));
+ } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+ throw new AssertionError(e);
+ } finally {
+ for (var recipient : recipients) {
+ final var recipientId = resolveRecipient(recipient);
+ account.getSessionStore().deleteAllSessions(recipientId);
}
- throw e;
}
}
- SendMessageResult renewSession(RecipientId recipientId) throws IOException {
- account.getSessionStore().archiveSessions(recipientId);
- return 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 {
+ public void setContactName(
+ RecipientIdentifier.Single recipient, String name
+ ) throws NotMasterDeviceException, UnregisteredUserException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
}
- final var recipientId = canonicalizeAndResolveRecipient(number);
- var contact = account.getContactStore().getContact(recipientId);
- final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
- account.getContactStore().storeContact(recipientId, builder.withName(name).build());
+ contactHelper.setContactName(resolveRecipient(recipient), name);
}
public void setContactBlocked(
- String number, boolean blocked
- ) throws InvalidNumberException, NotMasterDeviceException {
+ RecipientIdentifier.Single recipient, boolean blocked
+ ) throws NotMasterDeviceException, IOException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
}
- setContactBlocked(canonicalizeAndResolveRecipient(number), blocked);
- }
-
- private void setContactBlocked(RecipientId recipientId, boolean blocked) {
- var contact = account.getContactStore().getContact(recipientId);
- final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
- account.getContactStore().storeContact(recipientId, builder.withBlocked(blocked).build());
- }
-
- public void setGroupBlocked(final GroupId groupId, final boolean blocked) throws GroupNotFoundException {
- var group = getGroup(groupId);
- if (group == null) {
- throw new GroupNotFoundException(groupId);
- }
-
- group.setBlocked(blocked);
- account.getGroupStore().updateGroup(group);
- }
-
- private void setExpirationTimer(RecipientId recipientId, int messageExpirationTimer) {
- var contact = account.getContactStore().getContact(recipientId);
- if (contact != null && contact.getMessageExpirationTime() == messageExpirationTimer) {
- return;
- }
- final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
- account.getContactStore()
- .storeContact(recipientId, builder.withMessageExpirationTime(messageExpirationTimer).build());
+ contactHelper.setContactBlocked(resolveRecipient(recipient), blocked);
+ // TODO cycle our profile key
+ syncHelper.sendBlockedList();
}
- private void sendExpirationTimerUpdate(RecipientId recipientId) throws IOException {
- final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
- sendMessage(messageBuilder, Set.of(recipientId));
+ public void setGroupBlocked(
+ final GroupId groupId, final boolean blocked
+ ) throws GroupNotFoundException, IOException {
+ groupHelper.setGroupBlocked(groupId, blocked);
+ // TODO cycle our profile key
+ syncHelper.sendBlockedList();
}
/**
* Change the expiration timer for a contact
*/
public void setExpirationTimer(
- String number, int messageExpirationTimer
- ) throws IOException, InvalidNumberException {
- var recipientId = canonicalizeAndResolveRecipient(number);
- setExpirationTimer(recipientId, messageExpirationTimer);
- sendExpirationTimerUpdate(recipientId);
- }
-
- /**
- * Change the expiration timer for a group
- */
- public void setExpirationTimer(GroupId groupId, int messageExpirationTimer) {
- var g = getGroup(groupId);
- if (g instanceof GroupInfoV1) {
- var groupInfoV1 = (GroupInfoV1) g;
- groupInfoV1.messageExpirationTime = messageExpirationTimer;
- account.getGroupStore().updateGroup(groupInfoV1);
- } else {
- throw new RuntimeException("TODO Not implemented!");
+ RecipientIdentifier.Single recipient, int messageExpirationTimer
+ ) throws IOException {
+ var recipientId = resolveRecipient(recipient);
+ contactHelper.setExpirationTimer(recipientId, messageExpirationTimer);
+ final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
+ try {
+ sendMessage(messageBuilder, Set.of(recipient));
+ } catch (NotAGroupMemberException | GroupNotFoundException | GroupSendingNotAllowedException e) {
+ throw new AssertionError(e);
}
}
* @param path Path can be a path to a manifest.json file or to a zip file that contains a manifest.json file
* @return if successful, returns the URL to install the sticker pack in the signal app
*/
- public String uploadStickerPack(File path) throws IOException, StickerPackInvalidException {
+ public URI uploadStickerPack(File path) throws IOException, StickerPackInvalidException {
var manifest = StickerUtils.getSignalServiceStickerManifestUpload(path);
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
var packKey = KeyUtils.createStickerUploadKey();
- var packId = messageSender.uploadStickerManifest(manifest, packKey);
+ var packIdString = messageSender.uploadStickerManifest(manifest, packKey);
+ var packId = StickerPackId.deserialize(Hex.fromStringCondensed(packIdString));
- var sticker = new Sticker(StickerPackId.deserialize(Hex.fromStringCondensed(packId)), packKey);
+ var sticker = new Sticker(packId, packKey);
account.getStickerStore().updateSticker(sticker);
try {
return new URI("https",
"signal.art",
"/addstickers/",
- "pack_id=" + URLEncoder.encode(packId, StandardCharsets.UTF_8) + "&pack_key=" + URLEncoder.encode(
- Hex.toStringCondensed(packKey),
- StandardCharsets.UTF_8)).toString();
+ "pack_id="
+ + URLEncoder.encode(Hex.toStringCondensed(packId.serialize()), StandardCharsets.UTF_8)
+ + "&pack_key="
+ + URLEncoder.encode(Hex.toStringCondensed(packKey), StandardCharsets.UTF_8));
} catch (URISyntaxException e) {
throw new AssertionError(e);
}
}
public void requestAllSyncData() throws IOException {
- requestSyncGroups();
- requestSyncContacts();
- requestSyncBlocked();
- requestSyncConfiguration();
- requestSyncKeys();
- }
-
- private void requestSyncGroups() throws IOException {
- var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
- .setType(SignalServiceProtos.SyncMessage.Request.Type.GROUPS)
- .build();
- var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
+ syncHelper.requestAllSyncData();
+ retrieveRemoteStorage();
}
- private void requestSyncContacts() throws IOException {
- var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
- .setType(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS)
- .build();
- var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
+ void retrieveRemoteStorage() throws IOException {
+ if (account.getStorageKey() != null) {
+ storageHelper.readDataFromStorage();
}
}
- private void requestSyncBlocked() throws IOException {
- var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
- .setType(SignalServiceProtos.SyncMessage.Request.Type.BLOCKED)
- .build();
- var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
- }
-
- private void requestSyncConfiguration() throws IOException {
- var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
- .setType(SignalServiceProtos.SyncMessage.Request.Type.CONFIGURATION)
- .build();
- var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
- }
-
- private void requestSyncKeys() throws IOException {
- var r = SignalServiceProtos.SyncMessage.Request.newBuilder()
- .setType(SignalServiceProtos.SyncMessage.Request.Type.KEYS)
- .build();
- var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
- try {
- sendSyncMessage(message);
- } catch (UntrustedIdentityException e) {
- throw new AssertionError(e);
- }
- }
-
- private byte[] getSenderCertificate() {
- byte[] certificate;
+ 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.sendMessage(message, unidentifiedAccessHelper.getAccessForSync());
- }
-
- private Set<RecipientId> getSignalServiceAddresses(Collection<String> numbers) throws InvalidNumberException {
- final var signalServiceAddresses = new HashSet<SignalServiceAddress>(numbers.size());
- final var addressesMissingUuid = new HashSet<SignalServiceAddress>();
-
- for (var number : numbers) {
- final var resolvedAddress = resolveSignalServiceAddress(canonicalizeAndResolveRecipient(number));
- if (resolvedAddress.getUuid().isPresent()) {
- signalServiceAddresses.add(resolvedAddress);
- } else {
- addressesMissingUuid.add(resolvedAddress);
- }
- }
-
- final var numbersMissingUuid = addressesMissingUuid.stream()
- .map(a -> a.getNumber().get())
- .collect(Collectors.toSet());
- Map<String, UUID> registeredUsers;
- try {
- registeredUsers = getRegisteredUsers(numbersMissingUuid);
- } catch (IOException e) {
- logger.warn("Failed to resolve uuids from server, ignoring: {}", e.getMessage());
- registeredUsers = Map.of();
- }
-
- for (var address : addressesMissingUuid) {
- final var number = address.getNumber().get();
- if (registeredUsers.containsKey(number)) {
- final var newAddress = resolveSignalServiceAddress(resolveRecipientTrusted(new SignalServiceAddress(
- registeredUsers.get(number),
- number)));
- signalServiceAddresses.add(newAddress);
- } else {
- signalServiceAddresses.add(address);
- }
- }
-
- return signalServiceAddresses.stream().map(this::resolveRecipient).collect(Collectors.toSet());
- }
-
private RecipientId refreshRegisteredUser(RecipientId recipientId) throws IOException {
final var address = resolveSignalServiceAddress(recipientId);
if (!address.getNumber().isPresent()) {
return recipientId;
}
final var number = address.getNumber().get();
- final var uuidMap = getRegisteredUsers(Set.of(number));
- return resolveRecipientTrusted(new SignalServiceAddress(uuidMap.getOrDefault(number, null), number));
+ final var uuid = getRegisteredUser(number);
+ return resolveRecipientTrusted(new SignalServiceAddress(uuid, number));
}
- private Map<String, UUID> getRegisteredUsers(final Set<String> numbers) throws IOException {
+ private UUID getRegisteredUser(final String number) throws IOException {
+ final Map<String, UUID> uuidMap;
try {
- return accountManager.getRegisteredUsers(ServiceConfig.getIasKeyStore(),
- numbers,
- serviceEnvironmentConfig.getCdsMrenclave());
- } catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException | InvalidKeyException e) {
- throw new IOException(e);
+ uuidMap = getRegisteredUsers(Set.of(number));
+ } catch (NumberFormatException e) {
+ throw new UnregisteredUserException(number, e);
}
- }
-
- private Pair<Long, List<SendMessageResult>> sendMessage(
- SignalServiceDataMessage.Builder messageBuilder, Set<RecipientId> recipientIds
- ) throws IOException {
- 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.sendMessage(addresses,
- unidentifiedAccessHelper.getAccessFor(recipientIdList),
- isRecipientUpdate,
- 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);
- }
- }
+ final var uuid = uuidMap.get(number);
+ if (uuid == null) {
+ throw new UnregisteredUserException(number, null);
}
+ return uuid;
}
- private Pair<Long, SendMessageResult> sendSelfMessage(
- SignalServiceDataMessage.Builder messageBuilder
- ) throws IOException {
- final var timestamp = System.currentTimeMillis();
- 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.sendMessage(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.sendMessage(address, unidentifiedAccessHelper.getAccessFor(recipientId), message);
- } catch (UnregisteredUserException e) {
- final var newRecipientId = refreshRegisteredUser(recipientId);
- return messageSender.sendMessage(resolveSignalServiceAddress(newRecipientId),
- unidentifiedAccessHelper.getAccessFor(newRecipientId),
- message);
- }
- } catch (UntrustedIdentityException e) {
- return SendMessageResult.identityFailure(address, e.getIdentityKey());
- }
- }
-
- 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, org.whispersystems.libsignal.UntrustedIdentityException {
- var cipher = new SignalServiceCipher(account.getSelfAddress(),
- account.getSignalProtocolStore(),
- certificateValidator);
+ private Map<String, UUID> getRegisteredUsers(final Set<String> numbers) throws IOException {
+ final Map<String, UUID> registeredUsers;
try {
- return cipher.decrypt(envelope);
- } catch (ProtocolUntrustedIdentityException e) {
- if (e.getCause() instanceof org.whispersystems.libsignal.UntrustedIdentityException) {
- throw (org.whispersystems.libsignal.UntrustedIdentityException) e.getCause();
- }
- throw new AssertionError(e);
- }
- }
-
- private void handleEndSession(RecipientId recipientId) {
- account.getSessionStore().deleteAllSessions(recipientId);
- }
-
- private List<HandleAction> handleSignalServiceDataMessage(
- SignalServiceDataMessage message,
- boolean isSync,
- SignalServiceAddress source,
- SignalServiceAddress destination,
- boolean ignoreAttachments
- ) {
- var actions = new ArrayList<HandleAction>();
- if (message.getGroupContext().isPresent()) {
- if (message.getGroupContext().get().getGroupV1().isPresent()) {
- var groupInfo = message.getGroupContext().get().getGroupV1().get();
- var groupId = GroupId.v1(groupInfo.getGroupId());
- var group = getGroup(groupId);
- if (group == null || group instanceof GroupInfoV1) {
- var groupV1 = (GroupInfoV1) group;
- switch (groupInfo.getType()) {
- case UPDATE: {
- if (groupV1 == null) {
- groupV1 = new GroupInfoV1(groupId);
- }
-
- if (groupInfo.getAvatar().isPresent()) {
- var avatar = groupInfo.getAvatar().get();
- downloadGroupAvatar(avatar, groupV1.getGroupId());
- }
-
- if (groupInfo.getName().isPresent()) {
- groupV1.name = groupInfo.getName().get();
- }
-
- if (groupInfo.getMembers().isPresent()) {
- groupV1.addMembers(groupInfo.getMembers()
- .get()
- .stream()
- .map(this::resolveRecipient)
- .collect(Collectors.toSet()));
- }
-
- account.getGroupStore().updateGroup(groupV1);
- break;
- }
- case DELIVER:
- if (groupV1 == null && !isSync) {
- actions.add(new SendGroupInfoRequestAction(source, groupId));
- }
- break;
- case QUIT: {
- if (groupV1 != null) {
- groupV1.removeMember(resolveRecipient(source));
- account.getGroupStore().updateGroup(groupV1);
- }
- break;
- }
- case REQUEST_INFO:
- if (groupV1 != null && !isSync) {
- actions.add(new SendGroupInfoAction(source, groupV1.getGroupId()));
- }
- break;
- }
- } else {
- // Received a group v1 message for a v2 group
- }
- }
- if (message.getGroupContext().get().getGroupV2().isPresent()) {
- final var groupContext = message.getGroupContext().get().getGroupV2().get();
- final var groupMasterKey = groupContext.getMasterKey();
-
- getOrMigrateGroup(groupMasterKey,
- groupContext.getRevision(),
- groupContext.hasSignedGroupChange() ? groupContext.getSignedGroupChange() : null);
- }
- }
-
- final var conversationPartnerAddress = isSync ? destination : source;
- if (conversationPartnerAddress != null && message.isEndSession()) {
- handleEndSession(resolveRecipient(conversationPartnerAddress));
- }
- if (message.isExpirationUpdate() || message.getBody().isPresent()) {
- if (message.getGroupContext().isPresent()) {
- if (message.getGroupContext().get().getGroupV1().isPresent()) {
- var groupInfo = message.getGroupContext().get().getGroupV1().get();
- var group = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(groupInfo.getGroupId()));
- if (group != null) {
- if (group.messageExpirationTime != message.getExpiresInSeconds()) {
- group.messageExpirationTime = message.getExpiresInSeconds();
- account.getGroupStore().updateGroup(group);
- }
- }
- } else if (message.getGroupContext().get().getGroupV2().isPresent()) {
- // disappearing message timer already stored in the DecryptedGroup
- }
- } else if (conversationPartnerAddress != null) {
- setExpirationTimer(resolveRecipient(conversationPartnerAddress), message.getExpiresInSeconds());
- }
- }
- if (!ignoreAttachments) {
- if (message.getAttachments().isPresent()) {
- for (var attachment : message.getAttachments().get()) {
- downloadAttachment(attachment);
- }
- }
- if (message.getSharedContacts().isPresent()) {
- for (var contact : message.getSharedContacts().get()) {
- if (contact.getAvatar().isPresent()) {
- downloadAttachment(contact.getAvatar().get().getAttachment());
- }
- }
- }
- }
- if (message.getProfileKey().isPresent() && message.getProfileKey().get().length == 32) {
- final ProfileKey profileKey;
- try {
- profileKey = new ProfileKey(message.getProfileKey().get());
- } catch (InvalidInputException e) {
- throw new AssertionError(e);
- }
- if (source.matches(account.getSelfAddress())) {
- this.account.setProfileKey(profileKey);
- }
- this.account.getProfileStore().storeProfileKey(resolveRecipient(source), profileKey);
- }
- if (message.getPreviews().isPresent()) {
- final var previews = message.getPreviews().get();
- for (var preview : previews) {
- if (preview.getImage().isPresent()) {
- downloadAttachment(preview.getImage().get());
- }
- }
- }
- if (message.getQuote().isPresent()) {
- final var quote = message.getQuote().get();
-
- for (var quotedAttachment : quote.getAttachments()) {
- final var thumbnail = quotedAttachment.getThumbnail();
- if (thumbnail != null) {
- downloadAttachment(thumbnail);
- }
- }
- }
- if (message.getSticker().isPresent()) {
- final var messageSticker = message.getSticker().get();
- final var stickerPackId = StickerPackId.deserialize(messageSticker.getPackId());
- var sticker = account.getStickerStore().getSticker(stickerPackId);
- if (sticker == null) {
- sticker = new Sticker(stickerPackId, messageSticker.getPackKey());
- account.getStickerStore().updateSticker(sticker);
- }
- }
- return actions;
- }
-
- private GroupInfoV2 getOrMigrateGroup(
- final GroupMasterKey groupMasterKey, final int revision, final byte[] signedGroupChange
- ) {
- final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
-
- var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
- var groupInfo = getGroup(groupId);
- final GroupInfoV2 groupInfoV2;
- if (groupInfo instanceof GroupInfoV1) {
- // Received a v2 group message for a v1 group, we need to locally migrate the group
- account.getGroupStore().deleteGroupV1(((GroupInfoV1) groupInfo).getGroupId());
- groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey);
- logger.info("Locally migrated group {} to group v2, id: {}",
- groupInfo.getGroupId().toBase64(),
- groupInfoV2.getGroupId().toBase64());
- } else if (groupInfo instanceof GroupInfoV2) {
- groupInfoV2 = (GroupInfoV2) groupInfo;
- } else {
- groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey);
+ registeredUsers = dependencies.getAccountManager()
+ .getRegisteredUsers(ServiceConfig.getIasKeyStore(),
+ numbers,
+ serviceEnvironmentConfig.getCdsMrenclave());
+ } catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException | InvalidKeyException e) {
+ throw new IOException(e);
}
- if (groupInfoV2.getGroup() == null || groupInfoV2.getGroup().getRevision() < revision) {
- DecryptedGroup group = null;
- if (signedGroupChange != null
- && groupInfoV2.getGroup() != null
- && groupInfoV2.getGroup().getRevision() + 1 == revision) {
- group = groupHelper.getUpdatedDecryptedGroup(groupInfoV2.getGroup(), signedGroupChange, groupMasterKey);
- }
- if (group == null) {
- group = groupHelper.getDecryptedGroup(groupSecretParams);
- }
- if (group != null) {
- storeProfileKeysFromMembers(group);
- final var avatar = group.getAvatar();
- if (avatar != null && !avatar.isEmpty()) {
- downloadGroupAvatar(groupId, groupSecretParams, avatar);
- }
- }
- groupInfoV2.setGroup(group, this::resolveRecipient);
- account.getGroupStore().updateGroup(groupInfoV2);
- }
+ // Store numbers as recipients so we have the number/uuid association
+ registeredUsers.forEach((number, uuid) -> resolveRecipientTrusted(new SignalServiceAddress(uuid, number)));
- return groupInfoV2;
+ return registeredUsers;
}
- private void storeProfileKeysFromMembers(final DecryptedGroup group) {
- for (var member : group.getMembersList()) {
- final var uuid = UuidUtil.parseOrThrow(member.getUuid().toByteArray());
- final var recipientId = account.getRecipientStore().resolveRecipient(uuid);
- try {
- account.getProfileStore()
- .storeProfileKey(recipientId, new ProfileKey(member.getProfileKey().toByteArray()));
- } catch (InvalidInputException ignored) {
- }
- }
+ public void sendTypingMessage(
+ TypingAction action, Set<RecipientIdentifier> recipients
+ ) throws IOException, UntrustedIdentityException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+ sendTypingMessage(action.toSignalService(), recipients);
}
private void retryFailedReceivedMessages(ReceiveMessageHandler handler, boolean ignoreAttachments) {
queuedActions.addAll(actions);
}
}
- for (var action : queuedActions) {
- try {
- action.execute(this);
- } catch (Throwable e) {
- logger.warn("Message action failed.", e);
- }
- }
+ handleQueuedActions(queuedActions);
}
private List<HandleAction> retryFailedReceivedMessage(
) {
var envelope = cachedMessage.loadEnvelope();
if (envelope == null) {
+ cachedMessage.delete();
return null;
}
- SignalServiceContent content = null;
- List<HandleAction> actions = null;
- if (!envelope.isReceipt()) {
- try {
- content = decryptMessage(envelope);
- } catch (org.whispersystems.libsignal.UntrustedIdentityException e) {
- if (!envelope.hasSource()) {
- final var identifier = ((org.whispersystems.libsignal.UntrustedIdentityException) e).getName();
- final var recipientId = resolveRecipient(identifier);
- try {
- account.getMessageCache().replaceSender(cachedMessage, recipientId);
- } catch (IOException ioException) {
- logger.warn("Failed to move cached message to recipient folder: {}", ioException.getMessage());
- }
- }
- return null;
- } catch (Exception er) {
- // All other errors are not recoverable, so delete the cached message
+
+ final var result = incomingMessageHandler.handleRetryEnvelope(envelope, ignoreAttachments, handler);
+ final var actions = result.first();
+ final var exception = result.second();
+
+ if (exception instanceof UntrustedIdentityException) {
+ if (System.currentTimeMillis() - envelope.getServerDeliveredTimestamp() > 1000L * 60 * 60 * 24 * 30) {
+ // Envelope is more than a month old, cleaning up.
cachedMessage.delete();
return null;
}
- actions = handleMessage(envelope, content, ignoreAttachments);
+ if (!envelope.hasSourceUuid()) {
+ final var identifier = ((UntrustedIdentityException) exception).getSender();
+ final var recipientId = account.getRecipientStore().resolveRecipient(identifier);
+ try {
+ account.getMessageCache().replaceSender(cachedMessage, recipientId);
+ } catch (IOException ioException) {
+ logger.warn("Failed to move cached message to recipient folder: {}", ioException.getMessage());
+ }
+ }
+ return null;
}
- handler.handleMessage(envelope, content, null);
+
+ // If successful and for all other errors that are not recoverable, delete the cached message
cachedMessage.delete();
return actions;
}
) throws IOException {
retryFailedReceivedMessages(handler, ignoreAttachments);
- Set<HandleAction> queuedActions = null;
+ Set<HandleAction> queuedActions = new HashSet<>();
- final var messagePipe = getOrCreateMessagePipe();
+ final var signalWebSocket = dependencies.getSignalWebSocket();
+ signalWebSocket.connect();
- var hasCaughtUpWithOldMessages = false;
+ hasCaughtUpWithOldMessages = false;
- while (true) {
+ while (!Thread.interrupted()) {
SignalServiceEnvelope envelope;
- SignalServiceContent content = null;
- Exception exception = null;
final CachedMessage[] cachedMessage = {null};
+ account.setLastReceiveTimestamp(System.currentTimeMillis());
+ logger.debug("Checking for new message from server");
try {
- var result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
- final var recipientId = envelope1.hasSource()
- ? resolveRecipient(envelope1.getSourceIdentifier())
+ var result = signalWebSocket.readOrEmpty(unit.toMillis(timeout), envelope1 -> {
+ final var recipientId = envelope1.hasSourceUuid()
+ ? resolveRecipient(envelope1.getSourceAddress())
: null;
// store message on disk, before acknowledging receipt to the server
cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
});
+ logger.debug("New message received from server");
if (result.isPresent()) {
envelope = result.get();
} else {
// Received indicator that server queue is empty
- hasCaughtUpWithOldMessages = true;
+ handleQueuedActions(queuedActions);
+ queuedActions.clear();
- if (queuedActions != null) {
- for (var action : queuedActions) {
- try {
- action.execute(this);
- } catch (Throwable e) {
- logger.warn("Message action failed.", e);
- }
- }
- queuedActions.clear();
- queuedActions = null;
+ hasCaughtUpWithOldMessages = true;
+ synchronized (this) {
+ this.notifyAll();
}
// Continue to wait another timeout for new messages
continue;
}
+ } catch (AssertionError e) {
+ if (e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ break;
+ } else {
+ throw e;
+ }
+ } catch (WebSocketUnavailableException e) {
+ logger.debug("Pipe unexpectedly unavailable, connecting");
+ signalWebSocket.connect();
+ continue;
} catch (TimeoutException e) {
if (returnOnTimeout) return;
continue;
}
- if (envelope.hasSource()) {
- // Store uuid if we don't have it already
- // address/uuid in envelope is sent by server
- resolveRecipientTrusted(envelope.getSourceAddress());
- }
- final var notAGroupMember = isNotAGroupMember(envelope, content);
- if (!envelope.isReceipt()) {
- try {
- content = decryptMessage(envelope);
- } catch (Exception e) {
- exception = e;
- }
- if (!envelope.hasSource() && content != null) {
- // Store uuid if we don't have it already
- // address/uuid is validated by unidentified sender certificate
- resolveRecipientTrusted(content.getSender());
- }
- var actions = handleMessage(envelope, content, ignoreAttachments);
- if (exception instanceof ProtocolInvalidMessageException) {
- final var sender = resolveRecipient(((ProtocolInvalidMessageException) exception).getSender());
- logger.debug("Received invalid message, queuing renew session action.");
- actions.add(new RenewSessionAction(sender));
- }
- if (hasCaughtUpWithOldMessages) {
- for (var action : actions) {
- try {
- action.execute(this);
- } catch (Throwable e) {
- logger.warn("Message action failed.", e);
- }
- }
- } else {
- if (queuedActions == null) {
- queuedActions = new HashSet<>();
- }
- queuedActions.addAll(actions);
- }
- }
- 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 {
- handler.handleMessage(envelope, content, exception);
+ final var result = incomingMessageHandler.handleEnvelope(envelope, ignoreAttachments, handler);
+ queuedActions.addAll(result.first());
+ final var exception = result.second();
+
+ if (hasCaughtUpWithOldMessages) {
+ handleQueuedActions(queuedActions);
}
if (cachedMessage[0] != null) {
- if (exception instanceof org.whispersystems.libsignal.UntrustedIdentityException) {
- final var identifier = ((org.whispersystems.libsignal.UntrustedIdentityException) exception).getName();
- final var recipientId = resolveRecipient(identifier);
- queuedActions.add(new RetrieveProfileAction(recipientId));
- if (!envelope.hasSource()) {
+ if (exception instanceof UntrustedIdentityException) {
+ final var address = ((UntrustedIdentityException) exception).getSender();
+ final var recipientId = resolveRecipient(address);
+ if (!envelope.hasSourceUuid()) {
try {
cachedMessage[0] = account.getMessageCache().replaceSender(cachedMessage[0], recipientId);
} catch (IOException ioException) {
}
}
}
+ handleQueuedActions(queuedActions);
}
- private boolean isMessageBlocked(
- SignalServiceEnvelope envelope, SignalServiceContent content
- ) {
- SignalServiceAddress source;
- if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
- source = envelope.getSourceAddress();
- } else if (content != null) {
- source = content.getSender();
- } else {
- return false;
- }
- final var recipientId = resolveRecipient(source);
- if (isContactBlocked(recipientId)) {
- return true;
- }
-
- if (content != null && content.getDataMessage().isPresent()) {
- var message = content.getDataMessage().get();
- if (message.getGroupContext().isPresent()) {
- var groupId = GroupUtils.getGroupId(message.getGroupContext().get());
- var group = getGroup(groupId);
- if (group != null && group.isBlocked()) {
- return true;
- }
- }
- }
- return false;
- }
-
- public boolean isContactBlocked(final String identifier) throws InvalidNumberException {
- final var recipientId = canonicalizeAndResolveRecipient(identifier);
- return isContactBlocked(recipientId);
- }
-
- private boolean isContactBlocked(final RecipientId recipientId) {
- var sourceContact = account.getContactStore().getContact(recipientId);
- return sourceContact != null && sourceContact.isBlocked();
- }
-
- private boolean isNotAGroupMember(
- SignalServiceEnvelope envelope, SignalServiceContent content
- ) {
- SignalServiceAddress source;
- if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
- source = envelope.getSourceAddress();
- } else if (content != null) {
- source = content.getSender();
- } else {
- 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;
- }
- }
- }
- return false;
+ public boolean hasCaughtUpWithOldMessages() {
+ return hasCaughtUpWithOldMessages;
}
- private List<HandleAction> handleMessage(
- SignalServiceEnvelope envelope, SignalServiceContent content, boolean ignoreAttachments
- ) {
- var actions = new ArrayList<HandleAction>();
- if (content != null) {
- final SignalServiceAddress sender;
- if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
- sender = envelope.getSourceAddress();
- } else {
- sender = content.getSender();
- }
-
- if (content.getDataMessage().isPresent()) {
- var message = content.getDataMessage().get();
-
- if (content.isNeedsReceipt()) {
- actions.add(new SendReceiptAction(sender, message.getTimestamp()));
- }
-
- actions.addAll(handleSignalServiceDataMessage(message,
- false,
- sender,
- account.getSelfAddress(),
- ignoreAttachments));
- }
- if (content.getSyncMessage().isPresent()) {
- account.setMultiDevice(true);
- var syncMessage = content.getSyncMessage().get();
- if (syncMessage.getSent().isPresent()) {
- var message = syncMessage.getSent().get();
- final var destination = message.getDestination().orNull();
- actions.addAll(handleSignalServiceDataMessage(message.getMessage(),
- true,
- sender,
- destination,
- ignoreAttachments));
- }
- if (syncMessage.getRequest().isPresent() && account.isMasterDevice()) {
- var rm = syncMessage.getRequest().get();
- if (rm.isContactsRequest()) {
- actions.add(SendSyncContactsAction.create());
- }
- if (rm.isGroupsRequest()) {
- actions.add(SendSyncGroupsAction.create());
- }
- if (rm.isBlockedListRequest()) {
- actions.add(SendSyncBlockedListAction.create());
- }
- // TODO Handle rm.isConfigurationRequest(); rm.isKeysRequest();
- }
- if (syncMessage.getGroups().isPresent()) {
- File tmpFile = null;
- try {
- tmpFile = IOUtils.createTempFile();
- final var groupsMessage = syncMessage.getGroups().get();
- try (var attachmentAsStream = retrieveAttachmentAsStream(groupsMessage.asPointer(), tmpFile)) {
- var s = new DeviceGroupsInputStream(attachmentAsStream);
- DeviceGroup g;
- while ((g = s.read()) != null) {
- var syncGroup = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(g.getId()));
- if (syncGroup != null) {
- if (g.getName().isPresent()) {
- syncGroup.name = g.getName().get();
- }
- syncGroup.addMembers(g.getMembers()
- .stream()
- .map(this::resolveRecipient)
- .collect(Collectors.toSet()));
- if (!g.isActive()) {
- syncGroup.removeMember(account.getSelfRecipientId());
- } else {
- // Add ourself to the member set as it's marked as active
- syncGroup.addMembers(List.of(account.getSelfRecipientId()));
- }
- syncGroup.blocked = g.isBlocked();
- if (g.getColor().isPresent()) {
- syncGroup.color = g.getColor().get();
- }
-
- if (g.getAvatar().isPresent()) {
- downloadGroupAvatar(g.getAvatar().get(), syncGroup.getGroupId());
- }
- syncGroup.archived = g.isArchived();
- account.getGroupStore().updateGroup(syncGroup);
- }
- }
- }
- } catch (Exception e) {
- logger.warn("Failed to handle received sync groups “{}”, ignoring: {}",
- tmpFile,
- e.getMessage());
- } finally {
- if (tmpFile != null) {
- try {
- Files.delete(tmpFile.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete received groups temp file “{}”, ignoring: {}",
- tmpFile,
- e.getMessage());
- }
- }
- }
- }
- if (syncMessage.getBlockedList().isPresent()) {
- final var blockedListMessage = syncMessage.getBlockedList().get();
- for (var address : blockedListMessage.getAddresses()) {
- setContactBlocked(resolveRecipient(address), true);
- }
- for (var groupId : blockedListMessage.getGroupIds()
- .stream()
- .map(GroupId::unknownVersion)
- .collect(Collectors.toSet())) {
- try {
- setGroupBlocked(groupId, true);
- } catch (GroupNotFoundException e) {
- logger.warn("BlockedListMessage contained groupID that was not found in GroupStore: {}",
- groupId.toBase64());
- }
- }
- }
- if (syncMessage.getContacts().isPresent()) {
- File tmpFile = null;
- try {
- tmpFile = IOUtils.createTempFile();
- final var contactsMessage = syncMessage.getContacts().get();
- try (var attachmentAsStream = retrieveAttachmentAsStream(contactsMessage.getContactsStream()
- .asPointer(), tmpFile)) {
- var s = new DeviceContactsInputStream(attachmentAsStream);
- DeviceContact c;
- while ((c = s.read()) != null) {
- if (c.getAddress().matches(account.getSelfAddress()) && c.getProfileKey().isPresent()) {
- account.setProfileKey(c.getProfileKey().get());
- }
- final var recipientId = resolveRecipientTrusted(c.getAddress());
- var contact = account.getContactStore().getContact(recipientId);
- final var builder = contact == null
- ? Contact.newBuilder()
- : Contact.newBuilder(contact);
- if (c.getName().isPresent()) {
- builder.withName(c.getName().get());
- }
- if (c.getColor().isPresent()) {
- builder.withColor(c.getColor().get());
- }
- if (c.getProfileKey().isPresent()) {
- account.getProfileStore().storeProfileKey(recipientId, c.getProfileKey().get());
- }
- if (c.getVerified().isPresent()) {
- final var verifiedMessage = c.getVerified().get();
- account.getIdentityKeyStore()
- .setIdentityTrustLevel(resolveRecipientTrusted(verifiedMessage.getDestination()),
- verifiedMessage.getIdentityKey(),
- TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
- }
- if (c.getExpirationTimer().isPresent()) {
- builder.withMessageExpirationTime(c.getExpirationTimer().get());
- }
- builder.withBlocked(c.isBlocked());
- builder.withArchived(c.isArchived());
- account.getContactStore().storeContact(recipientId, builder.build());
-
- if (c.getAvatar().isPresent()) {
- downloadContactAvatar(c.getAvatar().get(), c.getAddress());
- }
- }
- }
- } catch (Exception e) {
- logger.warn("Failed to handle received sync contacts “{}”, ignoring: {}",
- tmpFile,
- e.getMessage());
- } finally {
- if (tmpFile != null) {
- try {
- Files.delete(tmpFile.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete received contacts temp file “{}”, ignoring: {}",
- tmpFile,
- e.getMessage());
- }
- }
- }
- }
- if (syncMessage.getVerified().isPresent()) {
- final var verifiedMessage = syncMessage.getVerified().get();
- account.getIdentityKeyStore()
- .setIdentityTrustLevel(resolveRecipientTrusted(verifiedMessage.getDestination()),
- verifiedMessage.getIdentityKey(),
- TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
- }
- if (syncMessage.getStickerPackOperations().isPresent()) {
- final var stickerPackOperationMessages = syncMessage.getStickerPackOperations().get();
- for (var m : stickerPackOperationMessages) {
- if (!m.getPackId().isPresent()) {
- continue;
- }
- final var stickerPackId = StickerPackId.deserialize(m.getPackId().get());
- var sticker = account.getStickerStore().getSticker(stickerPackId);
- if (sticker == null) {
- if (!m.getPackKey().isPresent()) {
- continue;
- }
- sticker = new Sticker(stickerPackId, m.getPackKey().get());
- }
- sticker.setInstalled(!m.getType().isPresent()
- || m.getType().get() == StickerPackOperationMessage.Type.INSTALL);
- account.getStickerStore().updateSticker(sticker);
- }
- }
- if (syncMessage.getFetchType().isPresent()) {
- switch (syncMessage.getFetchType().get()) {
- case LOCAL_PROFILE:
- getRecipientProfile(account.getSelfRecipientId(), true);
- case STORAGE_MANIFEST:
- // TODO
- }
- }
- if (syncMessage.getKeys().isPresent()) {
- final var keysMessage = syncMessage.getKeys().get();
- if (keysMessage.getStorageService().isPresent()) {
- final var storageKey = keysMessage.getStorageService().get();
- account.setStorageKey(storageKey);
- }
- }
- if (syncMessage.getConfiguration().isPresent()) {
- // TODO
+ private void handleQueuedActions(final Collection<HandleAction> queuedActions) {
+ var interrupted = false;
+ for (var action : queuedActions) {
+ try {
+ action.execute(context);
+ } catch (Throwable e) {
+ if ((e instanceof AssertionError || e instanceof RuntimeException)
+ && e.getCause() instanceof InterruptedException) {
+ interrupted = true;
+ continue;
}
+ logger.warn("Message action failed.", e);
}
}
- return actions;
- }
-
- private void downloadContactAvatar(SignalServiceAttachment avatar, SignalServiceAddress address) {
- try {
- avatarStore.storeContactAvatar(address, outputStream -> retrieveAttachment(avatar, outputStream));
- } catch (IOException e) {
- logger.warn("Failed to download avatar for contact {}, ignoring: {}", address, e.getMessage());
+ if (interrupted) {
+ Thread.currentThread().interrupt();
}
}
- private void downloadGroupAvatar(SignalServiceAttachment avatar, GroupId groupId) {
+ public boolean isContactBlocked(final RecipientIdentifier.Single recipient) {
+ final RecipientId recipientId;
try {
- avatarStore.storeGroupAvatar(groupId, outputStream -> retrieveAttachment(avatar, outputStream));
- } catch (IOException e) {
- logger.warn("Failed to download avatar for group {}, ignoring: {}", groupId.toBase64(), e.getMessage());
- }
- }
-
- private void downloadGroupAvatar(GroupId groupId, GroupSecretParams groupSecretParams, String cdnKey) {
- try {
- avatarStore.storeGroupAvatar(groupId,
- outputStream -> retrieveGroupV2Avatar(groupSecretParams, cdnKey, outputStream));
- } catch (IOException e) {
- logger.warn("Failed to download avatar for group {}, ignoring: {}", groupId.toBase64(), e.getMessage());
- }
- }
-
- private void downloadProfileAvatar(
- SignalServiceAddress address, String avatarPath, ProfileKey profileKey
- ) {
- try {
- avatarStore.storeProfileAvatar(address,
- outputStream -> retrieveProfileAvatar(avatarPath, profileKey, outputStream));
- } catch (Throwable e) {
- logger.warn("Failed to download profile avatar, ignoring: {}", e.getMessage());
+ recipientId = resolveRecipient(recipient);
+ } catch (UnregisteredUserException e) {
+ return false;
}
+ return contactHelper.isContactBlocked(recipientId);
}
public File getAttachmentFile(SignalServiceAttachmentRemoteId attachmentId) {
- return attachmentStore.getAttachmentFile(attachmentId);
- }
-
- private void downloadAttachment(final SignalServiceAttachment attachment) {
- if (!attachment.isPointer()) {
- logger.warn("Invalid state, can't store an attachment stream.");
- }
-
- var pointer = attachment.asPointer();
- if (pointer.getPreview().isPresent()) {
- final var preview = pointer.getPreview().get();
- try {
- attachmentStore.storeAttachmentPreview(pointer.getRemoteId(),
- outputStream -> outputStream.write(preview, 0, preview.length));
- } catch (IOException e) {
- logger.warn("Failed to download attachment preview, ignoring: {}", e.getMessage());
- }
- }
-
- try {
- attachmentStore.storeAttachment(pointer.getRemoteId(),
- outputStream -> retrieveAttachmentPointer(pointer, outputStream));
- } catch (IOException e) {
- logger.warn("Failed to download attachment ({}), ignoring: {}", pointer.getRemoteId(), e.getMessage());
- }
- }
-
- private void retrieveGroupV2Avatar(
- GroupSecretParams groupSecretParams, String cdnKey, OutputStream outputStream
- ) throws IOException {
- var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
-
- var tmpFile = IOUtils.createTempFile();
- try (InputStream input = messageReceiver.retrieveGroupsV2ProfileAvatar(cdnKey,
- tmpFile,
- ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
- var encryptedData = IOUtils.readFully(input);
-
- var decryptedData = groupOperations.decryptAvatar(encryptedData);
- outputStream.write(decryptedData);
- } finally {
- try {
- Files.delete(tmpFile.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete received group avatar temp file “{}”, ignoring: {}",
- tmpFile,
- e.getMessage());
- }
- }
- }
-
- private void retrieveProfileAvatar(
- 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)) {
- // 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 {
- try {
- Files.delete(tmpFile.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete received profile avatar temp file “{}”, ignoring: {}",
- tmpFile,
- e.getMessage());
- }
- }
- }
-
- private void retrieveAttachment(
- final SignalServiceAttachment attachment, final OutputStream outputStream
- ) throws IOException {
- if (attachment.isPointer()) {
- var pointer = attachment.asPointer();
- retrieveAttachmentPointer(pointer, outputStream);
- } else {
- var stream = attachment.asStream();
- IOUtils.copyStream(stream.getInputStream(), outputStream);
- }
- }
-
- private void retrieveAttachmentPointer(
- SignalServiceAttachmentPointer pointer, OutputStream outputStream
- ) throws IOException {
- var tmpFile = IOUtils.createTempFile();
- try (var input = retrieveAttachmentAsStream(pointer, tmpFile)) {
- IOUtils.copyStream(input, outputStream);
- } catch (MissingConfigurationException | InvalidMessageException e) {
- throw new IOException(e);
- } finally {
- try {
- Files.delete(tmpFile.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete received attachment temp file “{}”, ignoring: {}",
- tmpFile,
- e.getMessage());
- }
- }
- }
-
- private InputStream retrieveAttachmentAsStream(
- SignalServiceAttachmentPointer pointer, File tmpFile
- ) throws IOException, InvalidMessageException, MissingConfigurationException {
- return messageReceiver.retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
+ return attachmentHelper.getAttachmentFile(attachmentId);
}
- void sendGroups() throws IOException, UntrustedIdentityException {
- var groupsFile = IOUtils.createTempFile();
-
- try {
- try (OutputStream fos = new FileOutputStream(groupsFile)) {
- var out = new DeviceGroupsOutputStream(fos);
- for (var record : getGroups()) {
- if (record instanceof GroupInfoV1) {
- var groupInfo = (GroupInfoV1) record;
- out.write(new DeviceGroup(groupInfo.getGroupId().serialize(),
- Optional.fromNullable(groupInfo.name),
- groupInfo.getMembers()
- .stream()
- .map(this::resolveSignalServiceAddress)
- .collect(Collectors.toList()),
- createGroupAvatarAttachment(groupInfo.getGroupId()),
- groupInfo.isMember(account.getSelfRecipientId()),
- Optional.of(groupInfo.messageExpirationTime),
- Optional.fromNullable(groupInfo.color),
- groupInfo.blocked,
- Optional.absent(),
- groupInfo.archived));
- }
- }
- }
-
- if (groupsFile.exists() && groupsFile.length() > 0) {
- try (var groupsFileStream = new FileInputStream(groupsFile)) {
- var attachmentStream = SignalServiceAttachment.newStreamBuilder()
- .withStream(groupsFileStream)
- .withContentType("application/octet-stream")
- .withLength(groupsFile.length())
- .build();
-
- sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
- }
- }
- } finally {
- try {
- Files.delete(groupsFile.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete groups temp file “{}”, ignoring: {}", groupsFile, e.getMessage());
- }
- }
- }
-
- public void sendContacts() throws IOException, UntrustedIdentityException {
- var contactsFile = IOUtils.createTempFile();
-
- try {
- try (OutputStream fos = new FileOutputStream(contactsFile)) {
- var out = new DeviceContactsOutputStream(fos);
- for (var contactPair : account.getContactStore().getContacts()) {
- final var recipientId = contactPair.first();
- final var contact = contactPair.second();
- final var address = resolveSignalServiceAddress(recipientId);
-
- var currentIdentity = account.getIdentityKeyStore().getIdentity(recipientId);
- VerifiedMessage verifiedMessage = null;
- if (currentIdentity != null) {
- verifiedMessage = new VerifiedMessage(address,
- currentIdentity.getIdentityKey(),
- currentIdentity.getTrustLevel().toVerifiedState(),
- currentIdentity.getDateAdded().getTime());
- }
-
- var profileKey = account.getProfileStore().getProfileKey(recipientId);
- out.write(new DeviceContact(address,
- Optional.fromNullable(contact.getName()),
- createContactAvatarAttachment(address),
- Optional.fromNullable(contact.getColor()),
- Optional.fromNullable(verifiedMessage),
- Optional.fromNullable(profileKey),
- contact.isBlocked(),
- Optional.of(contact.getMessageExpirationTime()),
- Optional.absent(),
- contact.isArchived()));
- }
-
- if (account.getProfileKey() != null) {
- // Send our own profile key as well
- out.write(new DeviceContact(account.getSelfAddress(),
- Optional.absent(),
- Optional.absent(),
- Optional.absent(),
- Optional.absent(),
- Optional.of(account.getProfileKey()),
- false,
- Optional.absent(),
- Optional.absent(),
- false));
- }
- }
-
- if (contactsFile.exists() && contactsFile.length() > 0) {
- try (var contactsFileStream = new FileInputStream(contactsFile)) {
- var attachmentStream = SignalServiceAttachment.newStreamBuilder()
- .withStream(contactsFileStream)
- .withContentType("application/octet-stream")
- .withLength(contactsFile.length())
- .build();
-
- sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream, true)));
- }
- }
- } finally {
- try {
- Files.delete(contactsFile.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete contacts temp file “{}”, ignoring: {}", contactsFile, e.getMessage());
- }
- }
- }
-
- void sendBlockedList() throws IOException, UntrustedIdentityException {
- var addresses = new ArrayList<SignalServiceAddress>();
- for (var record : account.getContactStore().getContacts()) {
- if (record.second().isBlocked()) {
- addresses.add(resolveSignalServiceAddress(record.first()));
- }
- }
- var groupIds = new ArrayList<byte[]>();
- for (var record : getGroups()) {
- if (record.isBlocked()) {
- groupIds.add(record.getGroupId().serialize());
- }
- }
- sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
- }
-
- private void sendVerifiedMessage(
- SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel
- ) throws IOException, UntrustedIdentityException {
- var verifiedMessage = new VerifiedMessage(destination,
- identityKey,
- trustLevel.toVerifiedState(),
- System.currentTimeMillis());
- sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
+ public void sendContacts() throws IOException {
+ syncHelper.sendContacts();
}
public List<Pair<RecipientId, Contact>> getContacts() {
return account.getContactStore().getContacts();
}
- public String getContactOrProfileName(String number) throws InvalidNumberException {
- final var recipientId = canonicalizeAndResolveRecipient(number);
- final var recipient = account.getRecipientStore().getRecipient(recipientId);
- if (recipient == null) {
+ public String getContactOrProfileName(RecipientIdentifier.Single recipientIdentifier) {
+ final RecipientId recipientId;
+ try {
+ recipientId = resolveRecipient(recipientIdentifier);
+ } catch (UnregisteredUserException e) {
return null;
}
- if (recipient.getContact() != null && !Util.isEmpty(recipient.getContact().getName())) {
- return recipient.getContact().getName();
+ final var contact = account.getContactStore().getContact(recipientId);
+ if (contact != null && !Util.isEmpty(contact.getName())) {
+ return contact.getName();
}
- if (recipient.getProfile() != null && recipient.getProfile() != null) {
- return recipient.getProfile().getDisplayName();
+ final var profile = getRecipientProfile(recipientId);
+ if (profile != null) {
+ return profile.getDisplayName();
}
return null;
}
public GroupInfo getGroup(GroupId groupId) {
- final var group = account.getGroupStore().getGroup(groupId);
- if (group instanceof GroupInfoV2 && ((GroupInfoV2) group).getGroup() == null) {
- final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(((GroupInfoV2) group).getMasterKey());
- ((GroupInfoV2) group).setGroup(groupHelper.getDecryptedGroup(groupSecretParams), this::resolveRecipient);
- account.getGroupStore().updateGroup(group);
- }
- return group;
+ return groupHelper.getGroup(groupId);
}
public List<IdentityInfo> getIdentities() {
return account.getIdentityKeyStore().getIdentities();
}
- public List<IdentityInfo> getIdentities(String number) throws InvalidNumberException {
- final var identity = account.getIdentityKeyStore().getIdentity(canonicalizeAndResolveRecipient(number));
+ public List<IdentityInfo> getIdentities(RecipientIdentifier.Single recipient) {
+ IdentityInfo identity;
+ try {
+ identity = account.getIdentityKeyStore().getIdentity(resolveRecipient(recipient));
+ } catch (UnregisteredUserException e) {
+ identity = null;
+ }
return identity == null ? List.of() : List.of(identity);
}
/**
* Trust this the identity with this fingerprint
*
- * @param name username of the identity
+ * @param recipient username of the identity
* @param fingerprint Fingerprint
*/
- public boolean trustIdentityVerified(String name, byte[] fingerprint) throws InvalidNumberException {
- var recipientId = canonicalizeAndResolveRecipient(name);
+ public boolean trustIdentityVerified(RecipientIdentifier.Single recipient, byte[] fingerprint) {
+ RecipientId recipientId;
+ try {
+ recipientId = resolveRecipient(recipient);
+ } catch (UnregisteredUserException e) {
+ return false;
+ }
return trustIdentity(recipientId,
identityKey -> Arrays.equals(identityKey.serialize(), fingerprint),
TrustLevel.TRUSTED_VERIFIED);
/**
* Trust this the identity with this safety number
*
- * @param name username of the identity
+ * @param recipient username of the identity
* @param safetyNumber Safety number
*/
- public boolean trustIdentityVerifiedSafetyNumber(String name, String safetyNumber) throws InvalidNumberException {
- var recipientId = canonicalizeAndResolveRecipient(name);
- var address = account.getRecipientStore().resolveServiceAddress(recipientId);
+ public boolean trustIdentityVerifiedSafetyNumber(RecipientIdentifier.Single recipient, String safetyNumber) {
+ RecipientId recipientId;
+ try {
+ recipientId = resolveRecipient(recipient);
+ } catch (UnregisteredUserException e) {
+ return false;
+ }
+ var address = resolveSignalServiceAddress(recipientId);
return trustIdentity(recipientId,
identityKey -> safetyNumber.equals(computeSafetyNumber(address, identityKey)),
TrustLevel.TRUSTED_VERIFIED);
}
+ /**
+ * Trust this the identity with this scannable safety number
+ *
+ * @param recipient username of the identity
+ * @param safetyNumber Scannable safety number
+ */
+ public boolean trustIdentityVerifiedSafetyNumber(RecipientIdentifier.Single recipient, byte[] safetyNumber) {
+ RecipientId recipientId;
+ try {
+ recipientId = resolveRecipient(recipient);
+ } catch (UnregisteredUserException e) {
+ return false;
+ }
+ var address = resolveSignalServiceAddress(recipientId);
+ return trustIdentity(recipientId, identityKey -> {
+ final var fingerprint = computeSafetyNumberFingerprint(address, identityKey);
+ try {
+ return fingerprint != null && fingerprint.getScannableFingerprint().compareTo(safetyNumber);
+ } catch (FingerprintVersionMismatchException | FingerprintParsingException e) {
+ return false;
+ }
+ }, TrustLevel.TRUSTED_VERIFIED);
+ }
+
/**
* Trust all keys of this identity without verification
*
- * @param name username of the identity
+ * @param recipient username of the identity
*/
- public boolean trustIdentityAllKeys(String name) throws InvalidNumberException {
- var recipientId = canonicalizeAndResolveRecipient(name);
+ public boolean trustIdentityAllKeys(RecipientIdentifier.Single recipient) {
+ RecipientId recipientId;
+ try {
+ recipientId = resolveRecipient(recipient);
+ } catch (UnregisteredUserException e) {
+ return false;
+ }
return trustIdentity(recipientId, identityKey -> true, TrustLevel.TRUSTED_UNVERIFIED);
}
account.getIdentityKeyStore().setIdentityTrustLevel(recipientId, identity.getIdentityKey(), trustLevel);
try {
- var address = account.getRecipientStore().resolveServiceAddress(recipientId);
- sendVerifiedMessage(address, identity.getIdentityKey(), trustLevel);
- } catch (IOException | UntrustedIdentityException e) {
+ var address = resolveSignalServiceAddress(recipientId);
+ syncHelper.sendVerifiedMessage(address, identity.getIdentityKey(), trustLevel);
+ } 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
+ ) {
+ 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
+ profileHelper.refreshRecipientProfile(recipientId);
+ }
+ }
+
+ public String computeSafetyNumber(SignalServiceAddress theirAddress, IdentityKey theirIdentityKey) {
+ final Fingerprint fingerprint = computeSafetyNumberFingerprint(theirAddress, theirIdentityKey);
+ return fingerprint == null ? null : fingerprint.getDisplayableFingerprint().getDisplayText();
+ }
+
+ public byte[] computeSafetyNumberForScanning(SignalServiceAddress theirAddress, IdentityKey theirIdentityKey) {
+ final Fingerprint fingerprint = computeSafetyNumberFingerprint(theirAddress, theirIdentityKey);
+ return fingerprint == null ? null : fingerprint.getScannableFingerprint().getSerialized();
+ }
+
+ private Fingerprint computeSafetyNumberFingerprint(
+ final SignalServiceAddress theirAddress, final IdentityKey theirIdentityKey
) {
- return Utils.computeSafetyNumber(ServiceConfig.capabilities.isUuid(),
+ return Utils.computeSafetyNumber(capabilities.isUuid(),
account.getSelfAddress(),
getIdentityKeyPair().getPublicKey(),
theirAddress,
theirIdentityKey);
}
- @Deprecated
- public SignalServiceAddress resolveSignalServiceAddress(String identifier) {
- var address = Utils.getSignalServiceAddressFromIdentifier(identifier);
-
- return resolveSignalServiceAddress(address);
- }
-
- @Deprecated
public SignalServiceAddress resolveSignalServiceAddress(SignalServiceAddress address) {
- if (address.matches(account.getSelfAddress())) {
- return account.getSelfAddress();
- }
-
- return account.getRecipientStore().resolveServiceAddress(address);
+ return resolveSignalServiceAddress(resolveRecipient(address));
}
- public SignalServiceAddress resolveSignalServiceAddress(RecipientId recipientId) {
- return account.getRecipientStore().resolveServiceAddress(recipientId);
+ public SignalServiceAddress resolveSignalServiceAddress(UUID uuid) {
+ return resolveSignalServiceAddress(account.getRecipientStore().resolveRecipient(uuid));
}
- public RecipientId canonicalizeAndResolveRecipient(String identifier) throws InvalidNumberException {
- var canonicalizedNumber = UuidUtil.isUuid(identifier)
- ? identifier
- : PhoneNumberFormatter.formatNumber(identifier, account.getUsername());
+ public SignalServiceAddress resolveSignalServiceAddress(RecipientId recipientId) {
+ final var address = account.getRecipientStore().resolveRecipientAddress(recipientId);
+ if (address.getUuid().isPresent()) {
+ return address.toSignalServiceAddress();
+ }
- return resolveRecipient(canonicalizedNumber);
+ // Address in recipient store doesn't have a uuid, this shouldn't happen
+ // Try to retrieve the uuid from the server
+ final var number = address.getNumber().get();
+ try {
+ return resolveSignalServiceAddress(getRegisteredUser(number));
+ } catch (IOException e) {
+ logger.warn("Failed to get uuid for e164 number: {}", number, e);
+ // Return SignalServiceAddress with unknown UUID
+ return address.toSignalServiceAddress();
+ }
}
- private RecipientId resolveRecipient(final String identifier) {
- var address = Utils.getSignalServiceAddressFromIdentifier(identifier);
+ private Set<RecipientId> resolveRecipients(Collection<RecipientIdentifier.Single> recipients) throws UnregisteredUserException {
+ final var recipientIds = new HashSet<RecipientId>(recipients.size());
+ for (var number : recipients) {
+ final var recipientId = resolveRecipient(number);
+ recipientIds.add(recipientId);
+ }
+ return recipientIds;
+ }
- return resolveRecipient(address);
+ private RecipientId resolveRecipient(final RecipientIdentifier.Single recipient) throws UnregisteredUserException {
+ if (recipient instanceof RecipientIdentifier.Uuid) {
+ return account.getRecipientStore().resolveRecipient(((RecipientIdentifier.Uuid) recipient).uuid);
+ } else {
+ final var number = ((RecipientIdentifier.Number) recipient).number;
+ return account.getRecipientStore().resolveRecipient(number, () -> {
+ try {
+ return getRegisteredUser(number);
+ } catch (IOException e) {
+ return null;
+ }
+ });
+ }
}
- public RecipientId resolveRecipient(SignalServiceAddress address) {
+ private RecipientId resolveRecipient(SignalServiceAddress address) {
return account.getRecipientStore().resolveRecipient(address);
}
close(true);
}
- void close(boolean closeAccount) throws IOException {
+ private 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
