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

Store untrusted identities in identityKeyStore

Browse source
This commit is contained in:
AsamK 2016-07-08 11:32:41 +02:00
parent 55d485de88
commit bfb51e414b
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
View file

@ -68,6 +68,10 @@ class JsonSignalProtocolStore implements SignalProtocolStore {
identityKeyStore.saveIdentity(name, identityKey); identityKeyStore.saveIdentity(name, identityKey);
} }
public void saveIdentity(String name, IdentityKey identityKey, TrustLevel trustLevel) {
identityKeyStore.saveIdentity(name, identityKey, trustLevel, null);
}
@Override @Override
public boolean isTrustedIdentity(String name, IdentityKey identityKey) { public boolean isTrustedIdentity(String name, IdentityKey identityKey) {
return identityKeyStore.isTrustedIdentity(name, identityKey); return identityKeyStore.isTrustedIdentity(name, identityKey);

23
src/main/java/org/asamk/signal/Manager.java
View file

@ -32,7 +32,6 @@ import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair; import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPublicKey; import org.whispersystems.libsignal.ecc.ECPublicKey;
import org.whispersystems.libsignal.state.PreKeyRecord; import org.whispersystems.libsignal.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SignalProtocolStore;
import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.util.KeyHelper; import org.whispersystems.libsignal.util.KeyHelper;
import org.whispersystems.libsignal.util.Medium; import org.whispersystems.libsignal.util.Medium;
@ -96,7 +95,7 @@ class Manager implements Signal {
private boolean registered = false; private boolean registered = false;
private SignalProtocolStore signalProtocolStore; private JsonSignalProtocolStore signalProtocolStore;
private SignalServiceAccountManager accountManager; private SignalServiceAccountManager accountManager;
private JsonGroupStore groupStore; private JsonGroupStore groupStore;
private JsonContactsStore contactStore; private JsonContactsStore contactStore;
@ -648,7 +647,12 @@ class Manager implements Signal {
throws IOException, UntrustedIdentityException { throws IOException, UntrustedIdentityException {
SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password, SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent()); deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
messageSender.sendMessage(message); try {
messageSender.sendMessage(message);
} catch (UntrustedIdentityException e) {
signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
throw e;
}
} }
private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients) private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients)
@ -670,7 +674,13 @@ class Manager implements Signal {
deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent()); deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
if (message.getGroupInfo().isPresent()) { if (message.getGroupInfo().isPresent()) {
messageSender.sendMessage(new ArrayList<>(recipientsTS), message); try {
messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
} catch (EncapsulatedExceptions encapsulatedExceptions) {
for (UntrustedIdentityException e : encapsulatedExceptions.getUntrustedIdentityExceptions()) {
signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
}
}
} else { } else {
// Send to all individually, so sync messages are sent correctly // Send to all individually, so sync messages are sent correctly
List<UntrustedIdentityException> untrustedIdentities = new LinkedList<>(); List<UntrustedIdentityException> untrustedIdentities = new LinkedList<>();
@ -680,6 +690,7 @@ class Manager implements Signal {
try { try {
messageSender.sendMessage(address, message); messageSender.sendMessage(address, message);
} catch (UntrustedIdentityException e) { } catch (UntrustedIdentityException e) {
signalProtocolStore.saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
untrustedIdentities.add(e); untrustedIdentities.add(e);
} catch (UnregisteredUserException e) { } catch (UnregisteredUserException e) {
unregisteredUsers.add(e); unregisteredUsers.add(e);
@ -705,6 +716,10 @@ class Manager implements Signal {
SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore); SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), signalProtocolStore);
try { try {
return cipher.decrypt(envelope); return cipher.decrypt(envelope);
} catch (org.whispersystems.libsignal.UntrustedIdentityException e) {
// TODO temporarily store message, until user has accepted the key
signalProtocolStore.saveIdentity(e.getName(), e.getUntrustedIdentity(), TrustLevel.UNTRUSTED);
throw e;
} catch (Exception e) { } catch (Exception e) {
throw e; throw e;
} }