import org.asamk.signal.storage.protocol.JsonSignalProtocolStore;
import org.asamk.signal.storage.threads.JsonThreadStore;
import org.asamk.signal.storage.threads.ThreadInfo;
+import org.asamk.signal.util.KeyUtils;
import org.asamk.signal.util.Util;
+import org.signal.libsignal.metadata.*;
+import org.signal.libsignal.metadata.certificate.CertificateValidator;
import org.whispersystems.libsignal.*;
import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
import org.whispersystems.signalservice.api.SignalServiceMessageSender;
import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
+import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
+import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.*;
import org.whispersystems.signalservice.api.messages.multidevice.*;
import org.whispersystems.signalservice.api.push.ContactTokenDetails;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.TrustStore;
-import org.whispersystems.signalservice.api.push.exceptions.*;
+import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
+import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.signalservice.api.util.InvalidNumberException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.api.util.SleepTimer;
+import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
+import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
-import org.whispersystems.signalservice.internal.push.SignalServiceUrl;
import org.whispersystems.signalservice.internal.util.Base64;
import java.io.*;
class Manager implements Signal {
private final static String URL = "https://textsecure-service.whispersystems.org";
+ private final static String CDN_URL = "https://cdn.signal.org";
private final static TrustStore TRUST_STORE = new WhisperTrustStore();
- private final static SignalServiceUrl[] serviceUrls = new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)};
+ private final static SignalServiceConfiguration serviceConfiguration = new SignalServiceConfiguration(
+ new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)},
+ new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
+ new SignalContactDiscoveryUrl[0]
+ );
+ private final static String UNIDENTIFIED_SENDER_TRUST_ROOT = "BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF";
public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle();
public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion();
private final ObjectMapper jsonProcessor = new ObjectMapper();
private String username;
private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
+ private boolean isMultiDevice = false;
private String password;
+ private String registrationLockPin;
private String signalingKey;
+ private byte[] profileKey;
private int preKeyIdOffset;
private int nextSignedPreKeyId;
private JsonContactsStore contactStore;
private JsonThreadStore threadStore;
private SignalServiceMessagePipe messagePipe = null;
+ private SignalServiceMessagePipe unidentifiedMessagePipe = null;
+
+ private SleepTimer timer = new UptimeSleepTimer();
public Manager(String username, String settingsPath) {
this.username = username;
migrateLegacyConfigs();
- accountManager = new SignalServiceAccountManager(serviceUrls, username, password, deviceId, USER_AGENT);
+ accountManager = new SignalServiceAccountManager(serviceConfiguration, username, password, deviceId, USER_AGENT, timer);
try {
if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
refreshPreKeys();
}
username = getNotNullNode(rootNode, "username").asText();
password = getNotNullNode(rootNode, "password").asText();
+ JsonNode pinNode = rootNode.get("registrationLockPin");
+ registrationLockPin = pinNode == null ? null : pinNode.asText();
if (rootNode.has("signalingKey")) {
signalingKey = getNotNullNode(rootNode, "signalingKey").asText();
}
} else {
nextSignedPreKeyId = 0;
}
+ if (rootNode.has("profileKey")) {
+ profileKey = Base64.decode(getNotNullNode(rootNode, "profileKey").asText());
+ } else {
+ // Old config file, creating new profile key
+ profileKey = KeyUtils.createProfileKey();
+ }
+
signalProtocolStore = jsonProcessor.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);
registered = getNotNullNode(rootNode, "registered").asBoolean();
JsonNode groupStoreNode = rootNode.get("groupStore");
rootNode.put("username", username)
.put("deviceId", deviceId)
.put("password", password)
+ .put("registrationLockPin", registrationLockPin)
.put("signalingKey", signalingKey)
.put("preKeyIdOffset", preKeyIdOffset)
.put("nextSignedPreKeyId", nextSignedPreKeyId)
}
public void register(boolean voiceVerification) throws IOException {
- password = Util.getSecret(18);
+ password = KeyUtils.createPassword();
- accountManager = new SignalServiceAccountManager(serviceUrls, username, password, USER_AGENT);
+ accountManager = new SignalServiceAccountManager(serviceConfiguration, username, password, USER_AGENT, timer);
if (voiceVerification)
accountManager.requestVoiceVerificationCode();
}
public void updateAccountAttributes() throws IOException {
- accountManager.setAccountAttributes(signalingKey, signalProtocolStore.getLocalRegistrationId(), false, false, true);
+ accountManager.setAccountAttributes(signalingKey, signalProtocolStore.getLocalRegistrationId(), true, registrationLockPin, getSelfUnidentifiedAccessKey(), false);
}
public void unregister() throws IOException {
}
public URI getDeviceLinkUri() throws TimeoutException, IOException {
- password = Util.getSecret(18);
+ password = KeyUtils.createPassword();
- accountManager = new SignalServiceAccountManager(serviceUrls, username, password, USER_AGENT);
+ accountManager = new SignalServiceAccountManager(serviceConfiguration, username, password, USER_AGENT, timer);
String uuid = accountManager.getNewDeviceUuid();
registered = false;
}
public void finishDeviceLink(String deviceName) throws IOException, InvalidKeyException, TimeoutException, UserAlreadyExists {
- signalingKey = Util.getSecret(52);
+ signalingKey = KeyUtils.createSignalingKey();
SignalServiceAccountManager.NewDeviceRegistrationReturn ret = accountManager.finishNewDeviceRegistration(signalProtocolStore.getIdentityKeyPair(), signalingKey, false, true, signalProtocolStore.getLocalRegistrationId(), deviceName);
deviceId = ret.getDeviceId();
username = ret.getNumber();
signalProtocolStore = new JsonSignalProtocolStore(ret.getIdentity(), signalProtocolStore.getLocalRegistrationId());
registered = true;
+ isMultiDevice = true;
refreshPreKeys();
requestSyncGroups();
}
public List<DeviceInfo> getLinkedDevices() throws IOException {
- return accountManager.getDevices();
+ List<DeviceInfo> devices = accountManager.getDevices();
+ isMultiDevice = devices.size() > 1;
+ return devices;
}
public void removeLinkedDevices(int deviceId) throws IOException {
Map<String, String> map = new HashMap<>();
for (String param : params) {
String name = null;
+ final String[] paramParts = param.split("=");
try {
- name = URLDecoder.decode(param.split("=")[0], "utf-8");
+ name = URLDecoder.decode(paramParts[0], "utf-8");
} catch (UnsupportedEncodingException e) {
// Impossible
}
String value = null;
try {
- value = URLDecoder.decode(param.split("=")[1], "utf-8");
+ value = URLDecoder.decode(paramParts[1], "utf-8");
} catch (UnsupportedEncodingException e) {
// Impossible
}
IdentityKeyPair identityKeyPair = signalProtocolStore.getIdentityKeyPair();
String verificationCode = accountManager.getNewDeviceVerificationCode();
- accountManager.addDevice(deviceIdentifier, deviceKey, identityKeyPair, verificationCode);
+ accountManager.addDevice(deviceIdentifier, deviceKey, identityKeyPair, Optional.of(profileKey), verificationCode);
+ isMultiDevice = true;
}
private List<PreKeyRecord> generatePreKeys() {
return records;
}
- private PreKeyRecord getOrGenerateLastResortPreKey() {
- if (signalProtocolStore.containsPreKey(Medium.MAX_VALUE)) {
- try {
- return signalProtocolStore.loadPreKey(Medium.MAX_VALUE);
- } catch (InvalidKeyIdException e) {
- signalProtocolStore.removePreKey(Medium.MAX_VALUE);
- }
- }
-
- ECKeyPair keyPair = Curve.generateKeyPair();
- PreKeyRecord record = new PreKeyRecord(Medium.MAX_VALUE, keyPair);
-
- signalProtocolStore.storePreKey(Medium.MAX_VALUE, record);
- save();
-
- return record;
- }
-
private SignedPreKeyRecord generateSignedPreKey(IdentityKeyPair identityKeyPair) {
try {
ECKeyPair keyPair = Curve.generateKeyPair();
}
}
- public void verifyAccount(String verificationCode) throws IOException {
+ public void verifyAccount(String verificationCode, String pin) throws IOException {
verificationCode = verificationCode.replace("-", "");
- signalingKey = Util.getSecret(52);
- accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), false, false, true);
+ signalingKey = KeyUtils.createSignalingKey();
+ accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), true, pin, getSelfUnidentifiedAccessKey(), false);
//accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
registered = true;
+ registrationLockPin = pin;
refreshPreKeys();
save();
}
+ public void setRegistrationLockPin(Optional<String> pin) throws IOException {
+ accountManager.setPin(pin);
+ if (pin.isPresent()) {
+ registrationLockPin = pin.get();
+ } else {
+ registrationLockPin = null;
+ }
+ }
+
private void refreshPreKeys() throws IOException {
List<PreKeyRecord> oneTimePreKeys = generatePreKeys();
- PreKeyRecord lastResortKey = getOrGenerateLastResortPreKey();
SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(signalProtocolStore.getIdentityKeyPair());
- accountManager.setPreKeys(signalProtocolStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);
+ accountManager.setPreKeys(signalProtocolStore.getIdentityKeyPair().getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
}
if (mime == null) {
mime = "application/octet-stream";
}
- // TODO mabybe add a parameter to set the voiceNote and preview option
- return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), false, Optional.<byte[]>absent(), null);
+ // TODO mabybe add a parameter to set the voiceNote, preview, width, height and caption option
+ Optional<byte[]> preview = Optional.absent();
+ Optional<String> caption = Optional.absent();
+ return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), false, preview, 0, 0, caption, null);
}
private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {
// Don't send group message to ourself
final List<String> membersSend = new ArrayList<>(g.members);
membersSend.remove(this.username);
- sendMessage(messageBuilder, membersSend);
+ sendMessageLegacy(messageBuilder, membersSend);
}
public void sendQuitGroupMessage(byte[] groupId) throws GroupNotFoundException, IOException, EncapsulatedExceptions {
g.members.remove(this.username);
groupStore.updateGroup(g);
- sendMessage(messageBuilder, g.members);
+ sendMessageLegacy(messageBuilder, g.members);
}
private static String join(CharSequence separator, Iterable<? extends CharSequence> list) {
GroupInfo g;
if (groupId == null) {
// Create new group
- g = new GroupInfo(Util.getSecretBytes(16));
+ g = new GroupInfo(KeyUtils.createGroupId());
g.members.add(username);
} else {
g = getGroupForSending(groupId);
// Don't send group message to ourself
final List<String> membersSend = new ArrayList<>(g.members);
membersSend.remove(this.username);
- sendMessage(messageBuilder, membersSend);
+ sendMessageLegacy(messageBuilder, membersSend);
return g.groupId;
}
// Send group message only to the recipient who requested it
final List<String> membersSend = new ArrayList<>();
membersSend.add(recipient);
- sendMessage(messageBuilder, membersSend);
+ sendMessageLegacy(messageBuilder, membersSend);
}
private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfo g) {
// Send group info request message to the recipient who sent us a message with this groupId
final List<String> membersSend = new ArrayList<>();
membersSend.add(recipient);
- sendMessage(messageBuilder, membersSend);
+ sendMessageLegacy(messageBuilder, membersSend);
}
@Override
if (attachments != null) {
messageBuilder.withAttachments(getSignalServiceAttachments(attachments));
}
- sendMessage(messageBuilder, recipients);
+ sendMessageLegacy(messageBuilder, recipients);
}
@Override
SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
.asEndSessionMessage();
- sendMessage(messageBuilder, recipients);
+ sendMessageLegacy(messageBuilder, recipients);
}
@Override
save();
}
+ @Override
+ public List<byte[]> getGroupIds() {
+ List<GroupInfo> groups = getGroups();
+ List<byte[]> ids = new ArrayList<byte[]>(groups.size());
+ for (GroupInfo group : groups) {
+ ids.add(group.groupId);
+ }
+ return ids;
+ }
+
@Override
public String getGroupName(byte[] groupId) {
GroupInfo group = getGroup(groupId);
}
}
+ private byte[] getSelfUnidentifiedAccessKey() {
+ return UnidentifiedAccess.deriveAccessKeyFrom(profileKey);
+ }
+
+ private static byte[] getTargetUnidentifiedAccessKey(SignalServiceAddress recipient) {
+ // TODO implement
+ return null;
+ }
+
+ public Optional<UnidentifiedAccessPair> getAccessForSync() {
+ // TODO implement
+ return Optional.absent();
+ }
+
+ public List<Optional<UnidentifiedAccessPair>> getAccessFor(Collection<SignalServiceAddress> recipients) {
+ List<Optional<UnidentifiedAccessPair>> result = new ArrayList<>(recipients.size());
+ for (SignalServiceAddress recipient : recipients) {
+ result.add(Optional.<UnidentifiedAccessPair>absent());
+ }
+ return result;
+ }
+
+ public Optional<UnidentifiedAccessPair> getAccessFor(SignalServiceAddress recipient) {
+ // TODO implement
+ return Optional.absent();
+ }
+
private void sendSyncMessage(SignalServiceSyncMessage message)
throws IOException, UntrustedIdentityException {
- SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,
- deviceId, signalProtocolStore, USER_AGENT, Optional.fromNullable(messagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
+ SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceConfiguration, username, password,
+ deviceId, signalProtocolStore, USER_AGENT, isMultiDevice, Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
try {
- messageSender.sendMessage(message);
+ messageSender.sendMessage(message, getAccessForSync());
} catch (UntrustedIdentityException e) {
signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
throw e;
}
}
- private void sendMessage(SignalServiceDataMessage.Builder messageBuilder, Collection<String> recipients)
+ /**
+ * This method throws an EncapsulatedExceptions exception instead of returning a list of SendMessageResult.
+ */
+ private void sendMessageLegacy(SignalServiceDataMessage.Builder messageBuilder, Collection<String> recipients)
throws EncapsulatedExceptions, IOException {
+ List<SendMessageResult> results = sendMessage(messageBuilder, recipients);
+
+ List<UntrustedIdentityException> untrustedIdentities = new LinkedList<>();
+ List<UnregisteredUserException> unregisteredUsers = new LinkedList<>();
+ List<NetworkFailureException> networkExceptions = new LinkedList<>();
+
+ for (SendMessageResult result : results) {
+ if (result.isUnregisteredFailure()) {
+ unregisteredUsers.add(new UnregisteredUserException(result.getAddress().getNumber(), null));
+ } else if (result.isNetworkFailure()) {
+ networkExceptions.add(new NetworkFailureException(result.getAddress().getNumber(), null));
+ } else if (result.getIdentityFailure() != null) {
+ untrustedIdentities.add(new UntrustedIdentityException("Untrusted", result.getAddress().getNumber(), result.getIdentityFailure().getIdentityKey()));
+ }
+ }
+ if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty() || !networkExceptions.isEmpty()) {
+ throw new EncapsulatedExceptions(untrustedIdentities, unregisteredUsers, networkExceptions);
+ }
+ }
+
+ private List<SendMessageResult> sendMessage(SignalServiceDataMessage.Builder messageBuilder, Collection<String> recipients)
+ throws IOException {
Set<SignalServiceAddress> recipientsTS = getSignalServiceAddresses(recipients);
- if (recipientsTS == null) return;
+ if (recipientsTS == null) return Collections.emptyList();
SignalServiceDataMessage message = null;
try {
- SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,
- deviceId, signalProtocolStore, USER_AGENT, Optional.fromNullable(messagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
+ SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceConfiguration, username, password,
+ deviceId, signalProtocolStore, USER_AGENT, isMultiDevice, Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
message = messageBuilder.build();
if (message.getGroupInfo().isPresent()) {
try {
- messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
- } catch (EncapsulatedExceptions encapsulatedExceptions) {
- for (UntrustedIdentityException e : encapsulatedExceptions.getUntrustedIdentityExceptions()) {
- signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+ List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipientsTS), getAccessFor(recipientsTS), message);
+ for (SendMessageResult r : result) {
+ if (r.getIdentityFailure() != null) {
+ signalProtocolStore.saveIdentity(r.getAddress().getNumber(), r.getIdentityFailure().getIdentityKey(), TrustLevel.UNTRUSTED);
+ }
}
+ return result;
+ } catch (UntrustedIdentityException e) {
+ signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+ return Collections.emptyList();
}
} else {
// Send to all individually, so sync messages are sent correctly
- List<UntrustedIdentityException> untrustedIdentities = new LinkedList<>();
- List<UnregisteredUserException> unregisteredUsers = new LinkedList<>();
- List<NetworkFailureException> networkExceptions = new LinkedList<>();
+ List<SendMessageResult> results = new ArrayList<>(recipientsTS.size());
for (SignalServiceAddress address : recipientsTS) {
ThreadInfo thread = threadStore.getThread(address.getNumber());
if (thread != null) {
}
message = messageBuilder.build();
try {
- messageSender.sendMessage(address, message);
+ SendMessageResult result = messageSender.sendMessage(address, getAccessFor(address), message);
+ results.add(result);
} catch (UntrustedIdentityException e) {
signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
- untrustedIdentities.add(e);
- } catch (UnregisteredUserException e) {
- unregisteredUsers.add(e);
- } catch (PushNetworkException e) {
- networkExceptions.add(new NetworkFailureException(address.getNumber(), e));
+ results.add(SendMessageResult.identityFailure(address, e.getIdentityKey()));
}
}
- if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty() || !networkExceptions.isEmpty()) {
- throw new EncapsulatedExceptions(untrustedIdentities, unregisteredUsers, networkExceptions);
- }
+ return results;
}
} finally {
if (message != null && message.isEndSession()) {
return recipientsTS;
}
- private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws NoSessionException, LegacyMessageException, InvalidVersionException, InvalidMessageException, DuplicateMessageException, InvalidKeyException, InvalidKeyIdException, org.whispersystems.libsignal.UntrustedIdentityException {
- SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore);
+ public static CertificateValidator getCertificateValidator() {
+ try {
+ ECPublicKey unidentifiedSenderTrustRoot = Curve.decodePoint(Base64.decode(UNIDENTIFIED_SENDER_TRUST_ROOT), 0);
+ return new CertificateValidator(unidentifiedSenderTrustRoot);
+ } catch (InvalidKeyException | IOException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws org.whispersystems.libsignal.UntrustedIdentityException, InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, ProtocolUntrustedIdentityException, SelfSendException {
+ SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore, getCertificateValidator());
try {
return cipher.decrypt(envelope);
- } catch (org.whispersystems.libsignal.UntrustedIdentityException e) {
- signalProtocolStore.saveIdentity(e.getName(), e.getUntrustedIdentity(), TrustLevel.UNTRUSTED);
+ } catch (ProtocolUntrustedIdentityException e) {
+ // TODO We don't get the new untrusted identity from ProtocolUntrustedIdentityException anymore ... we need to get it from somewhere else
+// signalProtocolStore.saveIdentity(e.getSender(), e.getUntrustedIdentity(), TrustLevel.UNTRUSTED);
throw e;
}
}
}
}
}
+ if (message.getProfileKey().isPresent() && message.getProfileKey().get().length == 32) {
+ ContactInfo contact = contactStore.getContact(source);
+ if (contact == null) {
+ contact = new ContactInfo();
+ contact.number = source;
+ }
+ contact.profileKey = Base64.encodeBytes(message.getProfileKey().get());
+ }
}
public void retryFailedReceivedMessages(ReceiveMessageHandler handler, boolean ignoreAttachments) {
System.err.println("Failed to delete cached message file “" + fileEntry + "”: " + e.getMessage());
}
}
+ // Try to delete directory if empty
+ dir.delete();
}
}
public void receiveMessages(long timeout, TimeUnit unit, boolean returnOnTimeout, boolean ignoreAttachments, ReceiveMessageHandler handler) throws IOException {
retryFailedReceivedMessages(handler, ignoreAttachments);
- final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
+ final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration, username, password, deviceId, signalingKey, USER_AGENT, null, timer);
try {
if (messagePipe == null) {
try {
cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
Files.delete(cacheFile.toPath());
+ // Try to delete directory if empty
+ new File(getMessageCachePath()).delete();
} catch (IOException e) {
System.err.println("Failed to delete cached message file “" + cacheFile + "”: " + e.getMessage());
}
handleSignalServiceDataMessage(message, false, envelope.getSource(), username, ignoreAttachments);
}
if (content.getSyncMessage().isPresent()) {
+ isMultiDevice = true;
SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
if (syncMessage.getSent().isPresent()) {
SignalServiceDataMessage message = syncMessage.getSent().get().getMessage();
if (rm.isContactsRequest()) {
try {
sendContacts();
- sendVerifiedMessage();
} catch (UntrustedIdentityException | IOException e) {
e.printStackTrace();
}
}
syncGroup.members.addAll(g.getMembers());
syncGroup.active = g.isActive();
+ if (g.getColor().isPresent()) {
+ syncGroup.color = g.getColor().get();
+ }
if (g.getAvatar().isPresent()) {
retrieveGroupAvatarAttachment(g.getAvatar().get(), syncGroup.groupId);
if (c.getColor().isPresent()) {
contact.color = c.getColor().get();
}
+ if (c.getProfileKey().isPresent()) {
+ contact.profileKey = Base64.encodeBytes(c.getProfileKey().get());
+ }
+ if (c.getVerified().isPresent()) {
+ final VerifiedMessage verifiedMessage = c.getVerified().get();
+ signalProtocolStore.saveIdentity(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
+ }
+ if (c.getExpirationTimer().isPresent()) {
+ ThreadInfo thread = threadStore.getThread(c.getNumber());
+ thread.messageExpirationTime = c.getExpirationTimer().get();
+ threadStore.updateThread(thread);
+ }
+ if (c.isBlocked()) {
+ // TODO store list of blocked numbers
+ }
contactStore.updateContact(contact);
if (c.getAvatar().isPresent()) {
}
}
if (syncMessage.getVerified().isPresent()) {
- final List<VerifiedMessage> verifiedList = syncMessage.getVerified().get();
- for (VerifiedMessage v : verifiedList) {
- signalProtocolStore.saveIdentity(v.getDestination(), v.getIdentityKey(), TrustLevel.fromVerifiedState(v.getVerified()));
- }
+ final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
+ signalProtocolStore.saveIdentity(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
}
}
}
try (FileInputStream f = new FileInputStream(file)) {
DataInputStream in = new DataInputStream(f);
int version = in.readInt();
- if (version != 1) {
+ if (version > 2) {
return null;
}
int type = in.readInt();
String source = in.readUTF();
int sourceDevice = in.readInt();
- String relay = in.readUTF();
+ if (version == 1) {
+ // read legacy relay field
+ in.readUTF();
+ }
long timestamp = in.readLong();
byte[] content = null;
int contentLen = in.readInt();
legacyMessage = new byte[legacyMessageLen];
in.readFully(legacyMessage);
}
- return new SignalServiceEnvelope(type, source, sourceDevice, relay, timestamp, legacyMessage, content);
+ long serverTimestamp = 0;
+ String uuid = null;
+ if (version == 2) {
+ serverTimestamp = in.readLong();
+ uuid = in.readUTF();
+ if ("".equals(uuid)) {
+ uuid = null;
+ }
+ }
+ return new SignalServiceEnvelope(type, source, sourceDevice, timestamp, legacyMessage, content, serverTimestamp, uuid);
}
}
private void storeEnvelope(SignalServiceEnvelope envelope, File file) throws IOException {
try (FileOutputStream f = new FileOutputStream(file)) {
try (DataOutputStream out = new DataOutputStream(f)) {
- out.writeInt(1); // version
+ out.writeInt(2); // version
out.writeInt(envelope.getType());
out.writeUTF(envelope.getSource());
out.writeInt(envelope.getSourceDevice());
- out.writeUTF(envelope.getRelay());
out.writeLong(envelope.getTimestamp());
if (envelope.hasContent()) {
out.writeInt(envelope.getContent().length);
} else {
out.writeInt(0);
}
+ out.writeLong(envelope.getServerTimestamp());
+ String uuid = envelope.getUuid();
+ out.writeUTF(uuid == null ? "" : uuid);
}
}
}
}
}
- final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
+ final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration, username, password, deviceId, signalingKey, USER_AGENT, null, timer);
File tmpFile = Util.createTempFile();
try (InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile, MAX_ATTACHMENT_SIZE)) {
}
private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer, File tmpFile) throws IOException, InvalidMessageException {
- final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
+ final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration, username, password, deviceId, signalingKey, USER_AGENT, null, timer);
return messageReceiver.retrieveAttachment(pointer, tmpFile, MAX_ATTACHMENT_SIZE);
}
try (OutputStream fos = new FileOutputStream(groupsFile)) {
DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);
for (GroupInfo record : groupStore.getGroups()) {
+ ThreadInfo info = threadStore.getThread(Base64.encodeBytes(record.groupId));
out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId),
- record.active));
+ record.active, Optional.fromNullable(info != null ? info.messageExpirationTime : null),
+ Optional.fromNullable(record.color), false));
}
}
try (OutputStream fos = new FileOutputStream(contactsFile)) {
DeviceContactsOutputStream out = new DeviceContactsOutputStream(fos);
for (ContactInfo record : contactStore.getContacts()) {
+ VerifiedMessage verifiedMessage = null;
+ ThreadInfo info = threadStore.getThread(record.number);
+ if (getIdentities().containsKey(record.number)) {
+ JsonIdentityKeyStore.Identity currentIdentity = null;
+ for (JsonIdentityKeyStore.Identity id : getIdentities().get(record.number)) {
+ if (currentIdentity == null || id.getDateAdded().after(currentIdentity.getDateAdded())) {
+ currentIdentity = id;
+ }
+ }
+ if (currentIdentity != null) {
+ verifiedMessage = new VerifiedMessage(record.number, currentIdentity.getIdentityKey(), currentIdentity.getTrustLevel().toVerifiedState(), currentIdentity.getDateAdded().getTime());
+ }
+ }
+
+ byte[] profileKey = record.profileKey == null ? null : Base64.decode(record.profileKey);
+ // TODO store list of blocked numbers
+ boolean blocked = false;
out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
- createContactAvatarAttachment(record.number), Optional.fromNullable(record.color)));
+ createContactAvatarAttachment(record.number), Optional.fromNullable(record.color),
+ Optional.fromNullable(verifiedMessage), Optional.fromNullable(profileKey), blocked, Optional.fromNullable(info != null ? info.messageExpirationTime : null)));
}
}
}
}
- private void sendVerifiedMessage() throws IOException, UntrustedIdentityException {
- List<VerifiedMessage> verifiedMessages = new LinkedList<>();
- for (Map.Entry<String, List<JsonIdentityKeyStore.Identity>> x : getIdentities().entrySet()) {
- final String name = x.getKey();
- for (JsonIdentityKeyStore.Identity id : x.getValue()) {
- if (id.getTrustLevel() == TrustLevel.TRUSTED_UNVERIFIED) {
- continue;
- }
- VerifiedMessage verifiedMessage = new VerifiedMessage(name, id.getIdentityKey(), id.getTrustLevel().toVerifiedState());
- verifiedMessages.add(verifiedMessage);
- }
- }
- sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessages));
- }
-
private void sendVerifiedMessage(String destination, IdentityKey identityKey, TrustLevel trustLevel) throws IOException, UntrustedIdentityException {
- VerifiedMessage verifiedMessage = new VerifiedMessage(destination, identityKey, trustLevel.toVerifiedState());
+ VerifiedMessage verifiedMessage = new VerifiedMessage(destination, identityKey, trustLevel.toVerifiedState(), System.currentTimeMillis());
sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
}
git.nmode.ca / signal-cli / blobdiff
