package org.asamk.signal.manager;
import org.asamk.signal.manager.api.Device;
+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.helper.PinHelper;
import org.asamk.signal.manager.helper.ProfileHelper;
import org.asamk.signal.manager.helper.UnidentifiedAccessHelper;
+import org.asamk.signal.manager.jobs.Context;
+import org.asamk.signal.manager.jobs.Job;
+import org.asamk.signal.manager.jobs.RetrieveStickerPackJob;
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.signal.libsignal.metadata.ProtocolNoSessionException;
import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
import org.signal.libsignal.metadata.SelfSendException;
-import org.signal.libsignal.metadata.certificate.CertificateValidator;
import org.signal.storageservice.protos.groups.GroupChange;
import org.signal.storageservice.protos.groups.local.DecryptedGroup;
import org.signal.zkgroup.InvalidInputException;
import org.signal.zkgroup.VerificationFailedException;
import org.signal.zkgroup.groups.GroupMasterKey;
import org.signal.zkgroup.groups.GroupSecretParams;
-import org.signal.zkgroup.profiles.ClientZkProfileOperations;
import org.signal.zkgroup.profiles.ProfileKey;
import org.signal.zkgroup.profiles.ProfileKeyCredential;
import org.slf4j.Logger;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
-import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
-import org.whispersystems.signalservice.api.SignalServiceMessageSender;
+import org.whispersystems.signalservice.api.InvalidMessageStructureException;
import org.whispersystems.signalservice.api.SignalSessionLock;
-import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
+import org.whispersystems.signalservice.api.crypto.ContentHint;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
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.profiles.ProfileAndCredential;
import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.exceptions.ConflictException;
import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException;
import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.signalservice.api.util.DeviceNameUtil;
import org.whispersystems.signalservice.api.util.InvalidNumberException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
-import org.whispersystems.signalservice.api.util.SleepTimer;
-import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException;
import org.whispersystems.signalservice.internal.contacts.crypto.Quote;
import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedQuoteException;
import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
private final static Logger logger = LoggerFactory.getLogger(Manager.class);
- private final CertificateValidator certificateValidator;
-
private final ServiceEnvironmentConfig serviceEnvironmentConfig;
- private final String userAgent;
+ private final SignalDependencies dependencies;
private SignalAccount account;
- private final SignalServiceAccountManager accountManager;
- private final GroupsV2Api groupsV2Api;
- private final GroupsV2Operations groupsV2Operations;
- private final SignalServiceMessageReceiver messageReceiver;
- private final ClientZkProfileOperations clientZkProfileOperations;
private final ExecutorService executor = Executors.newCachedThreadPool();
- private SignalServiceMessagePipe messagePipe = null;
- private SignalServiceMessagePipe unidentifiedMessagePipe = null;
-
private final UnidentifiedAccessHelper unidentifiedAccessHelper;
private final ProfileHelper profileHelper;
private final GroupV2Helper groupV2Helper;
private final PinHelper pinHelper;
private final AvatarStore avatarStore;
private final AttachmentStore attachmentStore;
+ private final StickerPackStore stickerPackStore;
private final SignalSessionLock sessionLock = new SignalSessionLock() {
private final ReentrantLock LEGACY_LOCK = new ReentrantLock();
) {
this.account = account;
this.serviceEnvironmentConfig = serviceEnvironmentConfig;
- this.certificateValidator = new CertificateValidator(serviceEnvironmentConfig.getUnidentifiedSenderTrustRoot());
- this.userAgent = userAgent;
- this.groupsV2Operations = capabilities.isGv2() ? new GroupsV2Operations(ClientZkOperations.create(
- serviceEnvironmentConfig.getSignalServiceConfiguration())) : null;
- final SleepTimer timer = new UptimeSleepTimer();
- this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- new DynamicCredentialsProvider(account.getUuid(),
- account.getUsername(),
- account.getPassword(),
- account.getDeviceId()),
- userAgent,
- groupsV2Operations,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY,
- timer);
- this.groupsV2Api = accountManager.getGroupsV2Api();
- final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
- serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
- serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
- serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
- 10);
-
- this.pinHelper = new PinHelper(keyBackupService);
- this.clientZkProfileOperations = capabilities.isGv2()
- ? ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration())
- .getProfileOperations()
- : null;
- this.messageReceiver = new SignalServiceMessageReceiver(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- account.getUuid(),
+
+ final var credentialsProvider = new DynamicCredentialsProvider(account.getUuid(),
account.getUsername(),
account.getPassword(),
- account.getDeviceId(),
+ account.getDeviceId());
+ this.dependencies = new SignalDependencies(account.getSelfAddress(),
+ serviceEnvironmentConfig,
userAgent,
- null,
- timer,
- clientZkProfileOperations,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+ credentialsProvider,
+ account.getSignalProtocolStore(),
+ executor,
+ sessionLock);
+ this.pinHelper = new PinHelper(dependencies.getKeyBackupService());
this.unidentifiedAccessHelper = new UnidentifiedAccessHelper(account::getProfileKey,
account.getProfileStore()::getProfileKey,
this::getSenderCertificate);
this.profileHelper = new ProfileHelper(account.getProfileStore()::getProfileKey,
unidentifiedAccessHelper::getAccessFor,
- unidentified -> unidentified ? getOrCreateUnidentifiedMessagePipe() : getOrCreateMessagePipe(),
- () -> messageReceiver,
+ dependencies::getProfileService,
+ dependencies::getMessageReceiver,
this::resolveSignalServiceAddress);
this.groupV2Helper = new GroupV2Helper(this::getRecipientProfileKeyCredential,
this::getRecipientProfile,
account::getSelfRecipientId,
- groupsV2Operations,
- groupsV2Api,
+ dependencies.getGroupsV2Operations(),
+ dependencies.getGroupsV2Api(),
this::getGroupAuthForToday,
this::resolveSignalServiceAddress);
this.avatarStore = new AvatarStore(pathConfig.getAvatarsPath());
this.attachmentStore = new AttachmentStore(pathConfig.getAttachmentsPath());
+ this.stickerPackStore = new StickerPackStore(pathConfig.getStickerPacksPath());
}
public String getUsername() {
if (account.getLastReceiveTimestamp() == 0) {
logger.warn("The Signal protocol expects that incoming messages are regularly received.");
} else {
- var diffInMilliseconds = new Date().getTime() - account.getLastReceiveTimestamp();
+ var diffInMilliseconds = System.currentTimeMillis() - account.getLastReceiveTimestamp();
long days = TimeUnit.DAYS.convert(diffInMilliseconds, TimeUnit.MILLISECONDS);
if (days > 7) {
logger.warn(
days);
}
}
- if (accountManager.getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+ if (dependencies.getAccountManager().getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
refreshPreKeys();
}
if (account.getUuid() == null) {
- account.setUuid(accountManager.getOwnUuid());
+ account.setUuid(dependencies.getAccountManager().getOwnUuid());
}
updateAccountAttributes();
}
}
public void updateAccountAttributes() throws IOException {
- accountManager.setAccountAttributes(account.getEncryptedDeviceName(),
- null,
- account.getLocalRegistrationId(),
- true,
- // set legacy pin only if no KBS master key is set
- account.getPinMasterKey() == null ? account.getRegistrationLockPin() : null,
- account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
- account.getSelfUnidentifiedAccessKey(),
- account.isUnrestrictedUnidentifiedAccess(),
- capabilities,
- account.isDiscoverableByPhoneNumber());
+ dependencies.getAccountManager()
+ .setAccountAttributes(account.getEncryptedDeviceName(),
+ null,
+ account.getLocalRegistrationId(),
+ true,
+ // set legacy pin only if no KBS master key is set
+ account.getPinMasterKey() == null ? account.getRegistrationLockPin() : null,
+ account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
+ account.getSelfUnidentifiedAccessKey(),
+ account.isUnrestrictedUnidentifiedAccess(),
+ capabilities,
+ account.isDiscoverableByPhoneNumber());
}
/**
try (final var streamDetails = avatar == null
? avatarStore.retrieveProfileAvatar(getSelfAddress())
: avatar.isPresent() ? Utils.createStreamDetailsFromFile(avatar.get()) : null) {
- accountManager.setVersionedProfile(account.getUuid(),
- account.getProfileKey(),
- newProfile.getInternalServiceName(),
- newProfile.getAbout() == null ? "" : newProfile.getAbout(),
- newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
- Optional.absent(),
- streamDetails);
+ dependencies.getAccountManager()
+ .setVersionedProfile(account.getUuid(),
+ account.getProfileKey(),
+ newProfile.getInternalServiceName(),
+ newProfile.getAbout() == null ? "" : newProfile.getAbout(),
+ newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
+ Optional.absent(),
+ streamDetails);
}
if (avatar != null) {
// When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false.
// If this is the master device, other users can't send messages to this number anymore.
// If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.
- accountManager.setGcmId(Optional.absent());
+ dependencies.getAccountManager().setGcmId(Optional.absent());
account.setRegistered(false);
}
public void deleteAccount() throws IOException {
- accountManager.deleteAccount();
+ dependencies.getAccountManager().deleteAccount();
account.setRegistered(false);
}
public List<Device> getLinkedDevices() throws IOException {
- var devices = accountManager.getDevices();
+ var devices = dependencies.getAccountManager().getDevices();
account.setMultiDevice(devices.size() > 1);
var identityKey = account.getIdentityKeyPair().getPrivateKey();
return devices.stream().map(d -> {
}
public void removeLinkedDevices(int deviceId) throws IOException {
- accountManager.removeDevice(deviceId);
- var devices = accountManager.getDevices();
+ dependencies.getAccountManager().removeDevice(deviceId);
+ var devices = dependencies.getAccountManager().getDevices();
account.setMultiDevice(devices.size() > 1);
}
private void addDevice(String deviceIdentifier, ECPublicKey deviceKey) throws IOException, InvalidKeyException {
var identityKeyPair = getIdentityKeyPair();
- var verificationCode = accountManager.getNewDeviceVerificationCode();
-
- accountManager.addDevice(deviceIdentifier,
- deviceKey,
- identityKeyPair,
- Optional.of(account.getProfileKey().serialize()),
- verificationCode);
+ var verificationCode = dependencies.getAccountManager().getNewDeviceVerificationCode();
+
+ dependencies.getAccountManager()
+ .addDevice(deviceIdentifier,
+ deviceKey,
+ identityKeyPair,
+ Optional.of(account.getProfileKey().serialize()),
+ verificationCode);
account.setMultiDevice(true);
}
account.setRegistrationLockPin(pin.get(), masterKey);
} else {
- // Remove legacy registration lock
- accountManager.removeRegistrationLockV1();
-
// Remove KBS Pin
pinHelper.removeRegistrationLockPin();
final var identityKeyPair = getIdentityKeyPair();
var signedPreKeyRecord = generateSignedPreKey(identityKeyPair);
- accountManager.setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
+ dependencies.getAccountManager().setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
}
private List<PreKeyRecord> generatePreKeys() {
return record;
}
- private SignalServiceMessagePipe getOrCreateMessagePipe() {
- if (messagePipe == null) {
- messagePipe = messageReceiver.createMessagePipe();
- }
- return messagePipe;
- }
-
- private SignalServiceMessagePipe getOrCreateUnidentifiedMessagePipe() {
- if (unidentifiedMessagePipe == null) {
- unidentifiedMessagePipe = messageReceiver.createUnidentifiedMessagePipe();
- }
- return unidentifiedMessagePipe;
- }
-
- private SignalServiceMessageSender createMessageSender() {
- return new SignalServiceMessageSender(serviceEnvironmentConfig.getSignalServiceConfiguration(),
- account.getUuid(),
- account.getUsername(),
- account.getPassword(),
- account.getDeviceId(),
- account.getSignalProtocolStore(),
- sessionLock,
- userAgent,
- account.isMultiDevice(),
- Optional.fromNullable(messagePipe),
- Optional.fromNullable(unidentifiedMessagePipe),
- Optional.absent(),
- clientZkProfileOperations,
- executor,
- ServiceConfig.MAX_ENVELOPE_SIZE,
- ServiceConfig.AUTOMATIC_NETWORK_RETRY);
- }
-
public Profile getRecipientProfile(
RecipientId recipientId
) {
) {
var profile = account.getProfileStore().getProfile(recipientId);
- var now = new Date().getTime();
+ var now = System.currentTimeMillis();
// Profiles are cached for 24h before retrieving them again, unless forced
if (!force && profile != null && now - profile.getLastUpdateTimestamp() < 24 * 60 * 60 * 1000) {
return profile;
return null;
}
+ profile = decryptProfileIfKeyKnown(recipientId, encryptedProfile);
+ account.getProfileStore().storeProfile(recipientId, profile);
+
+ return profile;
+ }
+
+ private Profile decryptProfileIfKeyKnown(
+ final RecipientId recipientId, final SignalServiceProfile encryptedProfile
+ ) {
var profileKey = account.getProfileStore().getProfileKey(recipientId);
if (profileKey == null) {
- profile = new Profile(new Date().getTime(),
+ return new Profile(System.currentTimeMillis(),
null,
null,
null,
null,
ProfileUtils.getUnidentifiedAccessMode(encryptedProfile, null),
ProfileUtils.getCapabilities(encryptedProfile));
- } else {
- profile = decryptProfileAndDownloadAvatar(recipientId, profileKey, encryptedProfile);
}
- account.getProfileStore().storeProfile(recipientId, profile);
- return profile;
+ return decryptProfileAndDownloadAvatar(recipientId, profileKey, encryptedProfile);
}
private SignalServiceProfile retrieveEncryptedProfile(RecipientId recipientId) {
public Pair<Long, List<SendMessageResult>> sendQuitGroupMessage(
GroupId groupId, Set<String> groupAdmins
) throws GroupNotFoundException, IOException, NotAGroupMemberException, InvalidNumberException, LastGroupAdminException {
- SignalServiceDataMessage.Builder messageBuilder;
+ var group = getGroupForUpdating(groupId);
+ if (group instanceof GroupInfoV1) {
+ return quitGroupV1((GroupInfoV1) group);
+ }
- 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 currentAdmins = g.getAdminMembers();
- final var newAdmins = getSignalServiceAddresses(groupAdmins);
- newAdmins.removeAll(currentAdmins);
- newAdmins.retainAll(g.getMembers());
- if (currentAdmins.contains(getSelfRecipientId())
- && currentAdmins.size() == 1
- && g.getMembers().size() > 1
- && newAdmins.size() == 0) {
- // Last admin can't leave the group, unless she's also the last member
- throw new LastGroupAdminException(g.getGroupId(), g.getTitle());
- }
- final var groupGroupChangePair = groupV2Helper.leaveGroup(groupInfoV2, newAdmins);
- groupInfoV2.setGroup(groupGroupChangePair.first(), this::resolveRecipient);
- messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().toByteArray());
- account.getGroupStore().updateGroup(groupInfoV2);
+ final var newAdmins = getSignalServiceAddresses(groupAdmins);
+ try {
+ return quitGroupV2((GroupInfoV2) group, newAdmins);
+ } catch (ConflictException e) {
+ // Detected conflicting update, refreshing group and trying again
+ group = getGroup(groupId, true);
+ return quitGroupV2((GroupInfoV2) group, newAdmins);
}
+ }
- return sendMessage(messageBuilder, g.getMembersWithout(account.getSelfRecipientId()));
+ private Pair<Long, List<SendMessageResult>> quitGroupV1(final GroupInfoV1 groupInfoV1) throws IOException {
+ var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.QUIT)
+ .withId(groupInfoV1.getGroupId().serialize())
+ .build();
+
+ var messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group);
+ groupInfoV1.removeMember(account.getSelfRecipientId());
+ account.getGroupStore().updateGroup(groupInfoV1);
+ return sendMessage(messageBuilder, groupInfoV1.getMembersWithout(account.getSelfRecipientId()));
+ }
+
+ private Pair<Long, List<SendMessageResult>> quitGroupV2(
+ final GroupInfoV2 groupInfoV2, final Set<RecipientId> newAdmins
+ ) throws LastGroupAdminException, IOException {
+ final var currentAdmins = groupInfoV2.getAdminMembers();
+ newAdmins.removeAll(currentAdmins);
+ newAdmins.retainAll(groupInfoV2.getMembers());
+ if (currentAdmins.contains(getSelfRecipientId())
+ && currentAdmins.size() == 1
+ && groupInfoV2.getMembers().size() > 1
+ && newAdmins.size() == 0) {
+ // Last admin can't leave the group, unless she's also the last member
+ throw new LastGroupAdminException(groupInfoV2.getGroupId(), groupInfoV2.getTitle());
+ }
+ final var groupGroupChangePair = groupV2Helper.leaveGroup(groupInfoV2, newAdmins);
+ groupInfoV2.setGroup(groupGroupChangePair.first(), this::resolveRecipient);
+ var messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().toByteArray());
+ account.getGroupStore().updateGroup(groupInfoV2);
+ return sendMessage(messageBuilder, groupInfoV2.getMembersWithout(account.getSelfRecipientId()));
+ }
+
+ public void deleteGroup(GroupId groupId) throws IOException {
+ account.getGroupStore().deleteGroup(groupId);
+ avatarStore.deleteGroupAvatar(groupId);
}
public Pair<GroupId, List<SendMessageResult>> createGroup(
var group = getGroupForUpdating(groupId);
if (group instanceof GroupInfoV2) {
- return updateGroupV2((GroupInfoV2) group,
- name,
- description,
- members,
- removeMembers,
- admins,
- removeAdmins,
- resetGroupLink,
- groupLinkState,
- addMemberPermission,
- editDetailsPermission,
- avatarFile,
- expirationTimer);
+ try {
+ return updateGroupV2((GroupInfoV2) group,
+ name,
+ description,
+ members,
+ removeMembers,
+ admins,
+ removeAdmins,
+ resetGroupLink,
+ groupLinkState,
+ addMemberPermission,
+ editDetailsPermission,
+ avatarFile,
+ expirationTimer);
+ } catch (ConflictException e) {
+ // Detected conflicting update, refreshing group and trying again
+ group = getGroup(groupId, true);
+ return updateGroupV2((GroupInfoV2) group,
+ name,
+ description,
+ members,
+ removeMembers,
+ admins,
+ removeAdmins,
+ resetGroupLink,
+ groupLinkState,
+ addMemberPermission,
+ editDetailsPermission,
+ avatarFile,
+ expirationTimer);
+ }
}
final var gv1 = (GroupInfoV1) group;
) throws IOException {
final var today = currentTimeDays();
// Returns credentials for the next 7 days
- final var credentials = groupsV2Api.getCredentials(today);
+ final var credentials = dependencies.getGroupsV2Api().getCredentials(today);
// TODO cache credentials until they expire
var authCredentialResponse = credentials.get(today);
try {
- return groupsV2Api.getGroupsV2AuthorizationString(account.getUuid(),
- today,
- groupSecretParams,
- authCredentialResponse);
+ return dependencies.getGroupsV2Api()
+ .getGroupsV2AuthorizationString(account.getUuid(),
+ today,
+ groupSecretParams,
+ authCredentialResponse);
} catch (VerificationFailedException e) {
throw new IOException(e);
}
List.of(messageId),
System.currentTimeMillis());
- createMessageSender().sendReceipt(remoteAddress,
- unidentifiedAccessHelper.getAccessFor(resolveRecipient(remoteAddress)),
- receiptMessage);
+ dependencies.getMessageSender()
+ .sendReceipt(remoteAddress,
+ unidentifiedAccessHelper.getAccessFor(resolveRecipient(remoteAddress)),
+ receiptMessage);
}
public Pair<Long, List<SendMessageResult>> sendMessage(
var attachmentStreams = AttachmentUtils.getSignalServiceAttachments(attachments);
// Upload attachments here, so we only upload once even for multiple recipients
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
for (var attachment : attachmentStreams) {
if (attachment.isStream()) {
}
}
- public String getContactName(String number) throws InvalidNumberException {
- var contact = account.getContactStore().getContact(canonicalizeAndResolveRecipient(number));
- return contact == null || contact.getName() == null ? "" : contact.getName();
- }
-
public void setContactName(String number, String name) throws InvalidNumberException, NotMasterDeviceException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
public String uploadStickerPack(File path) throws IOException, StickerPackInvalidException {
var manifest = StickerUtils.getSignalServiceStickerManifestUpload(path);
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
var packKey = KeyUtils.createStickerUploadKey();
- var 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)).toString();
} catch (URISyntaxException e) {
throw new AssertionError(e);
}
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());
}
private void sendSyncMessage(SignalServiceSyncMessage message) throws IOException, UntrustedIdentityException {
- var messageSender = createMessageSender();
- messageSender.sendMessage(message, unidentifiedAccessHelper.getAccessForSync());
+ var messageSender = dependencies.getMessageSender();
+ messageSender.sendSyncMessage(message, unidentifiedAccessHelper.getAccessForSync());
}
private Set<RecipientId> getSignalServiceAddresses(Collection<String> numbers) throws InvalidNumberException {
private Map<String, UUID> getRegisteredUsers(final Set<String> numbers) throws IOException {
try {
- return accountManager.getRegisteredUsers(ServiceConfig.getIasKeyStore(),
- numbers,
- serviceEnvironmentConfig.getCdsMrenclave());
+ return dependencies.getAccountManager()
+ .getRegisteredUsers(ServiceConfig.getIasKeyStore(),
+ numbers,
+ serviceEnvironmentConfig.getCdsMrenclave());
} catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException | InvalidKeyException e) {
throw new IOException(e);
}
}
+ public void sendTypingMessage(
+ TypingAction action, Set<String> recipients
+ ) throws IOException, UntrustedIdentityException, InvalidNumberException {
+ sendTypingMessageInternal(action, getSignalServiceAddresses(recipients));
+ }
+
+ private void sendTypingMessageInternal(
+ TypingAction action, Set<RecipientId> recipientIds
+ ) throws IOException, UntrustedIdentityException {
+ final var timestamp = System.currentTimeMillis();
+ var message = new SignalServiceTypingMessage(action.toSignalService(), timestamp, Optional.absent());
+ var messageSender = dependencies.getMessageSender();
+ for (var recipientId : recipientIds) {
+ final var address = resolveSignalServiceAddress(recipientId);
+ messageSender.sendTyping(address, unidentifiedAccessHelper.getAccessFor(recipientId), message);
+ }
+ }
+
+ public void sendGroupTypingMessage(
+ TypingAction action, GroupId groupId
+ ) throws IOException, NotAGroupMemberException, GroupNotFoundException {
+ final var timestamp = System.currentTimeMillis();
+ final var g = getGroupForSending(groupId);
+ final var message = new SignalServiceTypingMessage(action.toSignalService(),
+ timestamp,
+ Optional.of(groupId.serialize()));
+ final var messageSender = dependencies.getMessageSender();
+ final var recipientIdList = new ArrayList<>(g.getMembersWithout(account.getSelfRecipientId()));
+ final var addresses = recipientIdList.stream()
+ .map(this::resolveSignalServiceAddress)
+ .collect(Collectors.toList());
+ messageSender.sendTyping(addresses, unidentifiedAccessHelper.getAccessFor(recipientIdList), message, null);
+ }
+
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();
+ var messageSender = dependencies.getMessageSender();
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,
+ var result = messageSender.sendDataMessage(addresses,
unidentifiedAccessHelper.getAccessFor(recipientIdList),
isRecipientUpdate,
- message);
+ ContentHint.DEFAULT,
+ message,
+ sendResult -> logger.trace("Partial message send result: {}", sendResult.isSuccess()),
+ () -> false);
for (var r : result) {
if (r.getIdentityFailure() != null) {
) throws IOException {
final var timestamp = System.currentTimeMillis();
messageBuilder.withTimestamp(timestamp);
- getOrCreateMessagePipe();
- getOrCreateUnidentifiedMessagePipe();
final var recipientId = account.getSelfRecipientId();
final var contact = account.getContactStore().getContact(recipientId);
}
private SendMessageResult sendSelfMessage(SignalServiceDataMessage message) throws IOException {
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
var recipientId = account.getSelfRecipientId();
var syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
try {
- var startTime = System.currentTimeMillis();
- messageSender.sendMessage(syncMessage, unidentifiedAccess);
- return SendMessageResult.success(recipient,
- unidentifiedAccess.isPresent(),
- false,
- System.currentTimeMillis() - startTime);
+ return messageSender.sendSyncMessage(syncMessage, unidentifiedAccess);
} catch (UntrustedIdentityException e) {
return SendMessageResult.identityFailure(recipient, e.getIdentityKey());
}
private SendMessageResult sendMessage(
RecipientId recipientId, SignalServiceDataMessage message
) throws IOException {
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
final var address = resolveSignalServiceAddress(recipientId);
try {
try {
- return messageSender.sendMessage(address, unidentifiedAccessHelper.getAccessFor(recipientId), message);
+ return messageSender.sendDataMessage(address,
+ unidentifiedAccessHelper.getAccessFor(recipientId),
+ ContentHint.DEFAULT,
+ message);
} catch (UnregisteredUserException e) {
final var newRecipientId = refreshRegisteredUser(recipientId);
- return messageSender.sendMessage(resolveSignalServiceAddress(newRecipientId),
+ return messageSender.sendDataMessage(resolveSignalServiceAddress(newRecipientId),
unidentifiedAccessHelper.getAccessFor(newRecipientId),
+ ContentHint.DEFAULT,
message);
}
} catch (UntrustedIdentityException e) {
}
private SendMessageResult sendNullMessage(RecipientId recipientId) throws IOException {
- var messageSender = createMessageSender();
+ var messageSender = dependencies.getMessageSender();
final var address = resolveSignalServiceAddress(recipientId);
try {
}
}
- private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, SelfSendException, UnsupportedDataMessageException, ProtocolUntrustedIdentityException {
- var cipher = new SignalServiceCipher(account.getSelfAddress(),
- account.getSignalProtocolStore(),
- sessionLock,
- certificateValidator);
- return cipher.decrypt(envelope);
+ private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, SelfSendException, UnsupportedDataMessageException, ProtocolUntrustedIdentityException, InvalidMessageStructureException {
+ return dependencies.getCipher().decrypt(envelope);
}
private void handleEndSession(RecipientId recipientId) {
sticker = new Sticker(stickerPackId, messageSticker.getPackKey());
account.getStickerStore().updateSticker(sticker);
}
+ enqueueJob(new RetrieveStickerPackJob(stickerPackId, messageSticker.getPackKey()));
}
return actions;
}
try {
action.execute(this);
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Message action failed.", e);
}
}
boolean returnOnTimeout,
boolean ignoreAttachments,
ReceiveMessageHandler handler
- ) throws IOException {
+ ) throws IOException, InterruptedException {
retryFailedReceivedMessages(handler, ignoreAttachments);
Set<HandleAction> queuedActions = null;
- final var messagePipe = getOrCreateMessagePipe();
+ final var signalWebSocket = dependencies.getSignalWebSocket();
+ signalWebSocket.connect();
var hasCaughtUpWithOldMessages = false;
- while (true) {
+ while (!Thread.interrupted()) {
SignalServiceEnvelope envelope;
SignalServiceContent content = null;
Exception exception = null;
final CachedMessage[] cachedMessage = {null};
- account.setLastReceiveTimestamp(new Date().getTime());
+ account.setLastReceiveTimestamp(System.currentTimeMillis());
+ logger.debug("Checking for new message from server");
try {
- var result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
+ var result = signalWebSocket.readOrEmpty(unit.toMillis(timeout), envelope1 -> {
final var recipientId = envelope1.hasSource()
? resolveRecipient(envelope1.getSourceIdentifier())
: null;
// 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 {
try {
action.execute(this);
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Message action failed.", e);
}
}
// Continue to wait another timeout for new messages
continue;
}
+ } catch (AssertionError e) {
+ if (e.getCause() instanceof InterruptedException) {
+ throw (InterruptedException) e.getCause();
+ } else {
+ throw e;
+ }
+ } catch (WebSocketUnavailableException e) {
+ logger.debug("Pipe unexpectedly unavailable, connecting");
+ signalWebSocket.connect();
+ continue;
} catch (TimeoutException e) {
if (returnOnTimeout) return;
continue;
try {
action.execute(this);
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Message action failed.", e);
}
}
try (var attachmentAsStream = retrieveAttachmentAsStream(groupsMessage.asPointer(), tmpFile)) {
var s = new DeviceGroupsInputStream(attachmentAsStream);
DeviceGroup g;
- while ((g = s.read()) != null) {
+ while (true) {
+ try {
+ g = s.read();
+ } catch (IOException e) {
+ logger.warn("Sync groups contained invalid group, ignoring: {}", e.getMessage());
+ continue;
+ }
+ if (g == null) {
+ break;
+ }
var syncGroup = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(g.getId()));
if (syncGroup != null) {
if (g.getName().isPresent()) {
.asPointer(), tmpFile)) {
var s = new DeviceContactsInputStream(attachmentAsStream);
DeviceContact c;
- while ((c = s.read()) != null) {
+ while (true) {
+ try {
+ c = s.read();
+ } catch (IOException e) {
+ logger.warn("Sync contacts contained invalid contact, ignoring: {}",
+ e.getMessage());
+ continue;
+ }
+ if (c == null) {
+ break;
+ }
if (c.getAddress().matches(account.getSelfAddress()) && c.getProfileKey().isPresent()) {
account.setProfileKey(c.getProfileKey().get());
}
continue;
}
final var stickerPackId = StickerPackId.deserialize(m.getPackId().get());
+ final var installed = !m.getType().isPresent()
+ || m.getType().get() == StickerPackOperationMessage.Type.INSTALL;
+
var sticker = account.getStickerStore().getSticker(stickerPackId);
- if (sticker == null) {
- if (!m.getPackKey().isPresent()) {
- continue;
+ if (m.getPackKey().isPresent()) {
+ if (sticker == null) {
+ sticker = new Sticker(stickerPackId, m.getPackKey().get());
+ }
+ if (installed) {
+ enqueueJob(new RetrieveStickerPackJob(stickerPackId, m.getPackKey().get()));
}
- sticker = new Sticker(stickerPackId, m.getPackKey().get());
}
- sticker.setInstalled(!m.getType().isPresent()
- || m.getType().get() == StickerPackOperationMessage.Type.INSTALL);
- account.getStickerStore().updateSticker(sticker);
+
+ if (sticker != null) {
+ sticker.setInstalled(installed);
+ account.getStickerStore().updateSticker(sticker);
+ }
}
}
if (syncMessage.getFetchType().isPresent()) {
avatarStore.storeProfileAvatar(address,
outputStream -> retrieveProfileAvatar(avatarPath, profileKey, outputStream));
} catch (Throwable e) {
+ if (e instanceof AssertionError && e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
logger.warn("Failed to download profile avatar, ignoring: {}", e.getMessage());
}
}
private void retrieveGroupV2Avatar(
GroupSecretParams groupSecretParams, String cdnKey, OutputStream outputStream
) throws IOException {
- var groupOperations = groupsV2Operations.forGroup(groupSecretParams);
+ var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
var tmpFile = IOUtils.createTempFile();
- try (InputStream input = messageReceiver.retrieveGroupsV2ProfileAvatar(cdnKey,
- tmpFile,
- ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
+ try (InputStream input = dependencies.getMessageReceiver()
+ .retrieveGroupsV2ProfileAvatar(cdnKey, tmpFile, ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
var encryptedData = IOUtils.readFully(input);
var decryptedData = groupOperations.decryptAvatar(encryptedData);
String avatarPath, ProfileKey profileKey, OutputStream outputStream
) throws IOException {
var tmpFile = IOUtils.createTempFile();
- try (var input = messageReceiver.retrieveProfileAvatar(avatarPath,
- tmpFile,
- profileKey,
- ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
+ try (var input = dependencies.getMessageReceiver()
+ .retrieveProfileAvatar(avatarPath,
+ tmpFile,
+ profileKey,
+ ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
// Use larger buffer size to prevent AssertionError: Need: 12272 but only have: 8192 ...
IOUtils.copyStream(input, outputStream, (int) ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE);
} finally {
private InputStream retrieveAttachmentAsStream(
SignalServiceAttachmentPointer pointer, File tmpFile
) throws IOException, InvalidMessageException, MissingConfigurationException {
- return messageReceiver.retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
+ return dependencies.getMessageReceiver()
+ .retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
}
void sendGroups() throws IOException, UntrustedIdentityException {
}
public GroupInfo getGroup(GroupId groupId) {
+ return getGroup(groupId, false);
+ }
+
+ public GroupInfo getGroup(GroupId groupId, boolean forceUpdate) {
final var group = account.getGroupStore().getGroup(groupId);
- if (group instanceof GroupInfoV2 && ((GroupInfoV2) group).getGroup() == null) {
+ if (group instanceof GroupInfoV2 && (forceUpdate || ((GroupInfoV2) group).getGroup() == null)) {
final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(((GroupInfoV2) group).getMasterKey());
((GroupInfoV2) group).setGroup(groupV2Helper.getDecryptedGroup(groupSecretParams), this::resolveRecipient);
account.getGroupStore().updateGroup(group);
return account.getRecipientStore().resolveRecipientTrusted(address);
}
+ private void enqueueJob(Job job) {
+ var context = new Context(account,
+ dependencies.getAccountManager(),
+ dependencies.getMessageReceiver(),
+ stickerPackStore);
+ job.run(context);
+ }
+
@Override
public void close() throws IOException {
close(true);
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
