Transport properties client. #229

briar-core/src/org/briarproject/invitation/AliceConnector.java

@@ -1,7 +1,5 @@
 package org.briarproject.invitation;
 
-import org.briarproject.api.TransportId;
-import org.briarproject.api.TransportProperties;
 import org.briarproject.api.contact.ContactManager;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.PseudoRandom;
@@ -17,7 +15,6 @@ import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.plugins.ConnectionManager;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
-import org.briarproject.api.property.TransportPropertyManager;
 import org.briarproject.api.sync.GroupFactory;
 import org.briarproject.api.system.Clock;
 import org.briarproject.api.transport.KeyManager;
@@ -28,7 +25,6 @@ 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 static java.util.logging.Level.INFO;
@@ -47,17 +43,12 @@ class AliceConnector extends Connector {
 			StreamWriterFactory streamWriterFactory,
 			AuthorFactory authorFactory, GroupFactory groupFactory,
 			KeyManager keyManager, ConnectionManager connectionManager,
-			ContactManager contactManager,
-			TransportPropertyManager transportPropertyManager, Clock clock,
-			boolean reuseConnection, ConnectorGroup group, DuplexPlugin plugin,
-			LocalAuthor localAuthor,
-			Map<TransportId, TransportProperties> localProps,
-			PseudoRandom random) {
+			ContactManager contactManager, Clock clock, ConnectorGroup group,
+			DuplexPlugin plugin, LocalAuthor localAuthor, PseudoRandom random) {
 		super(crypto, bdfReaderFactory, bdfWriterFactory, streamReaderFactory,
-				streamWriterFactory, authorFactory, groupFactory,
-				keyManager, connectionManager, contactManager,
-				transportPropertyManager, clock, reuseConnection, group,
-				plugin, localAuthor, localProps, random);
+				streamWriterFactory, authorFactory, groupFactory, keyManager,
+				connectionManager, contactManager, clock, group, plugin,
+				localAuthor, random);
 	}
 
 	@Override
