webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt to refresh recipients uuid if sending fails

Browse source
This commit is contained in:
AsamK 2021-05-03 00:04:49 +02:00
parent 0091c1cf26
commit 7afb1347b4
2 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -118,6 +118,7 @@ import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
import org.whispersystems.signalservice.api.profiles.SignalServiceProfile; import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException; import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException;
import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.signalservice.api.util.InvalidNumberException; import org.whispersystems.signalservice.api.util.InvalidNumberException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
import org.whispersystems.signalservice.api.util.SleepTimer; import org.whispersystems.signalservice.api.util.SleepTimer;
@ -1301,10 +1302,20 @@ public class Manager implements Closeable {
return signalServiceAddresses.stream().map(this::resolveRecipient).collect(Collectors.toSet()); return signalServiceAddresses.stream().map(this::resolveRecipient).collect(Collectors.toSet());
} }
private Map<String, UUID> getRegisteredUsers(final Set<String> numbersMissingUuid) throws IOException { 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));
}
private Map<String, UUID> getRegisteredUsers(final Set<String> numbers) throws IOException {
try { try {
return accountManager.getRegisteredUsers(ServiceConfig.getIasKeyStore(), return accountManager.getRegisteredUsers(ServiceConfig.getIasKeyStore(),
numbersMissingUuid, numbers,
serviceEnvironmentConfig.getCdsMrenclave()); serviceEnvironmentConfig.getCdsMrenclave());
} catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException | InvalidKeyException e) { } catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException | InvalidKeyException e) {
throw new IOException(e); throw new IOException(e);
@ -1418,10 +1429,16 @@ public class Manager implements Closeable {
) throws IOException { ) throws IOException {
var messageSender = createMessageSender(); var messageSender = createMessageSender();
final var recipientId = resolveRecipient(address);
try { try {
return messageSender.sendMessage(address, try {
unidentifiedAccessHelper.getAccessFor(resolveRecipient(address)), return messageSender.sendMessage(address, unidentifiedAccessHelper.getAccessFor(recipientId), message);
} catch (UnregisteredUserException e) {
final var newRecipientId = refreshRegisteredUser(recipientId);
return messageSender.sendMessage(resolveSignalServiceAddress(newRecipientId),
unidentifiedAccessHelper.getAccessFor(newRecipientId),
message); message);
}
} catch (UntrustedIdentityException e) { } catch (UntrustedIdentityException e) {
return SendMessageResult.identityFailure(address, e.getIdentityKey()); return SendMessageResult.identityFailure(address, e.getIdentityKey());
} }

11
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
View file

@ -301,7 +301,16 @@ public class RecipientStore implements ContactsStore, ProfileStore {
} }
if (byUuid.isEmpty()) { if (byUuid.isEmpty()) {
logger.debug("Got recipient existing with number, updating with high trust uuid"); if (byNumber.get().getAddress().getUuid().isPresent()) {
logger.debug(
"Got recipient existing with number, but different uuid, so stripping its number and adding new recipient");
updateRecipientAddressLocked(byNumber.get().getRecipientId(),
new SignalServiceAddress(byNumber.get().getAddress().getUuid().get(), null));
return new Pair<>(addNewRecipientLocked(address), Optional.empty());
}
logger.debug("Got recipient existing with number and no uuid, updating with high trust uuid");
updateRecipientAddressLocked(byNumber.get().getRecipientId(), address); updateRecipientAddressLocked(byNumber.get().getRecipientId(), address);
return new Pair<>(byNumber.get().getRecipientId(), Optional.empty()); return new Pair<>(byNumber.get().getRecipientId(), Optional.empty());
} }