Add logging on replacing outgoing transport keys

* social-backup-poc:
  Rm test which was not present in this branch before cherry pick
  Resolve conflict on cherry pick commit to use ByteBuddyClassImposteriser
  Tell animal sniffer gradle plugin to ignore java.util.Objects
  Improve lost password and setup password dialog for social backup
  When creating social backup, only allow selecting contacts when there are at least 2 contacts in contact list
  Disable help recover account option by default

bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeyManager.java

@@ -116,4 +116,8 @@ public interface KeyManager {
 	@Nullable
 	StreamContext getStreamContext(TransportId t, byte[] tag)
 			throws DbException;
+
+	@Nullable
+	StreamContext getStreamContextInHandshakeMode(ContactId c, TransportId t)
+			throws DbException;
 }

bramble-core/src/main/java/org/briarproject/bramble/connection/Connection.java

@@ -47,7 +47,9 @@ abstract class Connection {
 			TransportId transportId) {
 		StreamContext ctx;
 		try {
+			LOG.info("Reading tag...");
 			byte[] tag = readTag(reader.getInputStream());
+			LOG.info("Read tag!");
 			return keyManager.getStreamContext(transportId, tag);
 		} catch (IOException | DbException e) {
 			logException(LOG, WARNING, e);

bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingDuplexSyncConnection.java

@@ -130,13 +130,17 @@ class IncomingDuplexSyncConnection extends DuplexSyncConnection
 	private boolean performHandshake(StreamContext ctxIn, ContactId contactId) {
 		LOG.info("Performing handshake (Incoming)");
 		// Allocate the outgoing stream context
-		StreamContext ctxOut =
-				allocateStreamContext(contactId, transportId);
-		if (ctxOut == null) {
+		StreamContext ctxOut;
+
+		try {
+			ctxOut = keyManager.getStreamContextInHandshakeMode(contactId, transportId);
+		} catch (DbException e) {
+			logException(LOG, WARNING, e);
 			LOG.warning("Could not allocate stream context");
 			onReadError(true);
 			return false;
 		}
+
 		try {
 			InputStream in = streamReaderFactory.createStreamReader(
 					reader.getInputStream(), ctxIn);
@@ -148,7 +152,7 @@ class IncomingDuplexSyncConnection extends DuplexSyncConnection
 					handshakeManager.handshake(contactId, in, out);
 			keyManager.addRotationKeys(contactId, result.getMasterKey(),
 					TIMESTAMP, result.isAlice(), true);
-			LOG.info("Rotation keys added");
+			LOG.info("Rotation keys added - IncomingDuplexSyncConnection");
 			return true;
 		} catch (IOException | DbException e) {
 			logException(LOG, WARNING, e);

bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingDuplexSyncConnection.java

@@ -64,6 +64,7 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
 		LOG.info("Running OutgoingDuplexSyncConnection on transport " +
 				transportId.getString());
 		// Allocate a stream context
+
 		StreamContext ctx = allocateStreamContext(contactId, transportId);
 		if (ctx == null) {
 			LOG.warning("Could not allocate stream context");
@@ -71,6 +72,7 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
 			return;
 		}
 		if (ctx.isHandshakeMode()) {
+			LOG.info("OutgoingDuplexSyncConnection - context is in handshake mode, performing handshake");
 			if (!performHandshake(ctx)) {
 				LOG.warning("Handshake failed");
 				return;
@@ -155,7 +157,8 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
 	}
 
 	private boolean performHandshake(StreamContext ctxOut) {
-		LOG.info("Performing handshake (Outgoing)");
+		LOG.info("Performing handshake (Outgoing) for transport " +
+				ctxOut.getTransportId().getString());
 		// Flush the output stream to send the outgoing stream header
 		StreamWriter out;
 		try {
@@ -177,7 +180,7 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
 		}
 		// Check that the stream comes from the expected contact
 		ContactId inContactId = ctxIn.getContactId();
-		if (contactId == null) {
+		if (inContactId == null) {
 			LOG.warning("Expected contact tag, got rendezvous tag");
 			onReadError();
 			return false;
@@ -196,7 +199,7 @@ class OutgoingDuplexSyncConnection extends DuplexSyncConnection
 					handshakeManager.handshake(contactId, in, out);
 			keyManager.addRotationKeys(contactId, result.getMasterKey(),
 					TIMESTAMP, result.isAlice(), true);
-			LOG.info("Rotation keys added");
+			LOG.info("Rotation keys added - OutgoingDuplexSyncConnection");
 			return true;
 		} catch (IOException | DbException e) {
 			logException(LOG, WARNING, e);

bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -470,6 +470,10 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			if (now - then >= V3_MIGRATION_PERIOD_MS) retireV2HiddenService();
 			else publishV2HiddenService(port, privKey2);
 		}
+		if (isNullOrEmpty(privKey3)) {
+			TransportProperties p = callback.getLocalProperties();
+			privKey3 = p.get(HS_PRIVATE_KEY_V3);
+		}
 		publishV3HiddenService(port, privKey3);
 	}
 
@@ -511,9 +515,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		try {
 			// Use the control connection to set up the hidden service
 			if (privKey == null) {
+				LOG.info("Private key is null");
 				response = controlConnection.addOnion("NEW:ED25519-V3",
 						portLines, null);
 			} else {
+				LOG.info("Private key is not null");
 				response = controlConnection.addOnion(privKey, portLines);
 			}
 		} catch (IOException e) {
@@ -535,12 +541,15 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (privKey == null) {
 			// Publish the hidden service's onion hostname in transport props
 			TransportProperties p = new TransportProperties();
+			String now = String.valueOf(clock.currentTimeMillis());
 			p.put(PROP_ONION_V3, onion3);
+			p.put(HS_PRIVATE_KEY_V3, response.get(HS_PRIVKEY));
+			p.put(HS_V3_CREATED, now);
 			callback.mergeLocalProperties(p);
 			// Save the hidden service's private key for next time
 			Settings s = new Settings();
 			s.put(HS_PRIVATE_KEY_V3, response.get(HS_PRIVKEY));
-			s.put(HS_V3_CREATED, String.valueOf(clock.currentTimeMillis()));
+			s.put(HS_V3_CREATED, now);
 			callback.mergeSettings(s);
 		}
 	}

bramble-core/src/main/java/org/briarproject/bramble/transport/KeyManagerImpl.java

@@ -128,6 +128,7 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 			throws DbException, GeneralSecurityException {
 		SecretKey staticMasterKey = transportCrypto
 				.deriveStaticMasterKey(theirPublicKey, ourKeyPair);
+		LOG.info("Deriving root handshake key " + c.toString() + " " + ourKeyPair.getPublic().toString() + " them: " + theirPublicKey.toString());
 		SecretKey rootKey =
 				transportCrypto.deriveHandshakeRootKey(staticMasterKey, false);
 		boolean alice = transportCrypto.isAlice(theirPublicKey, ourKeyPair);
@@ -135,6 +136,7 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 		for (Entry<TransportId, TransportKeyManager> e : managers.entrySet()) {
 			TransportId t = e.getKey();
 			TransportKeyManager m = e.getValue();
+			LOG.info("Adding handshake keys for transport " + t.getString());
 			ids.put(t, m.addHandshakeKeys(txn, c, rootKey, alice));
 		}
 		return ids;
@@ -205,6 +207,14 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 						m.getStreamContext(txn, tag)));
 	}
 
+	@Override
+	public StreamContext getStreamContextInHandshakeMode(ContactId c, TransportId t)
+			throws DbException {
+		return withManager(t, m ->
+				db.transactionWithNullableResult(false, txn ->
+						m.getStreamContextInHandshakeMode(txn, c)));
+	}
+
 	@Override
 	public void eventOccurred(Event e) {
 		if (e instanceof ContactRemovedEvent) {

bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManager.java

@@ -48,4 +48,7 @@ interface TransportKeyManager {
 	StreamContext getStreamContext(Transaction txn, byte[] tag)
 			throws DbException;
 
+	@Nullable
+	StreamContext getStreamContextInHandshakeMode(Transaction txn, ContactId c)
+			throws DbException;
 }

bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java

@@ -19,6 +19,7 @@ import org.briarproject.bramble.api.transport.StreamContext;
 import org.briarproject.bramble.api.transport.TransportKeySet;
 import org.briarproject.bramble.api.transport.TransportKeys;
 import org.briarproject.bramble.transport.ReorderingWindow.Change;
+import org.briarproject.bramble.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -182,9 +183,12 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 			if (old == null || (old.getKeys().isHandshakeMode() &&
 					!ks.getKeys().isHandshakeMode()) ||
 					old.getKeySetId().getInt() < ks.getKeySetId().getInt()) {
+				LOG.info("Replacing Outgoing keys!");
 				if (ks.getContactId() == null)
 					pendingContactOutContexts.put(ks.getPendingContactId(), ks);
 				else contactOutContexts.put(ks.getContactId(), ks);
+			} else {
+				LOG.info("Not replacing Outgoing keys!");
 			}
 		}
 	}
@@ -372,6 +376,9 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 			MutableTransportKeySet ks = getOutgoingKeySet(c, p);
 			if (ks == null) return null;
 			MutableTransportKeys keys = ks.getKeys();
+
+			LOG.info("Using keys for outgoing connection - handshake mode: " +
+					keys.isHandshakeMode());
 			MutableOutgoingKeys outKeys = keys.getCurrentOutgoingKeys();
 			if (!outKeys.isActive()) throw new AssertionError();
 			if (outKeys.getStreamCounter() > MAX_32_BIT_UNSIGNED) return null;
@@ -395,7 +402,18 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 		try {
 			// Look up the incoming keys for the tag
 			TagContext tagCtx = inContexts.remove(new Bytes(tag));
-			if (tagCtx == null) return null;
+			if (tagCtx == null) {
+				LOG.info("Cannot find tag!");
+				for (MutableTransportKeySet t : keys.values()) {
+					LOG.info("Header key: " + StringUtils
+							.toHexString(t.getKeys().getCurrentIncomingKeys()
+									.getHeaderKey().getBytes()));
+					LOG.info("Tag key: " + StringUtils.toHexString(
+							t.getKeys().getCurrentIncomingKeys().getTagKey()
+									.getBytes()));
+				}
+				return null;
+			}
 			MutableIncomingKeys inKeys = tagCtx.inKeys;
 			// Create a stream context
 			StreamContext ctx = new StreamContext(tagCtx.contactId,
@@ -443,6 +461,51 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 		}
 	}
 
+	@Override
+	public StreamContext getStreamContextInHandshakeMode(Transaction txn,
+			ContactId c)
+			throws DbException {
+		lock.lock();
+		try {
+			MutableTransportKeySet ks = getOutgoingKeySet(c, null);
+			if (ks == null) return null;
+			MutableTransportKeys currentKeys = ks.getKeys();
+			LOG.info("Current keys handshake mode? " +
+					currentKeys.isHandshakeMode());
+			if (currentKeys.isHandshakeMode())
+				return getStreamContext(txn, c, null);
+
+			for (MutableTransportKeySet keySet : this.keys.values()) {
+				MutableTransportKeys keys = keySet.getKeys();
+				if (!keys.isHandshakeMode()) continue;
+				LOG.info("Found handshake mode keys");
+				MutableOutgoingKeys outKeys = keys.getCurrentOutgoingKeys();
+//				if (!outKeys.isActive()) throw new AssertionError();
+				if (outKeys.getStreamCounter() > MAX_32_BIT_UNSIGNED)
+					return null;
+				// Create a stream context
+				LOG.info("Creating handshake mode stream context");
+				StreamContext ctx = new StreamContext(c, null, transportId,
+						outKeys.getTagKey(), outKeys.getHeaderKey(),
+						outKeys.getStreamCounter(), keys.isHandshakeMode());
+				LOG.info("Tag key: " +
+						StringUtils.toHexString(outKeys.getTagKey().getBytes()));
+				LOG.info("Header key: " +
+						StringUtils.toHexString(outKeys.getHeaderKey().getBytes()));
+				// Increment the stream counter and write it back to the DB
+				outKeys.incrementStreamCounter();
+				db.incrementStreamCounter(txn, transportId,
+						keySet.getKeySetId());
+				LOG.info("Returning");
+				return ctx;
+			}
+			LOG.info("Cannot find handshake mode keys");
+			return null;
+		} finally {
+			lock.unlock();
+		}
+	}
+
 	@DatabaseExecutor
 	@Wakeful
 	private void updateKeys(Transaction txn) throws DbException {

briar-core/src/main/java/org/briarproject/briar/socialbackup/recovery/RestoreAccountImpl.java

@@ -201,6 +201,9 @@ public class RestoreAccountImpl implements RestoreAccount {
 			transportPropertyManager
 					.mergeLocalProperties(propertiesEntry.getKey(),
 							propertiesEntry.getValue());
+//			for (Map.Entry<String, String> entry : propertiesEntry.getValue().entrySet()) {
+//			  LOG.info(String.format("%s : %s", entry.getKey(), entry.getValue()));
+//			}
 		}
 	}