eliott/libsignal
1
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2026-05-09 00:22:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move the burden of SessionCipher locking to the client.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-02-17 16:35:26 -05:00
committed by Jack Lloyd
parent 2a90deeac7
commit a1468f7371
2 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/java/src/main/java/org/whispersystems/libsignal/SessionBuilder.java
View File

@@ -30,6 +30,8 @@ import org.whispersystems.libsignal.state.SignedPreKeyStore;
* Sessions are constructed per recipientId + deviceId tuple. Remote logical users are identified
* by their recipientId, and each logical recipientId can have multiple physical devices.
*
* This class is not thread-safe.
*
* @author Moxie Marlinspike
*/
public class SessionBuilder {
@@ -83,12 +85,9 @@ public class SessionBuilder {
* trusted.
*/
public void process(PreKeyBundle preKey) throws InvalidKeyException, UntrustedIdentityException {
synchronized (SessionCipher.SESSION_LOCK) {
Native.SessionBuilder_ProcessPreKeyBundle(preKey.nativeHandle(),
remoteAddress.nativeHandle(),
sessionStore,
identityKeyStore);
}
Native.SessionBuilder_ProcessPreKeyBundle(preKey.nativeHandle(),
remoteAddress.nativeHandle(),
sessionStore,
identityKeyStore);
}
}

57
java/java/src/main/java/org/whispersystems/libsignal/SessionCipher.java
View File

@@ -28,10 +28,11 @@ import java.security.NoSuchAlgorithmException;
* this class can be used for all encrypt/decrypt operations within
* that session.
*
* This class is not thread-safe.
*
* @author Moxie Marlinspike
*/
public class SessionCipher {
public static final Object SESSION_LOCK = new Object();
private final SessionStore sessionStore;
private final IdentityKeyStore identityKeyStore;
@@ -69,12 +70,10 @@ public class SessionCipher {
* @return A ciphertext message encrypted to the recipient+device tuple.
*/
public CiphertextMessage encrypt(byte[] paddedMessage) throws UntrustedIdentityException {
synchronized (SESSION_LOCK) {
return Native.SessionCipher_EncryptMessage(paddedMessage,
this.remoteAddress.nativeHandle(),
sessionStore,
identityKeyStore);
}
return Native.SessionCipher_EncryptMessage(paddedMessage,
this.remoteAddress.nativeHandle(),
sessionStore,
identityKeyStore);
}
/**
@@ -96,14 +95,12 @@ public class SessionCipher {
throws DuplicateMessageException, LegacyMessageException, InvalidMessageException,
InvalidKeyIdException, InvalidKeyException, UntrustedIdentityException
{
synchronized (SESSION_LOCK) {
return Native.SessionCipher_DecryptPreKeySignalMessage(ciphertext.nativeHandle(),
remoteAddress.nativeHandle(),
sessionStore,
identityKeyStore,
preKeyStore,
signedPreKeyStore);
}
return Native.SessionCipher_DecryptPreKeySignalMessage(ciphertext.nativeHandle(),
remoteAddress.nativeHandle(),
sessionStore,
identityKeyStore,
preKeyStore,
signedPreKeyStore);
}
/**
@@ -122,29 +119,27 @@ public class SessionCipher {
throws InvalidMessageException, DuplicateMessageException, LegacyMessageException,
NoSessionException, UntrustedIdentityException
{
synchronized (SESSION_LOCK) {
return Native.SessionCipher_DecryptSignalMessage(ciphertext.nativeHandle(),
remoteAddress.nativeHandle(),
sessionStore,
identityKeyStore);
}
return Native.SessionCipher_DecryptSignalMessage(ciphertext.nativeHandle(),
remoteAddress.nativeHandle(),
sessionStore,
identityKeyStore);
}
public int getRemoteRegistrationId() {
synchronized (SESSION_LOCK) {
SessionRecord record = sessionStore.loadSession(remoteAddress);
return record.getRemoteRegistrationId();
if (!sessionStore.containsSession(remoteAddress)) {
throw new IllegalStateException(String.format("No session for (%s)!", remoteAddress));
}
SessionRecord record = sessionStore.loadSession(remoteAddress);
return record.getRemoteRegistrationId();
}
public int getSessionVersion() {
synchronized (SESSION_LOCK) {
if (!sessionStore.containsSession(remoteAddress)) {
throw new IllegalStateException(String.format("No session for (%s)!", remoteAddress));
}
SessionRecord record = sessionStore.loadSession(remoteAddress);
return record.getSessionVersion();
if (!sessionStore.containsSession(remoteAddress)) {
throw new IllegalStateException(String.format("No session for (%s)!", remoteAddress));
}
SessionRecord record = sessionStore.loadSession(remoteAddress);
return record.getSessionVersion();
}
}