Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 04:18:53 +01:00
Code Issues Projects Releases Wiki Activity

Implemented KeyManager (untested).

Browse Source 
A test is failing due to key derivation errors - must be fixed!
This commit is contained in:
akwizgran
2012-10-24 18:16:17 +01:00
parent cc6e9d53ad
commit 27e50b8495
25 changed files with 540 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/build.xml
View File

@@ -20,7 +20,6 @@
<test name='net.sf.briar.crypto.ErasableKeyTest'/>
<test name='net.sf.briar.crypto.KeyAgreementTest'/>
<test name='net.sf.briar.crypto.KeyDerivationTest'/>
<test name='net.sf.briar.crypto.KeyRotatorImplTest'/>
<test name='net.sf.briar.db.BasicH2Test'/>
<test name='net.sf.briar.db.DatabaseCleanerImplTest'/>
<test name='net.sf.briar.db.DatabaseComponentImplTest'/>

2
test/net/sf/briar/ProtocolIntegrationTest.java
View File

@@ -189,7 +189,7 @@ public class ProtocolIntegrationTest extends BriarTestCase {
InputStream in = new ByteArrayInputStream(connectionData);
byte[] tag = new byte[TAG_LENGTH];
assertEquals(TAG_LENGTH, in.read(tag, 0, TAG_LENGTH));
assertArrayEquals(new byte[TAG_LENGTH], tag);
// FIXME: Check that the expected tag was received
ConnectionContext ctx = new ConnectionContext(contactId, transportId,
secret.clone(), 0L, true);
ConnectionReader conn = connectionReaderFactory.createConnectionReader(

2
test/net/sf/briar/crypto/KeyDerivationTest.java
View File

@@ -63,7 +63,7 @@ public class KeyDerivationTest extends BriarTestCase {
public void testConnectionNumberAffectsDerivation() {
List<byte[]> secrets = new ArrayList<byte[]>();
for(int i = 0; i < 20; i++) {
secrets.add(crypto.deriveNextSecret(secret, i));
secrets.add(crypto.deriveNextSecret(secret.clone(), i));
}
for(int i = 0; i < 20; i++) {
byte[] secretI = secrets.get(i);

54
test/net/sf/briar/crypto/KeyRotatorImplTest.java
View File

@@ -1,54 +0,0 @@
package net.sf.briar.crypto;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import net.sf.briar.BriarTestCase;
import net.sf.briar.api.db.DbException;
import net.sf.briar.crypto.KeyRotatorImpl;
import net.sf.briar.crypto.KeyRotator.Callback;
import org.junit.Test;
public class KeyRotatorImplTest extends BriarTestCase {
@Test
public void testCleanerRunsPeriodically() throws Exception {
final CountDownLatch latch = new CountDownLatch(5);
Callback callback = new Callback() {
public void rotateKeys() throws DbException {
latch.countDown();
}
};
KeyRotatorImpl cleaner = new KeyRotatorImpl();
// Start the rotator
cleaner.startRotating(callback, 10L);
// The keys should be rotated five times (allow 5 secs for system load)
assertTrue(latch.await(5, TimeUnit.SECONDS));
// Stop the rotator
cleaner.stopRotating();
}
@Test
public void testStoppingCleanerWakesItUp() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
Callback callback = new Callback() {
public void rotateKeys() throws DbException {
latch.countDown();
}
};
KeyRotatorImpl cleaner = new KeyRotatorImpl();
long start = System.currentTimeMillis();
// Start the rotator
cleaner.startRotating(callback, 10L * 1000L);
// The keys should be rotated once at startup
assertTrue(latch.await(5, TimeUnit.SECONDS));
// Stop the rotator (it should be waiting between rotations)
cleaner.stopRotating();
long end = System.currentTimeMillis();
// Check that much less than 10 seconds expired
assertTrue(end - start < 10L * 1000L);
}
}

4
test/net/sf/briar/db/DatabaseComponentTest.java
View File

@@ -88,8 +88,8 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
transports = Collections.singletonList(transport);
contactTransport = new ContactTransport(contactId, transportId, 123L,
234L, 345L, true);
temporarySecret = new TemporarySecret(contactId, transportId, 0L,
new byte[32], 0L, 0L, new byte[4]);
temporarySecret = new TemporarySecret(contactId, transportId, 1L, 2L,
3L, false, 4L, new byte[32], 5L, 6L, new byte[4]);
}
protected abstract <T> DatabaseComponent createDatabaseComponent(

200
test/net/sf/briar/db/H2DatabaseTest.java
View File

@@ -1728,18 +1728,18 @@ public class H2DatabaseTest extends BriarTestCase {
byte[] secret1 = new byte[32], bitmap1 = new byte[4];
random.nextBytes(secret1);
random.nextBytes(bitmap1);
TemporarySecret ts1 = new TemporarySecret(contactId, transportId, 0L,
secret1, 123L, 234L, bitmap1);
TemporarySecret s1 = new TemporarySecret(contactId, transportId, 123L,
234L, 345L, false, 0L, secret1, 456L, 567L, bitmap1);
byte[] secret2 = new byte[32], bitmap2 = new byte[4];
random.nextBytes(secret2);
random.nextBytes(bitmap2);
TemporarySecret ts2 = new TemporarySecret(contactId, transportId, 1L,
secret2, 1234L, 2345L, bitmap2);
TemporarySecret s2 = new TemporarySecret(contactId, transportId, 1234L,
2345L, 3456L, false, 1L, secret2, 4567L, 5678L, bitmap2);
byte[] secret3 = new byte[32], bitmap3 = new byte[4];
random.nextBytes(secret3);
random.nextBytes(bitmap3);
TemporarySecret ts3 = new TemporarySecret(contactId, transportId, 2L,
secret3, 12345L, 23456L, bitmap3);
TemporarySecret s3 = new TemporarySecret(contactId, transportId, 12345L,
23456L, 34567L, false, 0L, secret3, 45678L, 56789L, bitmap3);
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
@@ -1749,26 +1749,36 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact and the first two secrets
assertEquals(contactId, db.addContact(txn));
db.addSecrets(txn, Arrays.asList(ts1, ts2));
db.addSecrets(txn, Arrays.asList(s1, s2));
// Retrieve the first two secrets
Collection<TemporarySecret> secrets = db.getSecrets(txn);
assertEquals(2, secrets.size());
boolean foundFirst = false, foundSecond = false;
for(TemporarySecret ts : secrets) {
assertEquals(contactId, ts.getContactId());
assertEquals(transportId, ts.getTransportId());
if(ts.getPeriod() == 0L) {
assertArrayEquals(secret1, ts.getSecret());
assertEquals(123L, ts.getOutgoingConnectionCounter());
assertEquals(234L, ts.getWindowCentre());
assertArrayEquals(bitmap1, ts.getWindowBitmap());
for(TemporarySecret s : secrets) {
assertEquals(contactId, s.getContactId());
assertEquals(transportId, s.getTransportId());
if(s.getPeriod() == 0L) {
assertEquals(s1.getEpoch(), s.getEpoch());
assertEquals(s1.getClockDifference(), s.getClockDifference());
assertEquals(s1.getLatency(), s.getLatency());
assertEquals(s1.getAlice(), s.getAlice());
assertArrayEquals(s1.getSecret(), s.getSecret());
assertEquals(s1.getOutgoingConnectionCounter(),
s.getOutgoingConnectionCounter());
assertEquals(s1.getWindowCentre(), s.getWindowCentre());
assertArrayEquals(s1.getWindowBitmap(), s.getWindowBitmap());
foundFirst = true;
} else if(ts.getPeriod() == 1L) {
assertArrayEquals(secret2, ts.getSecret());
assertEquals(1234L, ts.getOutgoingConnectionCounter());
assertEquals(2345L, ts.getWindowCentre());
assertArrayEquals(bitmap2, ts.getWindowBitmap());
} else if(s.getPeriod() == 1L) {
assertEquals(s2.getEpoch(), s.getEpoch());
assertEquals(s2.getClockDifference(), s.getClockDifference());
assertEquals(s2.getLatency(), s.getLatency());
assertEquals(s2.getAlice(), s.getAlice());
assertArrayEquals(s2.getSecret(), s.getSecret());
assertEquals(s2.getOutgoingConnectionCounter(),
s.getOutgoingConnectionCounter());
assertEquals(s2.getWindowCentre(), s.getWindowCentre());
assertArrayEquals(s2.getWindowBitmap(), s.getWindowBitmap());
foundSecond = true;
} else {
fail();
@@ -1778,25 +1788,35 @@ public class H2DatabaseTest extends BriarTestCase {
assertTrue(foundSecond);
// Adding the third secret (period 2) should delete the first (period 0)
db.addSecrets(txn, Arrays.asList(ts3));
db.addSecrets(txn, Arrays.asList(s3));
secrets = db.getSecrets(txn);
assertEquals(2, secrets.size());
foundSecond = false;
boolean foundThird = false;
for(TemporarySecret ts : secrets) {
assertEquals(contactId, ts.getContactId());
assertEquals(transportId, ts.getTransportId());
if(ts.getPeriod() == 1L) {
assertArrayEquals(secret2, ts.getSecret());
assertEquals(1234L, ts.getOutgoingConnectionCounter());
assertEquals(2345L, ts.getWindowCentre());
assertArrayEquals(bitmap2, ts.getWindowBitmap());
for(TemporarySecret s : secrets) {
assertEquals(contactId, s.getContactId());
assertEquals(transportId, s.getTransportId());
if(s.getPeriod() == 1L) {
assertEquals(s2.getEpoch(), s.getEpoch());
assertEquals(s2.getClockDifference(), s.getClockDifference());
assertEquals(s2.getLatency(), s.getLatency());
assertEquals(s2.getAlice(), s.getAlice());
assertArrayEquals(s2.getSecret(), s.getSecret());
assertEquals(s2.getOutgoingConnectionCounter(),
s.getOutgoingConnectionCounter());
assertEquals(s2.getWindowCentre(), s.getWindowCentre());
assertArrayEquals(s2.getWindowBitmap(), s.getWindowBitmap());
foundSecond = true;
} else if(ts.getPeriod() == 2L) {
assertArrayEquals(secret3, ts.getSecret());
assertEquals(12345L, ts.getOutgoingConnectionCounter());
assertEquals(23456L, ts.getWindowCentre());
assertArrayEquals(bitmap3, ts.getWindowBitmap());
} else if(s.getPeriod() == 2L) {
assertEquals(s3.getEpoch(), s.getEpoch());
assertEquals(s3.getClockDifference(), s.getClockDifference());
assertEquals(s3.getLatency(), s.getLatency());
assertEquals(s3.getAlice(), s.getAlice());
assertArrayEquals(s3.getSecret(), s.getSecret());
assertEquals(s3.getOutgoingConnectionCounter(),
s.getOutgoingConnectionCounter());
assertEquals(s3.getWindowCentre(), s.getWindowCentre());
assertArrayEquals(s3.getWindowBitmap(), s.getWindowBitmap());
foundThird = true;
} else {
fail();
@@ -1819,55 +1839,43 @@ public class H2DatabaseTest extends BriarTestCase {
Random random = new Random();
byte[] secret = new byte[32], bitmap = new byte[4];
random.nextBytes(secret);
TemporarySecret ts = new TemporarySecret(contactId, transportId, 0L,
secret, 0L, 0L, bitmap);
TemporarySecret s = new TemporarySecret(contactId, transportId, 0L,
0L, 0L, false, 0L, secret, 0L, 0L, bitmap);
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
// Add a contact and the temporary secret
assertEquals(contactId, db.addContact(txn));
db.addSecrets(txn, Arrays.asList(ts));
db.addSecrets(txn, Arrays.asList(s));
// Retrieve the secret
Collection<TemporarySecret> secrets = db.getSecrets(txn);
assertEquals(1, secrets.size());
ts = secrets.iterator().next();
assertEquals(contactId, ts.getContactId());
assertEquals(transportId, ts.getTransportId());
assertEquals(0L, ts.getPeriod());
assertArrayEquals(secret, ts.getSecret());
assertEquals(0L, ts.getOutgoingConnectionCounter());
assertEquals(0L, ts.getWindowCentre());
assertArrayEquals(bitmap, ts.getWindowBitmap());
s = secrets.iterator().next();
assertEquals(contactId, s.getContactId());
assertEquals(transportId, s.getTransportId());
assertEquals(0L, s.getPeriod());
assertArrayEquals(secret, s.getSecret());
assertEquals(0L, s.getOutgoingConnectionCounter());
assertEquals(0L, s.getWindowCentre());
assertArrayEquals(bitmap, s.getWindowBitmap());
// Increment the connection counter twice and retrieve the secret again
db.incrementConnectionCounter(txn, contactId, transportId, 0L);
db.incrementConnectionCounter(txn, contactId, transportId, 0L);
assertEquals(0L, db.incrementConnectionCounter(txn, contactId,
transportId, 0L));
assertEquals(1L, db.incrementConnectionCounter(txn, contactId,
transportId, 0L));
secrets = db.getSecrets(txn);
assertEquals(1, secrets.size());
ts = secrets.iterator().next();
assertEquals(contactId, ts.getContactId());
assertEquals(transportId, ts.getTransportId());
assertEquals(0L, ts.getPeriod());
assertArrayEquals(secret, ts.getSecret());
assertEquals(2L, ts.getOutgoingConnectionCounter());
assertEquals(0L, ts.getWindowCentre());
assertArrayEquals(bitmap, ts.getWindowBitmap());
// Incrementing a nonexistent counter should not throw an exception
db.incrementConnectionCounter(txn, contactId, transportId, 1L);
// The nonexistent counter should not have been created
secrets = db.getSecrets(txn);
assertEquals(1, secrets.size());
ts = secrets.iterator().next();
assertEquals(contactId, ts.getContactId());
assertEquals(transportId, ts.getTransportId());
assertEquals(0L, ts.getPeriod());
assertArrayEquals(secret, ts.getSecret());
assertEquals(2L, ts.getOutgoingConnectionCounter());
assertEquals(0L, ts.getWindowCentre());
assertArrayEquals(bitmap, ts.getWindowBitmap());
s = secrets.iterator().next();
assertEquals(contactId, s.getContactId());
assertEquals(transportId, s.getTransportId());
assertEquals(0L, s.getPeriod());
assertArrayEquals(secret, s.getSecret());
assertEquals(2L, s.getOutgoingConnectionCounter());
assertEquals(0L, s.getWindowCentre());
assertArrayEquals(bitmap, s.getWindowBitmap());
db.commitTransaction(txn);
db.close();
@@ -1879,27 +1887,27 @@ public class H2DatabaseTest extends BriarTestCase {
Random random = new Random();
byte[] secret = new byte[32], bitmap = new byte[4];
random.nextBytes(secret);
TemporarySecret ts = new TemporarySecret(contactId, transportId, 0L,
secret, 0L, 0L, bitmap);
TemporarySecret s = new TemporarySecret(contactId, transportId, 0L,
0L, 0L, false, 0L, secret, 0L, 0L, bitmap);
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
// Add a contact and the temporary secret
assertEquals(contactId, db.addContact(txn));
db.addSecrets(txn, Arrays.asList(ts));
db.addSecrets(txn, Arrays.asList(s));
// Retrieve the secret
Collection<TemporarySecret> secrets = db.getSecrets(txn);
assertEquals(1, secrets.size());
ts = secrets.iterator().next();
assertEquals(contactId, ts.getContactId());
assertEquals(transportId, ts.getTransportId());
assertEquals(0L, ts.getPeriod());
assertArrayEquals(secret, ts.getSecret());
assertEquals(0L, ts.getOutgoingConnectionCounter());
assertEquals(0L, ts.getWindowCentre());
assertArrayEquals(bitmap, ts.getWindowBitmap());
s = secrets.iterator().next();
assertEquals(contactId, s.getContactId());
assertEquals(transportId, s.getTransportId());
assertEquals(0L, s.getPeriod());
assertArrayEquals(secret, s.getSecret());
assertEquals(0L, s.getOutgoingConnectionCounter());
assertEquals(0L, s.getWindowCentre());
assertArrayEquals(bitmap, s.getWindowBitmap());
// Update the connection window and retrieve the secret again
db.setConnectionWindow(txn, contactId, transportId, 0L, 1L, bitmap);
@@ -1907,28 +1915,28 @@ public class H2DatabaseTest extends BriarTestCase {
db.setConnectionWindow(txn, contactId, transportId, 0L, 1L, bitmap);
secrets = db.getSecrets(txn);
assertEquals(1, secrets.size());
ts = secrets.iterator().next();
assertEquals(contactId, ts.getContactId());
assertEquals(transportId, ts.getTransportId());
assertEquals(0L, ts.getPeriod());
assertArrayEquals(secret, ts.getSecret());
assertEquals(0L, ts.getOutgoingConnectionCounter());
assertEquals(1L, ts.getWindowCentre());
assertArrayEquals(bitmap, ts.getWindowBitmap());
s = secrets.iterator().next();
assertEquals(contactId, s.getContactId());
assertEquals(transportId, s.getTransportId());
assertEquals(0L, s.getPeriod());
assertArrayEquals(secret, s.getSecret());
assertEquals(0L, s.getOutgoingConnectionCounter());
assertEquals(1L, s.getWindowCentre());
assertArrayEquals(bitmap, s.getWindowBitmap());
// Updating a nonexistent window should not throw an exception
db.setConnectionWindow(txn, contactId, transportId, 1L, 1L, bitmap);
// The nonexistent window should not have been created
secrets = db.getSecrets(txn);
assertEquals(1, secrets.size());
ts = secrets.iterator().next();
assertEquals(contactId, ts.getContactId());
assertEquals(transportId, ts.getTransportId());
assertEquals(0L, ts.getPeriod());
assertArrayEquals(secret, ts.getSecret());
assertEquals(0L, ts.getOutgoingConnectionCounter());
assertEquals(1L, ts.getWindowCentre());
assertArrayEquals(bitmap, ts.getWindowBitmap());
s = secrets.iterator().next();
assertEquals(contactId, s.getContactId());
assertEquals(transportId, s.getTransportId());
assertEquals(0L, s.getPeriod());
assertArrayEquals(secret, s.getSecret());
assertEquals(0L, s.getOutgoingConnectionCounter());
assertEquals(1L, s.getWindowCentre());
assertArrayEquals(bitmap, s.getWindowBitmap());
db.commitTransaction(txn);
db.close();

8
test/net/sf/briar/protocol/simplex/OutgoingSimplexConnectionTest.java
View File

@@ -14,7 +14,6 @@ import java.util.concurrent.Executors;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.protocol.Ack;
@@ -24,7 +23,6 @@ import net.sf.briar.api.protocol.RawBatch;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.UniqueId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.crypto.CryptoModule;
@@ -48,8 +46,6 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
private final Mockery context;
private final DatabaseComponent db;
private final KeyManager keyManager;
private final ConnectionRecogniser connRecogniser;
private final ConnectionRegistry connRegistry;
private final ConnectionWriterFactory connFactory;
private final ProtocolWriterFactory protoFactory;
@@ -61,14 +57,10 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase {
super();
context = new Mockery();
db = context.mock(DatabaseComponent.class);
keyManager = context.mock(KeyManager.class);
connRecogniser = context.mock(ConnectionRecogniser.class);
Module testModule = new AbstractModule() {
@Override
public void configure() {
bind(DatabaseComponent.class).toInstance(db);
bind(KeyManager.class).toInstance(keyManager);
bind(ConnectionRecogniser.class).toInstance(connRecogniser);
bind(Executor.class).annotatedWith(
DatabaseExecutor.class).toInstance(
Executors.newCachedThreadPool());

1
test/net/sf/briar/transport/ConnectionWriterImplTest.java
View File

@@ -8,6 +8,7 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Test;
public class ConnectionWriterImplTest extends BriarTestCase {
private static final int FRAME_LENGTH = 1024;

6
test/net/sf/briar/transport/TransportIntegrationTest.java
View File

@@ -22,9 +22,15 @@ import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.transport.ConnectionReaderImpl;
import net.sf.briar.transport.ConnectionWriterFactoryImpl;
import net.sf.briar.transport.ConnectionWriterImpl;
import net.sf.briar.transport.IncomingEncryptionLayer;
import net.sf.briar.transport.OutgoingEncryptionLayer;
import org.junit.Test;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;