/*
- Copyright (C) 2015-2020 AsamK and contributors
+ Copyright (C) 2015-2021 AsamK and contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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.messageCache.CachedMessage;
import org.asamk.signal.manager.storage.profiles.SignalProfile;
import org.asamk.signal.manager.storage.profiles.SignalProfileEntry;
import org.asamk.signal.manager.storage.protocol.IdentityInfo;
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.MessageCacheUtils;
import org.asamk.signal.manager.util.Utils;
import org.signal.libsignal.metadata.InvalidMetadataMessageException;
import org.signal.libsignal.metadata.InvalidMetadataVersionException;
import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.InvalidVersionException;
-import org.whispersystems.libsignal.ecc.Curve;
-import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
-import org.whispersystems.libsignal.util.Medium;
import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.KeyBackupService;
import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
import java.security.SignatureException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
public class Manager implements Closeable {
- final static Logger logger = LoggerFactory.getLogger(Manager.class);
+ private final static Logger logger = LoggerFactory.getLogger(Manager.class);
- private final SleepTimer timer = new UptimeSleepTimer();
private final CertificateValidator certificateValidator = new CertificateValidator(ServiceConfig.getUnidentifiedSenderTrustRoot());
private final SignalServiceConfiguration serviceConfiguration;
private final String userAgent;
private SignalAccount account;
- private final PathConfig pathConfig;
private final SignalServiceAccountManager accountManager;
private final GroupsV2Api groupsV2Api;
private final GroupsV2Operations groupsV2Operations;
private final ProfileHelper profileHelper;
private final GroupHelper groupHelper;
private final PinHelper pinHelper;
+ private final AvatarStore avatarStore;
+ private final AttachmentStore attachmentStore;
Manager(
SignalAccount account,
String userAgent
) {
this.account = account;
- this.pathConfig = pathConfig;
this.serviceConfiguration = serviceConfiguration;
this.userAgent = userAgent;
this.groupsV2Operations = capabilities.isGv2() ? new GroupsV2Operations(ClientZkOperations.create(
serviceConfiguration)) : null;
+ final SleepTimer timer = new UptimeSleepTimer();
this.accountManager = new SignalServiceAccountManager(serviceConfiguration,
new DynamicCredentialsProvider(account.getUuid(),
account.getUsername(),
groupsV2Operations,
groupsV2Api,
this::getGroupAuthForToday);
+ this.avatarStore = new AvatarStore(pathConfig.getAvatarsPath());
+ this.attachmentStore = new AttachmentStore(pathConfig.getAttachmentsPath());
}
public String getUsername() {
return account.getDeviceId();
}
- private File getMessageCachePath() {
- return SignalAccount.getMessageCachePath(pathConfig.getDataPath(), account.getUsername());
- }
-
- private File getMessageCachePath(String sender) {
- if (sender == null || sender.isEmpty()) {
- return getMessageCachePath();
- }
-
- return new File(getMessageCachePath(), sender.replace("/", "_"));
- }
-
- private File getMessageCacheFile(String sender, long now, long timestamp) throws IOException {
- File cachePath = getMessageCachePath(sender);
- IOUtils.createPrivateDirectories(cachePath);
- return new File(cachePath, now + "_" + timestamp);
- }
-
public static Manager init(
String username, File settingsPath, SignalServiceConfiguration serviceConfiguration, String userAgent
) throws IOException, NotRegisteredException {
}
public void checkAccountState() throws IOException {
- if (account.isRegistered()) {
- if (accountManager.getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
- refreshPreKeys();
- account.save();
- }
- if (account.getUuid() == null) {
- account.setUuid(accountManager.getOwnUuid());
- account.save();
- }
- updateAccountAttributes();
+ if (accountManager.getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+ refreshPreKeys();
+ account.save();
}
- }
-
- public boolean isRegistered() {
- return account.isRegistered();
+ if (account.getUuid() == null) {
+ account.setUuid(accountManager.getOwnUuid());
+ account.save();
+ }
+ updateAccountAttributes();
}
/**
*
* @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
- * @throws IOException if its unable to check if the users are registered
+ * @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
account.isDiscoverableByPhoneNumber());
}
- public void setProfile(String name, File avatar) throws IOException {
- try (final StreamDetails streamDetails = avatar == null ? null : Utils.createStreamDetailsFromFile(avatar)) {
+ /**
+ * @param avatar if avatar is null the image from the local avatar store is used (if present),
+ * if it's Optional.absent(), the avatar will be removed
+ */
+ public void setProfile(String name, Optional<File> avatar) throws IOException {
+ try (final StreamDetails streamDetails = avatar == null
+ ? avatarStore.retrieveProfileAvatar(getSelfAddress())
+ : avatar.isPresent() ? Utils.createStreamDetailsFromFile(avatar.get()) : null) {
accountManager.setVersionedProfile(account.getUuid(), account.getProfileKey(), name, streamDetails);
}
+
+ if (avatar != null) {
+ if (avatar.isPresent()) {
+ avatarStore.storeProfileAvatar(getSelfAddress(),
+ outputStream -> IOUtils.copyFileToStream(avatar.get(), outputStream));
+ } else {
+ avatarStore.deleteProfileAvatar(getSelfAddress());
+ }
+ }
}
public void unregister() throws IOException {
account.save();
}
- private List<PreKeyRecord> generatePreKeys() {
- List<PreKeyRecord> records = new ArrayList<>(ServiceConfig.PREKEY_BATCH_SIZE);
-
- final int offset = account.getPreKeyIdOffset();
- for (int i = 0; i < ServiceConfig.PREKEY_BATCH_SIZE; i++) {
- int preKeyId = (offset + i) % Medium.MAX_VALUE;
- ECKeyPair keyPair = Curve.generateKeyPair();
- PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair);
-
- records.add(record);
- }
-
- account.addPreKeys(records);
- account.save();
-
- return records;
- }
-
- private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
- try {
- ECKeyPair keyPair = Curve.generateKeyPair();
- byte[] signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(),
- keyPair.getPublicKey().serialize());
- SignedPreKeyRecord record = new SignedPreKeyRecord(account.getNextSignedPreKeyId(),
- System.currentTimeMillis(),
- keyPair,
- signature);
-
- account.addSignedPreKey(record);
- account.save();
-
- return record;
- } catch (InvalidKeyException e) {
- throw new AssertionError(e);
- }
- }
-
public void setRegistrationLockPin(Optional<String> pin) throws IOException, UnauthenticatedResponseException {
if (pin.isPresent()) {
final MasterKey masterKey = account.getPinMasterKey() != null
accountManager.setPreKeys(identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
}
+ private List<PreKeyRecord> generatePreKeys() {
+ final int offset = account.getPreKeyIdOffset();
+
+ List<PreKeyRecord> records = KeyUtils.generatePreKeyRecords(offset, ServiceConfig.PREKEY_BATCH_SIZE);
+ account.addPreKeys(records);
+ account.save();
+
+ return records;
+ }
+
+ private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
+ final int signedPreKeyId = account.getNextSignedPreKeyId();
+
+ SignedPreKeyRecord record = KeyUtils.generateSignedPreKeyRecord(identityKeyPair, signedPreKeyId);
+ account.addSignedPreKey(record);
+ account.save();
+
+ return record;
+ }
+
private SignalServiceMessagePipe getOrCreateMessagePipe() {
if (messagePipe == null) {
messagePipe = messageReceiver.createMessagePipe();
ServiceConfig.MAX_ENVELOPE_SIZE);
}
- private SignalServiceProfile getEncryptedRecipientProfile(SignalServiceAddress address) throws IOException {
- return profileHelper.retrieveProfileSync(address, SignalServiceProfile.RequestType.PROFILE).getProfile();
- }
-
private SignalProfile getRecipientProfile(
SignalServiceAddress address
) {
if (!profileEntry.isRequestPending() && (
profileEntry.getProfile() == null || now - profileEntry.getLastUpdateTimestamp() > 24 * 60 * 60 * 1000
)) {
- ProfileKey profileKey = profileEntry.getProfileKey();
profileEntry.setRequestPending(true);
- SignalProfile profile;
+ final SignalServiceProfile encryptedProfile;
try {
- profile = retrieveRecipientProfile(address, profileKey);
+ encryptedProfile = profileHelper.retrieveProfileSync(address, SignalServiceProfile.RequestType.PROFILE)
+ .getProfile();
} catch (IOException e) {
logger.warn("Failed to retrieve profile, ignoring: {}", e.getMessage());
- profileEntry.setRequestPending(false);
return null;
+ } finally {
+ profileEntry.setRequestPending(false);
}
- profileEntry.setRequestPending(false);
+
+ ProfileKey profileKey = profileEntry.getProfileKey();
+ SignalProfile profile = decryptProfile(address, profileKey, encryptedProfile);
account.getProfileStore()
.updateProfile(address, profileKey, now, profile, profileEntry.getProfileKeyCredential());
return profile;
return profileEntry.getProfileKeyCredential();
}
- private SignalProfile retrieveRecipientProfile(
- SignalServiceAddress address, ProfileKey profileKey
- ) throws IOException {
- final SignalServiceProfile encryptedProfile = getEncryptedRecipientProfile(address);
-
- return decryptProfile(address, profileKey, encryptedProfile);
- }
-
private SignalProfile decryptProfile(
final SignalServiceAddress address, final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
) {
- File avatarFile = null;
- try {
- avatarFile = encryptedProfile.getAvatar() == null
- ? null
- : retrieveProfileAvatar(address, encryptedProfile.getAvatar(), profileKey);
- } catch (Throwable e) {
- logger.warn("Failed to retrieve profile avatar, ignoring: {}", e.getMessage());
+ if (encryptedProfile.getAvatar() != null) {
+ downloadProfileAvatar(address, encryptedProfile.getAvatar(), profileKey);
}
ProfileCipher profileCipher = new ProfileCipher(profileKey);
}
return new SignalProfile(encryptedProfile.getIdentityKey(),
name,
- avatarFile,
unidentifiedAccess,
encryptedProfile.isUnrestrictedUnidentifiedAccess(),
encryptedProfile.getCapabilities());
}
private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(GroupId groupId) throws IOException {
- File file = getGroupAvatarFile(groupId);
- if (!file.exists()) {
+ final StreamDetails streamDetails = avatarStore.retrieveGroupAvatar(groupId);
+ if (streamDetails == null) {
return Optional.absent();
}
- return Optional.of(AttachmentUtils.createAttachment(file));
+ return Optional.of(AttachmentUtils.createAttachment(streamDetails, Optional.absent()));
}
- private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(String number) throws IOException {
- File file = getContactAvatarFile(number);
- if (!file.exists()) {
+ private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(SignalServiceAddress address) throws IOException {
+ final StreamDetails streamDetails = avatarStore.retrieveContactAvatar(address);
+ if (streamDetails == null) {
return Optional.absent();
}
- return Optional.of(AttachmentUtils.createAttachment(file));
+ return Optional.of(AttachmentUtils.createAttachment(streamDetails, Optional.absent()));
}
private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
}
private Pair<GroupId, List<SendMessageResult>> sendUpdateGroupMessage(
- GroupId groupId, String name, Collection<SignalServiceAddress> members, String avatarFile
+ GroupId groupId, String name, Collection<SignalServiceAddress> members, File avatarFile
) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException {
GroupInfo g;
SignalServiceDataMessage.Builder messageBuilder;
if (groupId == null) {
// Create new group
- GroupInfoV2 gv2 = groupHelper.createGroupV2(name, members, avatarFile);
+ GroupInfoV2 gv2 = groupHelper.createGroupV2(name == null ? "" : name,
+ members == null ? List.of() : members,
+ avatarFile);
if (gv2 == null) {
GroupInfoV1 gv1 = new GroupInfoV1(GroupIdV1.createRandom());
gv1.addMembers(List.of(account.getSelfAddress()));
messageBuilder = getGroupUpdateMessageBuilder(gv1);
g = gv1;
} else {
+ if (avatarFile != null) {
+ avatarStore.storeGroupAvatar(gv2.getGroupId(),
+ outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
+ }
messageBuilder = getGroupUpdateMessageBuilder(gv2, null);
g = gv2;
}
Pair<DecryptedGroup, GroupChange> 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());
final GroupInfoV1 g,
final String name,
final Collection<SignalServiceAddress> members,
- final String avatarFile
+ final File avatarFile
) throws IOException {
if (name != null) {
g.name = name;
}
if (avatarFile != null) {
- IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
- File aFile = getGroupAvatarFile(g.getGroupId());
- Files.copy(Paths.get(avatarFile), aFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ avatarStore.storeGroupAvatar(g.getGroupId(),
+ outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
}
}
.withName(g.name)
.withMembers(new ArrayList<>(g.getMembers()));
- File aFile = getGroupAvatarFile(g.getGroupId());
- if (aFile.exists()) {
- try {
- group.withAvatar(AttachmentUtils.createAttachment(aFile));
- } catch (IOException e) {
- throw new AttachmentInvalidException(aFile.toString(), e);
+ try {
+ final Optional<SignalServiceAttachmentStream> attachment = createGroupAvatarAttachment(g.getGroupId());
+ if (attachment.isPresent()) {
+ group.withAvatar(attachment.get());
}
+ } catch (IOException e) {
+ throw new AttachmentInvalidException(g.getGroupId().toBase64(), e);
}
return SignalServiceDataMessage.newBuilder()
}
public Pair<GroupId, List<SendMessageResult>> updateGroup(
- GroupId groupId, String name, List<String> members, String avatar
+ GroupId groupId, String name, List<String> members, File avatarFile
) throws IOException, GroupNotFoundException, AttachmentInvalidException, InvalidNumberException, NotAGroupMemberException {
return sendUpdateGroupMessage(groupId,
name,
members == null ? null : getSignalServiceAddresses(members),
- avatar);
+ avatarFile);
}
/**
}
} else {
// Send to all individually, so sync messages are sent correctly
+ messageBuilder.withProfileKey(account.getProfileKey().serialize());
List<SendMessageResult> results = new ArrayList<>(recipients.size());
for (SignalServiceAddress address : recipients) {
- ContactInfo contact = account.getContactStore().getContact(address);
- if (contact != null) {
- messageBuilder.withExpiration(contact.messageExpirationTime);
- messageBuilder.withProfileKey(account.getProfileKey().serialize());
- } else {
- messageBuilder.withExpiration(0);
- messageBuilder.withProfileKey(null);
- }
+ final ContactInfo contact = account.getContactStore().getContact(address);
+ final int expirationTime = contact != null ? contact.messageExpirationTime : 0;
+ messageBuilder.withExpiration(expirationTime);
message = messageBuilder.build();
if (address.matches(account.getSelfAddress())) {
results.add(sendSelfMessage(message));
if (groupInfo.getAvatar().isPresent()) {
SignalServiceAttachment avatar = groupInfo.getAvatar().get();
- if (avatar.isPointer()) {
- try {
- retrieveGroupAvatarAttachment(avatar.asPointer(), groupV1.getGroupId());
- } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
- logger.warn("Failed to retrieve avatar for group {}, ignoring: {}",
- groupId.toBase64(),
- e.getMessage());
- }
- }
+ downloadGroupAvatar(avatar, groupV1.getGroupId());
}
if (groupInfo.getName().isPresent()) {
}
if (message.getAttachments().isPresent() && !ignoreAttachments) {
for (SignalServiceAttachment attachment : message.getAttachments().get()) {
- if (attachment.isPointer()) {
- try {
- retrieveAttachment(attachment.asPointer());
- } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
- logger.warn("Failed to retrieve attachment ({}), ignoring: {}",
- attachment.asPointer().getRemoteId(),
- e.getMessage());
- }
- }
+ downloadAttachment(attachment);
}
}
if (message.getProfileKey().isPresent() && message.getProfileKey().get().length == 32) {
if (message.getPreviews().isPresent()) {
final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();
for (SignalServiceDataMessage.Preview preview : previews) {
- if (preview.getImage().isPresent() && preview.getImage().get().isPointer()) {
- SignalServiceAttachmentPointer attachment = preview.getImage().get().asPointer();
- try {
- retrieveAttachment(attachment);
- } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
- logger.warn("Failed to retrieve preview image ({}), ignoring: {}",
- attachment.getRemoteId(),
- e.getMessage());
- }
+ if (preview.getImage().isPresent()) {
+ downloadAttachment(preview.getImage().get());
}
}
}
final SignalServiceDataMessage.Quote quote = message.getQuote().get();
for (SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment : quote.getAttachments()) {
- final SignalServiceAttachment attachment = quotedAttachment.getThumbnail();
- if (attachment != null && attachment.isPointer()) {
- try {
- retrieveAttachment(attachment.asPointer());
- } catch (IOException | InvalidMessageException | MissingConfigurationException e) {
- logger.warn("Failed to retrieve quote attachment thumbnail ({}), ignoring: {}",
- attachment.asPointer().getRemoteId(),
- e.getMessage());
- }
+ final SignalServiceAttachment thumbnail = quotedAttachment.getThumbnail();
+ if (thumbnail != null) {
+ downloadAttachment(thumbnail);
}
}
}
storeProfileKeysFromMembers(group);
final String avatar = group.getAvatar();
if (avatar != null && !avatar.isEmpty()) {
- try {
- retrieveGroupAvatar(groupId, groupSecretParams, avatar);
- } catch (IOException e) {
- logger.warn("Failed to download group avatar, ignoring: {}", e.getMessage());
- }
+ downloadGroupAvatar(groupId, groupSecretParams, avatar);
}
}
groupInfoV2.setGroup(group);
}
}
- private void retryFailedReceivedMessages(
- ReceiveMessageHandler handler, boolean ignoreAttachments
- ) {
- final File cachePath = getMessageCachePath();
- if (!cachePath.exists()) {
- return;
- }
- for (final File dir : Objects.requireNonNull(cachePath.listFiles())) {
- if (!dir.isDirectory()) {
- retryFailedReceivedMessage(handler, ignoreAttachments, dir);
- continue;
- }
-
- for (final File fileEntry : Objects.requireNonNull(dir.listFiles())) {
- if (!fileEntry.isFile()) {
- continue;
- }
- retryFailedReceivedMessage(handler, ignoreAttachments, fileEntry);
- }
- // Try to delete directory if empty
- dir.delete();
+ private void retryFailedReceivedMessages(ReceiveMessageHandler handler, boolean ignoreAttachments) {
+ for (CachedMessage cachedMessage : account.getMessageCache().getCachedMessages()) {
+ retryFailedReceivedMessage(handler, ignoreAttachments, cachedMessage);
}
}
private void retryFailedReceivedMessage(
- final ReceiveMessageHandler handler, final boolean ignoreAttachments, final File fileEntry
+ final ReceiveMessageHandler handler, final boolean ignoreAttachments, final CachedMessage cachedMessage
) {
- SignalServiceEnvelope envelope;
- try {
- envelope = MessageCacheUtils.loadEnvelope(fileEntry);
- if (envelope == null) {
- return;
- }
- } catch (IOException e) {
- e.printStackTrace();
+ SignalServiceEnvelope envelope = cachedMessage.loadEnvelope();
+ if (envelope == null) {
return;
}
SignalServiceContent content = null;
return;
} catch (Exception er) {
// All other errors are not recoverable, so delete the cached message
- try {
- Files.delete(fileEntry.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete cached message file “{}”, ignoring: {}", fileEntry, e.getMessage());
- }
+ cachedMessage.delete();
return;
}
List<HandleAction> actions = handleMessage(envelope, content, ignoreAttachments);
}
account.save();
handler.handleMessage(envelope, content, null);
- try {
- Files.delete(fileEntry.toPath());
- } catch (IOException e) {
- logger.warn("Failed to delete cached message file “{}”, ignoring: {}", fileEntry, e.getMessage());
- }
+ cachedMessage.delete();
}
public void receiveMessages(
Set<HandleAction> queuedActions = null;
- getOrCreateMessagePipe();
+ final SignalServiceMessagePipe messagePipe = getOrCreateMessagePipe();
boolean hasCaughtUpWithOldMessages = false;
SignalServiceEnvelope envelope;
SignalServiceContent content = null;
Exception exception = null;
- final long now = new Date().getTime();
+ final CachedMessage[] cachedMessage = {null};
try {
Optional<SignalServiceEnvelope> result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
// store message on disk, before acknowledging receipt to the server
- try {
- String source = envelope1.getSourceE164().isPresent() ? envelope1.getSourceE164().get() : "";
- File cacheFile = getMessageCacheFile(source, now, envelope1.getTimestamp());
- MessageCacheUtils.storeEnvelope(envelope1, cacheFile);
- } catch (IOException e) {
- logger.warn("Failed to store encrypted message in disk cache, ignoring: {}", e.getMessage());
- }
+ cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1);
});
if (result.isPresent()) {
envelope = result.get();
}
}
account.save();
- if (!isMessageBlocked(envelope, content)) {
+ if (isMessageBlocked(envelope, content)) {
+ logger.info("Ignoring a message from blocked user/group: {}", envelope.getTimestamp());
+ } else if (isNotAGroupMember(envelope, content)) {
+ logger.info("Ignoring a message from a non group member: {}", envelope.getTimestamp());
+ } else {
handler.handleMessage(envelope, content, exception);
}
if (!(exception instanceof org.whispersystems.libsignal.UntrustedIdentityException)) {
- File cacheFile = null;
- try {
- String source = envelope.getSourceE164().isPresent() ? envelope.getSourceE164().get() : "";
- cacheFile = getMessageCacheFile(source, now, envelope.getTimestamp());
- Files.delete(cacheFile.toPath());
- // Try to delete directory if empty
- getMessageCachePath().delete();
- } catch (IOException e) {
- logger.warn("Failed to delete cached message file “{}”, ignoring: {}", cacheFile, e.getMessage());
+ if (cachedMessage[0] != null) {
+ cachedMessage[0].delete();
}
}
}
return true;
}
+ if (content != null && content.getDataMessage().isPresent()) {
+ SignalServiceDataMessage message = content.getDataMessage().get();
+ if (message.getGroupContext().isPresent()) {
+ GroupId groupId = GroupUtils.getGroupId(message.getGroupContext().get());
+ GroupInfo group = getGroup(groupId);
+ if (group != null && group.isBlocked()) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ 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()) {
SignalServiceDataMessage message = content.getDataMessage().get();
if (message.getGroupContext().isPresent()) {
if (message.getGroupContext().get().getGroupV1().isPresent()) {
SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();
- if (groupInfo.getType() != SignalServiceGroup.Type.DELIVER) {
+ if (groupInfo.getType() == SignalServiceGroup.Type.QUIT) {
return false;
}
}
GroupId groupId = GroupUtils.getGroupId(message.getGroupContext().get());
GroupInfo group = getGroup(groupId);
- if (group != null && group.isBlocked()) {
+ if (group != null && !group.isMember(source)) {
return true;
}
}
File tmpFile = null;
try {
tmpFile = IOUtils.createTempFile();
- try (InputStream attachmentAsStream = retrieveAttachmentAsStream(syncMessage.getGroups()
- .get()
- .asPointer(), tmpFile)) {
+ final SignalServiceAttachment groupsMessage = syncMessage.getGroups().get();
+ try (InputStream attachmentAsStream = retrieveAttachmentAsStream(groupsMessage.asPointer(),
+ tmpFile)) {
DeviceGroupsInputStream s = new DeviceGroupsInputStream(attachmentAsStream);
DeviceGroup g;
while ((g = s.read()) != null) {
}
if (g.getAvatar().isPresent()) {
- retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.getGroupId());
+ downloadGroupAvatar(g.getAvatar().get(), syncGroup.getGroupId());
}
syncGroup.inboxPosition = g.getInboxPosition().orNull();
syncGroup.archived = g.isArchived();
account.getContactStore().updateContact(contact);
if (c.getAvatar().isPresent()) {
- retrieveContactAvatarAttachment(c.getAvatar().get(), contact.number);
+ downloadContactAvatar(c.getAvatar().get(), contact.getAddress());
}
}
}
return actions;
}
- private File getContactAvatarFile(String number) {
- return new File(pathConfig.getAvatarsPath(), "contact-" + number);
+ 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());
+ }
}
- private File retrieveContactAvatarAttachment(
- SignalServiceAttachment attachment, String number
- ) throws IOException, InvalidMessageException, MissingConfigurationException {
- IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
- if (attachment.isPointer()) {
- SignalServiceAttachmentPointer pointer = attachment.asPointer();
- return retrieveAttachment(pointer, getContactAvatarFile(number), false);
- } else {
- SignalServiceAttachmentStream stream = attachment.asStream();
- return AttachmentUtils.retrieveAttachment(stream, getContactAvatarFile(number));
+ private void downloadGroupAvatar(SignalServiceAttachment avatar, GroupId groupId) {
+ 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 File getGroupAvatarFile(GroupId groupId) {
- return new File(pathConfig.getAvatarsPath(), "group-" + groupId.toBase64().replace("/", "_"));
+ 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());
+ }
}
- private File retrieveGroupAvatarAttachment(
- SignalServiceAttachment attachment, GroupId groupId
- ) throws IOException, InvalidMessageException, MissingConfigurationException {
- IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
- if (attachment.isPointer()) {
- SignalServiceAttachmentPointer pointer = attachment.asPointer();
- return retrieveAttachment(pointer, getGroupAvatarFile(groupId), false);
- } else {
- SignalServiceAttachmentStream stream = attachment.asStream();
- return AttachmentUtils.retrieveAttachment(stream, getGroupAvatarFile(groupId));
+ 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.");
+ }
+
+ SignalServiceAttachmentPointer pointer = attachment.asPointer();
+ if (pointer.getPreview().isPresent()) {
+ final byte[] 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 File retrieveGroupAvatar(
- GroupId groupId, GroupSecretParams groupSecretParams, String cdnKey
+ private void retrieveGroupV2Avatar(
+ GroupSecretParams groupSecretParams, String cdnKey, OutputStream outputStream
) throws IOException {
- IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
- File outputFile = getGroupAvatarFile(groupId);
GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(groupSecretParams);
File tmpFile = IOUtils.createTempFile();
- tmpFile.deleteOnExit();
try (InputStream input = messageReceiver.retrieveGroupsV2ProfileAvatar(cdnKey,
tmpFile,
ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
byte[] encryptedData = IOUtils.readFully(input);
byte[] decryptedData = groupOperations.decryptAvatar(encryptedData);
- try (OutputStream output = new FileOutputStream(outputFile)) {
- output.write(decryptedData);
- }
+ outputStream.write(decryptedData);
} finally {
try {
Files.delete(tmpFile.toPath());
e.getMessage());
}
}
- return outputFile;
}
- private File getProfileAvatarFile(SignalServiceAddress address) {
- return new File(pathConfig.getAvatarsPath(), "profile-" + address.getLegacyIdentifier());
- }
-
- private File retrieveProfileAvatar(
- SignalServiceAddress address, String avatarPath, ProfileKey profileKey
+ private void retrieveProfileAvatar(
+ String avatarPath, ProfileKey profileKey, OutputStream outputStream
) throws IOException {
- IOUtils.createPrivateDirectories(pathConfig.getAvatarsPath());
- File outputFile = getProfileAvatarFile(address);
-
File tmpFile = IOUtils.createTempFile();
try (InputStream 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.copyStreamToFile(input, outputFile, (int) ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE);
+ IOUtils.copyStream(input, outputStream, (int) ServiceConfig.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE);
} finally {
try {
Files.delete(tmpFile.toPath());
e.getMessage());
}
}
- return outputFile;
- }
-
- public File getAttachmentFile(SignalServiceAttachmentRemoteId attachmentId) {
- return new File(pathConfig.getAttachmentsPath(), attachmentId.toString());
}
- private File retrieveAttachment(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException, MissingConfigurationException {
- IOUtils.createPrivateDirectories(pathConfig.getAttachmentsPath());
- return retrieveAttachment(pointer, getAttachmentFile(pointer.getRemoteId()), true);
- }
-
- private File retrieveAttachment(
- SignalServiceAttachmentPointer pointer, File outputFile, boolean storePreview
- ) throws IOException, InvalidMessageException, MissingConfigurationException {
- if (storePreview && pointer.getPreview().isPresent()) {
- File previewFile = new File(outputFile + ".preview");
- try (OutputStream output = new FileOutputStream(previewFile)) {
- byte[] preview = pointer.getPreview().get();
- output.write(preview, 0, preview.length);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- return null;
- }
+ private void retrieveAttachment(
+ final SignalServiceAttachment attachment, final OutputStream outputStream
+ ) throws IOException {
+ if (attachment.isPointer()) {
+ SignalServiceAttachmentPointer pointer = attachment.asPointer();
+ retrieveAttachmentPointer(pointer, outputStream);
+ } else {
+ SignalServiceAttachmentStream stream = attachment.asStream();
+ IOUtils.copyStream(stream.getInputStream(), outputStream);
}
+ }
+ private void retrieveAttachmentPointer(
+ SignalServiceAttachmentPointer pointer, OutputStream outputStream
+ ) throws IOException {
File tmpFile = IOUtils.createTempFile();
- try (InputStream input = messageReceiver.retrieveAttachment(pointer,
- tmpFile,
- ServiceConfig.MAX_ATTACHMENT_SIZE)) {
- IOUtils.copyStreamToFile(input, outputFile);
+ try (InputStream input = retrieveAttachmentAsStream(pointer, tmpFile)) {
+ IOUtils.copyStream(input, outputStream);
+ } catch (MissingConfigurationException | InvalidMessageException e) {
+ throw new IOException(e);
} finally {
try {
Files.delete(tmpFile.toPath());
e.getMessage());
}
}
- return outputFile;
}
private InputStream retrieveAttachmentAsStream(
ProfileKey profileKey = account.getProfileStore().getProfileKey(record.getAddress());
out.write(new DeviceContact(record.getAddress(),
Optional.fromNullable(record.name),
- createContactAvatarAttachment(record.number),
+ createContactAvatarAttachment(record.getAddress()),
Optional.fromNullable(record.color),
Optional.fromNullable(verifiedMessage),
Optional.fromNullable(profileKey),
theirIdentityKey);
}
- void saveAccount() {
- account.save();
- }
-
public SignalServiceAddress canonicalizeAndResolveSignalServiceAddress(String identifier) throws InvalidNumberException {
String canonicalizedNumber = UuidUtil.isUuid(identifier)
? identifier
git.nmode.ca / signal-cli / blobdiff