@@ -152,20 +143,14 @@ class AliceConnector extends Connector {
 		// Derive the invitation nonces
 		byte[] aliceNonce = crypto.deriveSignatureNonce(master, true);
 		byte[] bobNonce = crypto.deriveSignatureNonce(master, false);
-		// Exchange pseudonyms, signed nonces, timestamps and transports
+		// Exchange pseudonyms, signed nonces, and timestamps
 		Author remoteAuthor;
 		long remoteTimestamp;
-		Map<TransportId, TransportProperties> remoteProps;
-		boolean remoteReuseConnection;
 		try {
 			sendPseudonym(w, aliceNonce);
 			sendTimestamp(w, localTimestamp);
-			sendTransportProperties(w);
-			sendConfirmation(w, reuseConnection);
 			remoteAuthor = receivePseudonym(r, bobNonce);
 			remoteTimestamp = receiveTimestamp(r);
-			remoteProps = receiveTransportProperties(r);
-			remoteReuseConnection = receiveConfirmation(r);
 			// Close the outgoing stream and expect EOF on the incoming stream
 			w.close();
 			if (!r.eof()) LOG.warning("Unexpected data at end of connection");
@@ -182,18 +167,17 @@ class AliceConnector extends Connector {
 		}
 		// The agreed timestamp is the minimum of the peers' timestamps
 		long timestamp = Math.min(localTimestamp, remoteTimestamp);
-		// Add the contact and store the transports
+		// Add the contact
 		try {
-			addContact(remoteAuthor, remoteProps, master, timestamp, true);
+			addContact(remoteAuthor, master, timestamp, true);
 		} catch (DbException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			tryToClose(conn, true);
 			group.pseudonymExchangeFailed();
 			return;
 		}
-		// Reuse the connection as a transport connection if both peers agree
-		if (reuseConnection && remoteReuseConnection) reuseConnection(conn);
-		else tryToClose(conn, false);
+		// Reuse the connection as a transport connection
+		reuseConnection(conn);
 		// Pseudonym exchange succeeded
 		if (LOG.isLoggable(INFO))
 			LOG.info(pluginName + " pseudonym exchange succeeded");

briar-core/src/org/briarproject/invitation/BobConnector.java

@@ -1,7 +1,5 @@
 package org.briarproject.invitation;
 
-import org.briarproject.api.TransportId;
-import org.briarproject.api.TransportProperties;
 import org.briarproject.api.contact.ContactManager;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.PseudoRandom;
@@ -17,7 +15,6 @@ import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.plugins.ConnectionManager;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
-import org.briarproject.api.property.TransportPropertyManager;
 import org.briarproject.api.sync.GroupFactory;
 import org.briarproject.api.system.Clock;
 import org.briarproject.api.transport.KeyManager;
@@ -28,7 +25,6 @@ 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 static java.util.logging.Level.INFO;
@@ -47,17 +43,12 @@ class BobConnector extends Connector {
 			StreamWriterFactory streamWriterFactory,
 			AuthorFactory authorFactory, GroupFactory groupFactory,
 			KeyManager keyManager, ConnectionManager connectionManager,
-			ContactManager contactManager,
-			TransportPropertyManager transportPropertyManager, Clock clock,
-			boolean reuseConnection, ConnectorGroup group, DuplexPlugin plugin,
-			LocalAuthor localAuthor,
-			Map<TransportId, TransportProperties> localProps,
-			PseudoRandom random) {
+			ContactManager contactManager, Clock clock, ConnectorGroup group,
+			DuplexPlugin plugin, LocalAuthor localAuthor, PseudoRandom random) {
 		super(crypto, bdfReaderFactory, bdfWriterFactory, streamReaderFactory,
-				streamWriterFactory, authorFactory, groupFactory,
-				keyManager, connectionManager, contactManager,
-				transportPropertyManager, clock, reuseConnection, group,
-				plugin, localAuthor, localProps, random);
+				streamWriterFactory, authorFactory, groupFactory, keyManager,
+				connectionManager, contactManager, clock, group, plugin,
+				localAuthor, random);
 	}
 
 	@Override
@@ -152,20 +143,14 @@ class BobConnector extends Connector {
 		// Derive the nonces
 		byte[] aliceNonce = crypto.deriveSignatureNonce(master, true);
 		byte[] bobNonce = crypto.deriveSignatureNonce(master, false);
-		// Exchange pseudonyms, signed nonces, timestamps and transports
+		// Exchange pseudonyms, signed nonces and timestamps
 		Author remoteAuthor;
 		long remoteTimestamp;
-		Map<TransportId, TransportProperties> remoteProps;
-		boolean remoteReuseConnection;
 		try {
 			remoteAuthor = receivePseudonym(r, aliceNonce);
 			remoteTimestamp = receiveTimestamp(r);
-			remoteProps = receiveTransportProperties(r);
-			remoteReuseConnection = receiveConfirmation(r);
 			sendPseudonym(w, bobNonce);
 			sendTimestamp(w, localTimestamp);
-			sendTransportProperties(w);
-			sendConfirmation(w, reuseConnection);
 			// Close the outgoing stream and expect EOF on the incoming stream
 			w.close();
 			if (!r.eof()) LOG.warning("Unexpected data at end of connection");
@@ -182,18 +167,17 @@ class BobConnector extends Connector {
 		}
 		// The agreed timestamp is the minimum of the peers' timestamps
 		long timestamp = Math.min(localTimestamp, remoteTimestamp);
-		// Add the contact and store the transports
+		// Add the contact
 		try {
-			addContact(remoteAuthor, remoteProps, master, timestamp, false);
+			addContact(remoteAuthor, master, timestamp, false);
 		} catch (DbException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			tryToClose(conn, true);
 			group.pseudonymExchangeFailed();
 			return;
 		}
-		// Reuse the connection as a transport connection if both peers agree
-		if (reuseConnection && remoteReuseConnection) reuseConnection(conn);
-		else tryToClose(conn, false);
+		// Reuse the connection as a transport connection
+		reuseConnection(conn);
 		// Pseudonym exchange succeeded
 		if (LOG.isLoggable(INFO))
 			LOG.info(pluginName + " pseudonym exchange succeeded");

briar-core/src/org/briarproject/invitation/Connector.java

@@ -2,7 +2,6 @@ package org.briarproject.invitation;
 
 import org.briarproject.api.FormatException;
 import org.briarproject.api.TransportId;
-import org.briarproject.api.TransportProperties;
 import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.contact.ContactManager;
 import org.briarproject.api.crypto.CryptoComponent;
@@ -23,7 +22,6 @@ import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.plugins.ConnectionManager;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
-import org.briarproject.api.property.TransportPropertyManager;
 import org.briarproject.api.sync.GroupFactory;
 import org.briarproject.api.system.Clock;
 import org.briarproject.api.transport.KeyManager;
@@ -33,16 +31,10 @@ import org.briarproject.api.transport.StreamWriterFactory;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.logging.Logger;
 
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
-import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
-import static org.briarproject.api.TransportPropertyConstants.MAX_TRANSPORT_ID_LENGTH;
 import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 import static org.briarproject.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH;
@@ -64,13 +56,10 @@ abstract class Connector extends Thread {
 	protected final KeyManager keyManager;
 	protected final ConnectionManager connectionManager;
 	protected final ContactManager contactManager;
-	protected final TransportPropertyManager transportPropertyManager;
 	protected final Clock clock;
-	protected final boolean reuseConnection;
 	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;
 
@@ -87,12 +76,8 @@ abstract class Connector extends Thread {
 			StreamWriterFactory streamWriterFactory,
 			AuthorFactory authorFactory, GroupFactory groupFactory,
 			KeyManager keyManager, ConnectionManager connectionManager,
-			ContactManager contactManager,
-			TransportPropertyManager transportPropertyManager, Clock clock,
-			boolean reuseConnection, ConnectorGroup group, DuplexPlugin plugin,
-			LocalAuthor localAuthor,
-			Map<TransportId, TransportProperties> localProps,
-			PseudoRandom random) {
+			ContactManager contactManager, Clock clock, ConnectorGroup group,
+			DuplexPlugin plugin, LocalAuthor localAuthor, PseudoRandom random) {
 		super("Connector");
 		this.crypto = crypto;
 		this.bdfReaderFactory = bdfReaderFactory;
@@ -104,13 +89,10 @@ abstract class Connector extends Thread {
 		this.keyManager = keyManager;
 		this.connectionManager = connectionManager;
 		this.contactManager = contactManager;
-		this.transportPropertyManager = transportPropertyManager;
 		this.clock = clock;
-		this.reuseConnection = reuseConnection;
 		this.group = group;
 		this.plugin = plugin;
 		this.localAuthor = localAuthor;
-		this.localProps = localProps;
 		this.random = random;
 		pluginName = plugin.getClass().getName();
 		keyPair = crypto.generateAgreementKeyPair();
@@ -233,57 +215,14 @@ abstract class Connector extends Thread {
 		return timestamp;
 	}
 
-	protected void sendTransportProperties(BdfWriter w) throws IOException {
-		w.writeListStart();
-		for (Entry<TransportId, TransportProperties> e :
-				localProps.entrySet()) {
-			w.writeString(e.getKey().getString());
-			w.writeDictionary(e.getValue());
-		}
-		w.writeListEnd();
-		w.flush();
-		if (LOG.isLoggable(INFO))
-			LOG.info(pluginName + " sent transport properties");
-	}
-
-	protected Map<TransportId, TransportProperties> receiveTransportProperties(
-			BdfReader r) throws IOException {
-		Map<TransportId, TransportProperties> remoteProps =
-				new HashMap<TransportId, TransportProperties>();
-		r.readListStart();
-		while (!r.hasListEnd()) {
-			String idString = r.readString(MAX_TRANSPORT_ID_LENGTH);
-			if (idString.length() == 0) throw new FormatException();
-			TransportId id = new TransportId(idString);
-			Map<String, String> p = new HashMap<String, String>();
-			r.readDictionaryStart();
-			for (int i = 0; !r.hasDictionaryEnd(); i++) {
-				if (i == MAX_PROPERTIES_PER_TRANSPORT)
-					throw new FormatException();
-				String key = r.readString(MAX_PROPERTY_LENGTH);
-				String value = r.readString(MAX_PROPERTY_LENGTH);
-				p.put(key, value);
-			}
-			r.readDictionaryEnd();
-			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, SecretKey master,
+	protected ContactId addContact(Author remoteAuthor, SecretKey master,
 			long timestamp, boolean alice) throws DbException {
 		// Add the contact to the database
 		contactId = contactManager.addContact(remoteAuthor,
 				localAuthor.getId());
-		// Store the remote transport properties
-		transportPropertyManager.setRemoteProperties(contactId, remoteProps);
-		// Derive transport keys for each transport shared with the contact
-		keyManager.addContact(contactId, remoteProps.keySet(), master,
-				timestamp, alice);
+		// Derive transport keys
+		keyManager.addContact(contactId, master, timestamp, alice);
+		return contactId;
 	}
 
 	protected void tryToClose(DuplexTransportConnection conn,

briar-core/src/org/briarproject/invitation/ConnectorGroup.java

@@ -1,7 +1,5 @@
 package org.briarproject.invitation;
 
-import org.briarproject.api.TransportId;
-import org.briarproject.api.TransportProperties;
 import org.briarproject.api.contact.ContactManager;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.PseudoRandom;
@@ -19,7 +17,6 @@ import org.briarproject.api.invitation.InvitationTask;
 import org.briarproject.api.plugins.ConnectionManager;
 import org.briarproject.api.plugins.PluginManager;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
-import org.briarproject.api.property.TransportPropertyManager;
 import org.briarproject.api.sync.GroupFactory;
 import org.briarproject.api.system.Clock;
 import org.briarproject.api.transport.KeyManager;
@@ -28,7 +25,6 @@ import org.briarproject.api.transport.StreamWriterFactory;
 
 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;
@@ -57,12 +53,10 @@ class ConnectorGroup extends Thread implements InvitationTask {
 	private final ConnectionManager connectionManager;
 	private final IdentityManager identityManager;
 	private final ContactManager contactManager;
-	private final TransportPropertyManager transportPropertyManager;
 	private final Clock clock;
 	private final PluginManager pluginManager;
 	private final AuthorId localAuthorId;
 	private final int localInvitationCode, remoteInvitationCode;
-	private final boolean reuseConnection;
 	private final Collection<InvitationListener> listeners;
 	private final AtomicBoolean connected;
 	private final CountDownLatch localConfirmationLatch;
@@ -83,10 +77,8 @@ class ConnectorGroup extends Thread implements InvitationTask {
 			AuthorFactory authorFactory, GroupFactory groupFactory,
 			KeyManager keyManager, ConnectionManager connectionManager,
 			IdentityManager identityManager, ContactManager contactManager,
-			TransportPropertyManager transportPropertyManager, Clock clock,
-			PluginManager pluginManager, AuthorId localAuthorId,
-			int localInvitationCode, int remoteInvitationCode,
-			boolean reuseConnection) {
+			Clock clock, PluginManager pluginManager, AuthorId localAuthorId,
+			int localInvitationCode, int remoteInvitationCode) {
 		super("ConnectorGroup");
 		this.crypto = crypto;
 		this.bdfReaderFactory = bdfReaderFactory;
@@ -99,13 +91,11 @@ class ConnectorGroup extends Thread implements InvitationTask {
 		this.connectionManager = connectionManager;
 		this.identityManager = identityManager;
 		this.contactManager = contactManager;
-		this.transportPropertyManager = transportPropertyManager;
 		this.clock = clock;
 		this.pluginManager = pluginManager;
 		this.localAuthorId = localAuthorId;
 		this.localInvitationCode = localInvitationCode;
 		this.remoteInvitationCode = remoteInvitationCode;
-		this.reuseConnection = reuseConnection;
 		listeners = new CopyOnWriteArrayList<InvitationListener>();
 		connected = new AtomicBoolean(false);
 		localConfirmationLatch = new CountDownLatch(1);
@@ -136,11 +126,9 @@ class ConnectorGroup extends Thread implements InvitationTask {
 	@Override
 	public void run() {
 		LocalAuthor localAuthor;
-		Map<TransportId, TransportProperties> localProps;
-		// Load the local pseudonym and transport properties
+		// Load the local pseudonym
 		try {
 			localAuthor = identityManager.getLocalAuthor(localAuthorId);
-			localProps = transportPropertyManager.getLocalProperties();
 		} catch (DbException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			lock.lock();
@@ -157,15 +145,13 @@ class ConnectorGroup extends Thread implements InvitationTask {
 		// Alice is the party with the smaller invitation code
 		if (localInvitationCode < remoteInvitationCode) {
 			for (DuplexPlugin plugin : pluginManager.getInvitationPlugins()) {
-				Connector c = createAliceConnector(plugin, localAuthor,
-						localProps);
+				Connector c = createAliceConnector(plugin, localAuthor);
 				connectors.add(c);
 				c.start();
 			}
 		} else {
 			for (DuplexPlugin plugin: pluginManager.getInvitationPlugins()) {
-				Connector c = createBobConnector(plugin, localAuthor,
-						localProps);
+				Connector c = createBobConnector(plugin, localAuthor);
 				connectors.add(c);
 				c.start();
 			}
@@ -190,27 +176,23 @@ class ConnectorGroup extends Thread implements InvitationTask {
 	}
 
 	private Connector createAliceConnector(DuplexPlugin plugin,
-			LocalAuthor localAuthor,
-			Map<TransportId, TransportProperties> localProps) {
+			LocalAuthor localAuthor) {
 		PseudoRandom random = crypto.getPseudoRandom(localInvitationCode,
 				remoteInvitationCode);
 		return new AliceConnector(crypto, bdfReaderFactory, bdfWriterFactory,
 				streamReaderFactory, streamWriterFactory, authorFactory,
 				groupFactory, keyManager, connectionManager, contactManager,
-				transportPropertyManager, clock, reuseConnection, this, plugin,
-				localAuthor, localProps, random);
+				clock, this, plugin, localAuthor, random);
 	}
 
 	private Connector createBobConnector(DuplexPlugin plugin,
-			LocalAuthor localAuthor,
-			Map<TransportId, TransportProperties> localProps) {
+			LocalAuthor localAuthor) {
 		PseudoRandom random = crypto.getPseudoRandom(remoteInvitationCode,
 				localInvitationCode);
 		return new BobConnector(crypto, bdfReaderFactory, bdfWriterFactory,
 				streamReaderFactory, streamWriterFactory, authorFactory,
 				groupFactory, keyManager, connectionManager, contactManager,
-				transportPropertyManager, clock, reuseConnection, this, plugin,
-				localAuthor, localProps, random);
+				clock, this, plugin, localAuthor, random);
 	}
 
 	public void localConfirmationSucceeded() {

briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java

@@ -11,7 +11,6 @@ import org.briarproject.api.invitation.InvitationTask;
 import org.briarproject.api.invitation.InvitationTaskFactory;
 import org.briarproject.api.plugins.ConnectionManager;
 import org.briarproject.api.plugins.PluginManager;
-import org.briarproject.api.property.TransportPropertyManager;
 import org.briarproject.api.sync.GroupFactory;
 import org.briarproject.api.system.Clock;
 import org.briarproject.api.transport.KeyManager;
@@ -33,7 +32,6 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory {
 	private final ConnectionManager connectionManager;
 	private final IdentityManager identityManager;
 	private final ContactManager contactManager;
-	private final TransportPropertyManager transportPropertyManager;
 	private final Clock clock;
 	private final PluginManager pluginManager;
 
@@ -45,7 +43,6 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory {
 			AuthorFactory authorFactory, GroupFactory groupFactory,
 			KeyManager keyManager, ConnectionManager connectionManager,
 			IdentityManager identityManager, ContactManager contactManager,
-			TransportPropertyManager transportPropertyManager,
 			Clock clock, PluginManager pluginManager) {
 		this.crypto = crypto;
 		this.bdfReaderFactory = bdfReaderFactory;
@@ -58,17 +55,16 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory {
 		this.connectionManager = connectionManager;
 		this.identityManager = identityManager;
 		this.contactManager = contactManager;
-		this.transportPropertyManager = transportPropertyManager;
 		this.clock = clock;
 		this.pluginManager = pluginManager;
 	}
 
 	public InvitationTask createTask(AuthorId localAuthorId, int localCode,
-			int remoteCode, boolean reuseConnection) {
+			int remoteCode) {
 		return new ConnectorGroup(crypto, bdfReaderFactory, bdfWriterFactory,
 				streamReaderFactory, streamWriterFactory, authorFactory,
 				groupFactory, keyManager, connectionManager, identityManager,
-				contactManager, transportPropertyManager, clock, pluginManager,
-				localAuthorId, localCode, remoteCode, reuseConnection);
+				contactManager, clock, pluginManager, localAuthorId, localCode,
+				remoteCode);
 	}
 }