diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 5881c29be047db3d0d2085ac01b2ab7d62306ab9..550e381e74593eb97a2e02aa84abebbf5c52da62 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -13,7 +13,7 @@
<string name="contact_connected">Connected</string>
<string name="format_contact_last_connected">Last connected <br /> %1$s</string>
<string name="add_contact_title">Add a Contact</string>
- <string name="same_network">Briar can add contacts via Wi-Fi or Bluetooth. To use Wi-Fi you must both be connected to the same network.</string>
+ <string name="choose_identity">Choose an identity to use with this contact:</string>
<string name="wifi_not_available">Wi-Fi is not available on this device</string>
<string name="wifi_disabled">Wi-Fi is OFF</string>
<string name="wifi_disconnected">Wi-Fi is DISCONNECTED</string>
diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
index 5b01e6bb4fa69ae8ede754686b2d10c8d4ec82b7..784233dd36caddea9c42dbf94ff8159d9cd161e8 100644
--- a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
+++ b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
@@ -19,8 +19,8 @@ import net.sf.briar.android.widgets.CommonLayoutParams;
import net.sf.briar.android.widgets.HorizontalBorder;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
-import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.event.ContactAddedEvent;
import net.sf.briar.api.db.event.ContactRemovedEvent;
@@ -52,7 +52,7 @@ implements OnClickListener, DatabaseListener, ConnectionListener {
// Fields that are accessed from DB threads must be volatile
@Inject private volatile DatabaseComponent db;
- @Inject @DatabaseExecutor private volatile Executor dbExecutor;
+ @Inject @DatabaseUiExecutor private volatile Executor dbUiExecutor;
@Override
public void onCreate(Bundle state) {
@@ -87,36 +87,6 @@ implements OnClickListener, DatabaseListener, ConnectionListener {
// Bind to the service so we can wait for the DB to be opened
bindService(new Intent(BriarService.class.getName()),
serviceConnection, 0);
-
- // Add some fake contacts to the database in a background thread
- insertFakeContacts();
- }
-
- // FIXME: Remove this
- private void insertFakeContacts() {
- dbExecutor.execute(new Runnable() {
- public void run() {
- try {
- // Wait for the service to be bound and started
- serviceConnection.waitForStartup();
- // If there are no contacts in the DB, create some fake ones
- Collection<Contact> contacts = db.getContacts();
- if(contacts.isEmpty()) {
- if(LOG.isLoggable(INFO))
- LOG.info("Inserting fake contacts");
- db.addContact("Alice");
- db.addContact("Bob");
- }
- } catch(DbException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- } catch(InterruptedException e) {
- if(LOG.isLoggable(INFO))
- LOG.info("Interrupted while waiting for service");
- Thread.currentThread().interrupt();
- }
- }
- });
}
@Override
@@ -126,7 +96,7 @@ implements OnClickListener, DatabaseListener, ConnectionListener {
}
private void loadContacts() {
- dbExecutor.execute(new Runnable() {
+ dbUiExecutor.execute(new Runnable() {
public void run() {
try {
// Wait for the service to be bound and started
diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListItem.java b/briar-android/src/net/sf/briar/android/contact/ContactListItem.java
index 0b030f2f96a4dad832dc1de2b73ea2e6649fba3f..de867e7dcac0c21154225f4b6419a67ad2b98da1 100644
--- a/briar-android/src/net/sf/briar/android/contact/ContactListItem.java
+++ b/briar-android/src/net/sf/briar/android/contact/ContactListItem.java
@@ -19,7 +19,7 @@ class ContactListItem {
}
String getContactName() {
- return contact.getName();
+ return contact.getAuthor().getName();
}
long getLastConnected() {
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
index 43af87cf9d2afbf06942ff05c3f4b6cc4eb8a839..294f18da96e86ff7a9f136a7b87e5e5afb3b1a84 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
@@ -17,6 +17,7 @@ import net.sf.briar.android.BriarService;
import net.sf.briar.android.BriarService.BriarServiceConnection;
import net.sf.briar.android.widgets.CommonLayoutParams;
import net.sf.briar.android.widgets.HorizontalBorder;
+import net.sf.briar.api.Author;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
@@ -28,7 +29,6 @@ import net.sf.briar.api.db.event.GroupMessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
import net.sf.briar.api.db.event.RatingChangedEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
-import net.sf.briar.api.messaging.Author;
import net.sf.briar.api.messaging.GroupId;
import android.content.Intent;
import android.os.Bundle;
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
index d214f47bb45ff9548d002c9e6d6050e20ffbe688..87930d39d34399a01e66f3f1311df14e86bdb629 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
@@ -6,17 +6,17 @@ import static android.view.View.INVISIBLE;
import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
-import static net.sf.briar.api.Rating.GOOD;
-import static net.sf.briar.api.Rating.UNRATED;
+import static net.sf.briar.api.messaging.Rating.GOOD;
+import static net.sf.briar.api.messaging.Rating.UNRATED;
import java.util.ArrayList;
import net.sf.briar.R;
import net.sf.briar.android.widgets.CommonLayoutParams;
import net.sf.briar.android.widgets.HorizontalSpace;
-import net.sf.briar.api.Rating;
+import net.sf.briar.api.Author;
import net.sf.briar.api.db.GroupMessageHeader;
-import net.sf.briar.api.messaging.Author;
+import net.sf.briar.api.messaging.Rating;
import net.sf.briar.util.StringUtils;
import android.content.Context;
import android.content.res.Resources;
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
index 70d797bb358e958e1854c008ee910c37413f2b47..f173274fa882f27e3e2296acc42cbcfe97f6420d 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
@@ -6,15 +6,8 @@ import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
-import static net.sf.briar.api.Rating.BAD;
-import static net.sf.briar.api.Rating.GOOD;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.PrivateKey;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
@@ -29,11 +22,8 @@ import net.sf.briar.android.BriarService.BriarServiceConnection;
import net.sf.briar.android.widgets.CommonLayoutParams;
import net.sf.briar.android.widgets.HorizontalBorder;
import net.sf.briar.android.widgets.HorizontalSpace;
-import net.sf.briar.api.ContactId;
import net.sf.briar.api.android.DatabaseUiExecutor;
-import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.db.DatabaseComponent;
-import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.GroupMessageHeader;
import net.sf.briar.api.db.NoSuchSubscriptionException;
@@ -42,13 +32,8 @@ import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.GroupMessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorFactory;
import net.sf.briar.api.messaging.Group;
-import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.messaging.GroupId;
-import net.sf.briar.api.messaging.Message;
-import net.sf.briar.api.messaging.MessageFactory;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
@@ -73,13 +58,8 @@ implements OnClickListener, DatabaseListener {
private ImageButton newGroupButton = null, composeButton = null;
// Fields that are accessed from DB threads must be volatile
- @Inject private volatile CryptoComponent crypto;
@Inject private volatile DatabaseComponent db;
- @Inject @DatabaseExecutor private volatile Executor dbExecutor;
@Inject @DatabaseUiExecutor private volatile Executor dbUiExecutor;
- @Inject private volatile AuthorFactory authorFactory;
- @Inject private volatile GroupFactory groupFactory;
- @Inject private volatile MessageFactory messageFactory;
private volatile boolean restricted = false;
@Override
@@ -134,154 +114,6 @@ implements OnClickListener, DatabaseListener {
// Bind to the service so we can wait for the DB to be opened
bindService(new Intent(BriarService.class.getName()),
serviceConnection, 0);
-
- // Add some fake messages to the database in a background thread
- insertFakeMessages();
- }
-
- // FIXME: Remove this
- private void insertFakeMessages() {
- dbExecutor.execute(new Runnable() {
- public void run() {
- try {
- // Wait for the service to be bound and started
- serviceConnection.waitForStartup();
- // If there are no groups in the DB, create some fake ones
- Collection<Group> groups = db.getSubscriptions();
- if(!groups.isEmpty()) return;
- if(LOG.isLoggable(INFO))
- LOG.info("Inserting fake groups and messages");
- // We'll also need a contact to receive messages from
- ContactId contactId = db.addContact("Dave");
- // Finally, we'll need some authors for the messages
- long now = System.currentTimeMillis();
- KeyPair keyPair = crypto.generateSignatureKeyPair();
- long duration = System.currentTimeMillis() - now;
- if(LOG.isLoggable(INFO))
- LOG.info("Key generation took " + duration + " ms");
- byte[] publicKey = keyPair.getPublic().getEncoded();
- PrivateKey privateKey = keyPair.getPrivate();
- Author author = authorFactory.createAuthor("Batman",
- publicKey);
- db.setRating(author.getId(), BAD);
- Author author1 = authorFactory.createAuthor("Duckman",
- publicKey);
- db.setRating(author1.getId(), GOOD);
- // Insert some fake groups and make them visible
- Group group = groupFactory.createGroup("DisneyLeaks");
- db.subscribe(group);
- db.setVisibility(group.getId(), Arrays.asList(contactId));
- Group group1 = groupFactory.createGroup("Godwin's Lore");
- db.subscribe(group1);
- db.setVisibility(group1.getId(), Arrays.asList(contactId));
- Group group2 = groupFactory.createGroup(
- "All Kids Love Blog", publicKey);
- db.subscribe(group2);
- db.setVisibility(group2.getId(), Arrays.asList(contactId));
- // Insert some text messages to the unrestricted groups
- for(int i = 0; i < 20; i++) {
- String body;
- if(i % 3 == 0) {
- body = "Message " + i + " is short.";
- } else {
- body = "Message " + i + " is long enough to wrap"
- + " onto a second line on some screens.";
- }
- Group g = i % 2 == 0 ? group : group1;
- Message m;
- now = System.currentTimeMillis();
- if(i % 5 == 0) {
- m = messageFactory.createAnonymousMessage(null, g,
- "text/plain", body.getBytes("UTF-8"));
- } else if(i % 5 == 2) {
- m = messageFactory.createPseudonymousMessage(null,
- g, author, privateKey, "text/plain",
- body.getBytes("UTF-8"));
- } else {
- m = messageFactory.createPseudonymousMessage(null,
- g, author1, privateKey, "text/plain",
- body.getBytes("UTF-8"));
- }
- duration = System.currentTimeMillis() - now;
- if(LOG.isLoggable(INFO)) {
- LOG.info("Message creation took " +
- duration + " ms");
- }
- now = System.currentTimeMillis();
- if(Math.random() < 0.5) db.addLocalGroupMessage(m);
- else db.receiveMessage(contactId, m);
- db.setReadFlag(m.getId(), i % 4 == 0);
- duration = System.currentTimeMillis() - now;
- if(LOG.isLoggable(INFO)) {
- LOG.info("Message storage took " +
- duration + " ms");
- }
- }
- // Insert a non-text message
- Message m = messageFactory.createAnonymousMessage(null,
- group, "image/jpeg", new byte[1000]);
- db.receiveMessage(contactId, m);
- // Insert a long text message
- StringBuilder s = new StringBuilder();
- for(int i = 0; i < 100; i++)
- s.append("This is a very tedious message. ");
- String body = s.toString();
- m = messageFactory.createAnonymousMessage(m.getId(),
- group1, "text/plain", body.getBytes("UTF-8"));
- db.addLocalGroupMessage(m);
- // Insert some text messages to the restricted group
- for(int i = 0; i < 20; i++) {
- if(i % 3 == 0) {
- body = "Message " + i + " is short.";
- } else {
- body = "Message " + i + " is long enough to wrap"
- + " onto a second line on some screens.";
- }
- now = System.currentTimeMillis();
- if(i % 5 == 0) {
- m = messageFactory.createAnonymousMessage(null,
- group2, privateKey, "text/plain",
- body.getBytes("UTF-8"));
- } else if(i % 5 == 2) {
- m = messageFactory.createPseudonymousMessage(null,
- group2, privateKey, author, privateKey,
- "text/plain", body.getBytes("UTF-8"));
- } else {
- m = messageFactory.createPseudonymousMessage(null,
- group2, privateKey, author1, privateKey,
- "text/plain", body.getBytes("UTF-8"));
- }
- duration = System.currentTimeMillis() - now;
- if(LOG.isLoggable(INFO)) {
- LOG.info("Message creation took " +
- duration + " ms");
- }
- now = System.currentTimeMillis();
- if(Math.random() < 0.5) db.addLocalGroupMessage(m);
- else db.receiveMessage(contactId, m);
- db.setReadFlag(m.getId(), i % 4 == 0);
- duration = System.currentTimeMillis() - now;
- if(LOG.isLoggable(INFO)) {
- LOG.info("Message storage took " +
- duration + " ms");
- }
- }
- } catch(DbException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- } catch(GeneralSecurityException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- } catch(InterruptedException e) {
- if(LOG.isLoggable(INFO))
- LOG.info("Interrupted while waiting for service");
- Thread.currentThread().interrupt();
- } catch(IOException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- }
- }
- });
}
@Override
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListItem.java b/briar-android/src/net/sf/briar/android/groups/GroupListItem.java
index 36df21ec51cd64f93467e5b1c5dc294d6edfe80a..6302b51530049829ae34eca3d3576c6fdc2d91ab 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupListItem.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupListItem.java
@@ -4,8 +4,8 @@ import java.util.Collections;
import java.util.List;
import net.sf.briar.android.DescendingHeaderComparator;
+import net.sf.briar.api.Author;
import net.sf.briar.api.db.GroupMessageHeader;
-import net.sf.briar.api.messaging.Author;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
diff --git a/briar-android/src/net/sf/briar/android/groups/ReadGroupMessageActivity.java b/briar-android/src/net/sf/briar/android/groups/ReadGroupMessageActivity.java
index 4c03773933a5ef9ab8cf5aed775f98d53990b0b9..b8b33637ff9f4768df2bff11c97782d4f7bd56f8 100644
--- a/briar-android/src/net/sf/briar/android/groups/ReadGroupMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ReadGroupMessageActivity.java
@@ -9,9 +9,9 @@ import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
-import static net.sf.briar.api.Rating.BAD;
-import static net.sf.briar.api.Rating.GOOD;
-import static net.sf.briar.api.Rating.UNRATED;
+import static net.sf.briar.api.messaging.Rating.BAD;
+import static net.sf.briar.api.messaging.Rating.GOOD;
+import static net.sf.briar.api.messaging.Rating.UNRATED;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.Executor;
@@ -24,15 +24,15 @@ import net.sf.briar.android.BriarService.BriarServiceConnection;
import net.sf.briar.android.widgets.CommonLayoutParams;
import net.sf.briar.android.widgets.HorizontalBorder;
import net.sf.briar.android.widgets.HorizontalSpace;
-import net.sf.briar.api.Rating;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.android.BundleEncrypter;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchMessageException;
-import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.MessageId;
+import net.sf.briar.api.messaging.Rating;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
diff --git a/briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java b/briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java
index c96fec94f1f49e7e8eae76670feb7ab475c55774..74234a1a74d4577a7233c6bf08df3bb4349b5765 100644
--- a/briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java
+++ b/briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java
@@ -4,7 +4,6 @@ import static android.content.Context.MODE_PRIVATE;
import java.io.File;
-import net.sf.briar.api.crypto.Password;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.ui.UiCallback;
import android.app.Application;
@@ -39,13 +38,8 @@ public class HelloWorldModule extends AbstractModule {
return app.getApplicationContext().getDir("db", MODE_PRIVATE);
}
- public Password getPassword() {
- return new Password() {
-
- public char[] getPassword() {
- return "foo bar".toCharArray();
- }
- };
+ public char[] getPassword() {
+ return "foo bar".toCharArray();
}
public long getMaxSize() {
diff --git a/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java b/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
index 6bc03686f8711cc1432e094ac1da96c21c87a8dd..5d2fb02ad9401fc633984fb3816931fd84218386 100644
--- a/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
+++ b/briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
@@ -1,25 +1,14 @@
package net.sf.briar.android.invitation;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
import net.sf.briar.android.BriarActivity;
-import net.sf.briar.android.BriarService;
-import net.sf.briar.android.BriarService.BriarServiceConnection;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.android.BundleEncrypter;
import net.sf.briar.api.android.ReferenceManager;
import net.sf.briar.api.crypto.CryptoComponent;
-import net.sf.briar.api.db.DatabaseComponent;
-import net.sf.briar.api.db.DatabaseExecutor;
-import net.sf.briar.api.db.DbException;
import net.sf.briar.api.invitation.InvitationListener;
import net.sf.briar.api.invitation.InvitationState;
import net.sf.briar.api.invitation.InvitationTask;
import net.sf.briar.api.invitation.InvitationTaskFactory;
-import android.content.Intent;
import android.os.Bundle;
import com.google.inject.Inject;
@@ -27,12 +16,6 @@ import com.google.inject.Inject;
public class AddContactActivity extends BriarActivity
implements InvitationListener {
- private static final Logger LOG =
- Logger.getLogger(AddContactActivity.class.getName());
-
- private final BriarServiceConnection serviceConnection =
- new BriarServiceConnection();
-
@Inject private BundleEncrypter bundleEncrypter;
@Inject private CryptoComponent crypto;
@Inject private InvitationTaskFactory invitationTaskFactory;
@@ -40,6 +23,7 @@ implements InvitationListener {
private AddContactView view = null;
private InvitationTask task = null;
private long taskHandle = -1;
+ private AuthorId localAuthorId = null;
private String networkName = null;
private boolean useBluetooth = false;
private int localInvitationCode = -1, remoteInvitationCode = -1;
@@ -47,10 +31,7 @@ implements InvitationListener {
private boolean connectionFailed = false;
private boolean localCompared = false, remoteCompared = false;
private boolean localMatched = false, remoteMatched = false;
-
- // Fields that are accessed from DB threads must be volatile
- @Inject private volatile DatabaseComponent db;
- @Inject @DatabaseExecutor private volatile Executor dbExecutor;
+ private String contactName = null;
@Override
public void onCreate(Bundle state) {
@@ -60,6 +41,8 @@ implements InvitationListener {
setView(new NetworkSetupView(this));
} else {
// Restore the activity's state
+ byte[] id = state.getByteArray("net.sf.briar.LOCAL_AUTHOR_ID");
+ if(id != null) localAuthorId = new AuthorId(id);
networkName = state.getString("net.sf.briar.NETWORK_NAME");
useBluetooth = state.getBoolean("net.sf.briar.USE_BLUETOOTH");
taskHandle = state.getLong("net.sf.briar.TASK_HANDLE", -1);
@@ -70,7 +53,8 @@ implements InvitationListener {
localInvitationCode = state.getInt("net.sf.briar.LOCAL_CODE");
remoteInvitationCode = state.getInt("net.sf.briar.REMOTE_CODE");
connectionFailed = state.getBoolean("net.sf.briar.FAILED");
- if(state.getBoolean("net.sf.briar.MATCHED")) {
+ contactName = state.getString("net.sf.briar.CONTACT_NAME");
+ if(contactName != null) {
localCompared = remoteCompared = true;
localMatched = remoteMatched = true;
}
@@ -81,10 +65,10 @@ implements InvitationListener {
setView(new InvitationCodeView(this));
} else if(connectionFailed) {
setView(new ConnectionFailedView(this));
- } else if(localMatched && remoteMatched) {
- setView(new ContactAddedView(this));
- } else {
+ } else if(contactName == null) {
setView(new CodesDoNotMatchView(this));
+ } else {
+ setView(new ContactAddedView(this));
}
} else {
// A background task exists - listen to it and get its state
@@ -98,6 +82,7 @@ implements InvitationListener {
remoteCompared = s.getRemoteCompared();
localMatched = s.getLocalMatched();
remoteMatched = s.getRemoteMatched();
+ contactName = s.getContactName();
// Set the appropriate view for the state
if(localInvitationCode == -1) {
setView(new NetworkSetupView(this));
@@ -112,15 +97,14 @@ implements InvitationListener {
} else if(!remoteCompared) {
setView(new WaitForContactView(this));
} else if(localMatched && remoteMatched) {
- setView(new ContactAddedView(this));
+ if(contactName == null)
+ setView(new WaitForContactView(this));
+ else setView(new ContactAddedView(this));
} else {
setView(new CodesDoNotMatchView(this));
}
}
}
- // Bind to the service so we can wait for the DB to be opened
- bindService(new Intent(BriarService.class.getName()),
- serviceConnection, 0);
}
@Override
@@ -131,12 +115,16 @@ implements InvitationListener {
@Override
public void onSaveInstanceState(Bundle state) {
+ if(localAuthorId != null) {
+ state.putByteArray("net.sf.briar.LOCAL_AUTHOR_ID",
+ localAuthorId.getBytes());
+ }
state.putString("net.sf.briar.NETWORK_NAME", networkName);
state.putBoolean("net.sf.briar.USE_BLUETOOTH", useBluetooth);
state.putInt("net.sf.briar.LOCAL_CODE", localInvitationCode);
state.putInt("net.sf.briar.REMOTE_CODE", remoteInvitationCode);
state.putBoolean("net.sf.briar.FAILED", connectionFailed);
- state.putBoolean("net.sf.briar.MATCHED", localMatched && remoteMatched);
+ state.putString("net.sf.briar.CONTACT_NAME", contactName);
if(task != null) state.putLong("net.sf.briar.TASK_HANDLE", taskHandle);
bundleEncrypter.encrypt(state);
}
@@ -145,7 +133,6 @@ implements InvitationListener {
public void onDestroy() {
super.onDestroy();
if(task != null) task.removeListener(this);
- unbindService(serviceConnection);
}
void setView(AddContactView view) {
@@ -157,6 +144,7 @@ implements InvitationListener {
void reset(AddContactView view) {
task = null;
taskHandle = -1;
+ localAuthorId = null;
networkName = null;
useBluetooth = false;
localInvitationCode = -1;
@@ -164,9 +152,14 @@ implements InvitationListener {
connectionFailed = false;
localCompared = remoteCompared = false;
localMatched = remoteMatched = false;
+ contactName = null;
setView(view);
}
+ void setLocalAuthorId(AuthorId localAuthorId) {
+ this.localAuthorId = localAuthorId;
+ }
+
void setNetworkName(String networkName) {
this.networkName = networkName;
}
@@ -191,8 +184,10 @@ implements InvitationListener {
void remoteInvitationCodeEntered(int code) {
setView(new ConnectionView(this));
- // FIXME: These calls are blocking the UI thread for too long
- task = invitationTaskFactory.createTask(localInvitationCode, code);
+ if(localAuthorId == null) throw new IllegalStateException();
+ if(localInvitationCode == -1) throw new IllegalStateException();
+ task = invitationTaskFactory.createTask(localAuthorId,
+ localInvitationCode, code);
taskHandle = referenceManager.putReference(task, InvitationTask.class);
task.addListener(AddContactActivity.this);
task.addListener(new ReferenceCleaner(referenceManager, taskHandle));
@@ -204,11 +199,10 @@ implements InvitationListener {
}
void remoteConfirmationCodeEntered(int code) {
+ localCompared = true;
if(code == remoteConfirmationCode) {
localMatched = true;
- if(remoteMatched) setView(new ContactAddedView(this));
- else if(remoteCompared) setView(new CodesDoNotMatchView(this));
- else setView(new WaitForContactView(this));
+ setView(new WaitForContactView(this));
task.localConfirmationSucceeded();
} else {
setView(new CodesDoNotMatchView(this));
@@ -216,23 +210,8 @@ implements InvitationListener {
}
}
- void addContactAndFinish(final String nickname) {
- dbExecutor.execute(new Runnable() {
- public void run() {
- try {
- serviceConnection.waitForStartup();
- db.addContact(nickname);
- } catch(DbException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- } catch(InterruptedException e) {
- if(LOG.isLoggable(INFO))
- LOG.info("Interrupted while waiting for service");
- Thread.currentThread().interrupt();
- }
- }
- });
- finish();
+ String getContactName() {
+ return contactName;
}
public void connectionSucceeded(final int localCode, final int remoteCode) {
@@ -259,8 +238,6 @@ implements InvitationListener {
public void run() {
remoteCompared = true;
remoteMatched = true;
- if(localMatched)
- setView(new ContactAddedView(AddContactActivity.this));
}
});
}
@@ -275,6 +252,23 @@ implements InvitationListener {
});
}
+ public void pseudonymExchangeSucceeded(final String remoteName) {
+ runOnUiThread(new Runnable() {
+ public void run() {
+ contactName = remoteName;
+ setView(new ContactAddedView(AddContactActivity.this));
+ }
+ });
+ }
+
+ public void pseudonymExchangeFailed() {
+ runOnUiThread(new Runnable() {
+ public void run() {
+ setView(new ConnectionFailedView(AddContactActivity.this));
+ }
+ });
+ }
+
/**
* Cleans up the reference to the invitation task when the task completes.
* This class is static to prevent memory leaks.
@@ -299,11 +293,19 @@ implements InvitationListener {
}
public void remoteConfirmationSucceeded() {
- referenceManager.removeReference(handle, InvitationTask.class);
+ // Wait for the pseudonym exchange to succeed or fail
}
public void remoteConfirmationFailed() {
referenceManager.removeReference(handle, InvitationTask.class);
}
+
+ public void pseudonymExchangeSucceeded(String remoteName) {
+ referenceManager.removeReference(handle, InvitationTask.class);
+ }
+
+ public void pseudonymExchangeFailed() {
+ referenceManager.removeReference(handle, InvitationTask.class);
+ }
}
}
diff --git a/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java b/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java
index 7de4ddc405eef0b20893572d484ad6b0880918cd..a2b297aa49b893fa653862a02aed1ea01cbebdf4 100644
--- a/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java
@@ -1,27 +1,18 @@
package net.sf.briar.android.invitation;
-import static android.text.InputType.TYPE_CLASS_TEXT;
-import static android.text.InputType.TYPE_TEXT_FLAG_CAP_WORDS;
-import static android.text.InputType.TYPE_TEXT_VARIATION_PERSON_NAME;
import static android.view.Gravity.CENTER;
-import static android.view.Gravity.CENTER_HORIZONTAL;
import net.sf.briar.R;
import net.sf.briar.android.widgets.CommonLayoutParams;
import android.content.Context;
-import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
-import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
-public class ContactAddedView extends AddContactView implements OnClickListener,
-OnEditorActionListener {
-
- EditText nicknameEntry = null;
+public class ContactAddedView extends AddContactView
+implements OnClickListener {
ContactAddedView(Context ctx) {
super(ctx);
@@ -46,50 +37,21 @@ OnEditorActionListener {
innerLayout.addView(added);
addView(innerLayout);
- TextView enterNickname = new TextView(ctx);
- enterNickname.setGravity(CENTER_HORIZONTAL);
- enterNickname.setPadding(10, 0, 10, 10);
- enterNickname.setText(R.string.enter_nickname);
- addView(enterNickname);
-
- innerLayout = new LinearLayout(ctx);
- innerLayout.setOrientation(HORIZONTAL);
- innerLayout.setGravity(CENTER);
+ TextView contactName = new TextView(ctx);
+ contactName.setTextSize(22);
+ contactName.setPadding(10, 0, 10, 10);
+ contactName.setText(container.getContactName());
+ addView(contactName);
- final Button doneButton = new Button(ctx);
+ Button doneButton = new Button(ctx);
doneButton.setLayoutParams(CommonLayoutParams.WRAP_WRAP);
doneButton.setText(R.string.done_button);
doneButton.setEnabled(false);
doneButton.setOnClickListener(this);
-
- nicknameEntry = new EditText(ctx) {
- @Override
- protected void onTextChanged(CharSequence text, int start,
- int lengthBefore, int lengthAfter) {
- doneButton.setEnabled(text.length() > 0);
- }
- };
- nicknameEntry.setTextSize(26);
- nicknameEntry.setPadding(10, 0, 10, 10);
- nicknameEntry.setMinEms(5);
- nicknameEntry.setMaxEms(20);
- nicknameEntry.setMaxLines(1);
- nicknameEntry.setInputType(TYPE_CLASS_TEXT | TYPE_TEXT_FLAG_CAP_WORDS |
- TYPE_TEXT_VARIATION_PERSON_NAME);
- nicknameEntry.setOnEditorActionListener(this);
- innerLayout.addView(nicknameEntry);
- innerLayout.addView(doneButton);
- addView(innerLayout);
- }
-
- public boolean onEditorAction(TextView textView, int actionId, KeyEvent e) {
- String nickname = textView.getText().toString();
- if(nickname.length() > 0) container.addContactAndFinish(nickname);
- return true;
+ addView(doneButton);
}
public void onClick(View view) {
- String nickname = nicknameEntry.getText().toString();
- container.addContactAndFinish(nickname);
+ container.finish();
}
}
diff --git a/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java b/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java
index 06d6915b0920286f2955f75640ba9927cf7dfa83..aa37cac92c17d77ac0b67a86477dc9f967ea823a 100644
--- a/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java
+++ b/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java
@@ -20,11 +20,13 @@ implements WifiStateListener, BluetoothStateListener, OnClickListener {
void populate() {
removeAllViews();
Context ctx = getContext();
- TextView sameNetwork = new TextView(ctx);
- sameNetwork.setTextSize(14);
- sameNetwork.setPadding(10, 10, 10, 10);
- sameNetwork.setText(R.string.same_network);
- addView(sameNetwork);
+ TextView chooseIdentity = new TextView(ctx);
+ chooseIdentity.setTextSize(14);
+ chooseIdentity.setPadding(10, 10, 10, 10);
+ chooseIdentity.setText(R.string.choose_identity);
+ addView(chooseIdentity);
+
+ // FIXME: Add a spinner for choosing which identity to use
WifiWidget wifi = new WifiWidget(ctx);
wifi.init(this);
diff --git a/briar-android/src/net/sf/briar/android/messages/ContactNameSpinnerAdapter.java b/briar-android/src/net/sf/briar/android/messages/ContactNameSpinnerAdapter.java
index 18c4d00e7da665af939054442d5b261cd63906b7..2694f37a4a21458f4c8ea94a51c2a7f5be77416f 100644
--- a/briar-android/src/net/sf/briar/android/messages/ContactNameSpinnerAdapter.java
+++ b/briar-android/src/net/sf/briar/android/messages/ContactNameSpinnerAdapter.java
@@ -10,7 +10,7 @@ import android.widget.ArrayAdapter;
import android.widget.SpinnerAdapter;
import android.widget.TextView;
-class ContactNameSpinnerAdapter extends ArrayAdapter<Contact>
+public class ContactNameSpinnerAdapter extends ArrayAdapter<Contact>
implements SpinnerAdapter {
ContactNameSpinnerAdapter(Context context) {
@@ -24,7 +24,7 @@ implements SpinnerAdapter {
name.setTextSize(18);
name.setMaxLines(1);
name.setPadding(10, 10, 10, 10);
- name.setText(getItem(position).getName());
+ name.setText(getItem(position).getAuthor().getName());
return name;
}
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
index 2078a521c526909089af404195678a16ae79455c..3c2938da420510c94cf01914094fcddc4244df48 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
@@ -5,8 +5,6 @@ import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -25,7 +23,6 @@ import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
-import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.db.PrivateMessageHeader;
@@ -34,8 +31,6 @@ import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.MessageExpiredEvent;
import net.sf.briar.api.db.event.PrivateMessageAddedEvent;
-import net.sf.briar.api.messaging.Message;
-import net.sf.briar.api.messaging.MessageFactory;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
@@ -60,9 +55,7 @@ implements OnClickListener, DatabaseListener {
// Fields that are accessed from DB threads must be volatile
@Inject private volatile DatabaseComponent db;
- @Inject @DatabaseExecutor private volatile Executor dbExecutor;
@Inject @DatabaseUiExecutor private volatile Executor dbUiExecutor;
- @Inject private volatile MessageFactory messageFactory;
@Override
public void onCreate(Bundle state) {
@@ -93,70 +86,6 @@ implements OnClickListener, DatabaseListener {
// Bind to the service so we can wait for the DB to be opened
bindService(new Intent(BriarService.class.getName()),
serviceConnection, 0);
-
- // Add some fake messages to the database in a background thread
- insertFakeMessages();
- }
-
- // FIXME: Remove this
- private void insertFakeMessages() {
- dbExecutor.execute(new Runnable() {
- public void run() {
- try {
- // Wait for the service to be bound and started
- serviceConnection.waitForStartup();
- // If there are no messages in the DB, create some fake ones
- Collection<PrivateMessageHeader> headers =
- db.getPrivateMessageHeaders();
- if(!headers.isEmpty()) return;
- if(LOG.isLoggable(INFO))
- LOG.info("Inserting fake private messages");
- // We'll also need a contact to exchange messages with
- ContactId contactId = db.addContact("Carol");
- // Insert some text messages to and from the contact
- for(int i = 0; i < 20; i++) {
- String body;
- if(i % 3 == 0) {
- body = "Message " + i + " is short.";
- } else {
- body = "Message " + i + " is long enough to"
- + " wrap onto a second line on some"
- + " screens.";
- }
- Message m = messageFactory.createPrivateMessage(null,
- "text/plain", body.getBytes("UTF-8"));
- if(Math.random() < 0.5)
- db.addLocalPrivateMessage(m, contactId);
- else db.receiveMessage(contactId, m);
- db.setReadFlag(m.getId(), i % 4 == 0);
- }
- // Insert a non-text message
- Message m = messageFactory.createPrivateMessage(null,
- "image/jpeg", new byte[1000]);
- db.receiveMessage(contactId, m);
- // Insert a long text message
- StringBuilder s = new StringBuilder();
- for(int i = 0; i < 100; i++)
- s.append("This is a very tedious message. ");
- m = messageFactory.createPrivateMessage(m.getId(),
- "text/plain", s.toString().getBytes("UTF-8"));
- db.addLocalPrivateMessage(m, contactId);
- } catch(DbException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- } catch(GeneralSecurityException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- } catch(InterruptedException e) {
- if(LOG.isLoggable(INFO))
- LOG.info("Interrupted while waiting for service");
- Thread.currentThread().interrupt();
- } catch(IOException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- }
- }
- });
}
@Override
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListItem.java b/briar-android/src/net/sf/briar/android/messages/ConversationListItem.java
index eec30a91c80947d7cd4142db16e009f7c4c50991..7dd10c32b7e4e4ab8c7904dae5f3bd29340fc9b4 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationListItem.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationListItem.java
@@ -31,7 +31,7 @@ class ConversationListItem {
}
String getContactName() {
- return contact.getName();
+ return contact.getAuthor().getName();
}
String getSubject() {
diff --git a/briar-api/src/net/sf/briar/api/messaging/Author.java b/briar-api/src/net/sf/briar/api/Author.java
similarity index 78%
rename from briar-api/src/net/sf/briar/api/messaging/Author.java
rename to briar-api/src/net/sf/briar/api/Author.java
index 3621fbd84f063f4a0b6ba57b25d7571525dbe7e6..3866460242341476408f3093efd98aa029b4ddc2 100644
--- a/briar-api/src/net/sf/briar/api/messaging/Author.java
+++ b/briar-api/src/net/sf/briar/api/Author.java
@@ -1,6 +1,6 @@
-package net.sf.briar.api.messaging;
+package net.sf.briar.api;
-/** A pseudonymous author of {@link Message}s. */
+/** A pseudonym for a user. */
public class Author {
private final AuthorId id;
@@ -23,10 +23,7 @@ public class Author {
return name;
}
- /**
- * Returns the public key that is used to verify messages signed by the
- * author.
- */
+ /** Returns the public key used to verify the pseudonym's signatures. */
public byte[] getPublicKey() {
return publicKey;
}
diff --git a/briar-api/src/net/sf/briar/api/messaging/AuthorFactory.java b/briar-api/src/net/sf/briar/api/AuthorFactory.java
similarity index 79%
rename from briar-api/src/net/sf/briar/api/messaging/AuthorFactory.java
rename to briar-api/src/net/sf/briar/api/AuthorFactory.java
index d1708340a5cc296ab7d76702ed034b81230ea377..f9c50ca838ad1dafed5246d5c900851d119698d5 100644
--- a/briar-api/src/net/sf/briar/api/messaging/AuthorFactory.java
+++ b/briar-api/src/net/sf/briar/api/AuthorFactory.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package net.sf.briar.api;
import java.io.IOException;
diff --git a/briar-api/src/net/sf/briar/api/messaging/AuthorId.java b/briar-api/src/net/sf/briar/api/AuthorId.java
similarity index 90%
rename from briar-api/src/net/sf/briar/api/messaging/AuthorId.java
rename to briar-api/src/net/sf/briar/api/AuthorId.java
index 25360a3255f1f7ac94942a3cdf2b48e0d6f8c535..263962963078e241b82062fddde1278d07071d0a 100644
--- a/briar-api/src/net/sf/briar/api/messaging/AuthorId.java
+++ b/briar-api/src/net/sf/briar/api/AuthorId.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package net.sf.briar.api;
import java.util.Arrays;
diff --git a/briar-api/src/net/sf/briar/api/Contact.java b/briar-api/src/net/sf/briar/api/Contact.java
index bbac1dc99bdebb7d720cf4fd63586e7adf72321a..c86708276ed5f68d3096ad24943bfe42fe855b4d 100644
--- a/briar-api/src/net/sf/briar/api/Contact.java
+++ b/briar-api/src/net/sf/briar/api/Contact.java
@@ -3,12 +3,12 @@ package net.sf.briar.api;
public class Contact {
private final ContactId id;
- private final String name;
+ private final Author author;
private final long lastConnected;
- public Contact(ContactId id, String name, long lastConnected) {
+ public Contact(ContactId id, Author author, long lastConnected) {
this.id = id;
- this.name = name;
+ this.author = author;
this.lastConnected = lastConnected;
}
@@ -16,8 +16,8 @@ public class Contact {
return id;
}
- public String getName() {
- return name;
+ public Author getAuthor() {
+ return author;
}
public long getLastConnected() {
diff --git a/briar-api/src/net/sf/briar/api/messaging/LocalAuthor.java b/briar-api/src/net/sf/briar/api/LocalAuthor.java
similarity index 63%
rename from briar-api/src/net/sf/briar/api/messaging/LocalAuthor.java
rename to briar-api/src/net/sf/briar/api/LocalAuthor.java
index d60f44b4559f6c51374ac2fd8c04ad87c1f4b36c..365c92326ac748071001e71d288fda7708aa1b2f 100644
--- a/briar-api/src/net/sf/briar/api/messaging/LocalAuthor.java
+++ b/briar-api/src/net/sf/briar/api/LocalAuthor.java
@@ -1,6 +1,6 @@
-package net.sf.briar.api.messaging;
+package net.sf.briar.api;
-/** A pseudonym that the user can use to sign {@link Message}s. */
+/** A pseudonym for the local user. */
public class LocalAuthor extends Author {
private final byte[] privateKey;
@@ -11,7 +11,7 @@ public class LocalAuthor extends Author {
this.privateKey = privateKey;
}
- /** Returns the private key that is used to sign messages. */
+ /** Returns the private key used to generate the pseudonym's signatures. */
public byte[] getPrivateKey() {
return privateKey;
}
diff --git a/briar-api/src/net/sf/briar/api/messaging/TransportId.java b/briar-api/src/net/sf/briar/api/TransportId.java
similarity index 91%
rename from briar-api/src/net/sf/briar/api/messaging/TransportId.java
rename to briar-api/src/net/sf/briar/api/TransportId.java
index 3d546f4cba2473aa0536a818826e9d4647dc1e2f..bcc8519508a088b4f4aa0f13b36da60cf5861bee 100644
--- a/briar-api/src/net/sf/briar/api/messaging/TransportId.java
+++ b/briar-api/src/net/sf/briar/api/TransportId.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package net.sf.briar.api;
import java.util.Arrays;
diff --git a/briar-api/src/net/sf/briar/api/messaging/UniqueId.java b/briar-api/src/net/sf/briar/api/UniqueId.java
similarity index 94%
rename from briar-api/src/net/sf/briar/api/messaging/UniqueId.java
rename to briar-api/src/net/sf/briar/api/UniqueId.java
index a15573e9aa01d3f4a517cf12c698d998cdda758d..f86c873fa1c6406cbd1c4f8e4082adcc38b84db3 100644
--- a/briar-api/src/net/sf/briar/api/messaging/UniqueId.java
+++ b/briar-api/src/net/sf/briar/api/UniqueId.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package net.sf.briar.api;
import java.util.Arrays;
diff --git a/briar-api/src/net/sf/briar/api/crypto/CryptoComponent.java b/briar-api/src/net/sf/briar/api/crypto/CryptoComponent.java
index aa88207c16e496ff737c10371a3b51aaf207230c..c500cc3ccc13394a617d9a1e9d2634fc0e737983 100644
--- a/briar-api/src/net/sf/briar/api/crypto/CryptoComponent.java
+++ b/briar-api/src/net/sf/briar/api/crypto/CryptoComponent.java
@@ -9,75 +9,91 @@ import javax.crypto.Cipher;
public interface CryptoComponent {
+ ErasableKey generateSecretKey();
+
+ MessageDigest getMessageDigest();
+
+ PseudoRandom getPseudoRandom(int seed1, int seed2);
+
+ SecureRandom getSecureRandom();
+
+ Signature getSignature();
+
+ KeyPair generateAgreementKeyPair();
+
+ KeyParser getAgreementKeyParser();
+
+ KeyPair generateSignatureKeyPair();
+
+ KeyParser getSignatureKeyParser();
+
+ /** Generates a random invitation code. */
+ int generateInvitationCode();
+
/**
- * Derives a tag key from the given temporary secret.
- * @param alice indicates whether the key is for connections initiated by
- * Alice or Bob.
+ * Derives two confirmation codes from the given master secret. The first
+ * code is for Alice to give to Bob; the second is for Bob to give to
+ * Alice.
*/
- ErasableKey deriveTagKey(byte[] secret, boolean alice);
+ int[] deriveConfirmationCodes(byte[] secret);
/**
- * Derives a frame key from the given temporary secret and connection
- * number.
- * @param alice indicates whether the key is for a connection initiated by
- * Alice or Bob.
- * @param initiator indicates whether the key is for the initiator's or the
- * responder's side of the connection.
+ * Derives two nonces from the given master secret. The first nonce is for
+ * Alice to sign; the second is for Bob to sign.
*/
- ErasableKey deriveFrameKey(byte[] secret, long connection, boolean alice,
- boolean initiator);
+ byte[][] deriveInvitationNonces(byte[] secret);
/**
- * Derives an initial shared secret from two public keys and one of the
+ * Derives a shared master secret from two public keys and one of the
* corresponding private keys.
* @param alice indicates whether the private key belongs to Alice or Bob.
*/
- byte[] deriveInitialSecret(byte[] theirPublicKey, KeyPair ourKeyPair,
+ byte[] deriveMasterSecret(byte[] theirPublicKey, KeyPair ourKeyPair,
boolean alice) throws GeneralSecurityException;
/**
- * Generates a random invitation code.
+ * Derives an initial secret for the given transport from the given master
+ * secret.
*/
- int generateInvitationCode();
+ byte[] deriveInitialSecret(byte[] secret, int transportIndex);
/**
- * Derives two confirmation codes from the given initial shared secret. The
- * first code is for Alice to give to Bob; the second is for Bob to give to
- * Alice.
+ * Derives a temporary secret for the given period from the given secret,
+ * which is either the initial shared secret or the previous period's
+ * temporary secret.
*/
- int[] deriveConfirmationCodes(byte[] secret);
+ byte[] deriveNextSecret(byte[] secret, long period);
/**
- * Derives a temporary secret for the given period from the previous
- * period's temporary secret.
+ * Derives a tag key from the given temporary secret.
+ * @param alice indicates whether the key is for connections initiated by
+ * Alice or Bob.
*/
- byte[] deriveNextSecret(byte[] secret, long period);
-
- /** Encodes the pseudo-random tag that is used to recognise a connection. */
- void encodeTag(byte[] tag, Cipher tagCipher, ErasableKey tagKey,
- long connection);
-
- KeyPair generateAgreementKeyPair();
-
- KeyParser getAgreementKeyParser();
-
- KeyPair generateSignatureKeyPair();
-
- KeyParser getSignatureKeyParser();
-
- ErasableKey generateSecretKey();
-
- MessageDigest getMessageDigest();
-
- PseudoRandom getPseudoRandom(int seed1, int seed2);
+ ErasableKey deriveTagKey(byte[] secret, boolean alice);
- SecureRandom getSecureRandom();
+ /**
+ * Derives a frame key from the given temporary secret and connection
+ * number.
+ * @param alice indicates whether the key is for a connection initiated by
+ * Alice or Bob.
+ * @param initiator indicates whether the key is for the initiator's or the
+ * responder's side of the connection.
+ */
+ ErasableKey deriveFrameKey(byte[] secret, long connection, boolean alice,
+ boolean initiator);
+ /**
+ * Returns a cipher for generating the pseudo-random tags that are used to
+ * recognise connections.
+ */
Cipher getTagCipher();
+ /** Returns a cipher for encrypting and authenticating connections. */
AuthenticatedCipher getFrameCipher();
- Signature getSignature();
+ /** Encodes the pseudo-random tag that is used to recognise a connection. */
+ void encodeTag(byte[] tag, Cipher tagCipher, ErasableKey tagKey,
+ long connection);
/**
* Encrypts the given plaintext so it can be written to temporary storage.
diff --git a/briar-api/src/net/sf/briar/api/crypto/KeyManager.java b/briar-api/src/net/sf/briar/api/crypto/KeyManager.java
index e1ebbf512e3152a31bc140cf9159104b1f015466..8964f665f808e1be61180f98272538a207e88a04 100644
--- a/briar-api/src/net/sf/briar/api/crypto/KeyManager.java
+++ b/briar-api/src/net/sf/briar/api/crypto/KeyManager.java
@@ -1,7 +1,7 @@
package net.sf.briar.api.crypto;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.Endpoint;
diff --git a/briar-api/src/net/sf/briar/api/crypto/KeyParser.java b/briar-api/src/net/sf/briar/api/crypto/KeyParser.java
index 599c900828ccde04dbf9f24080c34c9c910648a0..da47281a822d2ed0144dd1548863986ac18e3517 100644
--- a/briar-api/src/net/sf/briar/api/crypto/KeyParser.java
+++ b/briar-api/src/net/sf/briar/api/crypto/KeyParser.java
@@ -1,9 +1,13 @@
package net.sf.briar.api.crypto;
+import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
public interface KeyParser {
PublicKey parsePublicKey(byte[] encodedKey) throws InvalidKeySpecException;
+
+ PrivateKey parsePrivateKey(byte[] encodedKey)
+ throws InvalidKeySpecException;
}
diff --git a/briar-api/src/net/sf/briar/api/crypto/Password.java b/briar-api/src/net/sf/briar/api/crypto/Password.java
deleted file mode 100644
index f26b68ef34174490f4fcd24b4c5d563be5b021cc..0000000000000000000000000000000000000000
--- a/briar-api/src/net/sf/briar/api/crypto/Password.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package net.sf.briar.api.crypto;
-
-/**
- * Encapsulates a password. Implementations may keep the password encrypted in
- * memory to reduce the chances of writing it to the swapfile in plaintext.
- */
-public interface Password {
-
- /**
- * Returns the password as a character array, which should be filled with
- * zeroes as soon as it has been used.
- */
- char[] getPassword();
-}
diff --git a/briar-api/src/net/sf/briar/api/crypto/PseudoRandom.java b/briar-api/src/net/sf/briar/api/crypto/PseudoRandom.java
index 6abca7c506ed2e559f843c7e87787f91ce076a68..0985fec3de661ebc72b1e26e86df372b725d43e6 100644
--- a/briar-api/src/net/sf/briar/api/crypto/PseudoRandom.java
+++ b/briar-api/src/net/sf/briar/api/crypto/PseudoRandom.java
@@ -1,5 +1,6 @@
package net.sf.briar.api.crypto;
+/** A deterministic PRNG. */
public interface PseudoRandom {
byte[] nextBytes(int bytes);
diff --git a/briar-api/src/net/sf/briar/api/db/ContactExistsException.java b/briar-api/src/net/sf/briar/api/db/ContactExistsException.java
new file mode 100644
index 0000000000000000000000000000000000000000..33b11d6d1fea17133e48166b902fcc065794f631
--- /dev/null
+++ b/briar-api/src/net/sf/briar/api/db/ContactExistsException.java
@@ -0,0 +1,10 @@
+package net.sf.briar.api.db;
+
+/**
+ * Thrown when a duplicate contact is added to the database. This exception may
+ * occur due to concurrent updates and does not indicate a database error.
+ */
+public class ContactExistsException extends DbException {
+
+ private static final long serialVersionUID = -6658762011691502411L;
+}
diff --git a/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java b/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
index ba5f1848e9bb7fe29144e0f13c37e83d6b8a5203..f261eac0aac5b2c56ae2bd3daff94a9a02ad662f 100644
--- a/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
+++ b/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
@@ -4,28 +4,29 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Map;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.Rating;
+import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.messaging.Ack;
-import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
-import net.sf.briar.api.messaging.LocalAuthor;
import net.sf.briar.api.messaging.LocalGroup;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.Offer;
+import net.sf.briar.api.messaging.Rating;
import net.sf.briar.api.messaging.Request;
import net.sf.briar.api.messaging.RetentionAck;
import net.sf.briar.api.messaging.RetentionUpdate;
import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
@@ -53,9 +54,10 @@ public interface DatabaseComponent {
void removeListener(DatabaseListener d);
/**
- * Stores a contact with the given name and returns an ID for the contact.
+ * Stores a contact with the given pseudonym, associated with the given
+ * local pseudonym, and returns an ID for the contact.
*/
- ContactId addContact(String name) throws DbException;
+ ContactId addContact(Author remote, AuthorId local) throws DbException;
/** Stores an endpoint. */
void addEndpoint(Endpoint ep) throws DbException;
@@ -85,7 +87,7 @@ public interface DatabaseComponent {
* Stores a transport and returns true if the transport was not previously
* in the database.
*/
- boolean addTransport(TransportId t) throws DbException;
+ boolean addTransport(TransportId t, long maxLatency) throws DbException;
/**
* Generates an acknowledgement for the given contact, or returns null if
@@ -176,12 +178,19 @@ public interface DatabaseComponent {
/** Returns the group with the given ID, if the user subscribes to it. */
Group getGroup(GroupId g) throws DbException;
+ /** Returns the pseudonym with the given ID. */
+ LocalAuthor getLocalAuthor(AuthorId a) throws DbException;
+
/** Returns all pseudonyms that the user can use to sign messages. */
Collection<LocalAuthor> getLocalAuthors() throws DbException;
/** Returns all restricted groups to which the user can post messages. */
Collection<LocalGroup> getLocalGroups() throws DbException;
+ /** Returns the local transport properties for all transports. */
+ Map<TransportId, TransportProperties> getLocalProperties()
+ throws DbException;
+
/** Returns the local transport properties for the given transport. */
TransportProperties getLocalProperties(TransportId t) throws DbException;
@@ -222,6 +231,9 @@ public interface DatabaseComponent {
/** Returns the set of groups to which the user subscribes. */
Collection<Group> getSubscriptions() throws DbException;
+ /** Returns the maximum latencies of all local transports. */
+ Map<TransportId, Long> getTransportLatencies() throws DbException;
+
/** Returns the number of unread messages in each subscribed group. */
Map<GroupId, Integer> getUnreadMessageCounts() throws DbException;
@@ -317,6 +329,13 @@ public interface DatabaseComponent {
*/
boolean setReadFlag(MessageId m, boolean read) throws DbException;
+ /**
+ * Sets the remote transport properties for the given contact, replacing
+ * any existing properties.
+ */
+ void setRemoteProperties(ContactId c,
+ Map<TransportId, TransportProperties> p) throws DbException;
+
/** Records the given messages as having been seen by the given contact. */
void setSeen(ContactId c, Collection<MessageId> seen) throws DbException;
diff --git a/briar-api/src/net/sf/briar/api/db/DatabaseConfig.java b/briar-api/src/net/sf/briar/api/db/DatabaseConfig.java
index 74fdb0c76e21ec481b7ab2e33aa16d7fbd657c34..64a99275998858f29a7157470153c25ce2aac9b4 100644
--- a/briar-api/src/net/sf/briar/api/db/DatabaseConfig.java
+++ b/briar-api/src/net/sf/briar/api/db/DatabaseConfig.java
@@ -2,13 +2,11 @@ package net.sf.briar.api.db;
import java.io.File;
-import net.sf.briar.api.crypto.Password;
-
public interface DatabaseConfig {
File getDataDirectory();
- Password getPassword();
+ char[] getPassword();
long getMaxSize();
}
diff --git a/briar-api/src/net/sf/briar/api/db/GroupMessageHeader.java b/briar-api/src/net/sf/briar/api/db/GroupMessageHeader.java
index a994de1bd4d6abf190c5ca18d253a19f8273a240..7e6d98cee65318cda02311afb654ec5a7b0e4f8b 100644
--- a/briar-api/src/net/sf/briar/api/db/GroupMessageHeader.java
+++ b/briar-api/src/net/sf/briar/api/db/GroupMessageHeader.java
@@ -1,9 +1,9 @@
package net.sf.briar.api.db;
-import net.sf.briar.api.Rating;
-import net.sf.briar.api.messaging.Author;
+import net.sf.briar.api.Author;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.MessageId;
+import net.sf.briar.api.messaging.Rating;
public class GroupMessageHeader extends MessageHeader {
diff --git a/briar-api/src/net/sf/briar/api/db/event/RatingChangedEvent.java b/briar-api/src/net/sf/briar/api/db/event/RatingChangedEvent.java
index 2c2bf6d7aa8a5da1bab7e3bf1f58b0d3d6275f55..bc47937221925d0742a187b11be13ebfb57a6658 100644
--- a/briar-api/src/net/sf/briar/api/db/event/RatingChangedEvent.java
+++ b/briar-api/src/net/sf/briar/api/db/event/RatingChangedEvent.java
@@ -1,7 +1,7 @@
package net.sf.briar.api.db.event;
-import net.sf.briar.api.Rating;
-import net.sf.briar.api.messaging.AuthorId;
+import net.sf.briar.api.AuthorId;
+import net.sf.briar.api.messaging.Rating;
public class RatingChangedEvent extends DatabaseEvent {
diff --git a/briar-api/src/net/sf/briar/api/db/event/RemoteTransportsUpdatedEvent.java b/briar-api/src/net/sf/briar/api/db/event/RemoteTransportsUpdatedEvent.java
index afb2f4a2680b0378df9cbef597fcc5b3fa391f24..b2f66008a95a9f6b79a83d9531299b6f0107487f 100644
--- a/briar-api/src/net/sf/briar/api/db/event/RemoteTransportsUpdatedEvent.java
+++ b/briar-api/src/net/sf/briar/api/db/event/RemoteTransportsUpdatedEvent.java
@@ -1,7 +1,7 @@
package net.sf.briar.api.db.event;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
/**
* An event that is broadcast when a contact's remote transport properties
diff --git a/briar-api/src/net/sf/briar/api/db/event/TransportAddedEvent.java b/briar-api/src/net/sf/briar/api/db/event/TransportAddedEvent.java
index 02d5b6b3b24c15b5620857fdea7c963ccfbf1ef1..f1e7dc62c9825386d0efae7a8bf22a30eeb67b6a 100644
--- a/briar-api/src/net/sf/briar/api/db/event/TransportAddedEvent.java
+++ b/briar-api/src/net/sf/briar/api/db/event/TransportAddedEvent.java
@@ -1,17 +1,23 @@
package net.sf.briar.api.db.event;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
-/** An event that is broadcast when a transport is added. */
+/** An event that is broadcast when a transport is added to the database. */
public class TransportAddedEvent extends DatabaseEvent {
private final TransportId transportId;
+ private final long maxLatency;
- public TransportAddedEvent(TransportId transportId) {
+ public TransportAddedEvent(TransportId transportId, long maxLatency) {
this.transportId = transportId;
+ this.maxLatency = maxLatency;
}
public TransportId getTransportId() {
return transportId;
}
+
+ public long getMaxLatency() {
+ return maxLatency;
+ }
}
diff --git a/briar-api/src/net/sf/briar/api/db/event/TransportRemovedEvent.java b/briar-api/src/net/sf/briar/api/db/event/TransportRemovedEvent.java
index 3381b63da81e0b25a0ee39a03e4b61fe66bdd753..b5e4ee0f0e46d9bfc968cacb4fc1c7919cb6e378 100644
--- a/briar-api/src/net/sf/briar/api/db/event/TransportRemovedEvent.java
+++ b/briar-api/src/net/sf/briar/api/db/event/TransportRemovedEvent.java
@@ -1,6 +1,6 @@
package net.sf.briar.api.db.event;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
/** An event that is broadcast when a transport is removed. */
public class TransportRemovedEvent extends DatabaseEvent {
diff --git a/briar-api/src/net/sf/briar/api/invitation/InvitationListener.java b/briar-api/src/net/sf/briar/api/invitation/InvitationListener.java
index 1f5ecddb80a133eaff0a5401f17510f17054dde6..b7c3ccd2fc62e2ca7ef306e16f19b1a830c103bf 100644
--- a/briar-api/src/net/sf/briar/api/invitation/InvitationListener.java
+++ b/briar-api/src/net/sf/briar/api/invitation/InvitationListener.java
@@ -9,7 +9,10 @@ public interface InvitationListener {
/** Called if a connection is established and key agreement succeeds. */
void connectionSucceeded(int localCode, int remoteCode);
- /** Called if a connection cannot be established. */
+ /**
+ * Called if a connection cannot be established. This indicates that the
+ * protocol has ended unsuccessfully.
+ */
void connectionFailed();
/**
@@ -20,7 +23,21 @@ public interface InvitationListener {
/**
* Informs the local peer that the remote peer's confirmation check did
- * not succeed, or the connection was lost during confirmation.
+ * not succeed, or the connection was lost during confirmation. This
+ * indicates that the protocol has ended unsuccessfully.
*/
void remoteConfirmationFailed();
+
+ /**
+ * Informs the local peer of the name used by the remote peer. Called if
+ * the exchange of pseudonyms succeeds. This indicates that the protocol
+ * has ended successfully.
+ */
+ void pseudonymExchangeSucceeded(String remoteName);
+
+ /**
+ * Called if the exchange of pseudonyms fails. This indicates that the
+ * protocol has ended unsuccessfully.
+ */
+ void pseudonymExchangeFailed();
}
diff --git a/briar-api/src/net/sf/briar/api/invitation/InvitationState.java b/briar-api/src/net/sf/briar/api/invitation/InvitationState.java
index 8862e3b6664bb14cb8324957a2f489747e068b8f..0a65863d38d680a551a2173b539cd2aaac9790df 100644
--- a/briar-api/src/net/sf/briar/api/invitation/InvitationState.java
+++ b/briar-api/src/net/sf/briar/api/invitation/InvitationState.java
@@ -7,12 +7,13 @@ public class InvitationState {
private final boolean connectionFailed;
private final boolean localCompared, remoteCompared;
private final boolean localMatched, remoteMatched;
+ private final String contactName;
public InvitationState(int localInvitationCode, int remoteInvitationCode,
int localConfirmationCode, int remoteConfirmationCode,
boolean connectionFailed, boolean localCompared,
boolean remoteCompared, boolean localMatched,
- boolean remoteMatched) {
+ boolean remoteMatched, String contactName) {
this.localInvitationCode = localInvitationCode;
this.remoteInvitationCode = remoteInvitationCode;
this.localConfirmationCode = localConfirmationCode;
@@ -22,6 +23,7 @@ public class InvitationState {
this.remoteCompared = remoteCompared;
this.localMatched = localMatched;
this.remoteMatched = remoteMatched;
+ this.contactName = contactName;
}
public int getLocalInvitationCode() {
@@ -59,4 +61,8 @@ public class InvitationState {
public boolean getRemoteMatched() {
return remoteMatched;
}
+
+ public String getContactName() {
+ return contactName;
+ }
}
diff --git a/briar-api/src/net/sf/briar/api/invitation/InvitationTaskFactory.java b/briar-api/src/net/sf/briar/api/invitation/InvitationTaskFactory.java
index 5e61986ff5b92bb7d1b48f57b82c6156aefa267c..7d6ccca93b16f8bea54ab7aa978b942b49c48c48 100644
--- a/briar-api/src/net/sf/briar/api/invitation/InvitationTaskFactory.java
+++ b/briar-api/src/net/sf/briar/api/invitation/InvitationTaskFactory.java
@@ -1,8 +1,11 @@
package net.sf.briar.api.invitation;
+import net.sf.briar.api.AuthorId;
+
/** Creates tasks for exchanging invitations with remote peers. */
public interface InvitationTaskFactory {
- /** Creates a task using the given invitation codes. */
- InvitationTask createTask(int localCode, int remoteCode);
+ /** Creates a task using the given pseudonym and invitation codes. */
+ InvitationTask createTask(AuthorId localAuthorId, int localCode,
+ int remoteCode);
}
diff --git a/briar-api/src/net/sf/briar/api/messaging/Group.java b/briar-api/src/net/sf/briar/api/messaging/Group.java
index 71d260ac8439699e43f4c5175cf0b1ed0b6a1b5f..eed2421f8483879c5cf8b8f02d5442a7bd15838c 100644
--- a/briar-api/src/net/sf/briar/api/messaging/Group.java
+++ b/briar-api/src/net/sf/briar/api/messaging/Group.java
@@ -29,8 +29,9 @@ public class Group {
}
/**
- * If the group is restricted, returns the public key that is used to
- * authorise all messages sent to the group. Otherwise returns null.
+ * If the group is restricted, returns the public key used to verify the
+ * signatures on all messages sent to the group. If the group is
+ * unrestricted, returns null.
*/
public byte[] getPublicKey() {
return publicKey;
diff --git a/briar-api/src/net/sf/briar/api/messaging/GroupId.java b/briar-api/src/net/sf/briar/api/messaging/GroupId.java
index ea2eb546b4b2949795a9762aa8261d88aad10b35..428726d7e01c880c35d3113e992edfe428cf3c81 100644
--- a/briar-api/src/net/sf/briar/api/messaging/GroupId.java
+++ b/briar-api/src/net/sf/briar/api/messaging/GroupId.java
@@ -2,6 +2,8 @@ package net.sf.briar.api.messaging;
import java.util.Arrays;
+import net.sf.briar.api.UniqueId;
+
/**
* Type-safe wrapper for a byte array that uniquely identifies a {@link Group}.
*/
diff --git a/briar-api/src/net/sf/briar/api/messaging/LocalGroup.java b/briar-api/src/net/sf/briar/api/messaging/LocalGroup.java
index 27bdca0fad7f04103c45842f40bfe42e0d369311..3b4e4ae5d4de2a13f253bede9f03335035a097c5 100644
--- a/briar-api/src/net/sf/briar/api/messaging/LocalGroup.java
+++ b/briar-api/src/net/sf/briar/api/messaging/LocalGroup.java
@@ -1,6 +1,6 @@
package net.sf.briar.api.messaging;
-/** A restricted group to which the user can post messages. */
+/** A restricted group to which the local user can post messages. */
public class LocalGroup extends Group {
private final byte[] privateKey;
@@ -11,7 +11,7 @@ public class LocalGroup extends Group {
this.privateKey = privateKey;
}
- /** Returns the private key that is used to sign messages. */
+ /** Returns the private key used to sign all messages sent to the group. */
public byte[] getPrivateKey() {
return privateKey;
}
diff --git a/briar-api/src/net/sf/briar/api/messaging/Message.java b/briar-api/src/net/sf/briar/api/messaging/Message.java
index b48d54cc061380af1a8e9d4c5fdb7240a8e6847f..06bcffe4a0238f6413fa5ca253b81f54f6ec3914 100644
--- a/briar-api/src/net/sf/briar/api/messaging/Message.java
+++ b/briar-api/src/net/sf/briar/api/messaging/Message.java
@@ -1,5 +1,7 @@
package net.sf.briar.api.messaging;
+import net.sf.briar.api.Author;
+
public interface Message {
/** Returns the message's unique identifier. */
@@ -18,8 +20,8 @@ public interface Message {
Group getGroup();
/**
- * Returns the message's {@link Author}, or null if this is an anonymous
- * message.
+ * Returns the message's {@link net.sf.briar.api.Author Author}, or null
+ * if this is an anonymous message.
*/
Author getAuthor();
@@ -33,7 +35,7 @@ public interface Message {
*/
String getSubject();
- /** Returns the timestamp created by the message's {@link Author}. */
+ /** Returns the message's timestamp. */
long getTimestamp();
/** Returns the serialised message. */
diff --git a/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java b/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
index 85cc33b661ce6db027366bbe4c3ba07dfe0d9359..a18b24df92f1387528ec99a470740719209ab6b0 100644
--- a/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
+++ b/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
@@ -4,6 +4,8 @@ import java.io.IOException;
import java.security.GeneralSecurityException;
import java.security.PrivateKey;
+import net.sf.briar.api.Author;
+
public interface MessageFactory {
/** Creates a private message. */
diff --git a/briar-api/src/net/sf/briar/api/messaging/MessageId.java b/briar-api/src/net/sf/briar/api/messaging/MessageId.java
index e0acc7d7a1bcce4bab9d3df235244126fea25d5c..35ae7e8f2184315cd509650aa4df60029ac2e863 100644
--- a/briar-api/src/net/sf/briar/api/messaging/MessageId.java
+++ b/briar-api/src/net/sf/briar/api/messaging/MessageId.java
@@ -2,6 +2,8 @@ package net.sf.briar.api.messaging;
import java.util.Arrays;
+import net.sf.briar.api.UniqueId;
+
/**
* Type-safe wrapper for a byte array that uniquely identifies a
* {@link Message}.
diff --git a/briar-api/src/net/sf/briar/api/messaging/MessagingConstants.java b/briar-api/src/net/sf/briar/api/messaging/MessagingConstants.java
index 4ddcedf2c5d6c87046b80ab78037f993e1470cc1..5373427cc004f02f8ff4416a0ca0c48b65882245 100644
--- a/briar-api/src/net/sf/briar/api/messaging/MessagingConstants.java
+++ b/briar-api/src/net/sf/briar/api/messaging/MessagingConstants.java
@@ -52,5 +52,5 @@ public interface MessagingConstants {
* The timestamp of the oldest message in the database is rounded using
* this modulus to avoid revealing the presence of any particular message.
*/
- long RETENTION_MODULUS = 60 * 60 * 1000; // 1 hour
+ int RETENTION_MODULUS = 60 * 60 * 1000; // 1 hour
}
diff --git a/briar-api/src/net/sf/briar/api/Rating.java b/briar-api/src/net/sf/briar/api/messaging/Rating.java
similarity index 76%
rename from briar-api/src/net/sf/briar/api/Rating.java
rename to briar-api/src/net/sf/briar/api/messaging/Rating.java
index a3ddb57c4d5595216a0cefaccc7f51cf2cec3e42..045de8fe7a00b14d3ef85bc1bacb12c24f07ba85 100644
--- a/briar-api/src/net/sf/briar/api/Rating.java
+++ b/briar-api/src/net/sf/briar/api/messaging/Rating.java
@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package net.sf.briar.api.messaging;
/** The ratings that may be applied to an author in peer moderation. */
public enum Rating {
diff --git a/briar-api/src/net/sf/briar/api/messaging/TransportAck.java b/briar-api/src/net/sf/briar/api/messaging/TransportAck.java
index f336945569aade80f37691656a95862223c1b93e..e9b0e19a4281e0743b0ab5aad430a1f6bb153eaa 100644
--- a/briar-api/src/net/sf/briar/api/messaging/TransportAck.java
+++ b/briar-api/src/net/sf/briar/api/messaging/TransportAck.java
@@ -1,5 +1,7 @@
package net.sf.briar.api.messaging;
+import net.sf.briar.api.TransportId;
+
/** A packet acknowledging a {@link TransportUpdate}. */
public class TransportAck {
diff --git a/briar-api/src/net/sf/briar/api/messaging/TransportUpdate.java b/briar-api/src/net/sf/briar/api/messaging/TransportUpdate.java
index 56ed14f2ad8b04e39553cc740edd203d8dff1e18..d192b200abb12bdc34818e80d9ff7472939a0a44 100644
--- a/briar-api/src/net/sf/briar/api/messaging/TransportUpdate.java
+++ b/briar-api/src/net/sf/briar/api/messaging/TransportUpdate.java
@@ -1,5 +1,6 @@
package net.sf.briar.api.messaging;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
/**
diff --git a/briar-api/src/net/sf/briar/api/messaging/UnverifiedMessage.java b/briar-api/src/net/sf/briar/api/messaging/UnverifiedMessage.java
index 83c81e55558b401053461987f7cd14eea8672a0c..bdb9ecf04876d1db503d6f7c109e5c95275244a8 100644
--- a/briar-api/src/net/sf/briar/api/messaging/UnverifiedMessage.java
+++ b/briar-api/src/net/sf/briar/api/messaging/UnverifiedMessage.java
@@ -1,6 +1,8 @@
package net.sf.briar.api.messaging;
-/** A {@link Message} that has not yet had its signatures verified. */
+import net.sf.briar.api.Author;
+
+/** A {@link Message} that has not yet had its signatures (if any) verified. */
public class UnverifiedMessage {
private final MessageId parent;
@@ -47,8 +49,8 @@ public class UnverifiedMessage {
}
/**
- * Returns the message's {@link Author}, or null if this is an anonymous
- * message.
+ * Returns the message's {@link net.sf.briar.api.Author Author}, or null
+ * if this is an anonymous message.
*/
public Author getAuthor() {
return author;
@@ -68,7 +70,7 @@ public class UnverifiedMessage {
return subject;
}
- /** Returns the timestamp created by the message's {@link Author}. */
+ /** Returns the message's timestamp. */
public long getTimestamp() {
return timestamp;
}
diff --git a/briar-api/src/net/sf/briar/api/messaging/duplex/DuplexConnectionFactory.java b/briar-api/src/net/sf/briar/api/messaging/duplex/DuplexConnectionFactory.java
index 8b85de2a6540540c880aa34f0c9f97e196d5668e..3c8451b3f822079bacb47b6111acc1f47acd69e8 100644
--- a/briar-api/src/net/sf/briar/api/messaging/duplex/DuplexConnectionFactory.java
+++ b/briar-api/src/net/sf/briar/api/messaging/duplex/DuplexConnectionFactory.java
@@ -1,13 +1,14 @@
package net.sf.briar.api.messaging.duplex;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.transport.ConnectionContext;
public interface DuplexConnectionFactory {
- void createIncomingConnection(ConnectionContext ctx, DuplexTransportConnection d);
+ void createIncomingConnection(ConnectionContext ctx,
+ DuplexTransportConnection d);
void createOutgoingConnection(ContactId c, TransportId t,
DuplexTransportConnection d);
diff --git a/briar-api/src/net/sf/briar/api/messaging/simplex/SimplexConnectionFactory.java b/briar-api/src/net/sf/briar/api/messaging/simplex/SimplexConnectionFactory.java
index 6f39db80ed3c0f88ba7175c196ef2bdf3dea8e0c..2eac7b0e268620cbb35a7b01e9af1b0778aba82e 100644
--- a/briar-api/src/net/sf/briar/api/messaging/simplex/SimplexConnectionFactory.java
+++ b/briar-api/src/net/sf/briar/api/messaging/simplex/SimplexConnectionFactory.java
@@ -1,14 +1,15 @@
package net.sf.briar.api.messaging.simplex;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
public interface SimplexConnectionFactory {
- void createIncomingConnection(ConnectionContext ctx, SimplexTransportReader r);
+ void createIncomingConnection(ConnectionContext ctx,
+ SimplexTransportReader r);
void createOutgoingConnection(ContactId c, TransportId t,
SimplexTransportWriter w);
diff --git a/briar-api/src/net/sf/briar/api/plugins/Plugin.java b/briar-api/src/net/sf/briar/api/plugins/Plugin.java
index 0d91e824b15eda935f9909d48f39c55476810548..a332eb63dca5f465163d13675409bbeb3035b1ea 100644
--- a/briar-api/src/net/sf/briar/api/plugins/Plugin.java
+++ b/briar-api/src/net/sf/briar/api/plugins/Plugin.java
@@ -4,7 +4,7 @@ import java.io.IOException;
import java.util.Collection;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
public interface Plugin {
diff --git a/briar-api/src/net/sf/briar/api/plugins/PluginManager.java b/briar-api/src/net/sf/briar/api/plugins/PluginManager.java
index 77bc1dc982fea2c6fc1f224c4e1e2342fbf72f61..61c7678a21dd54c124484c2b7c27be331879e03b 100644
--- a/briar-api/src/net/sf/briar/api/plugins/PluginManager.java
+++ b/briar-api/src/net/sf/briar/api/plugins/PluginManager.java
@@ -23,6 +23,6 @@ public interface PluginManager {
*/
int stop();
- /** Returns any duplex plugins that support invitations. */
+ /** Returns any running duplex plugins that support invitations. */
Collection<DuplexPlugin> getInvitationPlugins();
}
diff --git a/briar-api/src/net/sf/briar/api/plugins/duplex/DuplexPluginFactory.java b/briar-api/src/net/sf/briar/api/plugins/duplex/DuplexPluginFactory.java
index 5cdd8e768322001c5bc0a9e8e3cd0af298f294fc..2fb2accf0e2b9b6329ea1d47dd91fc71a07804ed 100644
--- a/briar-api/src/net/sf/briar/api/plugins/duplex/DuplexPluginFactory.java
+++ b/briar-api/src/net/sf/briar/api/plugins/duplex/DuplexPluginFactory.java
@@ -1,6 +1,6 @@
package net.sf.briar.api.plugins.duplex;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
public interface DuplexPluginFactory {
diff --git a/briar-api/src/net/sf/briar/api/plugins/simplex/SimplexPluginFactory.java b/briar-api/src/net/sf/briar/api/plugins/simplex/SimplexPluginFactory.java
index 5a842fdc1c95d35ec77fa657da128513e5b15cec..59f606118250cddac8bec93c021d551948ee15af 100644
--- a/briar-api/src/net/sf/briar/api/plugins/simplex/SimplexPluginFactory.java
+++ b/briar-api/src/net/sf/briar/api/plugins/simplex/SimplexPluginFactory.java
@@ -1,6 +1,6 @@
package net.sf.briar.api.plugins.simplex;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
public interface SimplexPluginFactory {
diff --git a/briar-api/src/net/sf/briar/api/transport/ConnectionContext.java b/briar-api/src/net/sf/briar/api/transport/ConnectionContext.java
index ad7c329d210f3553d4ab0df4567f4872891d95fe..9c62ab1abeb5e60d4b712f1211a06bb737445e0d 100644
--- a/briar-api/src/net/sf/briar/api/transport/ConnectionContext.java
+++ b/briar-api/src/net/sf/briar/api/transport/ConnectionContext.java
@@ -1,7 +1,7 @@
package net.sf.briar.api.transport;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
public class ConnectionContext {
diff --git a/briar-api/src/net/sf/briar/api/transport/ConnectionDispatcher.java b/briar-api/src/net/sf/briar/api/transport/ConnectionDispatcher.java
index a11b28ef2c53b541617379fac20c312bb3bd9dd6..6301eaece5249ce65de682327072e6f358875a7e 100644
--- a/briar-api/src/net/sf/briar/api/transport/ConnectionDispatcher.java
+++ b/briar-api/src/net/sf/briar/api/transport/ConnectionDispatcher.java
@@ -1,7 +1,7 @@
package net.sf.briar.api.transport;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
diff --git a/briar-api/src/net/sf/briar/api/transport/ConnectionReaderFactory.java b/briar-api/src/net/sf/briar/api/transport/ConnectionReaderFactory.java
index 148e07256ad14effbb0bb2daafd7e09f1f78feb4..518578c39cdea2b40b81991528ec7e2217d7a5f0 100644
--- a/briar-api/src/net/sf/briar/api/transport/ConnectionReaderFactory.java
+++ b/briar-api/src/net/sf/briar/api/transport/ConnectionReaderFactory.java
@@ -4,9 +4,11 @@ import java.io.InputStream;
public interface ConnectionReaderFactory {
- /**
- * Creates a connection reader for one side of a connection.
- */
+ /** Creates a connection reader for one side of a connection. */
ConnectionReader createConnectionReader(InputStream in,
ConnectionContext ctx, boolean incoming, boolean initiator);
+
+ /** Creates a connection reader for one side of an invitation connection. */
+ ConnectionReader createInvitationConnectionReader(InputStream in,
+ byte[] secret, boolean alice);
}
diff --git a/briar-api/src/net/sf/briar/api/transport/ConnectionRecogniser.java b/briar-api/src/net/sf/briar/api/transport/ConnectionRecogniser.java
index 1114d848c8a203137c11913b297ddfbdc81cd7fd..12903ac219c5d0402bdc2cbe3eeffb0e55cfece7 100644
--- a/briar-api/src/net/sf/briar/api/transport/ConnectionRecogniser.java
+++ b/briar-api/src/net/sf/briar/api/transport/ConnectionRecogniser.java
@@ -1,8 +1,8 @@
package net.sf.briar.api.transport;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.db.DbException;
-import net.sf.briar.api.messaging.TransportId;
/**
* Maintains the connection reordering windows and decides whether incoming
diff --git a/briar-api/src/net/sf/briar/api/transport/ConnectionRegistry.java b/briar-api/src/net/sf/briar/api/transport/ConnectionRegistry.java
index fd3759613a59aa1b5d1888da01bd7c7d79cd2992..fa211f559f2a86e9715685a92c0852b8b8c0640e 100644
--- a/briar-api/src/net/sf/briar/api/transport/ConnectionRegistry.java
+++ b/briar-api/src/net/sf/briar/api/transport/ConnectionRegistry.java
@@ -3,7 +3,7 @@ package net.sf.briar.api.transport;
import java.util.Collection;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
/**
* Keeps track of which contacts are currently connected by which transports.
diff --git a/briar-api/src/net/sf/briar/api/transport/ConnectionWriterFactory.java b/briar-api/src/net/sf/briar/api/transport/ConnectionWriterFactory.java
index 217d2ec8113c9713aec15ef0c2fcc0b481224966..4bff478a34c9c07c58d5d15880ebc3d388d267f1 100644
--- a/briar-api/src/net/sf/briar/api/transport/ConnectionWriterFactory.java
+++ b/briar-api/src/net/sf/briar/api/transport/ConnectionWriterFactory.java
@@ -4,9 +4,11 @@ import java.io.OutputStream;
public interface ConnectionWriterFactory {
- /**
- * Creates a connection writer for one side of a connection.
- */
+ /** Creates a connection writer for one side of a connection. */
ConnectionWriter createConnectionWriter(OutputStream out, long capacity,
ConnectionContext ctx, boolean incoming, boolean initiator);
+
+ /** Creates a connection writer for one side of an invitation connection. */
+ ConnectionWriter createInvitationConnectionWriter(OutputStream out,
+ byte[] secret, boolean alice);
}
diff --git a/briar-api/src/net/sf/briar/api/transport/Endpoint.java b/briar-api/src/net/sf/briar/api/transport/Endpoint.java
index 0b66b6477618192eeb7aefa5c6a096caa953f501..2b69df41e5a80651f8754dc5629f31fe9ae33c72 100644
--- a/briar-api/src/net/sf/briar/api/transport/Endpoint.java
+++ b/briar-api/src/net/sf/briar/api/transport/Endpoint.java
@@ -1,22 +1,20 @@
package net.sf.briar.api.transport;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
public class Endpoint {
private final ContactId contactId;
private final TransportId transportId;
- private final long epoch, clockDiff, latency;
+ private final long epoch;
private final boolean alice;
- public Endpoint(ContactId contactId, TransportId transportId,
- long epoch, long clockDiff, long latency, boolean alice) {
+ public Endpoint(ContactId contactId, TransportId transportId, long epoch,
+ boolean alice) {
this.contactId = contactId;
this.transportId = transportId;
this.epoch = epoch;
- this.clockDiff = clockDiff;
- this.latency = latency;
this.alice = alice;
}
@@ -32,14 +30,6 @@ public class Endpoint {
return epoch;
}
- public long getClockDifference() {
- return clockDiff;
- }
-
- public long getLatency() {
- return latency;
- }
-
public boolean getAlice() {
return alice;
}
diff --git a/briar-api/src/net/sf/briar/api/transport/TemporarySecret.java b/briar-api/src/net/sf/briar/api/transport/TemporarySecret.java
index d39866d98475594e11ed549b924b495747c86808..6629565b74b73c0779a04279c9b27fdc05e2208e 100644
--- a/briar-api/src/net/sf/briar/api/transport/TemporarySecret.java
+++ b/briar-api/src/net/sf/briar/api/transport/TemporarySecret.java
@@ -2,7 +2,7 @@ package net.sf.briar.api.transport;
import static net.sf.briar.api.transport.TransportConstants.CONNECTION_WINDOW_SIZE;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
public class TemporarySecret extends Endpoint {
@@ -11,10 +11,9 @@ public class TemporarySecret extends Endpoint {
/** Creates a temporary secret with the given connection window. */
public TemporarySecret(ContactId contactId, TransportId transportId,
- long epoch, long clockDiff, long latency, boolean alice,
- long period, byte[] secret, long outgoing, long centre,
- byte[] bitmap) {
- super(contactId, transportId, epoch, clockDiff, latency, alice);
+ long epoch, boolean alice, long period, byte[] secret,
+ long outgoing, long centre, byte[] bitmap) {
+ super(contactId, transportId, epoch, alice);
this.period = period;
this.secret = secret;
this.outgoing = outgoing;
@@ -24,17 +23,15 @@ public class TemporarySecret extends Endpoint {
/** Creates a temporary secret with a new connection window. */
public TemporarySecret(ContactId contactId, TransportId transportId,
- long epoch, long clockDiff, long latency, boolean alice,
- long period, byte[] secret) {
- this(contactId, transportId, epoch, clockDiff, latency, alice, period,
- secret, 0, 0, new byte[CONNECTION_WINDOW_SIZE / 8]);
+ long epoch, boolean alice, long period, byte[] secret) {
+ this(contactId, transportId, epoch, alice, period, secret, 0, 0,
+ new byte[CONNECTION_WINDOW_SIZE / 8]);
}
/** Creates a temporary secret derived from the given endpoint. */
public TemporarySecret(Endpoint ep, long period, byte[] secret) {
this(ep.getContactId(), ep.getTransportId(), ep.getEpoch(),
- ep.getClockDifference(), ep.getLatency(), ep.getAlice(),
- period, secret);
+ ep.getAlice(), period, secret);
}
public long getPeriod() {
diff --git a/briar-api/src/net/sf/briar/api/transport/TransportConstants.java b/briar-api/src/net/sf/briar/api/transport/TransportConstants.java
index 8068263017c825b9d71ef7588bfd08fda2da4fee..fe5df78fd94c9c9fbb7d01616fb9e7ef0d2d5dc4 100644
--- a/briar-api/src/net/sf/briar/api/transport/TransportConstants.java
+++ b/briar-api/src/net/sf/briar/api/transport/TransportConstants.java
@@ -27,6 +27,9 @@ public interface TransportConstants {
*/
int MIN_CONNECTION_LENGTH = 1024 * 1024; // 2^20, 1 MiB
+ /** The maximum difference between two communicating devices' clocks. */
+ int MAX_CLOCK_DIFFERENCE = 60 * 60 * 1000; // 1 hour
+
/** The size of the connection reordering window. */
int CONNECTION_WINDOW_SIZE = 32;
}
diff --git a/briar-core/src/net/sf/briar/crypto/CryptoComponentImpl.java b/briar-core/src/net/sf/briar/crypto/CryptoComponentImpl.java
index 8938bd120f1ea47aec8d66772080a8dd29da5308..cbe3a978dc14d1901cd90d195d21921314c88f75 100644
--- a/briar-core/src/net/sf/briar/crypto/CryptoComponentImpl.java
+++ b/briar-core/src/net/sf/briar/crypto/CryptoComponentImpl.java
@@ -11,10 +11,12 @@ import java.security.GeneralSecurityException;
import java.security.KeyFactory;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.SecureRandom;
import java.security.Security;
import java.security.Signature;
+import java.security.interfaces.ECPrivateKey;
import java.security.interfaces.ECPublicKey;
import java.security.spec.ECField;
import java.security.spec.ECFieldFp;
@@ -39,27 +41,33 @@ import org.spongycastle.crypto.modes.AEADBlockCipher;
import org.spongycastle.crypto.modes.GCMBlockCipher;
import org.spongycastle.jce.provider.BouncyCastleProvider;
-import com.google.inject.Inject;
-
class CryptoComponentImpl implements CryptoComponent {
private static final String PROVIDER = "SC"; // Spongy Castle
- private static final String AGREEMENT_KEY_PAIR_ALGO = "ECDH";
- private static final int AGREEMENT_KEY_PAIR_BITS = 384;
- private static final String AGREEMENT_ALGO = "ECDHC";
private static final String SECRET_KEY_ALGO = "AES";
private static final int SECRET_KEY_BYTES = 32; // 256 bits
- private static final String KEY_DERIVATION_ALGO = "AES/CTR/NoPadding";
- private static final int KEY_DERIVATION_IV_BYTES = 16; // 128 bits
private static final String DIGEST_ALGO = "SHA-384";
+ private static final String AGREEMENT_ALGO = "ECDHC";
+ private static final String AGREEMENT_KEY_PAIR_ALGO = "ECDH";
+ private static final int AGREEMENT_KEY_PAIR_BITS = 384;
+ private static final String SIGNATURE_ALGO = "ECDSA";
private static final String SIGNATURE_KEY_PAIR_ALGO = "ECDSA";
private static final int SIGNATURE_KEY_PAIR_BITS = 384;
- private static final String SIGNATURE_ALGO = "ECDSA";
private static final String TAG_CIPHER_ALGO = "AES/ECB/NoPadding";
private static final int GCM_MAC_LENGTH = 16; // 128 bits
private static final String STORAGE_CIPHER_ALGO = "AES/GCM/NoPadding";
private static final int STORAGE_IV_LENGTH = 32; // 256 bits
+ private static final String KEY_DERIVATION_ALGO = "AES/CTR/NoPadding";
+ private static final int KEY_DERIVATION_IV_BYTES = 16; // 128 bits
+ // Labels for secret derivation
+ private static final byte[] MASTER = { 'M', 'A', 'S', 'T', 'E', 'R', '\0' };
+ private static final byte[] FIRST = { 'F', 'I', 'R', 'S', 'T', '\0' };
+ private static final byte[] ROTATE = { 'R', 'O', 'T', 'A', 'T', 'E', '\0' };
+ // Label for confirmation code derivation
+ private static final byte[] CODE = { 'C', 'O', 'D', 'E', '\0' };
+ // Label for invitation nonce derivation
+ private static final byte[] NONCE = { 'N', 'O', 'N', 'C', 'E', '\0' };
// Labels for key derivation
private static final byte[] A_TAG = { 'A', '_', 'T', 'A', 'G', '\0' };
private static final byte[] B_TAG = { 'B', '_', 'T', 'A', 'G', '\0' };
@@ -71,11 +79,6 @@ class CryptoComponentImpl implements CryptoComponent {
{ 'B', '_', 'F', 'R', 'A', 'M', 'E', '_', 'A', '\0' };
private static final byte[] B_FRAME_B =
{ 'B', '_', 'F', 'R', 'A', 'M', 'E', '_', 'B', '\0' };
- // Labels for secret derivation
- private static final byte[] FIRST = { 'F', 'I', 'R', 'S', 'T', '\0' };
- private static final byte[] ROTATE = { 'R', 'O', 'T', 'A', 'T', 'E', '\0' };
- // Label for confirmation code derivation
- private static final byte[] CODE = { 'C', 'O', 'D', 'E', '\0' };
// Blank plaintext for key derivation
private static final byte[] KEY_DERIVATION_BLANK_PLAINTEXT =
new byte[SECRET_KEY_BYTES];
@@ -121,7 +124,6 @@ class CryptoComponentImpl implements CryptoComponent {
private final SecureRandom secureRandom;
private final ErasableKey temporaryStorageKey;
- @Inject
CryptoComponentImpl() {
Security.addProvider(new BouncyCastleProvider());
try {
@@ -146,134 +148,65 @@ class CryptoComponentImpl implements CryptoComponent {
temporaryStorageKey = generateSecretKey();
}
- public ErasableKey deriveTagKey(byte[] secret, boolean alice) {
- if(alice) return deriveKey(secret, A_TAG, 0);
- else return deriveKey(secret, B_TAG, 0);
+ public ErasableKey generateSecretKey() {
+ byte[] b = new byte[SECRET_KEY_BYTES];
+ secureRandom.nextBytes(b);
+ return new ErasableKeyImpl(b, SECRET_KEY_ALGO);
}
- public ErasableKey deriveFrameKey(byte[] secret, long connection,
- boolean alice, boolean initiator) {
- if(alice) {
- if(initiator) return deriveKey(secret, A_FRAME_A, connection);
- else return deriveKey(secret, A_FRAME_B, connection);
- } else {
- if(initiator) return deriveKey(secret, B_FRAME_A, connection);
- else return deriveKey(secret, B_FRAME_B, connection);
+ public MessageDigest getMessageDigest() {
+ try {
+ return new DoubleDigest(java.security.MessageDigest.getInstance(
+ DIGEST_ALGO, PROVIDER));
+ } catch(GeneralSecurityException e) {
+ throw new RuntimeException(e);
}
}
- private ErasableKey deriveKey(byte[] secret, byte[] label, long context) {
- byte[] key = counterModeKdf(secret, label, context);
- return new ErasableKeyImpl(key, SECRET_KEY_ALGO);
+ public PseudoRandom getPseudoRandom(int seed1, int seed2) {
+ return new PseudoRandomImpl(getMessageDigest(), seed1, seed2);
}
- // Key derivation function based on a block cipher in CTR mode - see
- // NIST SP 800-108, section 5.1
- private byte[] counterModeKdf(byte[] secret, byte[] label, long context) {
- // The secret must be usable as a key
- if(secret.length != SECRET_KEY_BYTES)
- throw new IllegalArgumentException();
- // The label and context must leave a byte free for the counter
- if(label.length + 4 >= KEY_DERIVATION_IV_BYTES)
- throw new IllegalArgumentException();
- byte[] ivBytes = new byte[KEY_DERIVATION_IV_BYTES];
- System.arraycopy(label, 0, ivBytes, 0, label.length);
- ByteUtils.writeUint32(context, ivBytes, label.length);
- // Use the secret and the IV to encrypt a blank plaintext
- IvParameterSpec iv = new IvParameterSpec(ivBytes);
- ErasableKey key = new ErasableKeyImpl(secret, SECRET_KEY_ALGO);
+ public SecureRandom getSecureRandom() {
+ return secureRandom;
+ }
+
+ public Signature getSignature() {
try {
- Cipher cipher = Cipher.getInstance(KEY_DERIVATION_ALGO, PROVIDER);
- cipher.init(Cipher.ENCRYPT_MODE, key, iv);
- byte[] output = cipher.doFinal(KEY_DERIVATION_BLANK_PLAINTEXT);
- assert output.length == SECRET_KEY_BYTES;
- return output;
+ return Signature.getInstance(SIGNATURE_ALGO, PROVIDER);
} catch(GeneralSecurityException e) {
throw new RuntimeException(e);
}
}
- public byte[] deriveInitialSecret(byte[] theirPublicKey,
- KeyPair ourKeyPair, boolean alice) throws GeneralSecurityException {
- PublicKey theirPublic = agreementKeyParser.parsePublicKey(
- theirPublicKey);
- MessageDigest messageDigest = getMessageDigest();
- byte[] ourPublicKey = ourKeyPair.getPublic().getEncoded();
- byte[] ourHash = messageDigest.digest(ourPublicKey);
- byte[] theirHash = messageDigest.digest(theirPublicKey);
- byte[] aliceInfo, bobInfo;
- if(alice) {
- aliceInfo = ourHash;
- bobInfo = theirHash;
- } else {
- aliceInfo = theirHash;
- bobInfo = ourHash;
- }
- // The raw secret comes from the key agreement algorithm
- KeyAgreement keyAgreement = KeyAgreement.getInstance(AGREEMENT_ALGO,
- PROVIDER);
- keyAgreement.init(ourKeyPair.getPrivate());
- keyAgreement.doPhase(theirPublic, true);
- byte[] rawSecret = keyAgreement.generateSecret();
- // Derive the cooked secret from the raw secret using the
- // concatenation KDF
- byte[] cookedSecret = concatenationKdf(rawSecret, FIRST, aliceInfo,
- bobInfo);
- ByteUtils.erase(rawSecret);
- return cookedSecret;
+ public KeyPair generateAgreementKeyPair() {
+ KeyPair keyPair = agreementKeyPairGenerator.generateKeyPair();
+ // Check that the key pair uses NIST curve P-384
+ ECPublicKey publicKey = checkP384Params(keyPair.getPublic());
+ // Return a wrapper that uses the SEC 1 encoding
+ publicKey = new Sec1PublicKey(publicKey, AGREEMENT_KEY_PAIR_BITS);
+ ECPrivateKey privateKey = (ECPrivateKey) keyPair.getPrivate();
+ privateKey = new Sec1PrivateKey(privateKey, AGREEMENT_KEY_PAIR_BITS);
+ return new KeyPair(publicKey, privateKey);
}
- // Key derivation function based on a hash function - see NIST SP 800-56A,
- // section 5.8
- private byte[] concatenationKdf(byte[] rawSecret, byte[] label,
- byte[] initiatorInfo, byte[] responderInfo) {
- // The output of the hash function must be long enough to use as a key
- MessageDigest messageDigest = getMessageDigest();
- if(messageDigest.getDigestLength() < SECRET_KEY_BYTES)
- throw new RuntimeException();
- // All fields are length-prefixed
- byte[] length = new byte[1];
- ByteUtils.writeUint8(rawSecret.length, length, 0);
- messageDigest.update(length);
- messageDigest.update(rawSecret);
- ByteUtils.writeUint8(label.length, length, 0);
- messageDigest.update(length);
- messageDigest.update(label);
- ByteUtils.writeUint8(initiatorInfo.length, length, 0);
- messageDigest.update(length);
- messageDigest.update(initiatorInfo);
- ByteUtils.writeUint8(responderInfo.length, length, 0);
- messageDigest.update(length);
- messageDigest.update(responderInfo);
- byte[] hash = messageDigest.digest();
- // The secret is the first SECRET_KEY_BYTES bytes of the hash
- byte[] output = new byte[SECRET_KEY_BYTES];
- System.arraycopy(hash, 0, output, 0, SECRET_KEY_BYTES);
- ByteUtils.erase(hash);
- return output;
+ public KeyParser getAgreementKeyParser() {
+ return agreementKeyParser;
}
- public byte[] deriveNextSecret(byte[] secret, long period) {
- if(period < 0 || period > MAX_32_BIT_UNSIGNED)
- throw new IllegalArgumentException();
- return counterModeKdf(secret, ROTATE, period);
+ public KeyPair generateSignatureKeyPair() {
+ KeyPair keyPair = signatureKeyPairGenerator.generateKeyPair();
+ // Check that the key pair uses NIST curve P-384
+ ECPublicKey publicKey = checkP384Params(keyPair.getPublic());
+ // Return a wrapper that uses the SEC 1 encoding
+ publicKey = new Sec1PublicKey(publicKey, SIGNATURE_KEY_PAIR_BITS);
+ ECPrivateKey privateKey = (ECPrivateKey) keyPair.getPrivate();
+ privateKey = new Sec1PrivateKey(privateKey, SIGNATURE_KEY_PAIR_BITS);
+ return new KeyPair(publicKey, privateKey);
}
- public void encodeTag(byte[] tag, Cipher tagCipher, ErasableKey tagKey,
- long connection) {
- if(tag.length < TAG_LENGTH) throw new IllegalArgumentException();
- if(connection < 0 || connection > MAX_32_BIT_UNSIGNED)
- throw new IllegalArgumentException();
- for(int i = 0; i < TAG_LENGTH; i++) tag[i] = 0;
- ByteUtils.writeUint32(connection, tag, 0);
- try {
- tagCipher.init(ENCRYPT_MODE, tagKey);
- int encrypted = tagCipher.doFinal(tag, 0, TAG_LENGTH, tag);
- if(encrypted != TAG_LENGTH) throw new IllegalArgumentException();
- } catch(GeneralSecurityException e) {
- // Unsuitable cipher or key
- throw new IllegalArgumentException(e);
- }
+ public KeyParser getSignatureKeyParser() {
+ return signatureKeyParser;
}
public int generateInvitationCode() {
@@ -294,78 +227,77 @@ class CryptoComponentImpl implements CryptoComponent {
return codes;
}
- public KeyPair generateAgreementKeyPair() {
- KeyPair keyPair = agreementKeyPairGenerator.generateKeyPair();
- // Check that the key pair uses NIST curve P-384
- ECPublicKey ecPublicKey = checkP384Params(keyPair.getPublic());
- // Return a public key that uses the SEC 1 encoding
- ecPublicKey = new Sec1PublicKey(ecPublicKey, AGREEMENT_KEY_PAIR_BITS);
- return new KeyPair(ecPublicKey, keyPair.getPrivate());
+ public byte[][] deriveInvitationNonces(byte[] secret) {
+ byte[] alice = counterModeKdf(secret, NONCE, 0);
+ byte[] bob = counterModeKdf(secret, NONCE, 1);
+ return new byte[][] { alice, bob };
}
- private ECPublicKey checkP384Params(PublicKey publicKey) {
- if(!(publicKey instanceof ECPublicKey)) throw new RuntimeException();
- ECPublicKey ecPublicKey = (ECPublicKey) publicKey;
- ECParameterSpec params = ecPublicKey.getParams();
- EllipticCurve curve = params.getCurve();
- ECField field = curve.getField();
- if(!(field instanceof ECFieldFp)) throw new RuntimeException();
- BigInteger q = ((ECFieldFp) field).getP();
- if(!q.equals(P_384_Q)) throw new RuntimeException();
- if(!curve.getA().equals(P_384_A)) throw new RuntimeException();
- if(!curve.getB().equals(P_384_B)) throw new RuntimeException();
- if(!params.getGenerator().equals(P_384_G)) throw new RuntimeException();
- if(!params.getOrder().equals(P_384_N)) throw new RuntimeException();
- if(!(params.getCofactor() == P_384_H)) throw new RuntimeException();
- return ecPublicKey;
+ public byte[] deriveMasterSecret(byte[] theirPublicKey,
+ KeyPair ourKeyPair, boolean alice) throws GeneralSecurityException {
+ PublicKey theirPub = agreementKeyParser.parsePublicKey(theirPublicKey);
+ MessageDigest messageDigest = getMessageDigest();
+ byte[] ourPublicKey = ourKeyPair.getPublic().getEncoded();
+ byte[] ourHash = messageDigest.digest(ourPublicKey);
+ byte[] theirHash = messageDigest.digest(theirPublicKey);
+ byte[] aliceInfo, bobInfo;
+ if(alice) {
+ aliceInfo = ourHash;
+ bobInfo = theirHash;
+ } else {
+ aliceInfo = theirHash;
+ bobInfo = ourHash;
+ }
+ PrivateKey ourPriv = ourKeyPair.getPrivate();
+ // The raw secret comes from the key agreement algorithm
+ byte[] raw = deriveSharedSecret(ourPriv, theirPub);
+ // Derive the cooked secret from the raw secret using the
+ // concatenation KDF
+ byte[] cooked = concatenationKdf(raw, MASTER, aliceInfo, bobInfo);
+ ByteUtils.erase(raw);
+ return cooked;
}
- public KeyParser getAgreementKeyParser() {
- return agreementKeyParser;
+ // Package access for testing
+ byte[] deriveSharedSecret(PrivateKey priv, PublicKey pub)
+ throws GeneralSecurityException {
+ KeyAgreement keyAgreement = KeyAgreement.getInstance(AGREEMENT_ALGO,
+ PROVIDER);
+ keyAgreement.init(priv);
+ keyAgreement.doPhase(pub, true);
+ return keyAgreement.generateSecret();
}
- public KeyPair generateSignatureKeyPair() {
- KeyPair keyPair = signatureKeyPairGenerator.generateKeyPair();
- // Check that the key pair uses NIST curve P-384
- ECPublicKey ecPublicKey = checkP384Params(keyPair.getPublic());
- // Return a public key that uses the SEC 1 encoding
- ecPublicKey = new Sec1PublicKey(ecPublicKey, SIGNATURE_KEY_PAIR_BITS);
- return new KeyPair(ecPublicKey, keyPair.getPrivate());
+ public byte[] deriveInitialSecret(byte[] secret, int transportIndex) {
+ if(transportIndex < 0) throw new IllegalArgumentException();
+ return counterModeKdf(secret, FIRST, transportIndex);
}
- public KeyParser getSignatureKeyParser() {
- return signatureKeyParser;
+ public byte[] deriveNextSecret(byte[] secret, long period) {
+ if(period < 0 || period > MAX_32_BIT_UNSIGNED)
+ throw new IllegalArgumentException();
+ return counterModeKdf(secret, ROTATE, period);
}
- public ErasableKey generateSecretKey() {
- byte[] b = new byte[SECRET_KEY_BYTES];
- secureRandom.nextBytes(b);
- return new ErasableKeyImpl(b, SECRET_KEY_ALGO);
+ public ErasableKey deriveTagKey(byte[] secret, boolean alice) {
+ if(alice) return deriveKey(secret, A_TAG, 0);
+ else return deriveKey(secret, B_TAG, 0);
}
- public MessageDigest getMessageDigest() {
- try {
- return new DoubleDigest(java.security.MessageDigest.getInstance(
- DIGEST_ALGO, PROVIDER));
- } catch(GeneralSecurityException e) {
- throw new RuntimeException(e);
+ public ErasableKey deriveFrameKey(byte[] secret, long connection,
+ boolean alice, boolean initiator) {
+ if(alice) {
+ if(initiator) return deriveKey(secret, A_FRAME_A, connection);
+ else return deriveKey(secret, A_FRAME_B, connection);
+ } else {
+ if(initiator) return deriveKey(secret, B_FRAME_A, connection);
+ else return deriveKey(secret, B_FRAME_B, connection);
}
}
- public PseudoRandom getPseudoRandom(int seed1, int seed2) {
- return new PseudoRandomImpl(getMessageDigest(), seed1, seed2);
- }
-
- public SecureRandom getSecureRandom() {
- return secureRandom;
- }
-
- public Signature getSignature() {
- try {
- return Signature.getInstance(SIGNATURE_ALGO, PROVIDER);
- } catch(GeneralSecurityException e) {
- throw new RuntimeException(e);
- }
+ private ErasableKey deriveKey(byte[] secret, byte[] label, long context) {
+ byte[] key = counterModeKdf(secret, label, context);
+ return new ErasableKeyImpl(key, SECRET_KEY_ALGO);
}
public Cipher getTagCipher() {
@@ -377,12 +309,28 @@ class CryptoComponentImpl implements CryptoComponent {
}
public AuthenticatedCipher getFrameCipher() {
- // This code is specific to BouncyCastle because javax.crypto.Cipher
+ // This code is specific to Spongy Castle because javax.crypto.Cipher
// doesn't support additional authenticated data until Java 7
AEADBlockCipher cipher = new GCMBlockCipher(new AESEngine());
return new AuthenticatedCipherImpl(cipher, GCM_MAC_LENGTH);
}
+ public void encodeTag(byte[] tag, Cipher tagCipher, ErasableKey tagKey,
+ long connection) {
+ if(tag.length < TAG_LENGTH) throw new IllegalArgumentException();
+ if(connection < 0 || connection > MAX_32_BIT_UNSIGNED)
+ throw new IllegalArgumentException();
+ for(int i = 0; i < TAG_LENGTH; i++) tag[i] = 0;
+ ByteUtils.writeUint32(connection, tag, 0);
+ try {
+ tagCipher.init(ENCRYPT_MODE, tagKey);
+ int encrypted = tagCipher.doFinal(tag, 0, TAG_LENGTH, tag);
+ if(encrypted != TAG_LENGTH) throw new IllegalArgumentException();
+ } catch(GeneralSecurityException e) {
+ throw new IllegalArgumentException(e); // Unsuitable cipher or key
+ }
+ }
+
public byte[] encryptTemporaryStorage(byte[] input) {
// Generate a random IV
byte[] ivBytes = new byte[STORAGE_IV_LENGTH];
@@ -425,4 +373,77 @@ class CryptoComponentImpl implements CryptoComponent {
return null; // Invalid
}
}
+
+ private ECPublicKey checkP384Params(PublicKey publicKey) {
+ if(!(publicKey instanceof ECPublicKey)) throw new RuntimeException();
+ ECPublicKey ecPublicKey = (ECPublicKey) publicKey;
+ ECParameterSpec params = ecPublicKey.getParams();
+ EllipticCurve curve = params.getCurve();
+ ECField field = curve.getField();
+ if(!(field instanceof ECFieldFp)) throw new RuntimeException();
+ BigInteger q = ((ECFieldFp) field).getP();
+ if(!q.equals(P_384_Q)) throw new RuntimeException();
+ if(!curve.getA().equals(P_384_A)) throw new RuntimeException();
+ if(!curve.getB().equals(P_384_B)) throw new RuntimeException();
+ if(!params.getGenerator().equals(P_384_G)) throw new RuntimeException();
+ if(!params.getOrder().equals(P_384_N)) throw new RuntimeException();
+ if(!(params.getCofactor() == P_384_H)) throw new RuntimeException();
+ return ecPublicKey;
+ }
+
+ // Key derivation function based on a hash function - see NIST SP 800-56A,
+ // section 5.8
+ private byte[] concatenationKdf(byte[] rawSecret, byte[] label,
+ byte[] initiatorInfo, byte[] responderInfo) {
+ // The output of the hash function must be long enough to use as a key
+ MessageDigest messageDigest = getMessageDigest();
+ if(messageDigest.getDigestLength() < SECRET_KEY_BYTES)
+ throw new RuntimeException();
+ // All fields are length-prefixed
+ byte[] length = new byte[1];
+ ByteUtils.writeUint8(rawSecret.length, length, 0);
+ messageDigest.update(length);
+ messageDigest.update(rawSecret);
+ ByteUtils.writeUint8(label.length, length, 0);
+ messageDigest.update(length);
+ messageDigest.update(label);
+ ByteUtils.writeUint8(initiatorInfo.length, length, 0);
+ messageDigest.update(length);
+ messageDigest.update(initiatorInfo);
+ ByteUtils.writeUint8(responderInfo.length, length, 0);
+ messageDigest.update(length);
+ messageDigest.update(responderInfo);
+ byte[] hash = messageDigest.digest();
+ // The secret is the first SECRET_KEY_BYTES bytes of the hash
+ byte[] output = new byte[SECRET_KEY_BYTES];
+ System.arraycopy(hash, 0, output, 0, SECRET_KEY_BYTES);
+ ByteUtils.erase(hash);
+ return output;
+ }
+
+ // Key derivation function based on a block cipher in CTR mode - see
+ // NIST SP 800-108, section 5.1
+ private byte[] counterModeKdf(byte[] secret, byte[] label, long context) {
+ // The secret must be usable as a key
+ if(secret.length != SECRET_KEY_BYTES)
+ throw new IllegalArgumentException();
+ // The label and context must leave a byte free for the counter
+ if(label.length + 4 >= KEY_DERIVATION_IV_BYTES)
+ throw new IllegalArgumentException();
+ byte[] ivBytes = new byte[KEY_DERIVATION_IV_BYTES];
+ System.arraycopy(label, 0, ivBytes, 0, label.length);
+ ByteUtils.writeUint32(context, ivBytes, label.length);
+ // Use the secret and the IV to encrypt a blank plaintext
+ IvParameterSpec iv = new IvParameterSpec(ivBytes);
+ ErasableKey key = new ErasableKeyImpl(secret, SECRET_KEY_ALGO);
+ try {
+ Cipher cipher = Cipher.getInstance(KEY_DERIVATION_ALGO, PROVIDER);
+ cipher.init(Cipher.ENCRYPT_MODE, key, iv);
+ byte[] output = cipher.doFinal(KEY_DERIVATION_BLANK_PLAINTEXT);
+ assert output.length == SECRET_KEY_BYTES;
+ return output;
+ } catch(GeneralSecurityException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
diff --git a/briar-core/src/net/sf/briar/crypto/Sec1KeyParser.java b/briar-core/src/net/sf/briar/crypto/Sec1KeyParser.java
index a3014e95f9a41f3cc4657bb651aeb7c8a9f3b876..6759d7a42c6731b7c5067563e96a6432b244b414 100644
--- a/briar-core/src/net/sf/briar/crypto/Sec1KeyParser.java
+++ b/briar-core/src/net/sf/briar/crypto/Sec1KeyParser.java
@@ -2,9 +2,13 @@ package net.sf.briar.crypto;
import java.math.BigInteger;
import java.security.KeyFactory;
+import java.security.PrivateKey;
import java.security.PublicKey;
+import java.security.interfaces.ECPrivateKey;
+import java.security.interfaces.ECPublicKey;
import java.security.spec.ECParameterSpec;
import java.security.spec.ECPoint;
+import java.security.spec.ECPrivateKeySpec;
import java.security.spec.ECPublicKeySpec;
import java.security.spec.InvalidKeySpecException;
@@ -20,20 +24,22 @@ class Sec1KeyParser implements KeyParser {
private final KeyFactory keyFactory;
private final ECParameterSpec params;
private final BigInteger modulus;
- private final int bytesPerInt, encodedKeyLength;
+ private final int keyBits, bytesPerInt, publicKeyBytes, privateKeyBytes;
Sec1KeyParser(KeyFactory keyFactory, ECParameterSpec params,
BigInteger modulus, int keyBits) {
this.keyFactory = keyFactory;
this.params = params;
this.modulus = modulus;
+ this.keyBits = keyBits;
bytesPerInt = (int) Math.ceil(keyBits / 8.0);
- encodedKeyLength = 1 + 2 * bytesPerInt;
+ publicKeyBytes = 1 + 2 * bytesPerInt;
+ privateKeyBytes = bytesPerInt;
}
public PublicKey parsePublicKey(byte[] encodedKey)
throws InvalidKeySpecException {
- if(encodedKey.length != encodedKeyLength)
+ if(encodedKey.length != publicKeyBytes)
throw new InvalidKeySpecException();
// The first byte must be 0x04
if(encodedKey[0] != 4) throw new InvalidKeySpecException();
@@ -52,9 +58,23 @@ class Sec1KeyParser implements KeyParser {
BigInteger lhs = y.multiply(y).mod(modulus);
BigInteger rhs = x.multiply(x).add(a).multiply(x).add(b).mod(modulus);
if(!lhs.equals(rhs)) throw new InvalidKeySpecException();
+ // FIXME: Verify that n times the point (x, y) = the point at infinity
// Construct a public key from the point (x, y) and the params
ECPoint pub = new ECPoint(x, y);
ECPublicKeySpec keySpec = new ECPublicKeySpec(pub, params);
- return keyFactory.generatePublic(keySpec);
+ ECPublicKey k = (ECPublicKey) keyFactory.generatePublic(keySpec);
+ return new Sec1PublicKey(k, keyBits);
+ }
+
+ public PrivateKey parsePrivateKey(byte[] encodedKey)
+ throws InvalidKeySpecException {
+ if(encodedKey.length != privateKeyBytes)
+ throw new InvalidKeySpecException();
+ BigInteger s = new BigInteger(1, encodedKey); // Positive signum
+ if(s.compareTo(params.getOrder()) >= 0)
+ throw new InvalidKeySpecException();
+ ECPrivateKeySpec keySpec = new ECPrivateKeySpec(s, params);
+ ECPrivateKey k = (ECPrivateKey) keyFactory.generatePrivate(keySpec);
+ return new Sec1PrivateKey(k, keyBits);
}
}
diff --git a/briar-core/src/net/sf/briar/crypto/Sec1PrivateKey.java b/briar-core/src/net/sf/briar/crypto/Sec1PrivateKey.java
new file mode 100644
index 0000000000000000000000000000000000000000..c590975cc64366027cdb49e64a704c2b7287bc6f
--- /dev/null
+++ b/briar-core/src/net/sf/briar/crypto/Sec1PrivateKey.java
@@ -0,0 +1,57 @@
+package net.sf.briar.crypto;
+
+import java.math.BigInteger;
+import java.security.interfaces.ECPrivateKey;
+import java.security.spec.ECParameterSpec;
+
+class Sec1PrivateKey implements ECPrivateKey,
+org.spongycastle.jce.interfaces.ECPrivateKey {
+
+ private static final long serialVersionUID = -493100835871466670L;
+
+ private final ECPrivateKey key;
+ private final int privateKeyBytes;
+
+ Sec1PrivateKey(ECPrivateKey key, int keyBits) {
+ // Spongy Castle only accepts instances of its own interface, so we
+ // have to wrap an instance of that interface and delegate to it
+ if(!(key instanceof org.spongycastle.jce.interfaces.ECPrivateKey))
+ throw new IllegalArgumentException();
+ this.key = key;
+ privateKeyBytes = (int) Math.ceil(keyBits / 8.0);
+ }
+
+ public String getAlgorithm() {
+ return key.getAlgorithm();
+ }
+
+ public byte[] getEncoded() {
+ byte[] encodedKey = new byte[privateKeyBytes];
+ BigInteger s = key.getS();
+ // Copy up to privateKeyBytes bytes into exactly privateKeyBytes bytes
+ byte[] sBytes = s.toByteArray();
+ for(int i = 0; i < sBytes.length && i < privateKeyBytes; i++)
+ encodedKey[privateKeyBytes - 1 - i] = sBytes[sBytes.length - 1 - i];
+ return encodedKey;
+ }
+
+ public String getFormat() {
+ return "SEC1";
+ }
+
+ public ECParameterSpec getParams() {
+ return key.getParams();
+ }
+
+ public BigInteger getS() {
+ return key.getS();
+ }
+
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters() {
+ return ((org.spongycastle.jce.interfaces.ECPrivateKey) key).getParameters();
+ }
+
+ public BigInteger getD() {
+ return ((org.spongycastle.jce.interfaces.ECPrivateKey) key).getD();
+ }
+}
diff --git a/briar-core/src/net/sf/briar/crypto/Sec1PublicKey.java b/briar-core/src/net/sf/briar/crypto/Sec1PublicKey.java
index 10170e53935c71a862ac8ee5f6c0c942e8ff6684..e3c2e32263bc87fdd99aea75d71ba432c00c2b63 100644
--- a/briar-core/src/net/sf/briar/crypto/Sec1PublicKey.java
+++ b/briar-core/src/net/sf/briar/crypto/Sec1PublicKey.java
@@ -10,17 +10,22 @@ import java.security.spec.ECPoint;
* Elliptic Curve Cryptography", section 2.3 (Certicom Corporation, May 2009).
* Point compression is not used.
*/
-class Sec1PublicKey implements ECPublicKey {
+class Sec1PublicKey implements ECPublicKey,
+org.spongycastle.jce.interfaces.ECPublicKey {
private static final long serialVersionUID = -2722797033851423987L;
private final ECPublicKey key;
- private final int bytesPerInt, encodedKeyLength;
+ private final int bytesPerInt, publicKeyBytes;
Sec1PublicKey(ECPublicKey key, int keyBits) {
+ // Spongy Castle only accepts instances of its own interface, so we
+ // have to wrap an instance of that interface and delegate to it
+ if(!(key instanceof org.spongycastle.jce.interfaces.ECPublicKey))
+ throw new IllegalArgumentException();
this.key = key;
bytesPerInt = (int) Math.ceil(keyBits / 8.0);
- encodedKeyLength = 1 + 2 * bytesPerInt;
+ publicKeyBytes = 1 + 2 * bytesPerInt;
}
public String getAlgorithm() {
@@ -28,9 +33,10 @@ class Sec1PublicKey implements ECPublicKey {
}
public byte[] getEncoded() {
- byte[] encodedKey = new byte[encodedKeyLength];
+ byte[] encodedKey = new byte[publicKeyBytes];
encodedKey[0] = 4;
- BigInteger x = key.getW().getAffineX(), y = key.getW().getAffineY();
+ BigInteger x = key.getW().getAffineX();
+ BigInteger y = key.getW().getAffineY();
// Copy up to bytesPerInt bytes into exactly bytesPerInt bytes
byte[] xBytes = x.toByteArray();
for(int i = 0; i < xBytes.length && i < bytesPerInt; i++)
@@ -52,4 +58,12 @@ class Sec1PublicKey implements ECPublicKey {
public ECPoint getW() {
return key.getW();
}
+
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters() {
+ return ((org.spongycastle.jce.interfaces.ECPublicKey) key).getParameters();
+ }
+
+ public org.spongycastle.math.ec.ECPoint getQ() {
+ return ((org.spongycastle.jce.interfaces.ECPublicKey) key).getQ();
+ }
}
diff --git a/briar-core/src/net/sf/briar/db/Database.java b/briar-core/src/net/sf/briar/db/Database.java
index f3cd30c36c35001a1ceceb2a8d3016d82fa4962f..c76e9255076c684d116af9da25cfaee57b8c81e9 100644
--- a/briar-core/src/net/sf/briar/db/Database.java
+++ b/briar-core/src/net/sf/briar/db/Database.java
@@ -4,27 +4,28 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Map;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.Rating;
+import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.GroupMessageHeader;
import net.sf.briar.api.db.PrivateMessageHeader;
-import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
-import net.sf.briar.api.messaging.LocalAuthor;
import net.sf.briar.api.messaging.LocalGroup;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
+import net.sf.briar.api.messaging.Rating;
import net.sf.briar.api.messaging.RetentionAck;
import net.sf.briar.api.messaging.RetentionUpdate;
import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
@@ -82,16 +83,17 @@ interface Database<T> {
void commitTransaction(T txn) throws DbException;
/**
- * Adds a contact with the given name to the database and returns an ID for
- * the contact.
+ * Stores a contact with the given pseudonym, associated with the given
+ * local pseudonym, and returns an ID for the contact.
* <p>
* Locking: contact write, retention write, subscription write, transport
* write, window write.
*/
- ContactId addContact(T txn, String name) throws DbException;
+ ContactId addContact(T txn, Author remote, AuthorId local)
+ throws DbException;
/**
- * Adds an endpoint to the database.
+ * Stores an endpoint.
* <p>
* Locking: window write.
*/
@@ -108,7 +110,7 @@ interface Database<T> {
/**
* Stores a pseudonym that the user can use to sign messages.
* <p>
- * Locking: identity write.
+ * Locking: contact write, identity write.
*/
void addLocalAuthor(T txn, LocalAuthor a) throws DbException;
@@ -162,12 +164,13 @@ interface Database<T> {
boolean addSubscription(T txn, Group g) throws DbException;
/**
- * Adds a new transport to the database and returns true if the transport
- * was not previously in the database.
+ * Stores a transport and returns true if the transport was not previously
+ * in the database.
* <p>
* Locking: transport write, window write.
*/
- boolean addTransport(T txn, TransportId t) throws DbException;
+ boolean addTransport(T txn, TransportId t, long maxLatency)
+ throws DbException;
/**
* Makes the given group visible to the given contact.
@@ -176,6 +179,13 @@ interface Database<T> {
*/
void addVisibility(T txn, ContactId c, GroupId g) throws DbException;
+ /**
+ * Returns true if the database contains the given contact.
+ * <p>
+ * Locking: contact read.
+ */
+ boolean containsContact(T txn, AuthorId a) throws DbException;
+
/**
* Returns true if the database contains the given contact.
* <p>
@@ -277,6 +287,13 @@ interface Database<T> {
*/
long getLastConnected(T txn, ContactId c) throws DbException;
+ /**
+ * Returns the pseudonym with the given ID.
+ * <p>
+ * Locking: identitiy read.
+ */
+ LocalAuthor getLocalAuthor(T txn, AuthorId a) throws DbException;
+
/**
* Returns all pseudonyms that the user can use to sign messages.
* <p>
@@ -291,6 +308,14 @@ interface Database<T> {
*/
Collection<LocalGroup> getLocalGroups(T txn) throws DbException;
+ /**
+ * Returns the local transport properties for all transports.
+ * <p>
+ * Locking: transport read.
+ */
+ Map<TransportId, TransportProperties> getLocalProperties(T txn)
+ throws DbException;
+
/**
* Returns the local transport properties for the given transport.
* <p>
@@ -509,6 +534,13 @@ interface Database<T> {
Collection<TransportAck> getTransportAcks(T txn, ContactId c)
throws DbException;
+ /**
+ * Returns the maximum latencies of all local transports.
+ * <p>
+ * Locking: transport read.
+ */
+ Map<TransportId, Long> getTransportLatencies(T txn) throws DbException;
+
/**
* Returns a collection of transport updates for the given contact and
* updates their expiry times using the given latency. Returns null if no
@@ -669,6 +701,15 @@ interface Database<T> {
*/
boolean setReadFlag(T txn, MessageId m, boolean read) throws DbException;
+ /**
+ * Sets the remote transport properties for the given contact, replacing
+ * any existing properties.
+ * <p>
+ * Locking: transport write.
+ */
+ void setRemoteProperties(T txn, ContactId c,
+ Map<TransportId, TransportProperties> p) throws DbException;
+
/**
* Updates the remote transport properties for the given contact and the
* given transport, replacing any existing properties, unless an update
diff --git a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
index a4edf9750aec385dc6c6580d00e8dfd5925cf664..eb4da283ddcd2971533631b64c548a958012362c 100644
--- a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
+++ b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
@@ -2,7 +2,7 @@ package net.sf.briar.db;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
-import static net.sf.briar.api.Rating.GOOD;
+import static net.sf.briar.api.messaging.Rating.GOOD;
import static net.sf.briar.db.DatabaseConstants.BYTES_PER_SWEEP;
import static net.sf.briar.db.DatabaseConstants.CRITICAL_FREE_SPACE;
import static net.sf.briar.db.DatabaseConstants.MAX_BYTES_BETWEEN_SPACE_CHECKS;
@@ -23,12 +23,16 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.Logger;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.Rating;
+import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
+import net.sf.briar.api.db.ContactExistsException;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.GroupMessageHeader;
@@ -57,22 +61,19 @@ import net.sf.briar.api.db.event.TransportAddedEvent;
import net.sf.briar.api.db.event.TransportRemovedEvent;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.messaging.Ack;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
-import net.sf.briar.api.messaging.LocalAuthor;
import net.sf.briar.api.messaging.LocalGroup;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.Offer;
+import net.sf.briar.api.messaging.Rating;
import net.sf.briar.api.messaging.Request;
import net.sf.briar.api.messaging.RetentionAck;
import net.sf.briar.api.messaging.RetentionUpdate;
import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
@@ -183,7 +184,8 @@ DatabaseCleaner.Callback {
listeners.remove(d);
}
- public ContactId addContact(String name) throws DbException {
+ public ContactId addContact(Author remote, AuthorId local)
+ throws DbException {
ContactId c;
contactLock.writeLock().lock();
try {
@@ -197,7 +199,9 @@ DatabaseCleaner.Callback {
try {
T txn = db.startTransaction();
try {
- c = db.addContact(txn, name);
+ if(db.containsContact(txn, remote.getId()))
+ throw new ContactExistsException();
+ c = db.addContact(txn, remote, local);
db.commitTransaction(txn);
} catch(DbException e) {
db.abortTransaction(txn);
@@ -257,6 +261,43 @@ DatabaseCleaner.Callback {
}
}
+ public void addLocalAuthor(LocalAuthor a) throws DbException {
+ contactLock.writeLock().lock();
+ try {
+ identityLock.writeLock().lock();
+ try {
+ T txn = db.startTransaction();
+ try {
+ db.addLocalAuthor(txn, a);
+ db.commitTransaction(txn);
+ } catch(DbException e) {
+ db.abortTransaction(txn);
+ throw e;
+ }
+ } finally {
+ identityLock.writeLock().unlock();
+ }
+ } finally {
+ contactLock.writeLock().unlock();
+ }
+ }
+
+ public void addLocalGroup(LocalGroup g) throws DbException {
+ identityLock.writeLock().lock();
+ try {
+ T txn = db.startTransaction();
+ try {
+ db.addLocalGroup(txn, g);
+ db.commitTransaction(txn);
+ } catch(DbException e) {
+ db.abortTransaction(txn);
+ throw e;
+ }
+ } finally {
+ identityLock.writeLock().unlock();
+ }
+ }
+
public void addLocalGroupMessage(Message m) throws DbException {
boolean added = false;
contactLock.readLock().lock();
@@ -430,38 +471,6 @@ DatabaseCleaner.Callback {
return true;
}
- public void addLocalAuthor(LocalAuthor a) throws DbException {
- identityLock.writeLock().lock();
- try {
- T txn = db.startTransaction();
- try {
- db.addLocalAuthor(txn, a);
- db.commitTransaction(txn);
- } catch(DbException e) {
- db.abortTransaction(txn);
- throw e;
- }
- } finally {
- identityLock.writeLock().unlock();
- }
- }
-
- public void addLocalGroup(LocalGroup g) throws DbException {
- identityLock.writeLock().lock();
- try {
- T txn = db.startTransaction();
- try {
- db.addLocalGroup(txn, g);
- db.commitTransaction(txn);
- } catch(DbException e) {
- db.abortTransaction(txn);
- throw e;
- }
- } finally {
- identityLock.writeLock().unlock();
- }
- }
-
public void addSecrets(Collection<TemporarySecret> secrets)
throws DbException {
contactLock.readLock().lock();
@@ -498,7 +507,8 @@ DatabaseCleaner.Callback {
}
}
- public boolean addTransport(TransportId t) throws DbException {
+ public boolean addTransport(TransportId t, long maxLatency)
+ throws DbException {
boolean added;
transportLock.writeLock().lock();
try {
@@ -506,7 +516,7 @@ DatabaseCleaner.Callback {
try {
T txn = db.startTransaction();
try {
- added = db.addTransport(txn, t);
+ added = db.addTransport(txn, t, maxLatency);
db.commitTransaction(txn);
} catch(DbException e) {
db.abortTransaction(txn);
@@ -518,7 +528,7 @@ DatabaseCleaner.Callback {
} finally {
transportLock.writeLock().unlock();
}
- if(added) callListeners(new TransportAddedEvent(t));
+ if(added) callListeners(new TransportAddedEvent(t, maxLatency));
return added;
}
@@ -947,6 +957,23 @@ DatabaseCleaner.Callback {
}
}
+ public LocalAuthor getLocalAuthor(AuthorId a) throws DbException {
+ identityLock.readLock().lock();
+ try {
+ T txn = db.startTransaction();
+ try {
+ LocalAuthor localAuthor = db.getLocalAuthor(txn, a);
+ db.commitTransaction(txn);
+ return localAuthor;
+ } catch(DbException e) {
+ db.abortTransaction(txn);
+ throw e;
+ }
+ } finally {
+ identityLock.readLock().unlock();
+ }
+ }
+
public Collection<LocalAuthor> getLocalAuthors() throws DbException {
identityLock.readLock().lock();
try {
@@ -981,6 +1008,25 @@ DatabaseCleaner.Callback {
}
}
+ public Map<TransportId, TransportProperties> getLocalProperties()
+ throws DbException {
+ transportLock.readLock().lock();
+ try {
+ T txn = db.startTransaction();
+ try {
+ Map<TransportId, TransportProperties> properties =
+ db.getLocalProperties(txn);
+ db.commitTransaction(txn);
+ return properties;
+ } catch(DbException e) {
+ db.abortTransaction(txn);
+ throw e;
+ }
+ } finally {
+ transportLock.readLock().unlock();
+ }
+ }
+
public TransportProperties getLocalProperties(TransportId t)
throws DbException {
transportLock.readLock().lock();
@@ -1197,6 +1243,24 @@ DatabaseCleaner.Callback {
}
}
+ public Map<TransportId, Long> getTransportLatencies() throws DbException {
+ transportLock.readLock().lock();
+ try {
+ T txn = db.startTransaction();
+ try {
+ Map<TransportId, Long> latencies =
+ db.getTransportLatencies(txn);
+ db.commitTransaction(txn);
+ return latencies;
+ } catch(DbException e) {
+ db.abortTransaction(txn);
+ throw e;
+ }
+ } finally {
+ transportLock.readLock().unlock();
+ }
+ }
+
public Map<GroupId, Integer> getUnreadMessageCounts() throws DbException {
messageLock.readLock().lock();
try {
@@ -1785,6 +1849,30 @@ DatabaseCleaner.Callback {
}
}
+ public void setRemoteProperties(ContactId c,
+ Map<TransportId, TransportProperties> p) throws DbException {
+ contactLock.readLock().lock();
+ try {
+ transportLock.writeLock().lock();
+ try {
+ T txn = db.startTransaction();
+ try {
+ if(!db.containsContact(txn, c))
+ throw new NoSuchContactException();
+ db.setRemoteProperties(txn, c, p);
+ db.commitTransaction(txn);
+ } catch(DbException e) {
+ db.abortTransaction(txn);
+ throw e;
+ }
+ } finally {
+ transportLock.writeLock().unlock();
+ }
+ } finally {
+ contactLock.readLock().unlock();
+ }
+ }
+
public void setSeen(ContactId c, Collection<MessageId> seen)
throws DbException {
contactLock.readLock().lock();
diff --git a/briar-core/src/net/sf/briar/db/H2Database.java b/briar-core/src/net/sf/briar/db/H2Database.java
index 6c28bc77958a84b8fec70adc8e115e52136d5bba..5bb1dcc52561f6e246dbc9efc5414f2b0739ca29 100644
--- a/briar-core/src/net/sf/briar/db/H2Database.java
+++ b/briar-core/src/net/sf/briar/db/H2Database.java
@@ -9,7 +9,6 @@ import java.util.Arrays;
import java.util.Properties;
import net.sf.briar.api.clock.Clock;
-import net.sf.briar.api.crypto.Password;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.db.DbException;
import net.sf.briar.util.FileUtils;
@@ -26,7 +25,7 @@ class H2Database extends JdbcDatabase {
private final File home;
private final String url;
- private final Password password;
+ private final char[] password;
private final long maxSize;
@Inject
@@ -76,13 +75,12 @@ class H2Database extends JdbcDatabase {
@Override
protected Connection createConnection() throws SQLException {
Properties props = new Properties();
- props.setProperty("user", "b");
- char[] passwordArray = password.getPassword();
- props.put("password", passwordArray);
+ props.setProperty("user", "user");
+ props.put("password", password);
try {
return DriverManager.getConnection(url, props);
} finally {
- Arrays.fill(passwordArray, (char) 0);
+ Arrays.fill(password, (char) 0);
}
}
}
diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
index d4dec6b438cbff6f21027803f91f2344ebaac5e3..59747daba35d71ef1b1a6b630867933179838c45 100644
--- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java
+++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
@@ -4,9 +4,9 @@ import static java.sql.Types.BINARY;
import static java.sql.Types.VARCHAR;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
-import static net.sf.briar.api.Rating.UNRATED;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SUBSCRIPTIONS;
import static net.sf.briar.api.messaging.MessagingConstants.RETENTION_MODULUS;
+import static net.sf.briar.api.messaging.Rating.UNRATED;
import static net.sf.briar.db.ExponentialBackoff.calculateExpiry;
import java.io.File;
@@ -27,30 +27,30 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Logger;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.Rating;
+import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.db.DbClosedException;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.GroupMessageHeader;
import net.sf.briar.api.db.PrivateMessageHeader;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
-import net.sf.briar.api.messaging.LocalAuthor;
import net.sf.briar.api.messaging.LocalGroup;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
+import net.sf.briar.api.messaging.Rating;
import net.sf.briar.api.messaging.RetentionAck;
import net.sf.briar.api.messaging.RetentionUpdate;
import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
@@ -85,8 +85,18 @@ abstract class JdbcDatabase implements Database<Connection> {
private static final String CREATE_CONTACTS =
"CREATE TABLE contacts"
+ " (contactId COUNTER,"
+ + " authorId HASH NOT NULL,"
+ " name VARCHAR NOT NULL,"
- + " PRIMARY KEY (contactId))";
+ + " publicKey BINARY NOT NULL,"
+ + " localAuthorId HASH NOT NULL,"
+ + " PRIMARY KEY (contactId),"
+ + " UNIQUE (authorId),"
+ + " FOREIGN KEY (localAuthorId)"
+ + " REFERENCES localAuthors (authorId)"
+ + " ON DELETE RESTRICT)"; // Deletion not allowed
+
+ private static final String INDEX_CONTACTS_BY_AUTHOR =
+ "CREATE INDEX contactsByAuthor ON contacts (authorId)";
// Locking: subscription
// Dependents: message
@@ -234,7 +244,10 @@ abstract class JdbcDatabase implements Database<Connection> {
// Locking: transport
// Dependents: window
private static final String CREATE_TRANSPORTS =
- "CREATE TABLE transports (transportId HASH NOT NULL)";
+ "CREATE TABLE transports"
+ + " (transportId HASH NOT NULL,"
+ + " maxLatency BIGINT NOT NULL,"
+ + " PRIMARY KEY (transportId))";
// Locking: transport
private static final String CREATE_TRANSPORT_CONFIGS =
@@ -305,8 +318,6 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " (contactId INT NOT NULL,"
+ " transportId HASH NOT NULL,"
+ " epoch BIGINT NOT NULL,"
- + " clockDiff BIGINT NOT NULL,"
- + " latency BIGINT NOT NULL,"
+ " alice BOOLEAN NOT NULL,"
+ " PRIMARY KEY (contactId, transportId),"
+ " FOREIGN KEY (contactId)"
@@ -401,6 +412,7 @@ abstract class JdbcDatabase implements Database<Connection> {
s.executeUpdate(insertTypeNames(CREATE_LOCAL_AUTHORS));
s.executeUpdate(insertTypeNames(CREATE_LOCAL_GROUPS));
s.executeUpdate(insertTypeNames(CREATE_CONTACTS));
+ s.executeUpdate(INDEX_CONTACTS_BY_AUTHOR);
s.executeUpdate(insertTypeNames(CREATE_GROUPS));
s.executeUpdate(insertTypeNames(CREATE_GROUP_VISIBILITIES));
s.executeUpdate(insertTypeNames(CREATE_CONTACT_GROUPS));
@@ -538,15 +550,20 @@ abstract class JdbcDatabase implements Database<Connection> {
if(interrupted) Thread.currentThread().interrupt();
}
- public ContactId addContact(Connection txn, String name)
+ public ContactId addContact(Connection txn, Author remote, AuthorId local)
throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
// Create a contact row
- String sql = "INSERT INTO contacts (name) VALUES (?)";
+ String sql = "INSERT INTO contacts"
+ + " (authorId, name, publicKey, localAuthorId)"
+ + " VALUES (?, ?, ?, ?)";
ps = txn.prepareStatement(sql);
- ps.setString(1, name);
+ ps.setBytes(1, remote.getId().getBytes());
+ ps.setString(2, remote.getName());
+ ps.setBytes(3, remote.getPublicKey());
+ ps.setBytes(4, local.getBytes());
int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
@@ -612,11 +629,11 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.setBytes(2, t);
ps.addBatch();
}
- int[] affectedBatch = ps.executeBatch();
- if(affectedBatch.length != transports.size())
+ int[] batchAffected = ps.executeBatch();
+ if(batchAffected.length != transports.size())
throw new DbStateException();
- for(int i = 0; i < affectedBatch.length; i++) {
- if(affectedBatch[i] != 1) throw new DbStateException();
+ for(int i = 0; i < batchAffected.length; i++) {
+ if(batchAffected[i] != 1) throw new DbStateException();
}
ps.close();
return c;
@@ -630,16 +647,14 @@ abstract class JdbcDatabase implements Database<Connection> {
public void addEndpoint(Connection txn, Endpoint ep) throws DbException {
PreparedStatement ps = null;
try {
- String sql = "INSERT INTO endpoints (contactId, transportId,"
- + " epoch, clockDiff, latency, alice)"
- + " VALUES (?, ?, ?, ?, ?, ?)";
+ String sql = "INSERT INTO endpoints"
+ + " (contactId, transportId, epoch, alice)"
+ + " VALUES (?, ?, ?, ?)";
ps = txn.prepareStatement(sql);
ps.setInt(1, ep.getContactId().getInt());
ps.setBytes(2, ep.getTransportId().getBytes());
ps.setLong(3, ep.getEpoch());
- ps.setLong(4, ep.getClockDifference());
- ps.setLong(5, ep.getLatency());
- ps.setBoolean(6, ep.getAlice());
+ ps.setBoolean(4, ep.getAlice());
int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
@@ -900,7 +915,7 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
- public boolean addTransport(Connection txn, TransportId t)
+ public boolean addTransport(Connection txn, TransportId t, long maxLatency)
throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
@@ -916,9 +931,11 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.close();
if(found) return false;
// Create a transport row
- sql = "INSERT INTO transports (transportId) VALUES (?)";
+ sql = "INSERT INTO transports (transportId, maxLatency)"
+ + " VALUES (?, ?)";
ps = txn.prepareStatement(sql);
ps.setBytes(1, t.getBytes());
+ ps.setLong(2, maxLatency);
int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
@@ -984,6 +1001,27 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
+ public boolean containsContact(Connection txn, AuthorId a)
+ throws DbException {
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ String sql = "SELECT NULL FROM contacts WHERE authorId = ?";
+ ps = txn.prepareStatement(sql);
+ ps.setBytes(1, a.getBytes());
+ rs = ps.executeQuery();
+ boolean found = rs.next();
+ if(rs.next()) throw new DbStateException();
+ rs.close();
+ ps.close();
+ return found;
+ } catch(SQLException e) {
+ tryToClose(rs);
+ tryToClose(ps);
+ throw new DbException(e);
+ }
+ }
+
public boolean containsContact(Connection txn, ContactId c)
throws DbException {
PreparedStatement ps = null;
@@ -1117,7 +1155,7 @@ abstract class JdbcDatabase implements Database<Connection> {
PreparedStatement ps = null;
ResultSet rs = null;
try {
- String sql = "SELECT name, lastConnected"
+ String sql = "SELECT authorId, name, publicKey, lastConnected"
+ " FROM contacts AS c"
+ " JOIN connectionTimes AS ct"
+ " ON c.contactId = ct.contactId"
@@ -1126,11 +1164,14 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.setInt(1, c.getInt());
rs = ps.executeQuery();
if(!rs.next()) throw new DbStateException();
- String name = rs.getString(1);
- long lastConnected = rs.getLong(2);
+ AuthorId authorId = new AuthorId(rs.getBytes(1));
+ String name = rs.getString(2);
+ byte[] publicKey = rs.getBytes(3);
+ long lastConnected = rs.getLong(4);
rs.close();
ps.close();
- return new Contact(c, name, lastConnected);
+ Author author = new Author(authorId, name, publicKey);
+ return new Contact(c, author, lastConnected);
} catch(SQLException e) {
tryToClose(rs);
tryToClose(ps);
@@ -1163,7 +1204,8 @@ abstract class JdbcDatabase implements Database<Connection> {
PreparedStatement ps = null;
ResultSet rs = null;
try {
- String sql = "SELECT c.contactId, name, lastConnected"
+ String sql = "SELECT c.contactId, authorId, name, publicKey,"
+ + " lastConnected"
+ " FROM contacts AS c"
+ " JOIN connectionTimes AS ct"
+ " ON c.contactId = ct.contactId";
@@ -1171,10 +1213,13 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery();
List<Contact> contacts = new ArrayList<Contact>();
while(rs.next()) {
- ContactId id = new ContactId(rs.getInt(1));
- String name = rs.getString(2);
- long lastConnected = rs.getLong(3);
- contacts.add(new Contact(id, name, lastConnected));
+ ContactId contactId = new ContactId(rs.getInt(1));
+ AuthorId authorId = new AuthorId(rs.getBytes(2));
+ String name = rs.getString(3);
+ byte[] publicKey = rs.getBytes(4);
+ long lastConnected = rs.getLong(5);
+ Author author = new Author(authorId, name, publicKey);
+ contacts.add(new Contact(contactId, author, lastConnected));
}
rs.close();
ps.close();
@@ -1191,8 +1236,7 @@ abstract class JdbcDatabase implements Database<Connection> {
PreparedStatement ps = null;
ResultSet rs = null;
try {
- String sql = "SELECT contactId, transportId, epoch, clockDiff,"
- + " latency, alice"
+ String sql = "SELECT contactId, transportId, epoch, alice"
+ " FROM endpoints";
ps = txn.prepareStatement(sql);
rs = ps.executeQuery();
@@ -1201,11 +1245,8 @@ abstract class JdbcDatabase implements Database<Connection> {
ContactId c = new ContactId(rs.getInt(1));
TransportId t = new TransportId(rs.getBytes(2));
long epoch = rs.getLong(3);
- long clockDiff = rs.getLong(4);
- long latency = rs.getLong(5);
- boolean alice = rs.getBoolean(6);
- endpoints.add(new Endpoint(c, t, epoch, clockDiff, latency,
- alice));
+ boolean alice = rs.getBoolean(4);
+ endpoints.add(new Endpoint(c, t, epoch, alice));
}
return Collections.unmodifiableList(endpoints);
} catch(SQLException e) {
@@ -1287,6 +1328,30 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
+ public LocalAuthor getLocalAuthor(Connection txn, AuthorId a)
+ throws DbException {
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ String sql = "SELECT name, publicKey, privateKey FROM localAuthors"
+ + " WHERE authorId = ?";
+ ps = txn.prepareStatement(sql);
+ rs = ps.executeQuery();
+ if(!rs.next()) throw new DbStateException();
+ AuthorId id = new AuthorId(rs.getBytes(1));
+ LocalAuthor localAuthor = new LocalAuthor(id, rs.getString(2),
+ rs.getBytes(3), rs.getBytes(4));
+ if(rs.next()) throw new DbStateException();
+ rs.close();
+ ps.close();
+ return localAuthor;
+ } catch(SQLException e) {
+ tryToClose(rs);
+ tryToClose(ps);
+ throw new DbException(e);
+ }
+ }
+
public Collection<LocalAuthor> getLocalAuthors(Connection txn)
throws DbException {
PreparedStatement ps = null;
@@ -1337,6 +1402,40 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
+ public Map<TransportId, TransportProperties> getLocalProperties(
+ Connection txn) throws DbException {
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ String sql = "SELECT transportId, key, value"
+ + " FROM transportProperties"
+ + " ORDER BY transportId";
+ ps = txn.prepareStatement(sql);
+ rs = ps.executeQuery();
+ Map<TransportId, TransportProperties> properties =
+ new HashMap<TransportId, TransportProperties>();
+ TransportId lastId = null;
+ TransportProperties p = null;
+ while(rs.next()) {
+ TransportId id = new TransportId(rs.getBytes(1));
+ String key = rs.getString(2), value = rs.getString(3);
+ if(!id.equals(lastId)) {
+ p = new TransportProperties();
+ properties.put(id, p);
+ lastId = id;
+ }
+ p.put(key, value);
+ }
+ rs.close();
+ ps.close();
+ return Collections.unmodifiableMap(properties);
+ } catch(SQLException e) {
+ tryToClose(rs);
+ tryToClose(ps);
+ throw new DbException(e);
+ }
+ }
+
public TransportProperties getLocalProperties(Connection txn, TransportId t)
throws DbException {
PreparedStatement ps = null;
@@ -1437,86 +1536,6 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
- public Collection<PrivateMessageHeader> getPrivateMessageHeaders(
- Connection txn) throws DbException {
- PreparedStatement ps = null;
- ResultSet rs = null;
- try {
- String sql = "SELECT m.messageId, parentId, contentType, subject,"
- + " timestamp, m.contactId, read, starred, seen"
- + " FROM messages AS m"
- + " JOIN statuses AS s"
- + " ON m.messageId = s.messageId"
- + " AND m.contactId = s.contactId"
- + " WHERE groupId IS NULL";
- ps = txn.prepareStatement(sql);
- rs = ps.executeQuery();
- List<PrivateMessageHeader> headers =
- new ArrayList<PrivateMessageHeader>();
- while(rs.next()) {
- MessageId id = new MessageId(rs.getBytes(1));
- byte[] b = rs.getBytes(2);
- MessageId parent = b == null ? null : new MessageId(b);
- String contentType = rs.getString(3);
- String subject = rs.getString(4);
- long timestamp = rs.getLong(5);
- ContactId contactId = new ContactId(rs.getInt(6));
- boolean read = rs.getBoolean(7);
- boolean starred = rs.getBoolean(8);
- boolean seen = rs.getBoolean(9);
- headers.add(new PrivateMessageHeader(id, parent, contentType,
- subject, timestamp, read, starred, contactId, seen));
- }
- rs.close();
- ps.close();
- return Collections.unmodifiableList(headers);
- } catch(SQLException e) {
- tryToClose(rs);
- tryToClose(ps);
- throw new DbException(e);
- }
- }
-
- public Collection<PrivateMessageHeader> getPrivateMessageHeaders(
- Connection txn, ContactId c) throws DbException {
- PreparedStatement ps = null;
- ResultSet rs = null;
- try {
- String sql = "SELECT m.messageId, parentId, contentType, subject,"
- + " timestamp, read, starred, seen"
- + " FROM messages AS m"
- + " JOIN statuses AS s"
- + " ON m.messageId = s.messageId"
- + " AND m.contactId = s.contactId"
- + " WHERE m.contactId = ? AND groupId IS NULL";
- ps = txn.prepareStatement(sql);
- ps.setInt(1, c.getInt());
- rs = ps.executeQuery();
- List<PrivateMessageHeader> headers =
- new ArrayList<PrivateMessageHeader>();
- while(rs.next()) {
- MessageId id = new MessageId(rs.getBytes(1));
- byte[] b = rs.getBytes(2);
- MessageId parent = b == null ? null : new MessageId(b);
- String contentType = rs.getString(3);
- String subject = rs.getString(4);
- long timestamp = rs.getLong(5);
- boolean read = rs.getBoolean(6);
- boolean starred = rs.getBoolean(7);
- boolean seen = rs.getBoolean(8);
- headers.add(new PrivateMessageHeader(id, parent, contentType,
- subject, timestamp, read, starred, c, seen));
- }
- rs.close();
- ps.close();
- return Collections.unmodifiableList(headers);
- } catch(SQLException e) {
- tryToClose(rs);
- tryToClose(ps);
- throw new DbException(e);
- }
- }
-
public Collection<MessageId> getMessagesByAuthor(Connection txn, AuthorId a)
throws DbException {
PreparedStatement ps = null;
@@ -1680,6 +1699,86 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
+ public Collection<PrivateMessageHeader> getPrivateMessageHeaders(
+ Connection txn) throws DbException {
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ String sql = "SELECT m.messageId, parentId, contentType, subject,"
+ + " timestamp, m.contactId, read, starred, seen"
+ + " FROM messages AS m"
+ + " JOIN statuses AS s"
+ + " ON m.messageId = s.messageId"
+ + " AND m.contactId = s.contactId"
+ + " WHERE groupId IS NULL";
+ ps = txn.prepareStatement(sql);
+ rs = ps.executeQuery();
+ List<PrivateMessageHeader> headers =
+ new ArrayList<PrivateMessageHeader>();
+ while(rs.next()) {
+ MessageId id = new MessageId(rs.getBytes(1));
+ byte[] b = rs.getBytes(2);
+ MessageId parent = b == null ? null : new MessageId(b);
+ String contentType = rs.getString(3);
+ String subject = rs.getString(4);
+ long timestamp = rs.getLong(5);
+ ContactId contactId = new ContactId(rs.getInt(6));
+ boolean read = rs.getBoolean(7);
+ boolean starred = rs.getBoolean(8);
+ boolean seen = rs.getBoolean(9);
+ headers.add(new PrivateMessageHeader(id, parent, contentType,
+ subject, timestamp, read, starred, contactId, seen));
+ }
+ rs.close();
+ ps.close();
+ return Collections.unmodifiableList(headers);
+ } catch(SQLException e) {
+ tryToClose(rs);
+ tryToClose(ps);
+ throw new DbException(e);
+ }
+ }
+
+ public Collection<PrivateMessageHeader> getPrivateMessageHeaders(
+ Connection txn, ContactId c) throws DbException {
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ String sql = "SELECT m.messageId, parentId, contentType, subject,"
+ + " timestamp, read, starred, seen"
+ + " FROM messages AS m"
+ + " JOIN statuses AS s"
+ + " ON m.messageId = s.messageId"
+ + " AND m.contactId = s.contactId"
+ + " WHERE m.contactId = ? AND groupId IS NULL";
+ ps = txn.prepareStatement(sql);
+ ps.setInt(1, c.getInt());
+ rs = ps.executeQuery();
+ List<PrivateMessageHeader> headers =
+ new ArrayList<PrivateMessageHeader>();
+ while(rs.next()) {
+ MessageId id = new MessageId(rs.getBytes(1));
+ byte[] b = rs.getBytes(2);
+ MessageId parent = b == null ? null : new MessageId(b);
+ String contentType = rs.getString(3);
+ String subject = rs.getString(4);
+ long timestamp = rs.getLong(5);
+ boolean read = rs.getBoolean(6);
+ boolean starred = rs.getBoolean(7);
+ boolean seen = rs.getBoolean(8);
+ headers.add(new PrivateMessageHeader(id, parent, contentType,
+ subject, timestamp, read, starred, c, seen));
+ }
+ rs.close();
+ ps.close();
+ return Collections.unmodifiableList(headers);
+ } catch(SQLException e) {
+ tryToClose(rs);
+ tryToClose(ps);
+ throw new DbException(e);
+ }
+ }
+
public Rating getRating(Connection txn, AuthorId a) throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
@@ -1834,6 +1933,7 @@ abstract class JdbcDatabase implements Database<Connection> {
if(!id.equals(lastId)) {
p = new TransportProperties();
properties.put(id, p);
+ lastId = id;
}
p.put(key, value);
}
@@ -1934,9 +2034,8 @@ abstract class JdbcDatabase implements Database<Connection> {
PreparedStatement ps = null;
ResultSet rs = null;
try {
- String sql = "SELECT e.contactId, e.transportId, epoch,"
- + " clockDiff, latency, alice, period, secret, outgoing,"
- + " centre, bitmap"
+ String sql = "SELECT e.contactId, e.transportId, epoch, alice,"
+ + " period, secret, outgoing, centre, bitmap"
+ " FROM endpoints AS e"
+ " JOIN secrets AS s"
+ " ON e.contactId = s.contactId"
@@ -1948,16 +2047,14 @@ abstract class JdbcDatabase implements Database<Connection> {
ContactId c = new ContactId(rs.getInt(1));
TransportId t = new TransportId(rs.getBytes(2));
long epoch = rs.getLong(3);
- long clockDiff = rs.getLong(4);
- long latency = rs.getLong(5);
- boolean alice = rs.getBoolean(6);
- long period = rs.getLong(7);
- byte[] secret = rs.getBytes(8);
- long outgoing = rs.getLong(9);
- long centre = rs.getLong(10);
- byte[] bitmap = rs.getBytes(11);
- secrets.add(new TemporarySecret(c, t, epoch, clockDiff, latency,
- alice, period, secret, outgoing, centre, bitmap));
+ boolean alice = rs.getBoolean(4);
+ long period = rs.getLong(5);
+ byte[] secret = rs.getBytes(6);
+ long outgoing = rs.getLong(7);
+ long centre = rs.getLong(8);
+ byte[] bitmap = rs.getBytes(9);
+ secrets.add(new TemporarySecret(c, t, epoch, alice, period,
+ secret, outgoing, centre, bitmap));
}
rs.close();
ps.close();
@@ -2265,11 +2362,11 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.setBytes(2, a.getId().getBytes());
ps.addBatch();
}
- int[] affectedBatch = ps.executeBatch();
- if(affectedBatch.length != acks.size())
+ int[] batchAffected = ps.executeBatch();
+ if(batchAffected.length != acks.size())
throw new DbStateException();
- for(int i = 0; i < affectedBatch.length; i++) {
- if(affectedBatch[i] < 1) throw new DbStateException();
+ for(int i = 0; i < batchAffected.length; i++) {
+ if(batchAffected[i] < 1) throw new DbStateException();
}
ps.close();
return Collections.unmodifiableList(acks);
@@ -2280,6 +2377,29 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
+ public Map<TransportId, Long> getTransportLatencies(Connection txn)
+ throws DbException {
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ String sql = "SELECT transportId, maxLatency FROM transports";
+ ps = txn.prepareStatement(sql);
+ rs = ps.executeQuery();
+ Map<TransportId, Long> latencies = new HashMap<TransportId, Long>();
+ while(rs.next()){
+ TransportId id = new TransportId(rs.getBytes(1));
+ latencies.put(id, rs.getLong(2));
+ }
+ rs.close();
+ ps.close();
+ return Collections.unmodifiableMap(latencies);
+ } catch(SQLException e) {
+ tryToClose(rs);
+ tryToClose(ps);
+ throw new DbException(e);
+ }
+ }
+
public Collection<TransportUpdate> getTransportUpdates(Connection txn,
ContactId c, long maxLatency) throws DbException {
long now = clock.currentTimeMillis();
@@ -2642,11 +2762,11 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.setInt(2, c);
ps.addBatch();
}
- int[] affectedBatch = ps.executeBatch();
- if(affectedBatch.length != visible.size())
+ int[] batchAffected = ps.executeBatch();
+ if(batchAffected.length != visible.size())
throw new DbStateException();
- for(int i = 0; i < affectedBatch.length; i++) {
- if(affectedBatch[i] != 1) throw new DbStateException();
+ for(int i = 0; i < batchAffected.length; i++) {
+ if(batchAffected[i] != 1) throw new DbStateException();
}
ps.close();
} catch(SQLException e) {
@@ -2891,6 +3011,45 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
+ public void setRemoteProperties(Connection txn, ContactId c,
+ Map<TransportId, TransportProperties> p) throws DbException {
+ PreparedStatement ps = null;
+ try {
+ // Delete the existing properties, if any
+ String sql = "DELETE FROM contactTransportProperties"
+ + " WHERE contactId = ?";
+ ps = txn.prepareStatement(sql);
+ ps.setInt(1, c.getInt());
+ ps.executeUpdate();
+ ps.close();
+ // Store the new properties
+ sql = "INSERT INTO contactTransportProperties"
+ + " (contactId, transportId, key, value)"
+ + " VALUES (?, ?, ?, ?)";
+ ps = txn.prepareStatement(sql);
+ ps.setInt(1, c.getInt());
+ int batchSize = 0;
+ for(Entry<TransportId, TransportProperties> e : p.entrySet()) {
+ ps.setBytes(2, e.getKey().getBytes());
+ for(Entry<String, String> e1 : e.getValue().entrySet()) {
+ ps.setString(3, e1.getKey());
+ ps.setString(4, e1.getValue());
+ ps.addBatch();
+ batchSize++;
+ }
+ }
+ int[] batchAffected = ps.executeBatch();
+ if(batchAffected.length != batchSize) throw new DbStateException();
+ for(int i = 0; i < batchAffected.length; i++) {
+ if(batchAffected[i] != 1) throw new DbStateException();
+ }
+ ps.close();
+ } catch(SQLException e) {
+ tryToClose(ps);
+ throw new DbException(e);
+ }
+ }
+
public void setRemoteProperties(Connection txn, ContactId c, TransportId t,
TransportProperties p, long version) throws DbException {
PreparedStatement ps = null;
@@ -3151,11 +3310,11 @@ abstract class JdbcDatabase implements Database<Connection> {
else ps.setNull(4, BINARY);
ps.addBatch();
}
- int[] affectedBatch = ps.executeBatch();
- if(affectedBatch.length != subs.size())
+ int[] batchAffected = ps.executeBatch();
+ if(batchAffected.length != subs.size())
throw new DbStateException();
- for(int i = 0; i < affectedBatch.length; i++) {
- if(affectedBatch[i] != 1) throw new DbStateException();
+ for(int i = 0; i < batchAffected.length; i++) {
+ if(batchAffected[i] != 1) throw new DbStateException();
}
ps.close();
} catch(SQLException e) {
diff --git a/briar-core/src/net/sf/briar/invitation/AliceConnector.java b/briar-core/src/net/sf/briar/invitation/AliceConnector.java
index 84d486d19d7dbe35036ab2745a6bdddc25416158..fc3ae0fdf25f14c344f32c5825632295571f924a 100644
--- a/briar-core/src/net/sf/briar/invitation/AliceConnector.java
+++ b/briar-core/src/net/sf/briar/invitation/AliceConnector.java
@@ -8,16 +8,30 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.security.GeneralSecurityException;
+import java.util.Map;
import java.util.logging.Logger;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorFactory;
+import net.sf.briar.api.LocalAuthor;
+import net.sf.briar.api.TransportId;
+import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
+import net.sf.briar.api.crypto.KeyManager;
+import net.sf.briar.api.crypto.PseudoRandom;
+import net.sf.briar.api.db.DatabaseComponent;
+import net.sf.briar.api.db.DbException;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
+import net.sf.briar.api.transport.ConnectionReader;
+import net.sf.briar.api.transport.ConnectionReaderFactory;
+import net.sf.briar.api.transport.ConnectionWriter;
+import net.sf.briar.api.transport.ConnectionWriterFactory;
/** A connection thread for the peer being Alice in the invitation protocol. */
class AliceConnector extends Connector {
@@ -25,11 +39,17 @@ class AliceConnector extends Connector {
private static final Logger LOG =
Logger.getLogger(AliceConnector.class.getName());
- AliceConnector(CryptoComponent crypto, ReaderFactory readerFactory,
- WriterFactory writerFactory, Clock clock, ConnectorGroup group,
- DuplexPlugin plugin, int localCode, int remoteCode) {
- super(crypto, readerFactory, writerFactory, clock, group, plugin,
- crypto.getPseudoRandom(localCode, remoteCode));
+ AliceConnector(CryptoComponent crypto, DatabaseComponent db,
+ ReaderFactory readerFactory, WriterFactory writerFactory,
+ ConnectionReaderFactory connectionReaderFactory,
+ ConnectionWriterFactory connectionWriterFactory,
+ AuthorFactory authorFactory, KeyManager keyManager, Clock clock,
+ ConnectorGroup group, DuplexPlugin plugin, LocalAuthor localAuthor,
+ Map<TransportId, TransportProperties> localProps,
+ PseudoRandom random) {
+ super(crypto, db, readerFactory, writerFactory, connectionReaderFactory,
+ connectionWriterFactory, authorFactory, keyManager, clock,
+ group, plugin, localAuthor, localProps, random);
}
@Override
@@ -65,7 +85,7 @@ class AliceConnector extends Connector {
byte[] hash = receivePublicKeyHash(r);
sendPublicKey(w);
byte[] key = receivePublicKey(r);
- secret = deriveSharedSecret(hash, key, true);
+ secret = deriveMasterSecret(hash, key, true);
} catch(IOException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
tryToClose(conn, true);
@@ -76,9 +96,10 @@ class AliceConnector extends Connector {
return;
}
// The key agreement succeeded - derive the confirmation codes
- if(LOG.isLoggable(INFO)) LOG.info(pluginName + " succeeded");
+ if(LOG.isLoggable(INFO)) LOG.info(pluginName + " agreement succeeded");
int[] codes = crypto.deriveConfirmationCodes(secret);
- group.connectionSucceeded(codes[0], codes[1]);
+ int aliceCode = codes[0], bobCode = codes[1];
+ group.connectionSucceeded(aliceCode, bobCode);
// Exchange confirmation results
try {
sendConfirmation(w);
@@ -97,7 +118,59 @@ class AliceConnector extends Connector {
Thread.currentThread().interrupt();
return;
}
- // That's all, folks!
+ // The timestamp is taken after exhanging confirmation results
+ long localTimestamp = clock.currentTimeMillis();
+ // Confirmation succeeded - upgrade to a secure connection
+ if(LOG.isLoggable(INFO))
+ LOG.info(pluginName + " confirmation succeeded");
+ ConnectionReader connectionReader =
+ connectionReaderFactory.createInvitationConnectionReader(in,
+ secret, false);
+ r = readerFactory.createReader(connectionReader.getInputStream());
+ ConnectionWriter connectionWriter =
+ connectionWriterFactory.createInvitationConnectionWriter(out,
+ secret, true);
+ w = writerFactory.createWriter(connectionWriter.getOutputStream());
+ // Derive the invitation nonces
+ byte[][] nonces = crypto.deriveInvitationNonces(secret);
+ byte[] aliceNonce = nonces[0], bobNonce = nonces[1];
+ // Exchange pseudonyms, signed nonces, timestamps and transports
+ Author remoteAuthor;
+ long remoteTimestamp;
+ Map<TransportId, TransportProperties> remoteProps;
+ try {
+ sendPseudonym(w, aliceNonce);
+ sendTimestamp(w, localTimestamp);
+ sendTransportProperties(w);
+ remoteAuthor = receivePseudonym(r, bobNonce);
+ remoteTimestamp = receiveTimestamp(r);
+ remoteProps = receiveTransportProperties(r);
+ } catch(GeneralSecurityException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ tryToClose(conn, true);
+ group.pseudonymExchangeFailed();
+ return;
+ } catch(IOException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ tryToClose(conn, true);
+ group.pseudonymExchangeFailed();
+ return;
+ }
+ // The epoch is the minimum of the peers' timestamps
+ long epoch = Math.min(localTimestamp, remoteTimestamp);
+ // Add the contact and store the transports
+ try {
+ addContact(remoteAuthor, remoteProps, secret, epoch, true);
+ } catch(DbException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ tryToClose(conn, true);
+ group.pseudonymExchangeFailed();
+ return;
+ }
+ // Pseudonym exchange succeeded
+ if(LOG.isLoggable(INFO))
+ LOG.info(pluginName + " pseudonym exchange succeeded");
+ group.pseudonymExchangeSucceeded(remoteAuthor);
tryToClose(conn, false);
}
}
\ No newline at end of file
diff --git a/briar-core/src/net/sf/briar/invitation/BobConnector.java b/briar-core/src/net/sf/briar/invitation/BobConnector.java
index 10c15bfe78ab638f2a7abceabec6bdc2c12598b2..da574f2badb293ec39855bcbcc24e998915d6222 100644
--- a/briar-core/src/net/sf/briar/invitation/BobConnector.java
+++ b/briar-core/src/net/sf/briar/invitation/BobConnector.java
@@ -8,16 +8,30 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.security.GeneralSecurityException;
+import java.util.Map;
import java.util.logging.Logger;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorFactory;
+import net.sf.briar.api.LocalAuthor;
+import net.sf.briar.api.TransportId;
+import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
+import net.sf.briar.api.crypto.KeyManager;
+import net.sf.briar.api.crypto.PseudoRandom;
+import net.sf.briar.api.db.DatabaseComponent;
+import net.sf.briar.api.db.DbException;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
+import net.sf.briar.api.transport.ConnectionReader;
+import net.sf.briar.api.transport.ConnectionReaderFactory;
+import net.sf.briar.api.transport.ConnectionWriter;
+import net.sf.briar.api.transport.ConnectionWriterFactory;
/** A connection thread for the peer being Bob in the invitation protocol. */
class BobConnector extends Connector {
@@ -25,11 +39,17 @@ class BobConnector extends Connector {
private static final Logger LOG =
Logger.getLogger(BobConnector.class.getName());
- BobConnector(CryptoComponent crypto, ReaderFactory readerFactory,
- WriterFactory writerFactory, Clock clock, ConnectorGroup group,
- DuplexPlugin plugin, int localCode, int remoteCode) {
- super(crypto, readerFactory, writerFactory, clock, group, plugin,
- crypto.getPseudoRandom(remoteCode, localCode));
+ BobConnector(CryptoComponent crypto, DatabaseComponent db,
+ ReaderFactory readerFactory, WriterFactory writerFactory,
+ ConnectionReaderFactory connectionReaderFactory,
+ ConnectionWriterFactory connectionWriterFactory,
+ AuthorFactory authorFactory, KeyManager keyManager, Clock clock,
+ ConnectorGroup group, DuplexPlugin plugin, LocalAuthor localAuthor,
+ Map<TransportId, TransportProperties> localProps,
+ PseudoRandom random) {
+ super(crypto, db, readerFactory, writerFactory, connectionReaderFactory,
+ connectionWriterFactory, authorFactory, keyManager, clock,
+ group, plugin, localAuthor, localProps, random);
}
@Override
@@ -65,7 +85,7 @@ class BobConnector extends Connector {
sendPublicKeyHash(w);
byte[] key = receivePublicKey(r);
sendPublicKey(w);
- secret = deriveSharedSecret(hash, key, false);
+ secret = deriveMasterSecret(hash, key, false);
} catch(IOException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
tryToClose(conn, true);
@@ -76,14 +96,15 @@ class BobConnector extends Connector {
return;
}
// The key agreement succeeded - derive the confirmation codes
- if(LOG.isLoggable(INFO)) LOG.info(pluginName + " succeeded");
+ if(LOG.isLoggable(INFO)) LOG.info(pluginName + " agreement succeeded");
int[] codes = crypto.deriveConfirmationCodes(secret);
- group.connectionSucceeded(codes[1], codes[0]);
+ int aliceCode = codes[0], bobCode = codes[1];
+ group.connectionSucceeded(bobCode, aliceCode);
// Exchange confirmation results
try {
- sendConfirmation(w);
if(receiveConfirmation(r)) group.remoteConfirmationSucceeded();
else group.remoteConfirmationFailed();
+ sendConfirmation(w);
} catch(IOException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
tryToClose(conn, true);
@@ -97,7 +118,59 @@ class BobConnector extends Connector {
Thread.currentThread().interrupt();
return;
}
- // That's all, folks!
+ // The timestamp is taken after exhanging confirmation results
+ long localTimestamp = clock.currentTimeMillis();
+ // Confirmation succeeded - upgrade to a secure connection
+ if(LOG.isLoggable(INFO))
+ LOG.info(pluginName + " confirmation succeeded");
+ ConnectionReader connectionReader =
+ connectionReaderFactory.createInvitationConnectionReader(in,
+ secret, true);
+ r = readerFactory.createReader(connectionReader.getInputStream());
+ ConnectionWriter connectionWriter =
+ connectionWriterFactory.createInvitationConnectionWriter(out,
+ secret, false);
+ w = writerFactory.createWriter(connectionWriter.getOutputStream());
+ // Derive the nonces
+ byte[][] nonces = crypto.deriveInvitationNonces(secret);
+ byte[] aliceNonce = nonces[0], bobNonce = nonces[1];
+ // Exchange pseudonyms, signed nonces, timestamps and transports
+ Author remoteAuthor;
+ long remoteTimestamp;
+ Map<TransportId, TransportProperties> remoteProps;
+ try {
+ remoteAuthor = receivePseudonym(r, aliceNonce);
+ remoteTimestamp = receiveTimestamp(r);
+ remoteProps = receiveTransportProperties(r);
+ sendPseudonym(w, bobNonce);
+ sendTimestamp(w, localTimestamp);
+ sendTransportProperties(w);
+ } catch(GeneralSecurityException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ tryToClose(conn, true);
+ group.pseudonymExchangeFailed();
+ return;
+ } catch(IOException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ tryToClose(conn, true);
+ group.pseudonymExchangeFailed();
+ return;
+ }
+ // The epoch is the minimum of the peers' timestamps
+ long epoch = Math.min(localTimestamp, remoteTimestamp);
+ // Add the contact and store the transports
+ try {
+ addContact(remoteAuthor, remoteProps, secret, epoch, true);
+ } catch(DbException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ tryToClose(conn, true);
+ group.pseudonymExchangeFailed();
+ return;
+ }
+ // Pseudonym exchange succeeded
+ if(LOG.isLoggable(INFO))
+ LOG.info(pluginName + " pseudonym exchange succeeded");
+ group.pseudonymExchangeSucceeded(remoteAuthor);
tryToClose(conn, false);
}
}
diff --git a/briar-core/src/net/sf/briar/invitation/Connector.java b/briar-core/src/net/sf/briar/invitation/Connector.java
index 67895642f3bb592299e42414b5d1c92f6aa85ec5..4dcf3c3d0c21ce1f862baa32688143faa193d776 100644
--- a/briar-core/src/net/sf/briar/invitation/Connector.java
+++ b/briar-core/src/net/sf/briar/invitation/Connector.java
@@ -2,28 +2,53 @@ package net.sf.briar.invitation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
+import static net.sf.briar.api.messaging.MessagingConstants.MAX_AUTHOR_NAME_LENGTH;
+import static net.sf.briar.api.messaging.MessagingConstants.MAX_PROPERTY_LENGTH;
+import static net.sf.briar.api.messaging.MessagingConstants.MAX_PUBLIC_KEY_LENGTH;
+import static net.sf.briar.api.messaging.MessagingConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.plugins.InvitationConstants.CONNECTION_TIMEOUT;
import static net.sf.briar.api.plugins.InvitationConstants.HASH_LENGTH;
-import static net.sf.briar.api.plugins.InvitationConstants.MAX_PUBLIC_KEY_LENGTH;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.security.KeyPair;
+import java.security.Signature;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
import java.util.logging.Logger;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorFactory;
+import net.sf.briar.api.ContactId;
import net.sf.briar.api.FormatException;
+import net.sf.briar.api.LocalAuthor;
+import net.sf.briar.api.TransportId;
+import net.sf.briar.api.TransportProperties;
+import net.sf.briar.api.UniqueId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
+import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.crypto.KeyParser;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.crypto.PseudoRandom;
+import net.sf.briar.api.db.DatabaseComponent;
+import net.sf.briar.api.db.DbException;
+import net.sf.briar.api.db.NoSuchTransportException;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
+import net.sf.briar.api.transport.ConnectionReaderFactory;
+import net.sf.briar.api.transport.ConnectionWriterFactory;
+import net.sf.briar.api.transport.Endpoint;
abstract class Connector extends Thread {
@@ -31,11 +56,18 @@ abstract class Connector extends Thread {
Logger.getLogger(Connector.class.getName());
protected final CryptoComponent crypto;
+ protected final DatabaseComponent db;
protected final ReaderFactory readerFactory;
protected final WriterFactory writerFactory;
+ protected final ConnectionReaderFactory connectionReaderFactory;
+ protected final ConnectionWriterFactory connectionWriterFactory;
+ protected final AuthorFactory authorFactory;
+ protected final KeyManager keyManager;
protected final Clock clock;
protected final ConnectorGroup group;
protected final DuplexPlugin plugin;
+ protected final LocalAuthor localAuthor;
+ protected final Map<TransportId, TransportProperties> localProps;
protected final PseudoRandom random;
protected final String pluginName;
@@ -43,16 +75,28 @@ abstract class Connector extends Thread {
private final KeyParser keyParser;
private final MessageDigest messageDigest;
- Connector(CryptoComponent crypto, ReaderFactory readerFactory,
- WriterFactory writerFactory, Clock clock, ConnectorGroup group,
- DuplexPlugin plugin, PseudoRandom random) {
+ Connector(CryptoComponent crypto, DatabaseComponent db,
+ ReaderFactory readerFactory, WriterFactory writerFactory,
+ ConnectionReaderFactory connectionReaderFactory,
+ ConnectionWriterFactory connectionWriterFactory,
+ AuthorFactory authorFactory, KeyManager keyManager, Clock clock,
+ ConnectorGroup group, DuplexPlugin plugin, LocalAuthor localAuthor,
+ Map<TransportId, TransportProperties> localProps,
+ PseudoRandom random) {
super("Connector");
this.crypto = crypto;
+ this.db = db;
this.readerFactory = readerFactory;
this.writerFactory = writerFactory;
+ this.connectionReaderFactory = connectionReaderFactory;
+ this.connectionWriterFactory = connectionWriterFactory;
+ this.authorFactory = authorFactory;
+ this.keyManager = keyManager;
this.clock = clock;
this.group = group;
this.plugin = plugin;
+ this.localAuthor = localAuthor;
+ this.localProps = localProps;
this.random = random;
pluginName = plugin.getClass().getName();
keyPair = crypto.generateAgreementKeyPair();
@@ -87,16 +131,6 @@ abstract class Connector extends Thread {
}
}
- protected void tryToClose(DuplexTransportConnection conn,
- boolean exception) {
- try {
- if(LOG.isLoggable(INFO)) LOG.info("Closing connection");
- conn.dispose(exception, true);
- } catch(IOException e) {
- if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
- }
- }
-
protected void sendPublicKeyHash(Writer w) throws IOException {
w.writeBytes(messageDigest.digest(keyPair.getPublic().getEncoded()));
w.flush();
@@ -116,18 +150,15 @@ abstract class Connector extends Thread {
if(LOG.isLoggable(INFO)) LOG.info(pluginName + " sent key");
}
- protected byte[] receivePublicKey(Reader r) throws IOException {
+ protected byte[] receivePublicKey(Reader r) throws GeneralSecurityException,
+ IOException {
byte[] b = r.readBytes(MAX_PUBLIC_KEY_LENGTH);
- try {
- keyParser.parsePublicKey(b);
- } catch(GeneralSecurityException e) {
- throw new FormatException();
- }
+ keyParser.parsePublicKey(b);
if(LOG.isLoggable(INFO)) LOG.info(pluginName + " received key");
return b;
}
- protected byte[] deriveSharedSecret(byte[] hash, byte[] key, boolean alice)
+ protected byte[] deriveMasterSecret(byte[] hash, byte[] key, boolean alice)
throws GeneralSecurityException {
// Check that the hash matches the key
if(!Arrays.equals(hash, messageDigest.digest(key))) {
@@ -135,16 +166,16 @@ abstract class Connector extends Thread {
LOG.info(pluginName + " hash does not match key");
throw new GeneralSecurityException();
}
- // Derive the shared secret
- return crypto.deriveInitialSecret(key, keyPair, alice);
+ // Derive the master secret
+ return crypto.deriveMasterSecret(key, keyPair, alice);
}
protected void sendConfirmation(Writer w) throws IOException,
InterruptedException {
boolean matched = group.waitForLocalConfirmationResult();
- if(LOG.isLoggable(INFO)) LOG.info(pluginName + " sent confirmation");
w.writeBoolean(matched);
w.flush();
+ if(LOG.isLoggable(INFO)) LOG.info(pluginName + " sent confirmation");
}
protected boolean receiveConfirmation(Reader r) throws IOException {
@@ -153,4 +184,137 @@ abstract class Connector extends Thread {
LOG.info(pluginName + " received confirmation");
return matched;
}
+
+ protected void sendPseudonym(Writer w, byte[] nonce)
+ throws GeneralSecurityException, IOException {
+ // Sign the nonce
+ Signature signature = crypto.getSignature();
+ KeyParser keyParser = crypto.getSignatureKeyParser();
+ byte[] privateKey = localAuthor.getPrivateKey();
+ signature.initSign(keyParser.parsePrivateKey(privateKey));
+ signature.update(nonce);
+ byte[] sig = signature.sign();
+ // Write the name, public key and signature
+ w.writeString(localAuthor.getName());
+ w.writeBytes(localAuthor.getPublicKey());
+ w.writeBytes(sig);
+ w.flush();
+ if(LOG.isLoggable(INFO)) LOG.info(pluginName + " sent pseudonym");
+ }
+
+ protected Author receivePseudonym(Reader r, byte[] nonce)
+ throws GeneralSecurityException, IOException {
+ // Read the name, public key and signature
+ String name = r.readString(MAX_AUTHOR_NAME_LENGTH);
+ byte[] publicKey = r.readBytes(MAX_PUBLIC_KEY_LENGTH);
+ byte[] sig = r.readBytes(MAX_SIGNATURE_LENGTH);
+ if(LOG.isLoggable(INFO)) LOG.info(pluginName + " received pseudonym");
+ // Verify the signature
+ Signature signature = crypto.getSignature();
+ KeyParser keyParser = crypto.getSignatureKeyParser();
+ signature.initVerify(keyParser.parsePublicKey(publicKey));
+ signature.update(nonce);
+ if(!signature.verify(sig)) {
+ if(LOG.isLoggable(INFO))
+ LOG.info(pluginName + " invalid signature");
+ throw new GeneralSecurityException();
+ }
+ return authorFactory.createAuthor(name, publicKey);
+ }
+
+ protected void sendTimestamp(Writer w, long timestamp) throws IOException {
+ w.writeInt64(timestamp);
+ w.flush();
+ if(LOG.isLoggable(INFO)) LOG.info(pluginName + " sent timestamp");
+ }
+
+ protected long receiveTimestamp(Reader r) throws IOException {
+ long timestamp = r.readInt64();
+ if(timestamp < 0) throw new FormatException();
+ if(LOG.isLoggable(INFO)) LOG.info(pluginName + " received timestamp");
+ return timestamp;
+ }
+
+ protected void sendTransportProperties(Writer w) throws IOException {
+ w.writeListStart();
+ for(Entry<TransportId, TransportProperties> e : localProps.entrySet()) {
+ w.writeBytes(e.getKey().getBytes());
+ w.writeMap(e.getValue());
+ }
+ w.writeListEnd();
+ w.flush();
+ if(LOG.isLoggable(INFO))
+ LOG.info(pluginName + " sent transport properties");
+ }
+
+ protected Map<TransportId, TransportProperties> receiveTransportProperties(
+ Reader r) throws IOException {
+ Map<TransportId, TransportProperties> remoteProps =
+ new HashMap<TransportId, TransportProperties>();
+ r.readListStart();
+ while(!r.hasListEnd()) {
+ byte[] b = r.readBytes(UniqueId.LENGTH);
+ if(b.length != UniqueId.LENGTH) throw new FormatException();
+ TransportId id = new TransportId(b);
+ r.setMaxStringLength(MAX_PROPERTY_LENGTH);
+ Map<String, String> p = r.readMap(String.class, String.class);
+ r.resetMaxStringLength();
+ remoteProps.put(id, new TransportProperties(p));
+ }
+ r.readListEnd();
+ if(LOG.isLoggable(INFO))
+ LOG.info(pluginName + " received transport properties");
+ return remoteProps;
+ }
+
+ protected void addContact(Author remoteAuthor,
+ Map<TransportId, TransportProperties> remoteProps, byte[] secret,
+ long epoch, boolean alice) throws DbException {
+ // Add the contact to the database
+ ContactId c = db.addContact(remoteAuthor, localAuthor.getId());
+ // Store the remote transport properties
+ db.setRemoteProperties(c, remoteProps);
+ // Create an endpoint for each transport shared with the contact
+ List<TransportId> ids = new ArrayList<TransportId>();
+ for(TransportId id : localProps.keySet())
+ if(remoteProps.containsKey(id)) ids.add(id);
+ // Assign indices to the transports in a deterministic way
+ Collections.sort(ids, TransportIdComparator.INSTANCE);
+ int size = ids.size();
+ for(int i = 0; i < size; i++) {
+ Endpoint ep = new Endpoint(c, ids.get(i), epoch, alice);
+ try {
+ db.addEndpoint(ep);
+ } catch(NoSuchTransportException e) {
+ continue;
+ }
+ keyManager.endpointAdded(ep, crypto.deriveInitialSecret(secret, i));
+ }
+ }
+
+ protected void tryToClose(DuplexTransportConnection conn,
+ boolean exception) {
+ try {
+ if(LOG.isLoggable(INFO)) LOG.info("Closing connection");
+ conn.dispose(exception, true);
+ } catch(IOException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ }
+ }
+
+ private static class TransportIdComparator
+ implements Comparator<TransportId> {
+
+ private static final TransportIdComparator INSTANCE =
+ new TransportIdComparator();
+
+ public int compare(TransportId t1, TransportId t2) {
+ byte[] b1 = t1.getBytes(), b2 = t2.getBytes();
+ for(int i = 0; i < UniqueId.LENGTH; i++) {
+ if((b1[i] & 0xff) < (b2[i] & 0xff)) return -1;
+ if((b1[i] & 0xff) > (b2[i] & 0xff)) return 1;
+ }
+ return 0;
+ }
+ }
}
diff --git a/briar-core/src/net/sf/briar/invitation/ConnectorGroup.java b/briar-core/src/net/sf/briar/invitation/ConnectorGroup.java
index 1076f026b431640fafa2e1690070eccbc0a3924c..19033ca576a83f6214936fbdee3e8f0e015311cd 100644
--- a/briar-core/src/net/sf/briar/invitation/ConnectorGroup.java
+++ b/briar-core/src/net/sf/briar/invitation/ConnectorGroup.java
@@ -6,13 +6,24 @@ import static net.sf.briar.api.plugins.InvitationConstants.CONFIRMATION_TIMEOUT;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorFactory;
+import net.sf.briar.api.AuthorId;
+import net.sf.briar.api.LocalAuthor;
+import net.sf.briar.api.TransportId;
+import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
+import net.sf.briar.api.crypto.KeyManager;
+import net.sf.briar.api.crypto.PseudoRandom;
+import net.sf.briar.api.db.DatabaseComponent;
+import net.sf.briar.api.db.DbException;
import net.sf.briar.api.invitation.InvitationListener;
import net.sf.briar.api.invitation.InvitationState;
import net.sf.briar.api.invitation.InvitationTask;
@@ -20,6 +31,8 @@ import net.sf.briar.api.plugins.PluginManager;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.WriterFactory;
+import net.sf.briar.api.transport.ConnectionReaderFactory;
+import net.sf.briar.api.transport.ConnectionWriterFactory;
/** A task consisting of one or more parallel connection attempts. */
class ConnectorGroup extends Thread implements InvitationTask {
@@ -28,10 +41,16 @@ class ConnectorGroup extends Thread implements InvitationTask {
Logger.getLogger(ConnectorGroup.class.getName());
private final CryptoComponent crypto;
+ private final DatabaseComponent db;
private final ReaderFactory readerFactory;
private final WriterFactory writerFactory;
+ private final ConnectionReaderFactory connectionReaderFactory;
+ private final ConnectionWriterFactory connectionWriterFactory;
+ private final AuthorFactory authorFactory;
+ private final KeyManager keyManager;
private final Clock clock;
private final PluginManager pluginManager;
+ private final AuthorId localAuthorId;
private final int localInvitationCode, remoteInvitationCode;
private final Collection<InvitationListener> listeners;
private final AtomicBoolean connected;
@@ -47,17 +66,27 @@ class ConnectorGroup extends Thread implements InvitationTask {
private boolean connectionFailed = false;
private boolean localCompared = false, remoteCompared = false;
private boolean localMatched = false, remoteMatched = false;
-
- ConnectorGroup(CryptoComponent crypto, ReaderFactory readerFactory,
- WriterFactory writerFactory, Clock clock,
- PluginManager pluginManager, int localInvitationCode,
- int remoteInvitationCode) {
+ private String remoteName = null;
+
+ ConnectorGroup(CryptoComponent crypto, DatabaseComponent db,
+ ReaderFactory readerFactory, WriterFactory writerFactory,
+ ConnectionReaderFactory connectionReaderFactory,
+ ConnectionWriterFactory connectionWriterFactory,
+ AuthorFactory authorFactory, KeyManager keyManager, Clock clock,
+ PluginManager pluginManager, AuthorId localAuthorId,
+ int localInvitationCode, int remoteInvitationCode) {
super("ConnectorGroup");
this.crypto = crypto;
+ this.db = db;
this.readerFactory = readerFactory;
this.writerFactory = writerFactory;
+ this.connectionReaderFactory = connectionReaderFactory;
+ this.connectionWriterFactory = connectionWriterFactory;
+ this.authorFactory = authorFactory;
+ this.keyManager = keyManager;
this.clock = clock;
this.pluginManager = pluginManager;
+ this.localAuthorId = localAuthorId;
this.localInvitationCode = localInvitationCode;
this.remoteInvitationCode = remoteInvitationCode;
listeners = new CopyOnWriteArrayList<InvitationListener>();
@@ -68,8 +97,9 @@ class ConnectorGroup extends Thread implements InvitationTask {
public synchronized InvitationState addListener(InvitationListener l) {
listeners.add(l);
return new InvitationState(localInvitationCode, remoteInvitationCode,
- localConfirmationCode, remoteConfirmationCode, connectionFailed,
- localCompared, remoteCompared, localMatched, remoteMatched);
+ localConfirmationCode, remoteConfirmationCode,
+ connectionFailed, localCompared, remoteCompared, localMatched,
+ remoteMatched, remoteName);
}
public void removeListener(InvitationListener l) {
@@ -82,22 +112,34 @@ class ConnectorGroup extends Thread implements InvitationTask {
@Override
public void run() {
+ LocalAuthor localAuthor;
+ Map<TransportId, TransportProperties> localProps;
+ // Load the local pseudonym and transport properties
+ try {
+ localAuthor = db.getLocalAuthor(localAuthorId);
+ localProps = db.getLocalProperties();
+ } catch(DbException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ synchronized(this) {
+ connectionFailed = true;
+ }
+ for(InvitationListener l : listeners) l.connectionFailed();
+ return;
+ }
// Start the connection threads
Collection<Connector> connectors = new ArrayList<Connector>();
// Alice is the party with the smaller invitation code
if(localInvitationCode < remoteInvitationCode) {
for(DuplexPlugin plugin : pluginManager.getInvitationPlugins()) {
- Connector c = new AliceConnector(crypto, readerFactory,
- writerFactory, clock, this, plugin, localInvitationCode,
- remoteInvitationCode);
+ Connector c = createAliceConnector(plugin, localAuthor,
+ localProps);
connectors.add(c);
c.start();
}
} else {
for(DuplexPlugin plugin: pluginManager.getInvitationPlugins()) {
- Connector c = (new BobConnector(crypto, readerFactory,
- writerFactory, clock, this, plugin, localInvitationCode,
- remoteInvitationCode));
+ Connector c = createBobConnector(plugin, localAuthor,
+ localProps);
connectors.add(c);
c.start();
}
@@ -118,6 +160,28 @@ class ConnectorGroup extends Thread implements InvitationTask {
}
}
+ private Connector createAliceConnector(DuplexPlugin plugin,
+ LocalAuthor localAuthor,
+ Map<TransportId, TransportProperties> localProps) {
+ PseudoRandom random = crypto.getPseudoRandom(localInvitationCode,
+ remoteInvitationCode);
+ return new AliceConnector(crypto, db, readerFactory, writerFactory,
+ connectionReaderFactory, connectionWriterFactory, authorFactory,
+ keyManager, clock, this, plugin, localAuthor, localProps,
+ random);
+ }
+
+ private Connector createBobConnector(DuplexPlugin plugin,
+ LocalAuthor localAuthor,
+ Map<TransportId, TransportProperties> localProps) {
+ PseudoRandom random = crypto.getPseudoRandom(remoteInvitationCode,
+ localInvitationCode);
+ return new BobConnector(crypto, db, readerFactory, writerFactory,
+ connectionReaderFactory, connectionWriterFactory, authorFactory,
+ keyManager, clock, this, plugin, localAuthor, localProps,
+ random);
+ }
+
public void localConfirmationSucceeded() {
synchronized(this) {
localCompared = true;
@@ -167,4 +231,17 @@ class ConnectorGroup extends Thread implements InvitationTask {
return localMatched;
}
}
+
+ void pseudonymExchangeSucceeded(Author remoteAuthor) {
+ String name = remoteAuthor.getName();
+ synchronized(this) {
+ remoteName = name;
+ }
+ for(InvitationListener l : listeners)
+ l.pseudonymExchangeSucceeded(name);
+ }
+
+ void pseudonymExchangeFailed() {
+ for(InvitationListener l : listeners) l.pseudonymExchangeFailed();
+ }
}
diff --git a/briar-core/src/net/sf/briar/invitation/InvitationTaskFactoryImpl.java b/briar-core/src/net/sf/briar/invitation/InvitationTaskFactoryImpl.java
index 2debc5e7eb4f36ec7a25ddafd975660e8a90f191..62ffa37cf2b11a5ed12e01c41c7bd907d0ba2afa 100644
--- a/briar-core/src/net/sf/briar/invitation/InvitationTaskFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/invitation/InvitationTaskFactoryImpl.java
@@ -1,36 +1,58 @@
package net.sf.briar.invitation;
+import net.sf.briar.api.AuthorFactory;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
+import net.sf.briar.api.crypto.KeyManager;
+import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.invitation.InvitationTask;
import net.sf.briar.api.invitation.InvitationTaskFactory;
import net.sf.briar.api.plugins.PluginManager;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.WriterFactory;
+import net.sf.briar.api.transport.ConnectionReaderFactory;
+import net.sf.briar.api.transport.ConnectionWriterFactory;
import com.google.inject.Inject;
class InvitationTaskFactoryImpl implements InvitationTaskFactory {
private final CryptoComponent crypto;
+ private final DatabaseComponent db;
private final ReaderFactory readerFactory;
private final WriterFactory writerFactory;
+ private final ConnectionReaderFactory connectionReaderFactory;
+ private final ConnectionWriterFactory connectionWriterFactory;
+ private final AuthorFactory authorFactory;
+ private final KeyManager keyManager;
private final Clock clock;
private final PluginManager pluginManager;
@Inject
- InvitationTaskFactoryImpl(CryptoComponent crypto,
+ InvitationTaskFactoryImpl(CryptoComponent crypto, DatabaseComponent db,
ReaderFactory readerFactory, WriterFactory writerFactory,
- Clock clock, PluginManager pluginManager) {
+ ConnectionReaderFactory connectionReaderFactory,
+ ConnectionWriterFactory connectionWriterFactory,
+ AuthorFactory authorFactory, KeyManager keyManager, Clock clock,
+ PluginManager pluginManager) {
this.crypto = crypto;
+ this.db = db;
this.readerFactory = readerFactory;
this.writerFactory = writerFactory;
+ this.connectionReaderFactory = connectionReaderFactory;
+ this.connectionWriterFactory = connectionWriterFactory;
+ this.authorFactory = authorFactory;
+ this.keyManager = keyManager;
this.clock = clock;
this.pluginManager = pluginManager;
}
- public InvitationTask createTask(int localCode, int remoteCode) {
- return new ConnectorGroup(crypto, readerFactory, writerFactory, clock,
- pluginManager, localCode, remoteCode);
+ public InvitationTask createTask(AuthorId localAuthorId, int localCode,
+ int remoteCode) {
+ return new ConnectorGroup(crypto, db, readerFactory, writerFactory,
+ connectionReaderFactory, connectionWriterFactory,
+ authorFactory, keyManager, clock, pluginManager, localAuthorId,
+ localCode, remoteCode);
}
}
diff --git a/briar-core/src/net/sf/briar/messaging/AuthorFactoryImpl.java b/briar-core/src/net/sf/briar/messaging/AuthorFactoryImpl.java
index 407cc9ebb491a82ff3a38f0fd58481b594e31d89..976094a1971d9861b6c0067ed20dd47f5f40a49a 100644
--- a/briar-core/src/net/sf/briar/messaging/AuthorFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/AuthorFactoryImpl.java
@@ -5,11 +5,11 @@ import static net.sf.briar.api.messaging.Types.AUTHOR;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorFactory;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.MessageDigest;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorFactory;
-import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
diff --git a/briar-core/src/net/sf/briar/messaging/AuthorReader.java b/briar-core/src/net/sf/briar/messaging/AuthorReader.java
index 410fdbb772d6798c93a239fd6bdb125160f9c0ac..6a04f0d5e18ab318e185edef403eba0d8da4ca28 100644
--- a/briar-core/src/net/sf/briar/messaging/AuthorReader.java
+++ b/briar-core/src/net/sf/briar/messaging/AuthorReader.java
@@ -6,10 +6,10 @@ import static net.sf.briar.api.messaging.Types.AUTHOR;
import java.io.IOException;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.MessageDigest;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.serial.DigestingConsumer;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.StructReader;
diff --git a/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java b/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
index a6c93b06ed8c720c69f979363a4bcc670364e0a7..5eb28cc36462d5595ea9bbd28883b1bcef94d548 100644
--- a/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
@@ -20,10 +20,10 @@ import java.security.PrivateKey;
import java.security.SecureRandom;
import java.security.Signature;
+import net.sf.briar.api.Author;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.MessageDigest;
-import net.sf.briar.api.messaging.Author;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageFactory;
diff --git a/briar-core/src/net/sf/briar/messaging/MessageImpl.java b/briar-core/src/net/sf/briar/messaging/MessageImpl.java
index 4ff50f31024ae6b4a78a821fc211949108132607..5fb145bec57f7bcb4ba964529557a6548de88158 100644
--- a/briar-core/src/net/sf/briar/messaging/MessageImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/MessageImpl.java
@@ -1,7 +1,7 @@
package net.sf.briar.messaging;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
-import net.sf.briar.api.messaging.Author;
+import net.sf.briar.api.Author;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
diff --git a/briar-core/src/net/sf/briar/messaging/MessageReader.java b/briar-core/src/net/sf/briar/messaging/MessageReader.java
index 73c05505160e0bb0e66f548322f25ff94bcaab74..5c39e0eede79cbdfcf25887044a3aec177b132d8 100644
--- a/briar-core/src/net/sf/briar/messaging/MessageReader.java
+++ b/briar-core/src/net/sf/briar/messaging/MessageReader.java
@@ -13,11 +13,11 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
+import net.sf.briar.api.Author;
import net.sf.briar.api.FormatException;
-import net.sf.briar.api.messaging.Author;
+import net.sf.briar.api.UniqueId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.MessageId;
-import net.sf.briar.api.messaging.UniqueId;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.serial.CopyingConsumer;
import net.sf.briar.api.serial.CountingConsumer;
diff --git a/briar-core/src/net/sf/briar/messaging/MessageVerifierImpl.java b/briar-core/src/net/sf/briar/messaging/MessageVerifierImpl.java
index de57bbb3a1e8a8164723aae7a0c9aea747a4a84e..eeaece89ab7ec9d95e3c0d83eb0d2b93aa132040 100644
--- a/briar-core/src/net/sf/briar/messaging/MessageVerifierImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/MessageVerifierImpl.java
@@ -4,10 +4,10 @@ import java.security.GeneralSecurityException;
import java.security.PublicKey;
import java.security.Signature;
+import net.sf.briar.api.Author;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyParser;
import net.sf.briar.api.crypto.MessageDigest;
-import net.sf.briar.api.messaging.Author;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
diff --git a/briar-core/src/net/sf/briar/messaging/MessagingModule.java b/briar-core/src/net/sf/briar/messaging/MessagingModule.java
index c98dd04675ef925d8646987cf149d5646871ffc8..a92c75e459ebea9597deed2b87e7660fc5f00600 100644
--- a/briar-core/src/net/sf/briar/messaging/MessagingModule.java
+++ b/briar-core/src/net/sf/briar/messaging/MessagingModule.java
@@ -1,8 +1,8 @@
package net.sf.briar.messaging;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.crypto.CryptoComponent;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorFactory;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.messaging.MessageFactory;
diff --git a/briar-core/src/net/sf/briar/messaging/PacketReaderImpl.java b/briar-core/src/net/sf/briar/messaging/PacketReaderImpl.java
index 9795dfe78132d562f7f440e782f851c6ecfd209c..f5eaa98e48be9a3d017fc7cdd2f6f44fbed3b7f6 100644
--- a/briar-core/src/net/sf/briar/messaging/PacketReaderImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/PacketReaderImpl.java
@@ -24,7 +24,9 @@ import java.util.Map;
import net.sf.briar.api.Bytes;
import net.sf.briar.api.FormatException;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
+import net.sf.briar.api.UniqueId;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.Offer;
@@ -35,9 +37,7 @@ import net.sf.briar.api.messaging.RetentionUpdate;
import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
-import net.sf.briar.api.messaging.UniqueId;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.serial.Consumer;
import net.sf.briar.api.serial.CountingConsumer;
diff --git a/briar-core/src/net/sf/briar/messaging/duplex/DuplexConnection.java b/briar-core/src/net/sf/briar/messaging/duplex/DuplexConnection.java
index c0604546f76b93f697afadca3f5ed2817a0ddf0d..18000e59c12152ed9c015367cbe4c80344eb522f 100644
--- a/briar-core/src/net/sf/briar/messaging/duplex/DuplexConnection.java
+++ b/briar-core/src/net/sf/briar/messaging/duplex/DuplexConnection.java
@@ -2,8 +2,8 @@ package net.sf.briar.messaging.duplex;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
-import static net.sf.briar.api.Rating.GOOD;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
+import static net.sf.briar.api.messaging.Rating.GOOD;
import java.io.IOException;
import java.io.InputStream;
@@ -23,6 +23,7 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.FormatException;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
@@ -55,7 +56,6 @@ import net.sf.briar.api.messaging.RetentionUpdate;
import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
diff --git a/briar-core/src/net/sf/briar/messaging/duplex/DuplexConnectionFactoryImpl.java b/briar-core/src/net/sf/briar/messaging/duplex/DuplexConnectionFactoryImpl.java
index f141fce031e54e0f3658207fe0a6e3bcb8dd8873..aaea38cbaba01bbdec92f06452682318b5780196 100644
--- a/briar-core/src/net/sf/briar/messaging/duplex/DuplexConnectionFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/duplex/DuplexConnectionFactoryImpl.java
@@ -6,6 +6,7 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
@@ -13,7 +14,6 @@ import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.duplex.DuplexConnectionFactory;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.transport.ConnectionContext;
diff --git a/briar-core/src/net/sf/briar/messaging/simplex/IncomingSimplexConnection.java b/briar-core/src/net/sf/briar/messaging/simplex/IncomingSimplexConnection.java
index cfb18c5039fba8c6b1d44b1c25f77cacf4cc9525..2ec4cd2d3be0d9282d4d2f48b905af3b22614841 100644
--- a/briar-core/src/net/sf/briar/messaging/simplex/IncomingSimplexConnection.java
+++ b/briar-core/src/net/sf/briar/messaging/simplex/IncomingSimplexConnection.java
@@ -10,6 +10,7 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.FormatException;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
@@ -24,7 +25,6 @@ import net.sf.briar.api.messaging.RetentionUpdate;
import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
diff --git a/briar-core/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnection.java b/briar-core/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnection.java
index 920a7724427cae909edafb250cad20db7361e710..759c085c329e544735372b88f654f9484d6cec12 100644
--- a/briar-core/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnection.java
+++ b/briar-core/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnection.java
@@ -10,6 +10,7 @@ import java.util.Collection;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.messaging.Ack;
@@ -20,7 +21,6 @@ import net.sf.briar.api.messaging.RetentionUpdate;
import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
diff --git a/briar-core/src/net/sf/briar/messaging/simplex/SimplexConnectionFactoryImpl.java b/briar-core/src/net/sf/briar/messaging/simplex/SimplexConnectionFactoryImpl.java
index b7f5ecdd3b11b688624532fecd65f0ccfe3b78d0..aed86936a68b2531e39ea2f2a3041080ff907017 100644
--- a/briar-core/src/net/sf/briar/messaging/simplex/SimplexConnectionFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/simplex/SimplexConnectionFactoryImpl.java
@@ -6,6 +6,7 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
@@ -13,7 +14,6 @@ import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.simplex.SimplexConnectionFactory;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
diff --git a/briar-core/src/net/sf/briar/plugins/PluginManagerImpl.java b/briar-core/src/net/sf/briar/plugins/PluginManagerImpl.java
index 902fbbd9c63db2b814133ae8f8fb4feba8bdc233..e7d6f070aea2308637f1ce133b16a499292c31cf 100644
--- a/briar-core/src/net/sf/briar/plugins/PluginManagerImpl.java
+++ b/briar-core/src/net/sf/briar/plugins/PluginManagerImpl.java
@@ -16,11 +16,11 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.Plugin;
import net.sf.briar.api.plugins.PluginCallback;
import net.sf.briar.api.plugins.PluginExecutor;
@@ -88,12 +88,6 @@ class PluginManagerImpl implements PluginManager {
LOG.warning("Duplicate transport ID: " + id);
continue;
}
- try {
- db.addTransport(id);
- } catch(DbException e) {
- if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
- continue;
- }
SimplexCallback callback = new SimplexCallback(id);
SimplexPlugin plugin = factory.createPlugin(callback);
if(plugin == null) {
@@ -103,6 +97,12 @@ class PluginManagerImpl implements PluginManager {
}
continue;
}
+ try {
+ db.addTransport(id, plugin.getMaxLatency());
+ } catch(DbException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ continue;
+ }
try {
if(plugin.start()) {
simplexPlugins.add(plugin);
@@ -124,12 +124,6 @@ class PluginManagerImpl implements PluginManager {
LOG.warning("Duplicate transport ID: " + id);
continue;
}
- try {
- db.addTransport(id);
- } catch(DbException e) {
- if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
- continue;
- }
DuplexCallback callback = new DuplexCallback(id);
DuplexPlugin plugin = factory.createPlugin(callback);
if(plugin == null) {
@@ -139,6 +133,12 @@ class PluginManagerImpl implements PluginManager {
}
continue;
}
+ try {
+ db.addTransport(id, plugin.getMaxLatency());
+ } catch(DbException e) {
+ if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ continue;
+ }
try {
if(plugin.start()) {
duplexPlugins.add(plugin);
@@ -197,10 +197,10 @@ class PluginManagerImpl implements PluginManager {
}
public synchronized Collection<DuplexPlugin> getInvitationPlugins() {
- Collection<DuplexPlugin> supported = new ArrayList<DuplexPlugin>();
+ List<DuplexPlugin> supported = new ArrayList<DuplexPlugin>();
for(DuplexPlugin d : duplexPlugins)
if(d.supportsInvitations()) supported.add(d);
- return supported;
+ return Collections.unmodifiableList(supported);
}
private abstract class PluginCallbackImpl implements PluginCallback {
diff --git a/briar-core/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java b/briar-core/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
index d8fa83b7af7ba5b5b697d7d75229dfb66beaa466..61ae77f5196bb0dacd5307620e5a35dbb9f911ac 100644
--- a/briar-core/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
@@ -26,10 +26,10 @@ import javax.microedition.io.StreamConnection;
import javax.microedition.io.StreamConnectionNotifier;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.PseudoRandom;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
diff --git a/briar-core/src/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java b/briar-core/src/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java
index b3e225cdc6c8ec6332e48c70cd4a64fdd995f134..4a07399189a1962f785dbc3ef05b306e34cd71f1 100644
--- a/briar-core/src/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java
+++ b/briar-core/src/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java
@@ -3,9 +3,9 @@ package net.sf.briar.plugins.bluetooth;
import java.security.SecureRandom;
import java.util.concurrent.Executor;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
diff --git a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java b/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
index 099d98ec1334a98b0f85577e2ca0e51fbe5811c5..25e3b673d852062b342285010fded74dd4afe501 100644
--- a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
@@ -24,10 +24,10 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.crypto.PseudoRandom;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
diff --git a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java b/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java
index 9c0cc7cf4c3c1bf81ee329216c69f60b5d46b9e6..078b8b8cde8478bf6214964f7a876c1a0feea4e2 100644
--- a/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java
+++ b/briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java
@@ -3,8 +3,8 @@ package net.sf.briar.plugins.droidtooth;
import java.security.SecureRandom;
import java.util.concurrent.Executor;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.android.AndroidExecutor;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
diff --git a/briar-core/src/net/sf/briar/plugins/file/RemovableDrivePlugin.java b/briar-core/src/net/sf/briar/plugins/file/RemovableDrivePlugin.java
index fecb1dfe7157ccbe73529470931d32513cec92c6..112377f23697c4153454a06382bb5163a822e336 100644
--- a/briar-core/src/net/sf/briar/plugins/file/RemovableDrivePlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/file/RemovableDrivePlugin.java
@@ -12,7 +12,7 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.util.StringUtils;
diff --git a/briar-core/src/net/sf/briar/plugins/file/RemovableDrivePluginFactory.java b/briar-core/src/net/sf/briar/plugins/file/RemovableDrivePluginFactory.java
index 845c38d9c40f4954191467f402b65c27138fc704..41e909825db053f0da71a6bdf31ac8b85581822c 100644
--- a/briar-core/src/net/sf/briar/plugins/file/RemovableDrivePluginFactory.java
+++ b/briar-core/src/net/sf/briar/plugins/file/RemovableDrivePluginFactory.java
@@ -2,7 +2,7 @@ package net.sf.briar.plugins.file;
import java.util.concurrent.Executor;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.simplex.SimplexPlugin;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
diff --git a/briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java b/briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
index cb838c5988a4cce7438570bbf30f01af25a6008f..b0f245fb8005cbea01a6945948109da23563f607 100644
--- a/briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
@@ -17,9 +17,9 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.PseudoRandom;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
diff --git a/briar-core/src/net/sf/briar/plugins/modem/ModemPluginFactory.java b/briar-core/src/net/sf/briar/plugins/modem/ModemPluginFactory.java
index 6a63508df3575a5acf58a96a25abcc11b878638e..d753fb88647f860532bd3962467680380b46bca6 100644
--- a/briar-core/src/net/sf/briar/plugins/modem/ModemPluginFactory.java
+++ b/briar-core/src/net/sf/briar/plugins/modem/ModemPluginFactory.java
@@ -2,7 +2,7 @@ package net.sf.briar.plugins.modem;
import java.util.concurrent.Executor;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java b/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
index 8b82d7e75038c5371ceec577e46d67bc02d83027..d0df485d8e3de42dd27fcf0d4b024fe2393c8cb1 100644
--- a/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
@@ -21,10 +21,10 @@ import java.util.List;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.PseudoRandom;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPluginFactory.java b/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPluginFactory.java
index d743a4831e84788b54f2025ff7383501f3028f6d..89d836199f6b8464bd80976e611a0fa0ecd95d3d 100644
--- a/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPluginFactory.java
+++ b/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPluginFactory.java
@@ -2,9 +2,9 @@ package net.sf.briar.plugins.tcp;
import java.util.concurrent.Executor;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java b/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
index 19bfb3321c69a3e63c83424095655586d356529e..f133b5fa34e16679343c4fccb73c311aea3af8f4 100644
--- a/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
@@ -14,9 +14,9 @@ import java.util.List;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.PseudoRandom;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPluginFactory.java b/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPluginFactory.java
index 52dfd215761b29bb42ed830a5e717d9562d444ae..33f3f5abf7e3c9bcea87081aba68eb3d00beb4c3 100644
--- a/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPluginFactory.java
+++ b/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPluginFactory.java
@@ -2,8 +2,8 @@ package net.sf.briar.plugins.tcp;
import java.util.concurrent.Executor;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.lifecycle.ShutdownManager;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
diff --git a/briar-core/src/net/sf/briar/serial/SerialComponentImpl.java b/briar-core/src/net/sf/briar/serial/SerialComponentImpl.java
index bf64c7fd2e486237183cd243782a1c598b4e5234..e55e94db0e991684097a0c9944e10b3723a4e143 100644
--- a/briar-core/src/net/sf/briar/serial/SerialComponentImpl.java
+++ b/briar-core/src/net/sf/briar/serial/SerialComponentImpl.java
@@ -1,6 +1,6 @@
package net.sf.briar.serial;
-import net.sf.briar.api.messaging.UniqueId;
+import net.sf.briar.api.UniqueId;
import net.sf.briar.api.serial.SerialComponent;
class SerialComponentImpl implements SerialComponent {
diff --git a/briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java b/briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java
index c8e0de79b0944a24d78895fcae48aedc97168eb2..ecd57aa2b73f5846223b77ac95d4137b006cc293 100644
--- a/briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java
+++ b/briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java
@@ -10,8 +10,8 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.db.DbException;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.duplex.DuplexConnectionFactory;
import net.sf.briar.api.messaging.simplex.SimplexConnectionFactory;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
diff --git a/briar-core/src/net/sf/briar/transport/ConnectionReaderFactoryImpl.java b/briar-core/src/net/sf/briar/transport/ConnectionReaderFactoryImpl.java
index dd31f3fe83da03795301ce2a1ca5d435cfa71508..1af211a5326f9073dc3322d0819e64c90f7058ec 100644
--- a/briar-core/src/net/sf/briar/transport/ConnectionReaderFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/transport/ConnectionReaderFactoryImpl.java
@@ -33,4 +33,12 @@ class ConnectionReaderFactoryImpl implements ConnectionReaderFactory {
crypto.getFrameCipher(), frameKey, MAX_FRAME_LENGTH);
return new ConnectionReaderImpl(encryption, MAX_FRAME_LENGTH);
}
+
+ public ConnectionReader createInvitationConnectionReader(InputStream in,
+ byte[] secret, boolean alice) {
+ ErasableKey frameKey = crypto.deriveFrameKey(secret, 0, true, alice);
+ FrameReader encryption = new IncomingEncryptionLayer(in,
+ crypto.getFrameCipher(), frameKey, MAX_FRAME_LENGTH);
+ return new ConnectionReaderImpl(encryption, MAX_FRAME_LENGTH);
+ }
}
diff --git a/briar-core/src/net/sf/briar/transport/ConnectionRecogniserImpl.java b/briar-core/src/net/sf/briar/transport/ConnectionRecogniserImpl.java
index 9a4af1ec5db0216f3c71e04b084049666777e776..080860b5b98e35501bd11c89652d3f97c78451c3 100644
--- a/briar-core/src/net/sf/briar/transport/ConnectionRecogniserImpl.java
+++ b/briar-core/src/net/sf/briar/transport/ConnectionRecogniserImpl.java
@@ -4,10 +4,10 @@ import java.util.HashMap;
import java.util.Map;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.TemporarySecret;
diff --git a/briar-core/src/net/sf/briar/transport/ConnectionRegistryImpl.java b/briar-core/src/net/sf/briar/transport/ConnectionRegistryImpl.java
index d1a5b48a64126977fcb5207fe89abd3221a99844..fc919d6a83f28047ae77ab5ca52fa3f657de6eb9 100644
--- a/briar-core/src/net/sf/briar/transport/ConnectionRegistryImpl.java
+++ b/briar-core/src/net/sf/briar/transport/ConnectionRegistryImpl.java
@@ -9,7 +9,7 @@ import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.transport.ConnectionListener;
import net.sf.briar.api.transport.ConnectionRegistry;
diff --git a/briar-core/src/net/sf/briar/transport/ConnectionWriterFactoryImpl.java b/briar-core/src/net/sf/briar/transport/ConnectionWriterFactoryImpl.java
index 9e57870a233a840aac73635e4d939a5f0bbbd4ca..2d8a74dca485a00687a95b30659b12b59303d757 100644
--- a/briar-core/src/net/sf/briar/transport/ConnectionWriterFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/transport/ConnectionWriterFactoryImpl.java
@@ -13,7 +13,6 @@ import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
-
import com.google.inject.Inject;
class ConnectionWriterFactoryImpl implements ConnectionWriterFactory {
@@ -48,4 +47,13 @@ class ConnectionWriterFactoryImpl implements ConnectionWriterFactory {
}
return new ConnectionWriterImpl(encryption, MAX_FRAME_LENGTH);
}
+
+ public ConnectionWriter createInvitationConnectionWriter(OutputStream out,
+ byte[] secret, boolean alice) {
+ ErasableKey frameKey = crypto.deriveFrameKey(secret, 0, true, alice);
+ FrameWriter encryption = new OutgoingEncryptionLayer(out,
+ Long.MAX_VALUE, crypto.getFrameCipher(), frameKey,
+ MAX_FRAME_LENGTH);
+ return new ConnectionWriterImpl(encryption, MAX_FRAME_LENGTH);
+ }
}
\ No newline at end of file
diff --git a/briar-core/src/net/sf/briar/transport/ConnectionWriterImpl.java b/briar-core/src/net/sf/briar/transport/ConnectionWriterImpl.java
index 4d1b2c571a79bb756c8c6e32a52de70ee5fe376e..7b75d36d6203a6a7267200aa6035505fa3d17eaa 100644
--- a/briar-core/src/net/sf/briar/transport/ConnectionWriterImpl.java
+++ b/briar-core/src/net/sf/briar/transport/ConnectionWriterImpl.java
@@ -6,7 +6,6 @@ import static net.sf.briar.api.transport.TransportConstants.MAC_LENGTH;
import java.io.IOException;
import java.io.OutputStream;
-
import net.sf.briar.api.transport.ConnectionWriter;
/**
diff --git a/briar-core/src/net/sf/briar/transport/KeyManagerImpl.java b/briar-core/src/net/sf/briar/transport/KeyManagerImpl.java
index b80a3605b359ca3cdeded3d136c0ec1c717368b6..9c51a19181576b85249ab4b97d489204b4d79a5d 100644
--- a/briar-core/src/net/sf/briar/transport/KeyManagerImpl.java
+++ b/briar-core/src/net/sf/briar/transport/KeyManagerImpl.java
@@ -1,6 +1,7 @@
package net.sf.briar.transport;
import static java.util.logging.Level.WARNING;
+import static net.sf.briar.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
import java.util.ArrayList;
import java.util.Arrays;
@@ -12,6 +13,7 @@ import java.util.TimerTask;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.Timer;
import net.sf.briar.api.crypto.CryptoComponent;
@@ -21,8 +23,8 @@ import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
+import net.sf.briar.api.db.event.TransportAddedEvent;
import net.sf.briar.api.db.event.TransportRemovedEvent;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.Endpoint;
@@ -31,6 +33,7 @@ import net.sf.briar.util.ByteUtils;
import com.google.inject.Inject;
+// FIXME: Don't make alien calls with a lock held
class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
private static final int MS_BETWEEN_CHECKS = 60 * 1000;
@@ -40,34 +43,38 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
private final CryptoComponent crypto;
private final DatabaseComponent db;
- private final ConnectionRecogniser recogniser;
+ private final ConnectionRecogniser connectionRecogniser;
private final Clock clock;
private final Timer timer;
- // Locking: this
+
+ // All of the following are locking: this
+ private final Map<TransportId, Long> maxLatencies;
private final Map<EndpointKey, TemporarySecret> outgoing;
- // Locking: this
private final Map<EndpointKey, TemporarySecret> incomingOld;
- // Locking: this
private final Map<EndpointKey, TemporarySecret> incomingNew;
@Inject
KeyManagerImpl(CryptoComponent crypto, DatabaseComponent db,
- ConnectionRecogniser recogniser, Clock clock, Timer timer) {
+ ConnectionRecogniser connectionRecogniser, Clock clock,
+ Timer timer) {
this.crypto = crypto;
this.db = db;
- this.recogniser = recogniser;
+ this.connectionRecogniser = connectionRecogniser;
this.clock = clock;
this.timer = timer;
+ maxLatencies = new HashMap<TransportId, Long>();
outgoing = new HashMap<EndpointKey, TemporarySecret>();
incomingOld = new HashMap<EndpointKey, TemporarySecret>();
incomingNew = new HashMap<EndpointKey, TemporarySecret>();
}
public synchronized boolean start() {
- // Load the temporary secrets and the storage key from the database
+ db.addListener(this);
+ // Load the temporary secrets and transport latencies from the database
Collection<TemporarySecret> secrets;
try {
secrets = db.getSecrets();
+ maxLatencies.putAll(db.getTransportLatencies());
} catch(DbException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
return false;
@@ -87,129 +94,111 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
}
}
// Pass the current incoming secrets to the recogniser
- for(TemporarySecret s : incomingOld.values()) recogniser.addSecret(s);
- for(TemporarySecret s : incomingNew.values()) recogniser.addSecret(s);
+ for(TemporarySecret s : incomingOld.values())
+ connectionRecogniser.addSecret(s);
+ for(TemporarySecret s : incomingNew.values())
+ connectionRecogniser.addSecret(s);
// Schedule periodic key rotation
timer.scheduleAtFixedRate(this, MS_BETWEEN_CHECKS, MS_BETWEEN_CHECKS);
return true;
}
// Assigns secrets to the appropriate maps and returns any dead secrets
+ // Locking: this
private Collection<TemporarySecret> assignSecretsToMaps(long now,
Collection<TemporarySecret> secrets) {
Collection<TemporarySecret> dead = new ArrayList<TemporarySecret>();
for(TemporarySecret s : secrets) {
+ // Discard the secret if the transport has been removed
+ if(!maxLatencies.containsKey(s.getTransportId())) {
+ ByteUtils.erase(s.getSecret());
+ continue;
+ }
EndpointKey k = new EndpointKey(s);
long rotationPeriod = getRotationPeriod(s);
long creationTime = getCreationTime(s);
- long activationTime = creationTime + s.getClockDifference();
+ long activationTime = creationTime + MAX_CLOCK_DIFFERENCE;
long successorCreationTime = creationTime + rotationPeriod;
long deactivationTime = activationTime + rotationPeriod;
long destructionTime = successorCreationTime + rotationPeriod;
- TemporarySecret dupe; // There should not be any duplicate keys
if(now >= destructionTime) {
dead.add(s);
} else if(now >= deactivationTime) {
- dupe = incomingOld.put(k, s);
- if(dupe != null) throw new IllegalStateException();
+ incomingOld.put(k, s);
} else if(now >= successorCreationTime) {
- dupe = incomingOld.put(k, s);
- if(dupe != null) throw new IllegalStateException();
- dupe = outgoing.put(k, s);
- if(dupe != null) throw new IllegalStateException();
+ incomingOld.put(k, s);
+ outgoing.put(k, s);
} else if(now >= activationTime) {
- dupe = incomingNew.put(k, s);
- if(dupe != null) throw new IllegalStateException();
- dupe = outgoing.put(k, s);
- if(dupe != null) throw new IllegalStateException();
+ incomingNew.put(k, s);
+ outgoing.put(k, s);
} else if(now >= creationTime) {
- dupe = incomingNew.put(k, s);
- if(dupe != null) throw new IllegalStateException();
+ incomingNew.put(k, s);
} else {
- // FIXME: What should we do if the clock moves backwards?
- throw new IllegalStateException();
+ throw new Error("Clock has moved backwards");
}
}
return dead;
}
// Replaces and erases the given secrets and returns any secrets created
+ // Locking: this
private Collection<TemporarySecret> replaceDeadSecrets(long now,
Collection<TemporarySecret> dead) {
Collection<TemporarySecret> created = new ArrayList<TemporarySecret>();
for(TemporarySecret s : dead) {
+ // Work out which rotation period we're in
+ long rotationPeriod = getRotationPeriod(s);
+ long elapsed = now - s.getEpoch();
+ long period = (elapsed / rotationPeriod) + 1;
+ if(period <= s.getPeriod()) throw new IllegalStateException();
+ // Derive the two current incoming secrets
+ byte[] secret1 = s.getSecret();
+ for(long p = s.getPeriod(); p < period; p++) {
+ byte[] temp = crypto.deriveNextSecret(secret1, p);
+ ByteUtils.erase(secret1);
+ secret1 = temp;
+ }
+ byte[] secret2 = crypto.deriveNextSecret(secret1, period);
+ // Add the incoming secrets to their respective maps - the older
+ // may already exist if the dead secret has a living successor
EndpointKey k = new EndpointKey(s);
- if(incomingNew.containsKey(k)) throw new IllegalStateException();
- byte[] secret = s.getSecret();
- long period = s.getPeriod();
- TemporarySecret dupe; // There should not be any duplicate keys
- if(incomingOld.containsKey(k)) {
- // The dead secret's successor is still alive
- byte[] secret1 = crypto.deriveNextSecret(secret, period + 1);
- TemporarySecret s1 = new TemporarySecret(s, period + 1,
- secret1);
- created.add(s1);
- dupe = incomingNew.put(k, s1);
- if(dupe != null) throw new IllegalStateException();
- long creationTime = getCreationTime(s1);
- long activationTime = creationTime + s1.getClockDifference();
- if(now >= activationTime) {
- dupe = outgoing.put(k, s1);
- if(dupe != null) throw new IllegalStateException();
- }
- } else {
- // The dead secret has no living successor
- long rotationPeriod = getRotationPeriod(s);
- long elapsed = now - s.getEpoch();
- long currentPeriod = elapsed / rotationPeriod;
- if(currentPeriod <= period) throw new IllegalStateException();
- // Derive the two current incoming secrets
- byte[] secret1, secret2;
- secret1 = secret;
- for(long p = period; p < currentPeriod; p++) {
- byte[] temp = crypto.deriveNextSecret(secret1, p);
- ByteUtils.erase(secret1);
- secret1 = temp;
- }
- secret2 = crypto.deriveNextSecret(secret1, currentPeriod);
- // One of the incoming secrets is the current outgoing secret
- TemporarySecret s1, s2;
- s1 = new TemporarySecret(s, currentPeriod - 1, secret1);
- created.add(s1);
- dupe = incomingOld.put(k, s1);
- if(dupe != null) throw new IllegalStateException();
- s2 = new TemporarySecret(s, currentPeriod, secret2);
- created.add(s2);
- dupe = incomingNew.put(k, s2);
- if(dupe != null) throw new IllegalStateException();
- if(elapsed % rotationPeriod < s.getClockDifference()) {
- // The outgoing secret is the newer incoming secret
- dupe = outgoing.put(k, s2);
- if(dupe != null) throw new IllegalStateException();
- } else {
- // The outgoing secret is the older incoming secret
- dupe = outgoing.put(k, s1);
- if(dupe != null) throw new IllegalStateException();
- }
+ TemporarySecret s1 = new TemporarySecret(s, period - 1, secret1);
+ created.add(s1);
+ TemporarySecret exists = incomingOld.put(k, s1);
+ if(exists != null) ByteUtils.erase(exists.getSecret());
+ TemporarySecret s2 = new TemporarySecret(s, period, secret2);
+ created.add(s2);
+ incomingNew.put(k, s2);
+ // One of the incoming secrets is the current outgoing secret
+ if(elapsed % rotationPeriod < MAX_CLOCK_DIFFERENCE) {
+ // The outgoing secret is the older incoming secret
+ outgoing.put(k, s1);
+ } else {
+ // The outgoing secret is the newer incoming secret
+ outgoing.put(k, s2);
}
- // Erase the dead secret
- ByteUtils.erase(secret);
}
return created;
}
+ // Locking: this
private long getRotationPeriod(Endpoint ep) {
- return 2 * ep.getClockDifference() + ep.getLatency();
+ Long maxLatency = maxLatencies.get(ep.getTransportId());
+ if(maxLatency == null) throw new IllegalStateException();
+ return 2 * MAX_CLOCK_DIFFERENCE + maxLatency;
}
+ // Locking: this
private long getCreationTime(TemporarySecret s) {
long rotationPeriod = getRotationPeriod(s);
return s.getEpoch() + rotationPeriod * s.getPeriod();
}
public synchronized void stop() {
+ db.removeListener(this);
timer.cancel();
- recogniser.removeSecrets();
+ connectionRecogniser.removeSecrets();
+ maxLatencies.clear();
removeAndEraseSecrets(outgoing);
removeAndEraseSecrets(incomingOld);
removeAndEraseSecrets(incomingNew);
@@ -236,50 +225,49 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
return new ConnectionContext(c, t, secret, connection, s.getAlice());
}
- public synchronized void endpointAdded(Endpoint ep, byte[] initialSecret) {
+ public synchronized void endpointAdded(Endpoint ep, byte[] initialSecret) {
+ if(!maxLatencies.containsKey(ep.getTransportId())) {
+ if(LOG.isLoggable(WARNING)) LOG.warning("No such transport");
+ return;
+ }
+ // Work out which rotation period we're in
long now = clock.currentTimeMillis();
long rotationPeriod = getRotationPeriod(ep);
long elapsed = now - ep.getEpoch();
- long currentPeriod = elapsed / rotationPeriod;
- if(currentPeriod < 1) throw new IllegalArgumentException();
+ long period = (elapsed / rotationPeriod) + 1;
+ if(period < 1) throw new IllegalStateException();
// Derive the two current incoming secrets
- byte[] secret1, secret2;
- secret1 = initialSecret;
- for(long p = 0; p < currentPeriod; p++) {
+ byte[] secret1 = initialSecret;
+ for(long p = 0; p < period; p++) {
byte[] temp = crypto.deriveNextSecret(secret1, p);
ByteUtils.erase(secret1);
secret1 = temp;
}
- secret2 = crypto.deriveNextSecret(secret1, currentPeriod);
- // One of the incoming secrets is the current outgoing secret
+ byte[] secret2 = crypto.deriveNextSecret(secret1, period);
+ // Add the incoming secrets to their respective maps
EndpointKey k = new EndpointKey(ep);
- TemporarySecret s1, s2, dupe;
- s1 = new TemporarySecret(ep, currentPeriod - 1, secret1);
- dupe = incomingOld.put(k, s1);
- if(dupe != null) throw new IllegalStateException();
- s2 = new TemporarySecret(ep, currentPeriod, secret2);
- dupe = incomingNew.put(k, s2);
- if(dupe != null) throw new IllegalStateException();
- if(elapsed % rotationPeriod < ep.getClockDifference()) {
- // The outgoing secret is the newer incoming secret
- dupe = outgoing.put(k, s2);
- if(dupe != null) throw new IllegalStateException();
- } else {
+ TemporarySecret s1 = new TemporarySecret(ep, period - 1, secret1);
+ incomingOld.put(k, s1);
+ TemporarySecret s2 = new TemporarySecret(ep, period, secret2);
+ incomingNew.put(k, s2);
+ // One of the incoming secrets is the current outgoing secret
+ if(elapsed % rotationPeriod < MAX_CLOCK_DIFFERENCE) {
// The outgoing secret is the older incoming secret
- dupe = outgoing.put(k, s1);
- if(dupe != null) throw new IllegalStateException();
+ outgoing.put(k, s1);
+ } else {
+ // The outgoing secret is the newer incoming secret
+ outgoing.put(k, s2);
}
// Store the new secrets
try {
db.addSecrets(Arrays.asList(s1, s2));
} catch(DbException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ return;
}
// Pass the new secrets to the recogniser
- recogniser.addSecret(s1);
- recogniser.addSecret(s2);
- // Erase the initial secret
- ByteUtils.erase(initialSecret);
+ connectionRecogniser.addSecret(s1);
+ connectionRecogniser.addSecret(s2);
}
@Override
@@ -299,7 +287,7 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
ContactId c = s.getContactId();
TransportId t = s.getTransportId();
long period = s.getPeriod();
- recogniser.removeSecret(c, t, period);
+ connectionRecogniser.removeSecret(c, t, period);
}
// Replace any dead secrets
Collection<TemporarySecret> created = replaceDeadSecrets(now, dead);
@@ -311,23 +299,29 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
}
// Pass any secrets that have been created to the recogniser
- for(TemporarySecret s : created) recogniser.addSecret(s);
+ for(TemporarySecret s : created) connectionRecogniser.addSecret(s);
}
}
public void eventOccurred(DatabaseEvent e) {
if(e instanceof ContactRemovedEvent) {
ContactId c = ((ContactRemovedEvent) e).getContactId();
- recogniser.removeSecrets(c);
+ connectionRecogniser.removeSecrets(c);
synchronized(this) {
removeAndEraseSecrets(c, outgoing);
removeAndEraseSecrets(c, incomingOld);
removeAndEraseSecrets(c, incomingNew);
}
+ } else if(e instanceof TransportAddedEvent) {
+ TransportAddedEvent t = (TransportAddedEvent) e;
+ synchronized(this) {
+ maxLatencies.put(t.getTransportId(), t.getMaxLatency());
+ }
} else if(e instanceof TransportRemovedEvent) {
TransportId t = ((TransportRemovedEvent) e).getTransportId();
- recogniser.removeSecrets(t);
+ connectionRecogniser.removeSecrets(t);
synchronized(this) {
+ maxLatencies.remove(t);
removeAndEraseSecrets(t, outgoing);
removeAndEraseSecrets(t, incomingOld);
removeAndEraseSecrets(t, incomingNew);
diff --git a/briar-core/src/net/sf/briar/transport/OutgoingEncryptionLayer.java b/briar-core/src/net/sf/briar/transport/OutgoingEncryptionLayer.java
index 658c4a26eaa6fc2a8046520b6a9baa60d48c7731..49203a107f9e6923bf3b5ab64996c9ce946742a6 100644
--- a/briar-core/src/net/sf/briar/transport/OutgoingEncryptionLayer.java
+++ b/briar-core/src/net/sf/briar/transport/OutgoingEncryptionLayer.java
@@ -11,7 +11,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.security.GeneralSecurityException;
-
import net.sf.briar.api.crypto.AuthenticatedCipher;
import net.sf.briar.api.crypto.ErasableKey;
diff --git a/briar-core/src/net/sf/briar/transport/TransportConnectionRecogniser.java b/briar-core/src/net/sf/briar/transport/TransportConnectionRecogniser.java
index 761f846a390a433d18fa3c403f8fd373003c7f6f..93de724c68707cec6d5ec59085f31cab0601ed18 100644
--- a/briar-core/src/net/sf/briar/transport/TransportConnectionRecogniser.java
+++ b/briar-core/src/net/sf/briar/transport/TransportConnectionRecogniser.java
@@ -11,11 +11,11 @@ import javax.crypto.Cipher;
import net.sf.briar.api.Bytes;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.ErasableKey;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.TemporarySecret;
import net.sf.briar.util.ByteUtils;
diff --git a/briar-tests/build.xml b/briar-tests/build.xml
index a6e8c05845ae4560f84d66ebcbbf0375d41c9d25..455a843144d9aa867c088a4703f0cedfab26b3a0 100644
--- a/briar-tests/build.xml
+++ b/briar-tests/build.xml
@@ -74,6 +74,7 @@
<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.KeyEncodingAndParsingTest'/>
<test name='net.sf.briar.db.BasicH2Test'/>
<test name='net.sf.briar.db.DatabaseCleanerImplTest'/>
<test name='net.sf.briar.db.DatabaseComponentImplTest'/>
diff --git a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
index fff45ea22d559dc5b9063b8011072a3b2c928ebc..76e5fecb386037b6e2d3b1cdfc2b93ec4f19ab99 100644
--- a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
+++ b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
@@ -14,12 +14,13 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Random;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.messaging.Ack;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorFactory;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.messaging.Message;
@@ -33,7 +34,6 @@ import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.Request;
import net.sf.briar.api.messaging.SubscriptionUpdate;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.transport.ConnectionContext;
diff --git a/briar-tests/src/net/sf/briar/TestDatabaseConfig.java b/briar-tests/src/net/sf/briar/TestDatabaseConfig.java
index fdfedb413f245fa2bd9095d184a7ec0a125c9129..614fadc863363a9929c52f2a17f62fa6ce3a78ef 100644
--- a/briar-tests/src/net/sf/briar/TestDatabaseConfig.java
+++ b/briar-tests/src/net/sf/briar/TestDatabaseConfig.java
@@ -2,7 +2,6 @@ package net.sf.briar;
import java.io.File;
-import net.sf.briar.api.crypto.Password;
import net.sf.briar.api.db.DatabaseConfig;
public class TestDatabaseConfig implements DatabaseConfig {
@@ -19,12 +18,8 @@ public class TestDatabaseConfig implements DatabaseConfig {
return dir;
}
- public Password getPassword() {
- return new Password() {
- public char[] getPassword() {
- return "foo bar".toCharArray();
- }
- };
+ public char[] getPassword() {
+ return "foo bar".toCharArray();
}
public long getMaxSize() {
diff --git a/briar-tests/src/net/sf/briar/TestMessage.java b/briar-tests/src/net/sf/briar/TestMessage.java
index 9a8283505eb4c893b50e30bbdbfc8cea89cdc27b..b390bd7ffe3cd5df937f0d45e426056f451e8ce6 100644
--- a/briar-tests/src/net/sf/briar/TestMessage.java
+++ b/briar-tests/src/net/sf/briar/TestMessage.java
@@ -3,7 +3,7 @@ package net.sf.briar;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import net.sf.briar.api.messaging.Author;
+import net.sf.briar.api.Author;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
diff --git a/briar-tests/src/net/sf/briar/TestUtils.java b/briar-tests/src/net/sf/briar/TestUtils.java
index 21c4beff9334ffe07d2e604767cf5bc9c287ed7f..cedb5d4281ff39c0cef14a020edb83388c7e1ec8 100644
--- a/briar-tests/src/net/sf/briar/TestUtils.java
+++ b/briar-tests/src/net/sf/briar/TestUtils.java
@@ -10,7 +10,7 @@ import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.TestCase;
-import net.sf.briar.api.messaging.UniqueId;
+import net.sf.briar.api.UniqueId;
public class TestUtils {
diff --git a/briar-tests/src/net/sf/briar/crypto/KeyAgreementTest.java b/briar-tests/src/net/sf/briar/crypto/KeyAgreementTest.java
index 01a8939409f95afe8e3244eb452f54818a2ded0a..d328c35e7aea3a3c5e343a1bb148d35c350d6e35 100644
--- a/briar-tests/src/net/sf/briar/crypto/KeyAgreementTest.java
+++ b/briar-tests/src/net/sf/briar/crypto/KeyAgreementTest.java
@@ -14,12 +14,12 @@ public class KeyAgreementTest extends BriarTestCase {
@Test
public void testKeyAgreement() throws Exception {
CryptoComponent crypto = new CryptoComponentImpl();
- KeyPair a = crypto.generateAgreementKeyPair();
- byte[] aPub = a.getPublic().getEncoded();
- KeyPair b = crypto.generateAgreementKeyPair();
- byte[] bPub = b.getPublic().getEncoded();
- byte[] aSecret = crypto.deriveInitialSecret(aPub, b, true);
- byte[] bSecret = crypto.deriveInitialSecret(bPub, a, false);
+ KeyPair aPair = crypto.generateAgreementKeyPair();
+ byte[] aPub = aPair.getPublic().getEncoded();
+ KeyPair bPair = crypto.generateAgreementKeyPair();
+ byte[] bPub = bPair.getPublic().getEncoded();
+ byte[] aSecret = crypto.deriveMasterSecret(aPub, bPair, true);
+ byte[] bSecret = crypto.deriveMasterSecret(bPub, aPair, false);
assertArrayEquals(aSecret, bSecret);
}
}
diff --git a/briar-tests/src/net/sf/briar/crypto/KeyEncodingAndParsingTest.java b/briar-tests/src/net/sf/briar/crypto/KeyEncodingAndParsingTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d327d6b83eb02f00735296d59ff38b87cb920038
--- /dev/null
+++ b/briar-tests/src/net/sf/briar/crypto/KeyEncodingAndParsingTest.java
@@ -0,0 +1,85 @@
+package net.sf.briar.crypto;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+
+import net.sf.briar.BriarTestCase;
+import net.sf.briar.api.crypto.KeyParser;
+
+import org.junit.Test;
+
+public class KeyEncodingAndParsingTest extends BriarTestCase {
+
+ private final CryptoComponentImpl crypto = new CryptoComponentImpl();
+
+ @Test
+ public void testAgreementPublicKeyEncodingAndParsing() throws Exception {
+ KeyParser parser = crypto.getAgreementKeyParser();
+ // Generate two key pairs
+ KeyPair aPair = crypto.generateAgreementKeyPair();
+ KeyPair bPair = crypto.generateAgreementKeyPair();
+ // Derive the shared secret
+ PublicKey aPub = aPair.getPublic();
+ byte[] secret = crypto.deriveSharedSecret(bPair.getPrivate(), aPub);
+ // Encode and parse the public key - no exceptions should be thrown
+ aPub = parser.parsePublicKey(aPub.getEncoded());
+ aPub = parser.parsePublicKey(aPub.getEncoded());
+ // Derive the shared secret again - it should be the same
+ byte[] secret1 = crypto.deriveSharedSecret(bPair.getPrivate(), aPub);
+ assertArrayEquals(secret, secret1);
+ }
+
+ @Test
+ public void testAgreementPrivateKeyEncodingAndParsing() throws Exception {
+ KeyParser parser = crypto.getAgreementKeyParser();
+ // Generate two key pairs
+ KeyPair aPair = crypto.generateAgreementKeyPair();
+ KeyPair bPair = crypto.generateAgreementKeyPair();
+ // Derive the shared secret
+ PrivateKey bPriv = bPair.getPrivate();
+ byte[] secret = crypto.deriveSharedSecret(bPriv, aPair.getPublic());
+ // Encode and parse the private key - no exceptions should be thrown
+ bPriv = parser.parsePrivateKey(bPriv.getEncoded());
+ bPriv = parser.parsePrivateKey(bPriv.getEncoded());
+ // Derive the shared secret again - it should be the same
+ byte[] secret1 = crypto.deriveSharedSecret(bPriv, aPair.getPublic());
+ assertArrayEquals(secret, secret1);
+ }
+
+ @Test
+ public void testSignaturePublicKeyEncodingAndParsing() throws Exception {
+ KeyParser parser = crypto.getSignatureKeyParser();
+ // Generate two key pairs
+ KeyPair aPair = crypto.generateSignatureKeyPair();
+ KeyPair bPair = crypto.generateSignatureKeyPair();
+ // Derive the shared secret
+ PublicKey aPub = aPair.getPublic();
+ byte[] secret = crypto.deriveSharedSecret(bPair.getPrivate(), aPub);
+ // Encode and parse the public key - no exceptions should be thrown
+ aPub = parser.parsePublicKey(aPub.getEncoded());
+ aPub = parser.parsePublicKey(aPub.getEncoded());
+ // Derive the shared secret again - it should be the same
+ byte[] secret1 = crypto.deriveSharedSecret(bPair.getPrivate(), aPub);
+ assertArrayEquals(secret, secret1);
+ }
+
+ @Test
+ public void testSignaturePrivateKeyEncodingAndParsing() throws Exception {
+ KeyParser parser = crypto.getSignatureKeyParser();
+ // Generate two key pairs
+ KeyPair aPair = crypto.generateSignatureKeyPair();
+ KeyPair bPair = crypto.generateSignatureKeyPair();
+ // Derive the shared secret
+ PrivateKey bPriv = bPair.getPrivate();
+ byte[] secret = crypto.deriveSharedSecret(bPriv, aPair.getPublic());
+ // Encode and parse the private key - no exceptions should be thrown
+ bPriv = parser.parsePrivateKey(bPriv.getEncoded());
+ bPriv = parser.parsePrivateKey(bPriv.getEncoded());
+ // Derive the shared secret again - it should be the same
+ byte[] secret1 = crypto.deriveSharedSecret(bPriv, aPair.getPublic());
+ assertArrayEquals(secret, secret1);
+ }
+}
diff --git a/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java b/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
index 61bc729a9d6a7d6707b970c0f932ae25c305c84c..7eeb1021a5823c6b59088a7fc896ecbe035fccf5 100644
--- a/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
+++ b/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
@@ -1,7 +1,7 @@
package net.sf.briar.db;
-import static net.sf.briar.api.Rating.GOOD;
-import static net.sf.briar.api.Rating.UNRATED;
+import static net.sf.briar.api.messaging.Rating.GOOD;
+import static net.sf.briar.api.messaging.Rating.UNRATED;
import java.util.ArrayList;
import java.util.Arrays;
@@ -14,9 +14,13 @@ import java.util.Map;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestMessage;
import net.sf.briar.TestUtils;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.NoSuchContactException;
@@ -33,8 +37,6 @@ import net.sf.briar.api.db.event.SubscriptionAddedEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.messaging.Ack;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.Message;
@@ -46,7 +48,6 @@ import net.sf.briar.api.messaging.RetentionUpdate;
import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
@@ -62,6 +63,8 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
protected final Group group;
protected final AuthorId authorId;
protected final Author author;
+ protected final AuthorId localAuthorId;
+ protected final LocalAuthor localAuthor;
protected final MessageId messageId, messageId1;
protected final String contentType, subject;
protected final long timestamp;
@@ -71,7 +74,6 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
protected final TransportId transportId;
protected final TransportProperties transportProperties;
protected final ContactId contactId;
- protected final String contactName;
protected final Contact contact;
protected final Endpoint endpoint;
protected final TemporarySecret temporarySecret;
@@ -82,6 +84,9 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
group = new Group(groupId, "Group name", null);
authorId = new AuthorId(TestUtils.getRandomId());
author = new Author(authorId, "Alice", new byte[60]);
+ localAuthorId = new AuthorId(TestUtils.getRandomId());
+ localAuthor = new LocalAuthor(localAuthorId, "Bob", new byte[60],
+ new byte[60]);
messageId = new MessageId(TestUtils.getRandomId());
messageId1 = new MessageId(TestUtils.getRandomId());
contentType = "text/plain";
@@ -97,11 +102,10 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
transportProperties = new TransportProperties(Collections.singletonMap(
"foo", "bar"));
contactId = new ContactId(234);
- contactName = "Alice";
- contact = new Contact(contactId, contactName, timestamp);
- endpoint = new Endpoint(contactId, transportId, 123, 234, 345, true);
- temporarySecret = new TemporarySecret(contactId, transportId, 1, 2,
- 3, false, 4, new byte[32], 5, 6, new byte[4]);
+ contact = new Contact(contactId, author, timestamp);
+ endpoint = new Endpoint(contactId, transportId, 123, true);
+ temporarySecret = new TemporarySecret(contactId, transportId, 123,
+ false, 234, new byte[32], 345, 456, new byte[4]);
}
protected abstract <T> DatabaseComponent createDatabaseComponent(
@@ -118,9 +122,9 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
context.checking(new Expectations() {{
- exactly(12).of(database).startTransaction();
+ exactly(13).of(database).startTransaction();
will(returnValue(txn));
- exactly(12).of(database).commitTransaction(txn);
+ exactly(13).of(database).commitTransaction(txn);
// open(false)
oneOf(database).open(false);
oneOf(cleaner).startCleaning(
@@ -140,8 +144,12 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
// setRating(authorId, GOOD) again
oneOf(database).setRating(txn, authorId, GOOD);
will(returnValue(GOOD));
- // addContact(contactName)
- oneOf(database).addContact(txn, contactName);
+ // addLocalAuthor(localAuthor)
+ oneOf(database).addLocalAuthor(txn, localAuthor);
+ // addContact(author, localAuthorId)
+ oneOf(database).containsContact(txn, authorId);
+ will(returnValue(false));
+ oneOf(database).addContact(txn, author, localAuthorId);
will(returnValue(contactId));
oneOf(listener).eventOccurred(with(any(ContactAddedEvent.class)));
// getContacts()
@@ -196,7 +204,8 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
assertEquals(UNRATED, db.getRating(authorId));
db.setRating(authorId, GOOD); // First time - listeners called
db.setRating(authorId, GOOD); // Second time - not called
- assertEquals(contactId, db.addContact(contactName));
+ db.addLocalAuthor(localAuthor);
+ assertEquals(contactId, db.addContact(author, localAuthorId));
assertEquals(Arrays.asList(contact), db.getContacts());
assertEquals(Collections.emptyMap(),
db.getRemoteProperties(transportId));
@@ -723,10 +732,17 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
context.checking(new Expectations() {{
- // addContact()
+ // addLocalAuthor(localAuthor)
oneOf(database).startTransaction();
will(returnValue(txn));
- oneOf(database).addContact(txn, contactName);
+ oneOf(database).addLocalAuthor(txn, localAuthor);
+ oneOf(database).commitTransaction(txn);
+ // addContact(author, localAuthorId)
+ oneOf(database).startTransaction();
+ will(returnValue(txn));
+ oneOf(database).containsContact(txn, authorId);
+ will(returnValue(false));
+ oneOf(database).addContact(txn, author, localAuthorId);
will(returnValue(contactId));
oneOf(database).commitTransaction(txn);
// Check whether the transport is in the DB (which it's not)
@@ -740,7 +756,8 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
}});
DatabaseComponent db = createDatabaseComponent(database, cleaner,
shutdown);
- assertEquals(contactId, db.addContact(contactName));
+ db.addLocalAuthor(localAuthor);
+ assertEquals(contactId, db.addContact(author, localAuthorId));
try {
db.addEndpoint(endpoint);
diff --git a/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java b/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
index b59bdd71d1cdd945125170d8043a718fc5ee1d8b..c392f385e445c52b3df0ce7fea4ecae042ed9f76 100644
--- a/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
+++ b/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
@@ -1,8 +1,8 @@
package net.sf.briar.db;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static net.sf.briar.api.Rating.GOOD;
-import static net.sf.briar.api.Rating.UNRATED;
+import static net.sf.briar.api.messaging.Rating.GOOD;
+import static net.sf.briar.api.messaging.Rating.UNRATED;
import static org.junit.Assert.assertArrayEquals;
import java.io.File;
@@ -23,19 +23,20 @@ import net.sf.briar.BriarTestCase;
import net.sf.briar.TestDatabaseConfig;
import net.sf.briar.TestMessage;
import net.sf.briar.TestUtils;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.GroupMessageHeader;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
@@ -55,6 +56,8 @@ public class H2DatabaseTest extends BriarTestCase {
private final Group group;
private final AuthorId authorId;
private final Author author;
+ private final AuthorId localAuthorId;
+ private final LocalAuthor localAuthor;
private final MessageId messageId, messageId1;
private final String contentType, subject;
private final long timestamp;
@@ -63,7 +66,6 @@ public class H2DatabaseTest extends BriarTestCase {
private final Message message, privateMessage;
private final TransportId transportId;
private final ContactId contactId;
- private final String contactName;
public H2DatabaseTest() throws Exception {
super();
@@ -71,6 +73,9 @@ public class H2DatabaseTest extends BriarTestCase {
group = new Group(groupId, "Group name", null);
authorId = new AuthorId(TestUtils.getRandomId());
author = new Author(authorId, "Alice", new byte[60]);
+ localAuthorId = new AuthorId(TestUtils.getRandomId());
+ localAuthor = new LocalAuthor(localAuthorId, "Bob", new byte[60],
+ new byte[60]);
messageId = new MessageId(TestUtils.getRandomId());
messageId1 = new MessageId(TestUtils.getRandomId());
contentType = "text/plain";
@@ -85,7 +90,6 @@ public class H2DatabaseTest extends BriarTestCase {
contentType, subject, timestamp, raw);
transportId = new TransportId(TestUtils.getRandomId());
contactId = new ContactId(1);
- contactName = "Alice";
}
@Before
@@ -99,7 +103,8 @@ public class H2DatabaseTest extends BriarTestCase {
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
assertFalse(db.containsContact(txn, contactId));
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
assertTrue(db.containsContact(txn, contactId));
assertFalse(db.containsSubscription(txn, groupId));
db.addSubscription(txn, group);
@@ -145,36 +150,6 @@ public class H2DatabaseTest extends BriarTestCase {
db.close();
}
- @Test
- public void testContactIdsIncrease() throws Exception {
- ContactId contactId1 = new ContactId(2);
- ContactId contactId2 = new ContactId(3);
- ContactId contactId3 = new ContactId(4);
- Database<Connection> db = open(false);
- Connection txn = db.startTransaction();
-
- // Create three contacts, all with the same name
- assertFalse(db.containsContact(txn, contactId));
- assertEquals(contactId, db.addContact(txn, contactName));
- assertTrue(db.containsContact(txn, contactId));
- assertFalse(db.containsContact(txn, contactId1));
- assertEquals(contactId1, db.addContact(txn, contactName));
- assertTrue(db.containsContact(txn, contactId1));
- assertFalse(db.containsContact(txn, contactId2));
- assertEquals(contactId2, db.addContact(txn, contactName));
- assertTrue(db.containsContact(txn, contactId2));
- // Delete the contact with the highest ID
- db.removeContact(txn, contactId2);
- assertFalse(db.containsContact(txn, contactId2));
- // Add another contact (same name again) - a new ID should be created
- assertFalse(db.containsContact(txn, contactId3));
- assertEquals(contactId3, db.addContact(txn, contactName));
- assertTrue(db.containsContact(txn, contactId3));
-
- db.commitTransaction(txn);
- db.close();
- }
-
@Test
public void testRatings() throws Exception {
Database<Connection> db = open(false);
@@ -215,7 +190,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and store a private message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addPrivateMessage(txn, privateMessage, contactId);
// Removing the contact should remove the message
@@ -234,7 +210,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and store a private message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addPrivateMessage(txn, privateMessage, contactId);
// The message has no status yet, so it should not be sendable
@@ -262,7 +239,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and store a private message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addPrivateMessage(txn, privateMessage, contactId);
db.addStatus(txn, contactId, messageId1, false);
@@ -290,7 +268,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -328,7 +307,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -365,7 +345,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.addGroupMessage(txn, message);
@@ -402,7 +383,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -433,7 +415,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
db.addGroupMessage(txn, message);
@@ -465,7 +448,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and some messages to ack
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addMessageToAck(txn, contactId, messageId);
db.addMessageToAck(txn, contactId, messageId1);
@@ -490,7 +474,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and receive the same message twice
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addMessageToAck(txn, contactId, messageId);
db.addMessageToAck(txn, contactId, messageId);
@@ -515,7 +500,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -752,9 +738,10 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact with a transport
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
TransportProperties p = new TransportProperties(
Collections.singletonMap("foo", "bar"));
- assertEquals(contactId, db.addContact(txn, contactName));
db.setRemoteProperties(txn, contactId, transportId, p, 1);
assertEquals(Collections.singletonMap(contactId, p),
db.getRemoteProperties(txn, transportId));
@@ -782,7 +769,7 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a transport to the database
- db.addTransport(txn, transportId);
+ db.addTransport(txn, transportId, 123);
// Set the transport properties
TransportProperties p = new TransportProperties();
@@ -790,6 +777,8 @@ public class H2DatabaseTest extends BriarTestCase {
p.put("bar", "bar");
db.mergeLocalProperties(txn, transportId, p);
assertEquals(p, db.getLocalProperties(txn, transportId));
+ assertEquals(Collections.singletonMap(transportId, p),
+ db.getLocalProperties(txn));
// Update one of the properties and add another
TransportProperties p1 = new TransportProperties();
@@ -801,6 +790,8 @@ public class H2DatabaseTest extends BriarTestCase {
merged.put("bar", "baz");
merged.put("bam", "bam");
assertEquals(merged, db.getLocalProperties(txn, transportId));
+ assertEquals(Collections.singletonMap(transportId, merged),
+ db.getLocalProperties(txn));
db.commitTransaction(txn);
db.close();
@@ -812,7 +803,7 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a transport to the database
- db.addTransport(txn, transportId);
+ db.addTransport(txn, transportId, 123);
// Set the transport config
TransportConfig c = new TransportConfig();
@@ -841,10 +832,13 @@ public class H2DatabaseTest extends BriarTestCase {
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
+ // Add a contact
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
+
// Initialise the transport properties with version 1
TransportProperties p = new TransportProperties(
Collections.singletonMap("foo", "bar"));
- assertEquals(contactId, db.addContact(txn, contactName));
db.setRemoteProperties(txn, contactId, transportId, p, 1);
assertEquals(Collections.singletonMap(contactId, p),
db.getRemoteProperties(txn, transportId));
@@ -876,7 +870,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and subscribe to a group
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -893,7 +888,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
db.addGroupMessage(txn, message);
@@ -916,7 +912,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
db.addGroupMessage(txn, message);
@@ -939,7 +936,8 @@ public class H2DatabaseTest extends BriarTestCase {
// Add a contact, subscribe to a group and store a message -
// the message is older than the contact's retention time
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -963,7 +961,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -988,7 +987,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and subscribe to a group
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -1007,7 +1007,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact with a subscription
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
// There's no local subscription for the group
@@ -1024,7 +1025,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addGroupMessage(txn, message);
db.addStatus(txn, contactId, messageId, false);
@@ -1043,7 +1045,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addGroupMessage(txn, message);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -1063,7 +1066,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -1085,7 +1089,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
db.addVisibility(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Arrays.asList(group), 1);
@@ -1106,13 +1111,17 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and subscribe to a group
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
+
// The group should not be visible to the contact
assertEquals(Collections.emptyList(), db.getVisibility(txn, groupId));
+
// Make the group visible to the contact
db.addVisibility(txn, contactId, groupId);
assertEquals(Arrays.asList(contactId), db.getVisibility(txn, groupId));
+
// Make the group invisible again
db.removeVisibility(txn, contactId, groupId);
assertEquals(Collections.emptyList(), db.getVisibility(txn, groupId));
@@ -1198,7 +1207,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and subscribe to a group
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
// A message with a private parent should return null
@@ -1247,7 +1257,8 @@ public class H2DatabaseTest extends BriarTestCase {
Connection txn = db.startTransaction();
// Add a contact and subscribe to a group
- assertEquals(contactId, db.addContact(txn, contactName));
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
db.addSubscription(txn, group);
// Store a couple of messages
@@ -1477,9 +1488,10 @@ public class H2DatabaseTest extends BriarTestCase {
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
- // Subscribe to the groups and add a contact
+ // Add a contact and subscribe to the groups
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
for(Group g : groups) db.addSubscription(txn, g);
- assertEquals(contactId, db.addContact(txn, contactName));
// Make the groups visible to the contact
Collections.shuffle(groups);
@@ -1500,32 +1512,28 @@ public class H2DatabaseTest extends BriarTestCase {
@Test
public void testTemporarySecrets() throws Exception {
// Create an endpoint and three consecutive temporary secrets
- long epoch = 123, clockDiff = 234, latency = 345;
+ long epoch = 123, latency = 234;
boolean alice = false;
- long outgoing1 = 456, centre1 = 567;
- long outgoing2 = 678, centre2 = 789;
- long outgoing3 = 890, centre3 = 901;
- Endpoint ep = new Endpoint(contactId, transportId, epoch, clockDiff,
- latency, alice);
+ long outgoing1 = 345, centre1 = 456;
+ long outgoing2 = 567, centre2 = 678;
+ long outgoing3 = 789, centre3 = 890;
+ Endpoint ep = new Endpoint(contactId, transportId, epoch, alice);
Random random = new Random();
byte[] secret1 = new byte[32], bitmap1 = new byte[4];
random.nextBytes(secret1);
random.nextBytes(bitmap1);
TemporarySecret s1 = new TemporarySecret(contactId, transportId, epoch,
- clockDiff, latency, alice, 0, secret1, outgoing1, centre1,
- bitmap1);
+ alice, 0, secret1, outgoing1, centre1, bitmap1);
byte[] secret2 = new byte[32], bitmap2 = new byte[4];
random.nextBytes(secret2);
random.nextBytes(bitmap2);
TemporarySecret s2 = new TemporarySecret(contactId, transportId, epoch,
- clockDiff, latency, alice, 1, secret2, outgoing2, centre2,
- bitmap2);
+ alice, 1, secret2, outgoing2, centre2, bitmap2);
byte[] secret3 = new byte[32], bitmap3 = new byte[4];
random.nextBytes(secret3);
random.nextBytes(bitmap3);
TemporarySecret s3 = new TemporarySecret(contactId, transportId, epoch,
- clockDiff, latency, alice, 2, secret3, outgoing3, centre3,
- bitmap3);
+ alice, 2, secret3, outgoing3, centre3, bitmap3);
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
@@ -1535,8 +1543,9 @@ public class H2DatabaseTest extends BriarTestCase {
// Add the contact, the transport, the endpoint and the first two
// secrets (periods 0 and 1)
- assertEquals(contactId, db.addContact(txn, contactName));
- db.addTransport(txn, transportId);
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
+ db.addTransport(txn, transportId, latency);
db.addEndpoint(txn, ep);
db.addSecrets(txn, Arrays.asList(s1, s2));
@@ -1548,8 +1557,6 @@ public class H2DatabaseTest extends BriarTestCase {
assertEquals(contactId, s.getContactId());
assertEquals(transportId, s.getTransportId());
assertEquals(epoch, s.getEpoch());
- assertEquals(clockDiff, s.getClockDifference());
- assertEquals(latency, s.getLatency());
assertEquals(alice, s.getAlice());
if(s.getPeriod() == 0) {
assertArrayEquals(secret1, s.getSecret());
@@ -1580,8 +1587,6 @@ public class H2DatabaseTest extends BriarTestCase {
assertEquals(contactId, s.getContactId());
assertEquals(transportId, s.getTransportId());
assertEquals(epoch, s.getEpoch());
- assertEquals(clockDiff, s.getClockDifference());
- assertEquals(latency, s.getLatency());
assertEquals(alice, s.getAlice());
if(s.getPeriod() == 1) {
assertArrayEquals(secret2, s.getSecret());
@@ -1613,24 +1618,23 @@ public class H2DatabaseTest extends BriarTestCase {
@Test
public void testIncrementConnectionCounter() throws Exception {
// Create an endpoint and a temporary secret
- long epoch = 123, clockDiff = 234, latency = 345;
+ long epoch = 123, latency = 234;
boolean alice = false;
- long period = 456, outgoing = 567, centre = 678;
- Endpoint ep = new Endpoint(contactId, transportId, epoch, clockDiff,
- latency, alice);
+ long period = 345, outgoing = 456, centre = 567;
+ Endpoint ep = new Endpoint(contactId, transportId, epoch, alice);
Random random = new Random();
byte[] secret = new byte[32], bitmap = new byte[4];
random.nextBytes(secret);
TemporarySecret s = new TemporarySecret(contactId, transportId, epoch,
- clockDiff, latency, alice, period, secret, outgoing, centre,
- bitmap);
+ alice, period, secret, outgoing, centre, bitmap);
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
// Add the contact, the transport, the endpoint and the temporary secret
- assertEquals(contactId, db.addContact(txn, contactName));
- db.addTransport(txn, transportId);
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
+ db.addTransport(txn, transportId, latency);
db.addEndpoint(txn, ep);
db.addSecrets(txn, Arrays.asList(s));
@@ -1669,24 +1673,23 @@ public class H2DatabaseTest extends BriarTestCase {
@Test
public void testSetConnectionWindow() throws Exception {
// Create an endpoint and a temporary secret
- long epoch = 123, clockDiff = 234, latency = 345;
+ long epoch = 123, latency = 234;
boolean alice = false;
- long period = 456, outgoing = 567, centre = 678;
- Endpoint ep = new Endpoint(contactId, transportId, epoch, clockDiff,
- latency, alice);
+ long period = 345, outgoing = 456, centre = 567;
+ Endpoint ep = new Endpoint(contactId, transportId, epoch, alice);
Random random = new Random();
byte[] secret = new byte[32], bitmap = new byte[4];
random.nextBytes(secret);
TemporarySecret s = new TemporarySecret(contactId, transportId, epoch,
- clockDiff, latency, alice, period, secret, outgoing, centre,
- bitmap);
+ alice, period, secret, outgoing, centre, bitmap);
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
// Add the contact, the transport, the endpoint and the temporary secret
- assertEquals(contactId, db.addContact(txn, contactName));
- db.addTransport(txn, transportId);
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
+ db.addTransport(txn, transportId, latency);
db.addEndpoint(txn, ep);
db.addSecrets(txn, Arrays.asList(s));
@@ -1739,15 +1742,13 @@ public class H2DatabaseTest extends BriarTestCase {
@Test
public void testContactTransports() throws Exception {
// Create some endpoints
- long epoch1 = 123, clockDiff1 = 234, latency1 = 345;
- long epoch2 = 456, clockDiff2 = 567, latency2 = 678;
+ long epoch1 = 123, latency1 = 234;
+ long epoch2 = 345, latency2 = 456;
boolean alice1 = true, alice2 = false;
TransportId transportId1 = new TransportId(TestUtils.getRandomId());
TransportId transportId2 = new TransportId(TestUtils.getRandomId());
- Endpoint ep1 = new Endpoint(contactId, transportId1, epoch1, clockDiff1,
- latency1, alice1);
- Endpoint ep2 = new Endpoint(contactId, transportId2, epoch2, clockDiff2,
- latency2, alice2);
+ Endpoint ep1 = new Endpoint(contactId, transportId1, epoch1, alice1);
+ Endpoint ep2 = new Endpoint(contactId, transportId2, epoch2, alice2);
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
@@ -1756,9 +1757,10 @@ public class H2DatabaseTest extends BriarTestCase {
assertEquals(Collections.emptyList(), db.getEndpoints(txn));
// Add the contact, the transports and the endpoints
- assertEquals(contactId, db.addContact(txn, contactName));
- db.addTransport(txn, transportId1);
- db.addTransport(txn, transportId2);
+ db.addLocalAuthor(txn, localAuthor);
+ assertEquals(contactId, db.addContact(txn, author, localAuthorId));
+ db.addTransport(txn, transportId1, latency1);
+ db.addTransport(txn, transportId2, latency2);
db.addEndpoint(txn, ep1);
db.addEndpoint(txn, ep2);
@@ -1770,14 +1772,10 @@ public class H2DatabaseTest extends BriarTestCase {
assertEquals(contactId, ep.getContactId());
if(ep.getTransportId().equals(transportId1)) {
assertEquals(epoch1, ep.getEpoch());
- assertEquals(clockDiff1, ep.getClockDifference());
- assertEquals(latency1, ep.getLatency());
assertEquals(alice1, ep.getAlice());
foundFirst = true;
} else if(ep.getTransportId().equals(transportId2)) {
assertEquals(epoch2, ep.getEpoch());
- assertEquals(clockDiff2, ep.getClockDifference());
- assertEquals(latency2, ep.getLatency());
assertEquals(alice2, ep.getAlice());
foundSecond = true;
} else {
diff --git a/briar-tests/src/net/sf/briar/messaging/ConstantsTest.java b/briar-tests/src/net/sf/briar/messaging/ConstantsTest.java
index 76e4d6ccab4d30c30a1d38ba2f8a6f4b85f10496..7d454d68d20e065f438544f5805a18f99f38b3e8 100644
--- a/briar-tests/src/net/sf/briar/messaging/ConstantsTest.java
+++ b/briar-tests/src/net/sf/briar/messaging/ConstantsTest.java
@@ -2,13 +2,13 @@ package net.sf.briar.messaging;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
+import static net.sf.briar.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PROPERTY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SIGNATURE_LENGTH;
-import static net.sf.briar.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SUBSCRIPTIONS;
import java.io.ByteArrayOutputStream;
@@ -21,11 +21,13 @@ import java.util.Random;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorFactory;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
+import net.sf.briar.api.UniqueId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.messaging.Ack;
-import net.sf.briar.api.messaging.Author;
-import net.sf.briar.api.messaging.AuthorFactory;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.messaging.Message;
@@ -35,9 +37,7 @@ import net.sf.briar.api.messaging.Offer;
import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.SubscriptionUpdate;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.messaging.TransportUpdate;
-import net.sf.briar.api.messaging.UniqueId;
import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.serial.SerialModule;
diff --git a/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java b/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java
index cb6309fae2bfe6718c4447cfb5ef2d337fcdbd6d..c32db9c0c9f31814696fded7fc60cedb87dd8649 100644
--- a/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java
+++ b/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java
@@ -17,7 +17,6 @@ import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.SerialComponent;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
-import net.sf.briar.messaging.PacketReaderImpl;
import net.sf.briar.serial.SerialModule;
import org.junit.Test;
diff --git a/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java b/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java
index 5a691ee2e7589dc025767d7d0bf7e867497a6481..4cf06c4f50628b4e56bbda71ad862d76d786afbf 100644
--- a/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java
+++ b/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java
@@ -11,8 +11,6 @@ import net.sf.briar.api.serial.SerialComponent;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
-import net.sf.briar.messaging.MessagingModule;
-import net.sf.briar.messaging.PacketWriterImpl;
import net.sf.briar.serial.SerialModule;
import net.sf.briar.util.StringUtils;
diff --git a/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java b/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java
index b13cae6016957c77e90008fbeb5fbddb41ffaf42..4c2684caa32007eaf6f45ed97377ec27e790088b 100644
--- a/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java
+++ b/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java
@@ -14,13 +14,13 @@ 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.TransportId;
+import net.sf.briar.api.UniqueId;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.PacketWriterFactory;
-import net.sf.briar.api.messaging.TransportId;
-import net.sf.briar.api.messaging.UniqueId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriterFactory;
diff --git a/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java b/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java
index b87285eb61654c51464869bd015e99e6a83badfd..c996745f390f0e026defa3833fac195ad9ae64ea 100644
--- a/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java
+++ b/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java
@@ -10,7 +10,11 @@ import java.util.Random;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestDatabaseModule;
import net.sf.briar.TestUtils;
+import net.sf.briar.api.Author;
+import net.sf.briar.api.AuthorId;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.LocalAuthor;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.event.DatabaseEvent;
@@ -21,7 +25,6 @@ import net.sf.briar.api.messaging.MessageFactory;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRecogniser;
@@ -103,12 +106,18 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
// Start Alice's key manager
KeyManager km = alice.getInstance(KeyManager.class);
km.start();
+ // Add a local pseudonym for Alice
+ AuthorId aliceId = new AuthorId(TestUtils.getRandomId());
+ LocalAuthor aliceAuthor = new LocalAuthor(aliceId, "Alice",
+ new byte[60], new byte[60]);
+ db.addLocalAuthor(aliceAuthor);
// Add Bob as a contact
- ContactId contactId = db.addContact("Bob");
- Endpoint ep = new Endpoint(contactId, transportId, epoch,
- CLOCK_DIFFERENCE, LATENCY, true);
+ AuthorId bobId = new AuthorId(TestUtils.getRandomId());
+ Author bobAuthor = new Author(bobId, "Bob", new byte[60]);
+ ContactId contactId = db.addContact(bobAuthor, aliceId);
// Add the transport and the endpoint
- db.addTransport(transportId);
+ db.addTransport(transportId, LATENCY);
+ Endpoint ep = new Endpoint(contactId, transportId, epoch, true);
db.addEndpoint(ep);
km.endpointAdded(ep, initialSecret.clone());
// Send Bob a message
@@ -151,12 +160,18 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
// Start Bob's key manager
KeyManager km = bob.getInstance(KeyManager.class);
km.start();
+ // Add a local pseudonym for Bob
+ AuthorId bobId = new AuthorId(TestUtils.getRandomId());
+ LocalAuthor bobAuthor = new LocalAuthor(bobId, "Bob", new byte[60],
+ new byte[60]);
+ db.addLocalAuthor(bobAuthor);
// Add Alice as a contact
- ContactId contactId = db.addContact("Alice");
- Endpoint ep = new Endpoint(contactId, transportId, epoch,
- CLOCK_DIFFERENCE, LATENCY, false);
+ AuthorId aliceId = new AuthorId(TestUtils.getRandomId());
+ Author aliceAuthor = new Author(aliceId, "Alice", new byte[60]);
+ ContactId contactId = db.addContact(aliceAuthor, bobId);
// Add the transport and the endpoint
- db.addTransport(transportId);
+ db.addTransport(transportId, LATENCY);
+ Endpoint ep = new Endpoint(contactId, transportId, epoch, false);
db.addEndpoint(ep);
km.endpointAdded(ep, initialSecret.clone());
// Set up a database listener
diff --git a/briar-tests/src/net/sf/briar/plugins/PluginManagerImplTest.java b/briar-tests/src/net/sf/briar/plugins/PluginManagerImplTest.java
index a33f7723828b972b5948898a7c48f739fe677758..5b4ee5b55a98ae9196f8b2d0290bc5448d6d66ae 100644
--- a/briar-tests/src/net/sf/briar/plugins/PluginManagerImplTest.java
+++ b/briar-tests/src/net/sf/briar/plugins/PluginManagerImplTest.java
@@ -6,9 +6,9 @@ import java.util.concurrent.Executors;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.db.DatabaseComponent;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginConfig;
@@ -46,23 +46,26 @@ public class PluginManagerImplTest extends BriarTestCase {
context.mock(SimplexPluginFactory.class);
final SimplexPlugin simplexPlugin = context.mock(SimplexPlugin.class);
final TransportId simplexId = new TransportId(TestUtils.getRandomId());
+ final long simplexLatency = 12345;
final SimplexPluginFactory simplexFailFactory =
context.mock(SimplexPluginFactory.class, "simplexFailFactory");
final SimplexPlugin simplexFailPlugin =
context.mock(SimplexPlugin.class, "simplexFailPlugin");
final TransportId simplexFailId =
new TransportId(TestUtils.getRandomId());
+ final long simplexFailLatency = 23456;
// Two duplex plugin factories: one creates a plugin, the other fails
final DuplexPluginFactory duplexFactory =
context.mock(DuplexPluginFactory.class);
final DuplexPlugin duplexPlugin = context.mock(DuplexPlugin.class);
final TransportId duplexId = new TransportId(TestUtils.getRandomId());
+ final long duplexLatency = 34567;
final DuplexPluginFactory duplexFailFactory =
context.mock(DuplexPluginFactory.class, "duplexFailFactory");
final TransportId duplexFailId =
new TransportId(TestUtils.getRandomId());
context.checking(new Expectations() {{
- // Start the simplex plugins
+ // First simplex plugin
oneOf(simplexPluginConfig).getFactories();
will(returnValue(Arrays.asList(simplexFactory,
simplexFailFactory)));
@@ -71,20 +74,25 @@ public class PluginManagerImplTest extends BriarTestCase {
oneOf(simplexFactory).createPlugin(with(any(
SimplexPluginCallback.class)));
will(returnValue(simplexPlugin)); // Created
- oneOf(db).addTransport(simplexId);
+ oneOf(simplexPlugin).getMaxLatency();
+ will(returnValue(simplexLatency));
+ oneOf(db).addTransport(simplexId, simplexLatency);
will(returnValue(true));
oneOf(simplexPlugin).start();
will(returnValue(true)); // Started
+ // Second simplex plugin
oneOf(simplexFailFactory).getId();
will(returnValue(simplexFailId));
oneOf(simplexFailFactory).createPlugin(with(any(
SimplexPluginCallback.class)));
will(returnValue(simplexFailPlugin)); // Created
- oneOf(db).addTransport(simplexFailId);
+ oneOf(simplexFailPlugin).getMaxLatency();
+ will(returnValue(simplexFailLatency));
+ oneOf(db).addTransport(simplexFailId, simplexFailLatency);
will(returnValue(true));
oneOf(simplexFailPlugin).start();
will(returnValue(false)); // Failed to start
- // Start the duplex plugins
+ // First duplex plugin
oneOf(duplexPluginConfig).getFactories();
will(returnValue(Arrays.asList(duplexFactory, duplexFailFactory)));
oneOf(duplexFactory).getId();
@@ -92,14 +100,15 @@ public class PluginManagerImplTest extends BriarTestCase {
oneOf(duplexFactory).createPlugin(with(any(
DuplexPluginCallback.class)));
will(returnValue(duplexPlugin)); // Created
- oneOf(db).addTransport(duplexId);
+ oneOf(duplexPlugin).getMaxLatency();
+ will(returnValue(duplexLatency));
+ oneOf(db).addTransport(duplexId, duplexLatency);
will(returnValue(true));
oneOf(duplexPlugin).start();
will(returnValue(true)); // Started
+ // Second duplex plugin
oneOf(duplexFailFactory).getId();
will(returnValue(duplexFailId));
- oneOf(db).addTransport(duplexFailId);
- will(returnValue(true));
oneOf(duplexFailFactory).createPlugin(with(any(
DuplexPluginCallback.class)));
will(returnValue(null)); // Failed to create a plugin
diff --git a/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java b/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java
index 9e63803aab55efec53dcb543f444a612ba83f30b..1e118bf7da395f4883a3431c8b2768d1126f2162 100644
--- a/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java
+++ b/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java
@@ -6,7 +6,7 @@ import java.util.Collections;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.TransportId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.transport.ConnectionRegistry;
import org.junit.Test;
diff --git a/briar-tests/src/net/sf/briar/transport/TransportConnectionRecogniserTest.java b/briar-tests/src/net/sf/briar/transport/TransportConnectionRecogniserTest.java
index 31a8152e7abfad51abbe720f973209c1ca3d2acb..dddcc83d07c4ddf94f66ba10d479271706bc9646 100644
--- a/briar-tests/src/net/sf/briar/transport/TransportConnectionRecogniserTest.java
+++ b/briar-tests/src/net/sf/briar/transport/TransportConnectionRecogniserTest.java
@@ -11,10 +11,10 @@ import javax.crypto.NullCipher;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.ErasableKey;
import net.sf.briar.api.db.DatabaseComponent;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.TemporarySecret;
import net.sf.briar.util.ByteUtils;
@@ -62,7 +62,7 @@ public class TransportConnectionRecogniserTest extends BriarTestCase {
will(new EncodeTagAction());
oneOf(tagKey).erase();
}});
- TemporarySecret s = new TemporarySecret(contactId, transportId, 0, 0, 0,
+ TemporarySecret s = new TemporarySecret(contactId, transportId, 123,
alice, 0, secret, 0, 0, new byte[4]);
TransportConnectionRecogniser recogniser =
new TransportConnectionRecogniser(crypto, db, transportId);
@@ -108,7 +108,7 @@ public class TransportConnectionRecogniserTest extends BriarTestCase {
oneOf(tagKey).erase();
// Accept connection again - no expectations
}});
- TemporarySecret s = new TemporarySecret(contactId, transportId, 0, 0, 0,
+ TemporarySecret s = new TemporarySecret(contactId, transportId, 123,
alice, 0, secret, 0, 0, new byte[4]);
TransportConnectionRecogniser recogniser =
new TransportConnectionRecogniser(crypto, db, transportId);
diff --git a/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java b/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java
index 11eae9905a3efcb35a6bebcd60ca4624d21c7d18..493439897c52a0e3ead237af8baa13c968ddcd58 100644
--- a/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java
+++ b/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java
@@ -13,10 +13,10 @@ import java.util.Random;
import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
+import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.AuthenticatedCipher;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.ErasableKey;
-import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;