Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure all SignalServiceAddresses have UUIDs.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-08-20 14:03:11 -04:00
committed by Alex Hart
parent 0ab2100fa5
commit 642d1984c4
30 changed files with 134 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
View File

@@ -88,13 +88,13 @@ public class SignalServiceMessageReceiver {
Optional<UnidentifiedAccess> unidentifiedAccess,
SignalServiceProfile.RequestType requestType)
{
Optional<UUID> uuid = address.getUuid();
UUID uuid = address.getUuid();
if (uuid.isPresent() && profileKey.isPresent()) {
if (profileKey.isPresent()) {
if (requestType == SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL) {
return socket.retrieveVersionedProfileAndCredential(uuid.get(), profileKey.get(), unidentifiedAccess);
return socket.retrieveVersionedProfileAndCredential(uuid, profileKey.get(), unidentifiedAccess);
} else {
return FutureTransformers.map(socket.retrieveVersionedProfile(uuid.get(), profileKey.get(), unidentifiedAccess), profile -> {
return FutureTransformers.map(socket.retrieveVersionedProfile(uuid, profileKey.get(), unidentifiedAccess), profile -> {
return new ProfileAndCredential(profile,
SignalServiceProfile.RequestType.PROFILE,
Optional.absent());

91
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@@ -319,9 +319,8 @@ public class SignalServiceMessageSender {
// TODO [greyson][session] Delete this when we delete the button
if (message.isEndSession()) {
if (recipient.getUuid().isPresent()) {
store.deleteAllSessions(recipient.getUuid().get().toString());
}
store.deleteAllSessions(recipient.getUuid().toString());
if (recipient.getNumber().isPresent()) {
store.deleteAllSessions(recipient.getNumber().get());
}
@@ -746,16 +745,8 @@ public class SignalServiceMessageSender {
if (message.getQuote().isPresent()) {
DataMessage.Quote.Builder quoteBuilder = DataMessage.Quote.newBuilder()
.setId(message.getQuote().get().getId())
.setText(message.getQuote().get().getText());
if (message.getQuote().get().getAuthor().getUuid().isPresent()) {
quoteBuilder.setAuthorUuid(message.getQuote().get().getAuthor().getUuid().get().toString());
}
// TODO [Alan] PhoneNumberPrivacy: Do not set this number
if (message.getQuote().get().getAuthor().getNumber().isPresent()) {
quoteBuilder.setAuthorE164(message.getQuote().get().getAuthor().getNumber().get());
}
.setText(message.getQuote().get().getText())
.setAuthorUuid(message.getQuote().get().getAuthor().getUuid().toString());
if (!message.getQuote().get().getMentions().isEmpty()) {
for (SignalServiceDataMessage.Mention mention : message.getQuote().get().getMentions()) {
@@ -850,11 +841,8 @@ public class SignalServiceMessageSender {
DataMessage.Reaction.Builder reactionBuilder = DataMessage.Reaction.newBuilder()
.setEmoji(message.getReaction().get().getEmoji())
.setRemove(message.getReaction().get().isRemove())
.setTargetSentTimestamp(message.getReaction().get().getTargetSentTimestamp());
if (message.getReaction().get().getTargetAuthor().getUuid().isPresent()) {
reactionBuilder.setTargetAuthorUuid(message.getReaction().get().getTargetAuthor().getUuid().get().toString());
}
.setTargetSentTimestamp(message.getReaction().get().getTargetSentTimestamp())
.setTargetAuthorUuid(message.getReaction().get().getTargetAuthor().getUuid().toString());
builder.setReaction(reactionBuilder.build());
builder.setRequiredProtocolVersion(Math.max(DataMessage.ProtocolVersion.REACTIONS_VALUE, builder.getRequiredProtocolVersion()));
@@ -1022,12 +1010,10 @@ public class SignalServiceMessageSender {
if (result.getSuccess() != null) {
SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder builder = SyncMessage.Sent.UnidentifiedDeliveryStatus.newBuilder();
if (result.getAddress().getUuid().isPresent()) {
builder = builder.setDestinationUuid(result.getAddress().getUuid().get().toString());
}
builder.setDestinationUuid(result.getAddress().getUuid().toString());
if (result.getAddress().getNumber().isPresent()) {
builder = builder.setDestinationE164(result.getAddress().getNumber().get());
builder.setDestinationE164(result.getAddress().getNumber().get());
}
builder.setUnidentified(result.getSuccess().isUnidentified());
@@ -1037,8 +1023,11 @@ public class SignalServiceMessageSender {
}
if (recipient.isPresent()) {
if (recipient.get().getUuid().isPresent()) sentMessage.setDestinationUuid(recipient.get().getUuid().get().toString());
if (recipient.get().getNumber().isPresent()) sentMessage.setDestinationE164(recipient.get().getNumber().get());
sentMessage.setDestinationUuid(recipient.get().getUuid().toString());
if (recipient.get().getNumber().isPresent()) {
sentMessage.setDestinationE164(recipient.get().getNumber().get());
}
}
if (dataMessage.getExpireTimer() > 0) {
@@ -1062,9 +1051,7 @@ public class SignalServiceMessageSender {
for (ReadMessage readMessage : readMessages) {
SyncMessage.Read.Builder readBuilder = SyncMessage.Read.newBuilder().setTimestamp(readMessage.getTimestamp());
if (readMessage.getSender().getUuid().isPresent()) {
readBuilder.setSenderUuid(readMessage.getSender().getUuid().get().toString());
}
readBuilder.setSenderUuid(readMessage.getSender().getUuid().toString());
if (readMessage.getSender().getNumber().isPresent()) {
readBuilder.setSenderE164(readMessage.getSender().getNumber().get());
@@ -1083,9 +1070,7 @@ public class SignalServiceMessageSender {
for (ViewedMessage readMessage : readMessages) {
SyncMessage.Viewed.Builder viewedBuilder = SyncMessage.Viewed.newBuilder().setTimestamp(readMessage.getTimestamp());
if (readMessage.getSender().getUuid().isPresent()) {
viewedBuilder.setSenderUuid(readMessage.getSender().getUuid().get().toString());
}
viewedBuilder.setSenderUuid(readMessage.getSender().getUuid().toString());
if (readMessage.getSender().getNumber().isPresent()) {
viewedBuilder.setSenderE164(readMessage.getSender().getNumber().get());
@@ -1102,9 +1087,7 @@ public class SignalServiceMessageSender {
SyncMessage.Builder builder = createSyncMessageBuilder();
SyncMessage.ViewOnceOpen.Builder viewOnceBuilder = SyncMessage.ViewOnceOpen.newBuilder().setTimestamp(readMessage.getTimestamp());
if (readMessage.getSender().getUuid().isPresent()) {
viewOnceBuilder.setSenderUuid(readMessage.getSender().getUuid().get().toString());
}
viewOnceBuilder.setSenderUuid(readMessage.getSender().getUuid().toString());
if (readMessage.getSender().getNumber().isPresent()) {
viewOnceBuilder.setSenderE164(readMessage.getSender().getNumber().get());
@@ -1121,9 +1104,7 @@ public class SignalServiceMessageSender {
SyncMessage.Blocked.Builder blockedMessage = SyncMessage.Blocked.newBuilder();
for (SignalServiceAddress address : blocked.getAddresses()) {
if (address.getUuid().isPresent()) {
blockedMessage.addUuids(address.getUuid().get().toString());
}
blockedMessage.addUuids(address.getUuid().toString());
if (address.getNumber().isPresent()) {
blockedMessage.addNumbers(address.getNumber().get());
}
@@ -1223,9 +1204,7 @@ public class SignalServiceMessageSender {
if (message.getPerson().get().getNumber().isPresent()) {
responseMessage.setThreadE164(message.getPerson().get().getNumber().get());
}
if (message.getPerson().get().getUuid().isPresent()) {
responseMessage.setThreadUuid(message.getPerson().get().getUuid().get().toString());
}
responseMessage.setThreadUuid(message.getPerson().get().getUuid().toString());
}
switch (message.getType()) {
@@ -1310,10 +1289,7 @@ public class SignalServiceMessageSender {
verifiedMessageBuilder.setNullMessage(ByteString.copyFrom(nullMessage));
verifiedMessageBuilder.setIdentityKey(ByteString.copyFrom(verifiedMessage.getIdentityKey().serialize()));
if (verifiedMessage.getDestination().getUuid().isPresent()) {
verifiedMessageBuilder.setDestinationUuid(verifiedMessage.getDestination().getUuid().get().toString());
}
verifiedMessageBuilder.setDestinationUuid(verifiedMessage.getDestination().getUuid().toString());
if (verifiedMessage.getDestination().getNumber().isPresent()) {
verifiedMessageBuilder.setDestinationE164(verifiedMessage.getDestination().getNumber().get());
@@ -1674,16 +1650,12 @@ public class SignalServiceMessageSender {
Preconditions.checkArgument(recipients.size() == unidentifiedAccess.size(), "Unidentified access mismatch!");
if (recipients.stream().anyMatch(r -> !r.getUuid().isPresent())) {
throw new IllegalArgumentException("All recipients must have a UUID!");
}
Map<UUID, UnidentifiedAccess> accessByUuid = new HashMap<>();
Iterator<SignalServiceAddress> addressIterator = recipients.iterator();
Iterator<UnidentifiedAccess> accessIterator = unidentifiedAccess.iterator();
while (addressIterator.hasNext()) {
accessByUuid.put(addressIterator.next().getUuid().get(), accessIterator.next());
accessByUuid.put(addressIterator.next().getUuid(), accessIterator.next());
}
for (int i = 0; i < RETRY_COUNT; i++) {
@@ -1693,7 +1665,7 @@ public class SignalServiceMessageSender {
.filter(a -> !sharedWith.contains(a))
.map(a -> UuidUtil.parseOrThrow(a.getName()))
.distinct()
.map(uuid -> new SignalServiceAddress(uuid, null))
.map(SignalServiceAddress::new)
.collect(Collectors.toList());
if (needsSenderKey.size() > 0) {
@@ -1701,7 +1673,7 @@ public class SignalServiceMessageSender {
SenderKeyDistributionMessage message = getOrCreateNewGroupSession(distributionId);
List<Optional<UnidentifiedAccessPair>> access = needsSenderKey.stream()
.map(r -> {
UnidentifiedAccess targetAccess = accessByUuid.get(r.getUuid().get());
UnidentifiedAccess targetAccess = accessByUuid.get(r.getUuid());
return Optional.of(new UnidentifiedAccessPair(targetAccess, targetAccess));
})
.collect(Collectors.toList());
@@ -1713,7 +1685,7 @@ public class SignalServiceMessageSender {
.map(SendMessageResult::getAddress)
.collect(Collectors.toList());
Set<String> successUuids = successes.stream().map(a -> a.getUuid().get().toString()).collect(Collectors.toSet());
Set<String> successUuids = successes.stream().map(a -> a.getUuid().toString()).collect(Collectors.toSet());
Set<SignalProtocolAddress> successAddresses = targetInfo.destinations.stream().filter(a -> successUuids.contains(a.getName())).collect(Collectors.toSet());
store.markSenderKeySharedWith(distributionId, successAddresses);
@@ -1777,13 +1749,13 @@ public class SignalServiceMessageSender {
} catch (GroupMismatchedDevicesException e) {
Log.w(TAG, "[sendGroupMessage] Handling mismatched devices.", e);
for (GroupMismatchedDevices mismatched : e.getMismatchedDevices()) {
SignalServiceAddress address = new SignalServiceAddress(UuidUtil.parse(mismatched.getUuid()), Optional.absent());
SignalServiceAddress address = new SignalServiceAddress(UuidUtil.parseOrThrow(mismatched.getUuid()), Optional.absent());
handleMismatchedDevices(socket, address, mismatched.getDevices());
}
} catch (GroupStaleDevicesException e) {
Log.w(TAG, "[sendGroupMessage] Handling stale devices.", e);
for (GroupStaleDevices stale : e.getStaleDevices()) {
SignalServiceAddress address = new SignalServiceAddress(UuidUtil.parse(stale.getUuid()), Optional.absent());
SignalServiceAddress address = new SignalServiceAddress(UuidUtil.parseOrThrow(stale.getUuid()), Optional.absent());
handleStaleDevices(address, stale.getDevices());
}
}
@@ -1801,12 +1773,12 @@ public class SignalServiceMessageSender {
for (SignalServiceAddress recipient : recipients) {
List<Integer> devices = recipientDevices.containsKey(recipient) ? recipientDevices.get(recipient) : new LinkedList<>();
destinations.add(new SignalProtocolAddress(recipient.getUuid().get().toString(), SignalServiceAddress.DEFAULT_DEVICE_ID));
destinations.add(new SignalProtocolAddress(recipient.getUuid().toString(), SignalServiceAddress.DEFAULT_DEVICE_ID));
devices.add(SignalServiceAddress.DEFAULT_DEVICE_ID);
for (int deviceId : store.getSubDeviceSessions(recipient.getIdentifier())) {
if (store.containsSession(new SignalProtocolAddress(recipient.getIdentifier(), deviceId))) {
destinations.add(new SignalProtocolAddress(recipient.getUuid().get().toString(), deviceId));
destinations.add(new SignalProtocolAddress(recipient.getUuid().toString(), deviceId));
devices.add(deviceId);
}
}
@@ -1832,13 +1804,13 @@ public class SignalServiceMessageSender {
Set<UUID> unregistered = response.getUnsentTargets();
List<SendMessageResult> failures = unregistered.stream()
.map(uuid -> new SignalServiceAddress(uuid, null))
.map(uuid -> new SignalServiceAddress(uuid))
.map(SendMessageResult::unregisteredFailure)
.collect(Collectors.toList());
List<SendMessageResult> success = recipients.keySet()
.stream()
.filter(r -> !unregistered.contains(r.getUuid().get()))
.filter(r -> !unregistered.contains(r.getUuid()))
.map(a -> SendMessageResult.success(a, recipients.get(a), true, store.isMultiDevice(), -1, Optional.of(content)))
.collect(Collectors.toList());
@@ -2038,9 +2010,8 @@ public class SignalServiceMessageSender {
List<SignalProtocolAddress> addresses = new ArrayList<>(devices.size());
for (int staleDeviceId : devices) {
if (recipient.getUuid().isPresent()) {
addresses.add(new SignalProtocolAddress(recipient.getUuid().get().toString(), staleDeviceId));
}
addresses.add(new SignalProtocolAddress(recipient.getUuid().toString(), staleDeviceId));
if (recipient.getNumber().isPresent()) {
addresses.add(new SignalProtocolAddress(recipient.getNumber().get(), staleDeviceId));
}

32
libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java
View File

@@ -36,7 +36,6 @@ import org.whispersystems.libsignal.SignalProtocolAddress;
import org.whispersystems.libsignal.UntrustedIdentityException;
import org.whispersystems.libsignal.groups.GroupCipher;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.protocol.PlaintextContent;
import org.whispersystems.libsignal.protocol.PreKeySignalMessage;
import org.whispersystems.libsignal.protocol.SignalMessage;
import org.whispersystems.libsignal.state.SignalProtocolStore;
@@ -52,12 +51,10 @@ import org.whispersystems.signalservice.api.util.UuidUtil;
import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
import org.whispersystems.signalservice.internal.push.PushTransportDetails;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope.Type;
import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
import org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer;
import org.whispersystems.signalservice.internal.serialize.SignalServiceMetadataProtobufSerializer;
import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto;
import org.whispersystems.util.Base64;
import java.util.List;
@@ -96,7 +93,7 @@ public class SignalServiceCipher {
PushTransportDetails transport = new PushTransportDetails();
SignalProtocolAddress localProtocolAddress = new SignalProtocolAddress(localAddress.getIdentifier(), SignalServiceAddress.DEFAULT_DEVICE_ID);
SignalGroupCipher groupCipher = new SignalGroupCipher(sessionLock, new GroupCipher(signalProtocolStore, localProtocolAddress));
SignalSealedSessionCipher sessionCipher = new SignalSealedSessionCipher(sessionLock, new SealedSessionCipher(signalProtocolStore, localAddress.getUuid().orNull(), localAddress.getNumber().orNull(), 1));
SignalSealedSessionCipher sessionCipher = new SignalSealedSessionCipher(sessionLock, new SealedSessionCipher(signalProtocolStore, localAddress.getUuid(), localAddress.getNumber().orNull(), 1));
CiphertextMessage message = groupCipher.encrypt(distributionId.asUuid(), transport.getPaddedMessageBody(unpaddedMessage));
UnidentifiedSenderMessageContent messageContent = new UnidentifiedSenderMessageContent(message,
senderCertificate,
@@ -113,7 +110,7 @@ public class SignalServiceCipher {
{
if (unidentifiedAccess.isPresent()) {
SignalSessionCipher sessionCipher = new SignalSessionCipher(sessionLock, new SessionCipher(signalProtocolStore, destination));
SignalSealedSessionCipher sealedSessionCipher = new SignalSealedSessionCipher(sessionLock, new SealedSessionCipher(signalProtocolStore, localAddress.getUuid().orNull(), localAddress.getNumber().orNull(), 1));
SignalSealedSessionCipher sealedSessionCipher = new SignalSealedSessionCipher(sessionLock, new SealedSessionCipher(signalProtocolStore, localAddress.getUuid(), localAddress.getNumber().orNull(), 1));
return content.processSealedSender(sessionCipher, sealedSessionCipher, destination, unidentifiedAccess.get().getUnidentifiedCertificate());
} else {
@@ -182,26 +179,26 @@ public class SignalServiceCipher {
byte[] paddedMessage;
SignalServiceMetadata metadata;
if (!envelope.hasSource() && !envelope.isUnidentifiedSender()) {
throw new InvalidMessageStructureException("Non-UD envelope is missing a source!");
if (!envelope.hasSourceUuid() && !envelope.isUnidentifiedSender()) {
throw new InvalidMessageStructureException("Non-UD envelope is missing a UUID!");
}
if (envelope.isPreKeySignalMessage()) {
SignalProtocolAddress sourceAddress = getPreferredProtocolAddress(signalProtocolStore, envelope.getSourceAddress(), envelope.getSourceDevice());
SignalProtocolAddress sourceAddress = new SignalProtocolAddress(envelope.getSourceUuid().get(), envelope.getSourceDevice());
SignalSessionCipher sessionCipher = new SignalSessionCipher(sessionLock, new SessionCipher(signalProtocolStore, sourceAddress));
paddedMessage = sessionCipher.decrypt(new PreKeySignalMessage(ciphertext));
metadata = new SignalServiceMetadata(envelope.getSourceAddress(), envelope.getSourceDevice(), envelope.getTimestamp(), envelope.getServerReceivedTimestamp(), envelope.getServerDeliveredTimestamp(), false, envelope.getServerGuid(), Optional.absent());
} else if (envelope.isSignalMessage()) {
SignalProtocolAddress sourceAddress = getPreferredProtocolAddress(signalProtocolStore, envelope.getSourceAddress(), envelope.getSourceDevice());
SignalProtocolAddress sourceAddress = new SignalProtocolAddress(envelope.getSourceUuid().get(), envelope.getSourceDevice());
SignalSessionCipher sessionCipher = new SignalSessionCipher(sessionLock, new SessionCipher(signalProtocolStore, sourceAddress));
paddedMessage = sessionCipher.decrypt(new SignalMessage(ciphertext));
metadata = new SignalServiceMetadata(envelope.getSourceAddress(), envelope.getSourceDevice(), envelope.getTimestamp(), envelope.getServerReceivedTimestamp(), envelope.getServerDeliveredTimestamp(), false, envelope.getServerGuid(), Optional.absent());
} else if (envelope.isUnidentifiedSender()) {
SignalSealedSessionCipher sealedSessionCipher = new SignalSealedSessionCipher(sessionLock, new SealedSessionCipher(signalProtocolStore, localAddress.getUuid().orNull(), localAddress.getNumber().orNull(), SignalServiceAddress.DEFAULT_DEVICE_ID));
SignalSealedSessionCipher sealedSessionCipher = new SignalSealedSessionCipher(sessionLock, new SealedSessionCipher(signalProtocolStore, localAddress.getUuid(), localAddress.getNumber().orNull(), SignalServiceAddress.DEFAULT_DEVICE_ID));
DecryptionResult result = sealedSessionCipher.decrypt(certificateValidator, ciphertext, envelope.getServerReceivedTimestamp());
SignalServiceAddress resultAddress = new SignalServiceAddress(UuidUtil.parse(result.getSenderUuid()), result.getSenderE164());
SignalServiceAddress resultAddress = new SignalServiceAddress(UuidUtil.parseOrThrow(result.getSenderUuid()), result.getSenderE164());
Optional<byte[]> groupId = result.getGroupId();
paddedMessage = result.getPaddedMessage();
@@ -233,19 +230,6 @@ public class SignalServiceCipher {
}
}
private static SignalProtocolAddress getPreferredProtocolAddress(SignalProtocolStore store, SignalServiceAddress address, int sourceDevice) {
SignalProtocolAddress uuidAddress = address.getUuid().isPresent() ? new SignalProtocolAddress(address.getUuid().get().toString(), sourceDevice) : null;
SignalProtocolAddress e164Address = address.getNumber().isPresent() ? new SignalProtocolAddress(address.getNumber().get(), sourceDevice) : null;
if (uuidAddress != null && store.containsSession(uuidAddress)) {
return uuidAddress;
} else if (e164Address != null && store.containsSession(e164Address)) {
return e164Address;
} else {
return new SignalProtocolAddress(address.getIdentifier(), sourceDevice);
}
}
private static class Plaintext {
private final SignalServiceMetadata metadata;
private final byte[] data;

2
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
View File

@@ -1004,7 +1004,7 @@ public final class SignalServiceContent {
return new SignalServiceDataMessage.Reaction(reaction.getEmoji(),
reaction.getRemove(),
new SignalServiceAddress(uuid, null),
new SignalServiceAddress(uuid),
reaction.getTargetSentTimestamp());
}

8
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java
View File

@@ -70,9 +70,7 @@ public class SignalServiceEnvelope {
.setServerTimestamp(serverReceivedTimestamp);
if (sender.isPresent()) {
if (sender.get().getUuid().isPresent()) {
builder.setSourceUuid(sender.get().getUuid().get().toString());
}
builder.setSourceUuid(sender.get().getUuid().toString());
if (sender.get().getNumber().isPresent()) {
builder.setSourceE164(sender.get().getNumber().get());
@@ -125,8 +123,8 @@ public class SignalServiceEnvelope {
/**
* @return True if either a source E164 or UUID is present.
*/
public boolean hasSource() {
return envelope.hasSourceE164() || envelope.hasSourceUuid();
public boolean hasSourceUuid() {
return envelope.hasSourceUuid();
}
/**

9
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java
View File

@@ -37,9 +37,7 @@ public class DeviceContactsOutputStream extends ChunkedOutputStream {
private void writeContactDetails(DeviceContact contact) throws IOException {
SignalServiceProtos.ContactDetails.Builder contactDetails = SignalServiceProtos.ContactDetails.newBuilder();
if (contact.getAddress().getUuid().isPresent()) {
contactDetails.setUuid(contact.getAddress().getUuid().get().toString());
}
contactDetails.setUuid(contact.getAddress().getUuid().toString());
if (contact.getAddress().getNumber().isPresent()) {
contactDetails.setNumber(contact.getAddress().getNumber().get());
@@ -71,12 +69,9 @@ public class DeviceContactsOutputStream extends ChunkedOutputStream {
SignalServiceProtos.Verified.Builder verifiedBuilder = SignalServiceProtos.Verified.newBuilder()
.setIdentityKey(ByteString.copyFrom(contact.getVerified().get().getIdentityKey().serialize()))
.setDestinationUuid(contact.getVerified().get().getDestination().getUuid().toString())
.setState(state);
if (contact.getVerified().get().getDestination().getUuid().isPresent()) {
verifiedBuilder.setDestinationUuid(contact.getVerified().get().getDestination().getUuid().get().toString());
}
if (contact.getVerified().get().getDestination().getNumber().isPresent()) {
verifiedBuilder.setDestinationE164(contact.getVerified().get().getDestination().getNumber().get());
}

5
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SentTranscriptMessage.java
View File

@@ -43,9 +43,8 @@ public class SentTranscriptMessage {
this.isRecipientUpdate = isRecipientUpdate;
for (Map.Entry<SignalServiceAddress, Boolean> entry : unidentifiedStatus.entrySet()) {
if (entry.getKey().getUuid().isPresent()) {
unidentifiedStatusByUuid.put(entry.getKey().getUuid().get().toString(), entry.getValue());
}
unidentifiedStatusByUuid.put(entry.getKey().getUuid().toString(), entry.getValue());
if (entry.getKey().getNumber().isPresent()) {
unidentifiedStatusByE164.put(entry.getKey().getNumber().get(), entry.getValue());
}

73
libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java
View File

@@ -7,9 +7,11 @@
package org.whispersystems.signalservice.api.push;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.libsignal.util.guava.Preconditions;
import org.whispersystems.signalservice.api.util.OptionalUtil;
import org.whispersystems.signalservice.api.util.UuidUtil;
import java.util.Objects;
import java.util.UUID;
/**
@@ -19,63 +21,46 @@ public class SignalServiceAddress {
public static final int DEFAULT_DEVICE_ID = 1;
private final Optional<UUID> uuid;
private final UUID uuid;
private final Optional<String> e164;
private final Optional<String> relay;
/**
* Construct a PushAddress.
*
* @param uuid The UUID of the user, if available.
* @param e164 The phone number of the user, if available.
* @param relay The Signal service federated server this user is registered with (if not your own server).
*/
public SignalServiceAddress(Optional<UUID> uuid, Optional<String> e164, Optional<String> relay) {
if (!uuid.isPresent() && !e164.isPresent()) {
throw new AssertionError("Must have either a UUID or E164 number!");
}
this.uuid = uuid;
public SignalServiceAddress(UUID uuid, Optional<String> e164) {
this.uuid = Preconditions.checkNotNull(uuid);
this.e164 = e164;
this.relay = relay;
}
public SignalServiceAddress(UUID uuid) {
this.uuid = Preconditions.checkNotNull(uuid);
this.e164 = Optional.absent();
}
/**
* Convenience constructor that will consider a UUID/E164 string absent if it is null or empty.
*/
public SignalServiceAddress(UUID uuid, String e164) {
this(Optional.fromNullable(uuid), OptionalUtil.absentIfEmpty(e164));
}
public SignalServiceAddress(Optional<UUID> uuid, Optional<String> e164) {
this(uuid, e164, Optional.<String>absent());
this(uuid, OptionalUtil.absentIfEmpty(e164));
}
public Optional<String> getNumber() {
return e164;
}
public Optional<UUID> getUuid() {
public UUID getUuid() {
return uuid;
}
public String getIdentifier() {
if (uuid.isPresent()) {
return uuid.get().toString();
} else if (e164.isPresent()) {
return e164.get();
} else {
throw new AssertionError("Given the checks in the constructor, this should not be possible.");
}
}
public Optional<String> getRelay() {
return relay;
return uuid.toString();
}
public boolean matches(SignalServiceAddress other) {
return (uuid.isPresent() && other.uuid.isPresent() && uuid.get().equals(other.uuid.get())) ||
(e164.isPresent() && other.e164.isPresent() && e164.get().equals(other.e164.get()));
return this.uuid.equals(other.uuid);
}
public static boolean isValidAddress(String rawUuid, String e164) {
@@ -90,30 +75,14 @@ public class SignalServiceAddress {
}
}
@Override
public boolean equals(Object other) {
if (other == null || !(other instanceof SignalServiceAddress)) return false;
SignalServiceAddress that = (SignalServiceAddress)other;
return equals(this.uuid, that.uuid) &&
equals(this.e164, that.e164) &&
equals(this.relay, that.relay);
@Override public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final SignalServiceAddress that = (SignalServiceAddress) o;
return uuid.equals(that.uuid) && e164.equals(that.e164);
}
@Override
public int hashCode() {
int hashCode = 0;
if (this.uuid != null) hashCode ^= this.uuid.hashCode();
if (this.e164 != null) hashCode ^= this.e164.hashCode();
if (this.relay.isPresent()) hashCode ^= this.relay.get().hashCode();
return hashCode;
}
private <T> boolean equals(Optional<T> one, Optional<T> two) {
if (one.isPresent()) return two.isPresent() && one.get().equals(two.get());
else return !two.isPresent();
@Override public int hashCode() {
return Objects.hash(uuid, e164);
}
}

13
libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java
View File

@@ -57,7 +57,7 @@ public final class ProfileService {
Optional<UnidentifiedAccess> unidentifiedAccess,
SignalServiceProfile.RequestType requestType)
{
Optional<UUID> uuid = address.getUuid();
UUID uuid = address.getUuid();
SecureRandom random = new SecureRandom();
ProfileKeyCredentialRequestContext requestContext = null;
@@ -65,20 +65,19 @@ public final class ProfileService {
.setId(random.nextLong())
.setVerb("GET");
if (uuid.isPresent() && profileKey.isPresent()) {
UUID target = uuid.get();
ProfileKeyVersion profileKeyIdentifier = profileKey.get().getProfileKeyVersion(target);
if (profileKey.isPresent()) {
ProfileKeyVersion profileKeyIdentifier = profileKey.get().getProfileKeyVersion(uuid);
String version = profileKeyIdentifier.serialize();
if (requestType == SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL) {
requestContext = clientZkProfileOperations.createProfileKeyCredentialRequestContext(random, target, profileKey.get());
requestContext = clientZkProfileOperations.createProfileKeyCredentialRequestContext(random, uuid, profileKey.get());
ProfileKeyCredentialRequest request = requestContext.getRequest();
String credentialRequest = Hex.toStringCondensed(request.serialize());
builder.setPath(String.format("/v1/profile/%s/%s/%s", target, version, credentialRequest));
builder.setPath(String.format("/v1/profile/%s/%s/%s", uuid, version, credentialRequest));
} else {
builder.setPath(String.format("/v1/profile/%s/%s", target, version));
builder.setPath(String.format("/v1/profile/%s/%s", uuid, version));
}
} else {
builder.setPath(String.format("/v1/profile/%s", address.getIdentifier()));

6
libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java
View File

@@ -297,9 +297,9 @@ public final class SignalAccountRecord implements SignalRecord {
private AccountRecord.PinnedConversation toRemote() {
if (contact.isPresent()) {
AccountRecord.PinnedConversation.Contact.Builder contactBuilder = AccountRecord.PinnedConversation.Contact.newBuilder();
if (contact.get().getUuid().isPresent()) {
contactBuilder.setUuid(contact.get().getUuid().get().toString());
}
contactBuilder.setUuid(contact.get().getUuid().toString());
if (contact.get().getNumber().isPresent()) {
contactBuilder.setE164(contact.get().getNumber().get());
}

4
libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.java
View File

@@ -33,7 +33,7 @@ public final class SignalContactRecord implements SignalRecord {
this.proto = proto;
this.hasUnknownFields = ProtoUtil.hasUnknownFields(proto);
this.address = new SignalServiceAddress(UuidUtil.parseOrNull(proto.getServiceUuid()), proto.getServiceE164());
this.address = new SignalServiceAddress(UuidUtil.parseOrUnknown(proto.getServiceUuid()), proto.getServiceE164());
this.givenName = OptionalUtil.absentIfEmpty(proto.getGivenName());
this.familyName = OptionalUtil.absentIfEmpty(proto.getFamilyName());
this.profileKey = OptionalUtil.absentIfEmpty(proto.getProfileKey());
@@ -207,7 +207,7 @@ public final class SignalContactRecord implements SignalRecord {
this.id = StorageId.forContact(rawId);
this.builder = ContactRecord.newBuilder();
builder.setServiceUuid(address.getUuid().isPresent() ? address.getUuid().get().toString() : "");
builder.setServiceUuid(address.getUuid().toString());
builder.setServiceE164(address.getNumber().or(""));
}

4
libsignal/service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java
View File

@@ -27,6 +27,10 @@ public final class UuidUtil {
return isUuid(uuid) ? parseOrThrow(uuid) : null;
}
public static UUID parseOrUnknown(String uuid) {
return uuid == null || uuid.isEmpty() ? UNKNOWN_UUID : parseOrThrow(uuid);
}
public static UUID parseOrThrow(String uuid) {
return UUID.fromString(uuid);
}

8
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
View File

@@ -560,10 +560,6 @@ public class PushServiceSocket {
String path = String.format(PREKEY_DEVICE_PATH, destination.getIdentifier(), deviceId);
if (destination.getRelay().isPresent()) {
path = path + "?relay=" + destination.getRelay().get();
}
String responseText = makeServiceRequest(path, "GET", null, NO_HEADERS, unidentifiedAccess);
PreKeyResponse response = JsonUtil.fromJson(responseText, PreKeyResponse.class);
List<PreKeyBundle> bundles = new LinkedList<>();
@@ -601,10 +597,6 @@ public class PushServiceSocket {
try {
String path = String.format(PREKEY_DEVICE_PATH, destination.getIdentifier(), String.valueOf(deviceId));
if (destination.getRelay().isPresent()) {
path = path + "?relay=" + destination.getRelay().get();
}
String responseText = makeServiceRequest(path, "GET", null);
PreKeyResponse response = JsonUtil.fromJson(responseText, PreKeyResponse.class);

18
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/serialize/SignalServiceAddressProtobufSerializer.java
View File

@@ -16,22 +16,20 @@ public final class SignalServiceAddressProtobufSerializer {
public static AddressProto toProtobuf(SignalServiceAddress signalServiceAddress) {
AddressProto.Builder builder = AddressProto.newBuilder();
builder.setUuid(ByteString.copyFrom(UuidUtil.toByteArray(signalServiceAddress.getUuid())));
if(signalServiceAddress.getNumber().isPresent()){
builder.setE164(signalServiceAddress.getNumber().get());
}
if(signalServiceAddress.getUuid().isPresent()){
builder.setUuid(ByteString.copyFrom(UuidUtil.toByteArray(signalServiceAddress.getUuid().get())));
}
if(signalServiceAddress.getRelay().isPresent()){
builder.setRelay(signalServiceAddress.getRelay().get());
}
return builder.build();
}
public static SignalServiceAddress fromProtobuf(AddressProto addressProto) {
Optional<UUID> uuid = addressProto.hasUuid() ? Optional.of(UuidUtil.parseOrThrow(addressProto.getUuid().toByteArray())) : Optional.<UUID>absent();
Optional<String> number = addressProto.hasE164() ? Optional.of(addressProto.getE164() ) : Optional.<String>absent();
Optional<String> relay = addressProto.hasRelay() ? Optional.of(addressProto.getRelay() ) : Optional.<String>absent();
return new SignalServiceAddress(uuid, number, relay);
UUID uuid = UuidUtil.parseOrThrow(addressProto.getUuid().toByteArray());
Optional<String> number = addressProto.hasE164() ? Optional.of(addressProto.getE164()) : Optional.absent();
return new SignalServiceAddress(uuid, number);
}
}

1
libsignal/service/src/main/proto/InternalSerialization.proto
View File

@@ -48,5 +48,4 @@ message MetadataProto {
message AddressProto {
optional bytes uuid = 1;
optional string e164 = 2;
optional string relay = 3;
}

22
libsignal/service/src/test/java/org/whispersystems/signalservice/internal/serialize/SignalServiceAddressProtobufSerializerTest.java
View File

@@ -13,16 +13,7 @@ public final class SignalServiceAddressProtobufSerializerTest {
@Test
public void serialize_and_deserialize_uuid_address() {
SignalServiceAddress address = new SignalServiceAddress(Optional.fromNullable(UUID.randomUUID()), Optional.<String>absent(), Optional.<String>absent());
AddressProto addressProto = org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer.toProtobuf(address);
SignalServiceAddress deserialized = org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer.fromProtobuf(addressProto);
assertEquals(address, deserialized);
}
@Test
public void serialize_and_deserialize_e164_address() {
SignalServiceAddress address = new SignalServiceAddress(Optional.<UUID>absent(), Optional.of("+15552345678"), Optional.<String>absent());
SignalServiceAddress address = new SignalServiceAddress(UUID.randomUUID(), Optional.absent());
AddressProto addressProto = org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer.toProtobuf(address);
SignalServiceAddress deserialized = org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer.fromProtobuf(addressProto);
@@ -31,19 +22,10 @@ public final class SignalServiceAddressProtobufSerializerTest {
@Test
public void serialize_and_deserialize_both_address() {
SignalServiceAddress address = new SignalServiceAddress(Optional.fromNullable(UUID.randomUUID()), Optional.of("+15552345678"), Optional.<String>absent());
SignalServiceAddress address = new SignalServiceAddress(UUID.randomUUID(), Optional.of("+15552345678"));
AddressProto addressProto = org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer.toProtobuf(address);
SignalServiceAddress deserialized = org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer.fromProtobuf(addressProto);
assertEquals(address, deserialized);
}
@Test
public void serialize_and_deserialize_both_address_with_relay() {
SignalServiceAddress address = new SignalServiceAddress(Optional.fromNullable(UUID.randomUUID()), Optional.of("+15552345678"), Optional.of("relay"));
AddressProto addressProto = org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer.toProtobuf(address);
SignalServiceAddress deserialized = SignalServiceAddressProtobufSerializer.fromProtobuf(addressProto);
assertEquals(address, deserialized);
}
}