mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-06-18 17:34:49 +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
94 lines
3.5 KiB
Java
94 lines
3.5 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;
|
|
|
|
import static junit.framework.TestCase.assertEquals;
|
|
import static junit.framework.TestCase.assertFalse;
|
|
import static junit.framework.TestCase.assertNotNull;
|
|
import static junit.framework.TestCase.assertNotSame;
|
|
import static junit.framework.TestCase.assertTrue;
|
|
|
|
import org.jivesoftware.smack.DummyConnection;
|
|
import org.jivesoftware.smack.packet.Message;
|
|
import org.jivesoftware.smack.test.util.SmackTestSuite;
|
|
import org.jivesoftware.smack.test.util.TestUtils;
|
|
import org.jivesoftware.smackx.omemo.element.OmemoElement;
|
|
import org.jivesoftware.smackx.omemo.provider.OmemoVAxolotlProvider;
|
|
import org.jivesoftware.smackx.omemo.signal.SignalOmemoService;
|
|
|
|
import org.junit.Test;
|
|
|
|
/**
|
|
* Test OmemoManager functionality.
|
|
*/
|
|
public class SignalOmemoManagerTest extends SmackTestSuite {
|
|
|
|
@Test
|
|
public void instantiationTest() {
|
|
SignalOmemoService.acknowledgeLicense();
|
|
SignalOmemoService.setup();
|
|
|
|
DummyConnection dummy = new DummyConnection();
|
|
DummyConnection silly = new DummyConnection();
|
|
OmemoManager a = OmemoManager.getInstanceFor(dummy, 123);
|
|
OmemoManager b = OmemoManager.getInstanceFor(dummy, 234);
|
|
OmemoManager c = OmemoManager.getInstanceFor(silly, 123);
|
|
OmemoManager d = OmemoManager.getInstanceFor(dummy, 123);
|
|
|
|
assertNotNull(a);
|
|
assertNotNull(b);
|
|
assertNotNull(c);
|
|
assertNotNull(d);
|
|
|
|
assertEquals(Integer.valueOf(123), a.getDeviceId());
|
|
assertEquals(Integer.valueOf(234), b.getDeviceId());
|
|
|
|
assertFalse(a == b);
|
|
assertFalse(a == c);
|
|
assertFalse(b == c);
|
|
assertTrue(a == d);
|
|
|
|
}
|
|
|
|
@Test
|
|
public void randomDeviceIdTest() {
|
|
int a = OmemoManager.randomDeviceId();
|
|
int b = OmemoManager.randomDeviceId();
|
|
|
|
assertNotSame(a, b); // This is highly unlikely
|
|
|
|
assertTrue(a > 0);
|
|
assertTrue(b > 0);
|
|
}
|
|
|
|
@Test
|
|
public void stanzaRecognitionTest() throws Exception {
|
|
String omemoXML = "<encrypted xmlns='eu.siacs.conversations.axolotl'><header sid='1009'><key rid='1337'>MwohBfRqBm2atj3fT0/KUDg59Cnvfpgoe/PLNIu1xgSXujEZEAAYACIwKh6TTC7VBQZcCcKnQlO+6s1GQ9DIRKH4JU7XrJ+JJnkPUwJ4VLSeOEQD7HmFbhQPTLZO0u/qlng=</key><iv>sN0amy4e2NBrlb4G/OjNIQ==</iv></header><payload>4xVUAeg4M0Mhk+5n3YG1x12Dw/cYTc0Z</payload></encrypted>";
|
|
OmemoElement omemoElement = new OmemoVAxolotlProvider().parse(TestUtils.getParser(omemoXML));
|
|
Message m = new Message();
|
|
m.addExtension(omemoElement);
|
|
Message n = new Message();
|
|
|
|
assertTrue(OmemoManager.stanzaContainsOmemoElement(m));
|
|
assertFalse(OmemoManager.stanzaContainsOmemoElement(n));
|
|
}
|
|
}
|