import org.asamk.signal.manager.util.KeyUtils;
import org.asamk.signal.manager.util.StickerUtils;
import org.asamk.signal.manager.util.Utils;
-import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.SignalSessionLock;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+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;
dependencies,
unidentifiedAccessHelper,
this::resolveSignalServiceAddress,
- this::resolveRecipient,
+ account.getRecipientStore(),
this::handleIdentityFailure,
this::getGroup,
this::refreshRegisteredUser);
groupV2Helper,
avatarStore,
this::resolveSignalServiceAddress,
- this::resolveRecipient);
+ account.getRecipientStore());
this.contactHelper = new ContactHelper(account);
this.syncHelper = new SyncHelper(account,
attachmentHelper,
sendHelper,
groupHelper,
avatarStore,
- this::resolveSignalServiceAddress,
- this::resolveRecipient);
+ this::resolveSignalServiceAddress);
this.context = new Context(account,
dependencies.getAccountManager(),
this.incomingMessageHandler = new IncomingMessageHandler(account,
dependencies,
- this::resolveRecipient,
+ account.getRecipientStore(),
+ this::resolveSignalServiceAddress,
groupHelper,
contactHelper,
attachmentHelper,
public Map<String, Pair<String, UUID>> areUsersRegistered(Set<String> numbers) throws IOException {
Map<String, String> canonicalizedNumbers = numbers.stream().collect(Collectors.toMap(n -> n, n -> {
try {
- return canonicalizePhoneNumber(n);
+ return PhoneNumberFormatter.formatNumber(n, account.getUsername());
} catch (InvalidNumberException e) {
return "";
}
public SendGroupMessageResults quitGroup(
GroupId groupId, Set<RecipientIdentifier.Single> groupAdmins
) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException {
- final var newAdmins = getRecipientIds(groupAdmins);
+ final var newAdmins = resolveRecipients(groupAdmins);
return groupHelper.quitGroup(groupId, newAdmins);
}
public Pair<GroupId, SendGroupMessageResults> createGroup(
String name, Set<RecipientIdentifier.Single> members, File avatarFile
) throws IOException, AttachmentInvalidException {
- return groupHelper.createGroup(name, members == null ? null : getRecipientIds(members), avatarFile);
+ return groupHelper.createGroup(name, members == null ? null : resolveRecipients(members), avatarFile);
}
public SendGroupMessageResults updateGroup(
return groupHelper.updateGroup(groupId,
name,
description,
- members == null ? null : getRecipientIds(members),
- removeMembers == null ? null : getRecipientIds(removeMembers),
- admins == null ? null : getRecipientIds(admins),
- removeAdmins == null ? null : getRecipientIds(removeAdmins),
+ members == null ? null : resolveRecipients(members),
+ removeMembers == null ? null : resolveRecipients(removeMembers),
+ admins == null ? null : resolveRecipients(admins),
+ removeAdmins == null ? null : resolveRecipients(removeAdmins),
resetGroupLink,
groupLinkState,
addMemberPermission,
public void setContactName(
RecipientIdentifier.Single recipient, String name
- ) throws NotMasterDeviceException {
+ ) throws NotMasterDeviceException, UnregisteredUserException {
if (!account.isMasterDevice()) {
throw new NotMasterDeviceException();
}
return certificate;
}
- private Set<RecipientId> getRecipientIds(Collection<RecipientIdentifier.Single> recipients) {
- final var signalServiceAddresses = new HashSet<SignalServiceAddress>(recipients.size());
- final var addressesMissingUuid = new HashSet<SignalServiceAddress>();
-
- for (var number : recipients) {
- final var resolvedAddress = resolveSignalServiceAddress(resolveRecipient(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 UUID getRegisteredUser(final String number) throws IOException {
+ final Map<String, UUID> uuidMap;
+ try {
+ uuidMap = getRegisteredUsers(Set.of(number));
+ } catch (NumberFormatException e) {
+ throw new UnregisteredUserException(number, e);
+ }
+ final var uuid = uuidMap.get(number);
+ if (uuid == null) {
+ throw new UnregisteredUserException(number, null);
+ }
+ return uuid;
}
private Map<String, UUID> getRegisteredUsers(final Set<String> numbers) throws IOException {
) {
var envelope = cachedMessage.loadEnvelope();
if (envelope == null) {
+ cachedMessage.delete();
return null;
}
- SignalServiceContent content = null;
- List<HandleAction> actions = null;
- if (!envelope.isReceipt()) {
- try {
- content = dependencies.getCipher().decrypt(envelope);
- } catch (ProtocolUntrustedIdentityException e) {
- if (System.currentTimeMillis() - envelope.getServerDeliveredTimestamp() > 1000L * 60 * 60 * 24 * 30) {
- // Envelope is more than a month old, cleaning up.
- cachedMessage.delete();
- return null;
- }
- if (!envelope.hasSource()) {
- final var identifier = e.getSender();
- 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 = incomingMessageHandler.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;
}
logger.debug("Checking for new message from server");
try {
var result = signalWebSocket.readOrEmpty(unit.toMillis(timeout), envelope1 -> {
- final var recipientId = envelope1.hasSource()
- ? resolveRecipient(envelope1.getSourceIdentifier())
+ 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);
handleQueuedActions(queuedActions);
}
if (cachedMessage[0] != null) {
- if (exception instanceof ProtocolUntrustedIdentityException) {
- final var identifier = ((ProtocolUntrustedIdentityException) exception).getSender();
- final var recipientId = resolveRecipient(identifier);
- 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) {
}
public boolean isContactBlocked(final RecipientIdentifier.Single recipient) {
- final var recipientId = resolveRecipient(recipient);
+ final RecipientId recipientId;
+ try {
+ recipientId = resolveRecipient(recipient);
+ } catch (UnregisteredUserException e) {
+ return false;
+ }
return contactHelper.isContactBlocked(recipientId);
}
}
public String getContactOrProfileName(RecipientIdentifier.Single recipientIdentifier) {
- final var recipientId = resolveRecipient(recipientIdentifier);
+ final RecipientId recipientId;
+ try {
+ recipientId = resolveRecipient(recipientIdentifier);
+ } catch (UnregisteredUserException e) {
+ return null;
+ }
final var contact = account.getContactStore().getContact(recipientId);
if (contact != null && !Util.isEmpty(contact.getName())) {
}
public List<IdentityInfo> getIdentities(RecipientIdentifier.Single recipient) {
- final var identity = account.getIdentityKeyStore().getIdentity(resolveRecipient(recipient));
+ IdentityInfo identity;
+ try {
+ identity = account.getIdentityKeyStore().getIdentity(resolveRecipient(recipient));
+ } catch (UnregisteredUserException e) {
+ identity = null;
+ }
return identity == null ? List.of() : List.of(identity);
}
* @param fingerprint Fingerprint
*/
public boolean trustIdentityVerified(RecipientIdentifier.Single recipient, byte[] fingerprint) {
- var recipientId = resolveRecipient(recipient);
+ RecipientId recipientId;
+ try {
+ recipientId = resolveRecipient(recipient);
+ } catch (UnregisteredUserException e) {
+ return false;
+ }
return trustIdentity(recipientId,
identityKey -> Arrays.equals(identityKey.serialize(), fingerprint),
TrustLevel.TRUSTED_VERIFIED);
* @param safetyNumber Safety number
*/
public boolean trustIdentityVerifiedSafetyNumber(RecipientIdentifier.Single recipient, String safetyNumber) {
- var recipientId = resolveRecipient(recipient);
- var address = account.getRecipientStore().resolveServiceAddress(recipientId);
+ 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);
* @param safetyNumber Scannable safety number
*/
public boolean trustIdentityVerifiedSafetyNumber(RecipientIdentifier.Single recipient, byte[] safetyNumber) {
- var recipientId = resolveRecipient(recipient);
- var address = account.getRecipientStore().resolveServiceAddress(recipientId);
+ 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 {
* @param recipient username of the identity
*/
public boolean trustIdentityAllKeys(RecipientIdentifier.Single recipient) {
- var recipientId = resolveRecipient(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);
+ var address = resolveSignalServiceAddress(recipientId);
syncHelper.sendVerifiedMessage(address, identity.getIdentityKey(), trustLevel);
} catch (IOException e) {
logger.warn("Failed to send verification sync message: {}", e.getMessage());
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));
}
- private String canonicalizePhoneNumber(final String number) throws InvalidNumberException {
- return PhoneNumberFormatter.formatNumber(number, account.getUsername());
- }
+ public SignalServiceAddress resolveSignalServiceAddress(RecipientId recipientId) {
+ final var address = account.getRecipientStore().resolveRecipientAddress(recipientId);
+ if (address.getUuid().isPresent()) {
+ return address.toSignalServiceAddress();
+ }
- private RecipientId resolveRecipient(final String identifier) {
- var address = Utils.getSignalServiceAddressFromIdentifier(identifier);
+ // 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();
+ }
+ }
- return resolveRecipient(address);
+ 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;
}
- private RecipientId resolveRecipient(final RecipientIdentifier.Single recipient) {
- final SignalServiceAddress address;
+ private RecipientId resolveRecipient(final RecipientIdentifier.Single recipient) throws UnregisteredUserException {
if (recipient instanceof RecipientIdentifier.Uuid) {
- address = new SignalServiceAddress(((RecipientIdentifier.Uuid) recipient).uuid, null);
+ return account.getRecipientStore().resolveRecipient(((RecipientIdentifier.Uuid) recipient).uuid);
} else {
- address = new SignalServiceAddress(null, ((RecipientIdentifier.Number) recipient).number);
+ final var number = ((RecipientIdentifier.Number) recipient).number;
+ return account.getRecipientStore().resolveRecipient(number, () -> {
+ try {
+ return getRegisteredUser(number);
+ } catch (IOException e) {
+ return null;
+ }
+ });
}
-
- return resolveRecipient(address);
}
- public RecipientId resolveRecipient(SignalServiceAddress address) {
+ private RecipientId resolveRecipient(SignalServiceAddress address) {
return account.getRecipientStore().resolveRecipient(address);
}
git.nmode.ca / signal-cli / blobdiff
