mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-06-22 11:34:50 +02:00
Paul Schaub
1f731f6318
Changes:
Rework integration tests
New structure of base integration test classes
bump dependency on signal-protocol-java from 2.4.0 to 2.6.2
Introduced CachingOmemoStore implementations
Use CachingOmemoStore classes in integration tests
Removed OmemoSession classes (replaced with more logical OmemoRatchet classes)
Consequently also removed load/storeOmemoSession methods from OmemoStore
Removed some clutter from KeyUtil classes
Moved trust decision related code from OmemoStore to TrustCallback
Require authenticated connection for many functions
Add async initialization function in OmemoStore
Refactor omemo test package (/java/org/jivesoftware/smack/omemo -> /java/org/jivesoftware/smackx)
Remove OmemoStore method isFreshInstallation() as well as defaultDeviceId related stuff
FileBasedOmemoStore: Add cleaner methods to store/load base data types (Using tryWithResource, only for future releases, once Android API gets bumped)
Attempt to make OmemoManager thread safe
new logic for getInstanceFor() deviceId determination
OmemoManagers encrypt methods now don't throw exceptions when encryption for some devices fails. Instead message gets encrypted when possible and more information about failures gets returned alongside the message itself
Added OmemoMessage class for that purpose
Reworked entire OmemoService class
Use safer logic for creating trust-ignoring messages (like ratchet-update messages)
Restructure elements/provider in order to prepare for OMEMO namespace bumps
Remove OmemoManager.regenerate() methods in favor of getInstanceFor(connection, randomDeviceId)
Removed some unnecessary configuration options
Prepare for support of more AES message key types
Simplify session creation
Where possible, avoid side effects in methods
Add UntrustedOmemoIdentityException
Add TrustState enum
More improved tests
114 lines
4.6 KiB
Java
114 lines
4.6 KiB
Java
/**
|
|
*
|
|
* Copyright 2017 Paul Schaub
|
|
*
|
|
* This file is part of smack-omemo-signal.
|
|
*
|
|
* smack-omemo-signal is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
package org.jivesoftware.smackx.omemo.signal;
|
|
|
|
import java.util.logging.Level;
|
|
|
|
import org.jivesoftware.smackx.omemo.OmemoManager;
|
|
import org.jivesoftware.smackx.omemo.OmemoService;
|
|
import org.jivesoftware.smackx.omemo.OmemoStore;
|
|
import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
|
|
import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
|
|
|
|
import org.whispersystems.libsignal.IdentityKey;
|
|
import org.whispersystems.libsignal.IdentityKeyPair;
|
|
import org.whispersystems.libsignal.SessionBuilder;
|
|
import org.whispersystems.libsignal.SessionCipher;
|
|
import org.whispersystems.libsignal.SignalProtocolAddress;
|
|
import org.whispersystems.libsignal.UntrustedIdentityException;
|
|
import org.whispersystems.libsignal.ecc.ECPublicKey;
|
|
import org.whispersystems.libsignal.state.PreKeyBundle;
|
|
import org.whispersystems.libsignal.state.PreKeyRecord;
|
|
import org.whispersystems.libsignal.state.SessionRecord;
|
|
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
|
|
|
|
/**
|
|
* Concrete implementation of the OmemoService using the Signal library.
|
|
*
|
|
* @author Paul Schaub
|
|
*/
|
|
@SuppressWarnings("unused")
|
|
public final class SignalOmemoService
|
|
extends OmemoService<IdentityKeyPair, IdentityKey, PreKeyRecord, SignedPreKeyRecord, SessionRecord,
|
|
SignalProtocolAddress, ECPublicKey, PreKeyBundle, SessionCipher> {
|
|
|
|
private static SignalOmemoService INSTANCE;
|
|
private static boolean LICENSE_ACKNOWLEDGED = false;
|
|
|
|
@Override
|
|
protected SignalOmemoRatchet instantiateOmemoRatchet(
|
|
OmemoManager manager,
|
|
OmemoStore<IdentityKeyPair, IdentityKey, PreKeyRecord, SignedPreKeyRecord, SessionRecord,
|
|
SignalProtocolAddress, ECPublicKey, PreKeyBundle, SessionCipher> store) {
|
|
|
|
return new SignalOmemoRatchet(manager, getOmemoStoreBackend());
|
|
}
|
|
|
|
public static void setup() {
|
|
if (!LICENSE_ACKNOWLEDGED) {
|
|
throw new IllegalStateException("smack-omemo-signal is licensed under the terms of the GPLv3. " +
|
|
"Please be aware that you can only use this library within the terms of the GPLv3. " +
|
|
"See for example https://www.gnu.org/licenses/quick-guide-gplv3 for more details. Please call " +
|
|
"SignalOmemoService.acknowledgeLicense() prior to the setup() method in order to prevent " +
|
|
"this exception.");
|
|
}
|
|
if (INSTANCE == null) {
|
|
INSTANCE = new SignalOmemoService();
|
|
}
|
|
setInstance(INSTANCE);
|
|
}
|
|
|
|
@Override
|
|
public OmemoStore<IdentityKeyPair, IdentityKey, PreKeyRecord, SignedPreKeyRecord, SessionRecord,
|
|
SignalProtocolAddress, ECPublicKey, PreKeyBundle, SessionCipher>
|
|
createDefaultOmemoStoreBackend() {
|
|
return new SignalCachingOmemoStore();
|
|
}
|
|
|
|
private SignalOmemoService() {
|
|
super();
|
|
}
|
|
|
|
public static void acknowledgeLicense() {
|
|
LICENSE_ACKNOWLEDGED = true;
|
|
}
|
|
|
|
@Override
|
|
protected void processBundle(OmemoManager omemoManager,
|
|
PreKeyBundle contactsBundle,
|
|
OmemoDevice contactsDevice)
|
|
throws CorruptedOmemoKeyException {
|
|
|
|
SignalOmemoStoreConnector connector = new SignalOmemoStoreConnector(omemoManager, getOmemoStoreBackend());
|
|
SessionBuilder builder = new SessionBuilder(connector, connector, connector, connector,
|
|
SignalOmemoStoreConnector.asAddress(contactsDevice));
|
|
try {
|
|
builder.process(contactsBundle);
|
|
LOGGER.log(Level.FINE, "Session built with " + contactsDevice);
|
|
} catch (org.whispersystems.libsignal.InvalidKeyException e) {
|
|
throw new CorruptedOmemoKeyException(e.getMessage());
|
|
} catch (UntrustedIdentityException e) {
|
|
// This should never happen.
|
|
throw new AssertionError(e);
|
|
}
|
|
}
|
|
}
|