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

Only add transport properties and keys when the contact was added

Browse Source 
This will be changed once we have a way to reset state for peers
that were contacts already at some point in the past.
One contact might have deleted the other, but not vice versa.
So they have mismatching state that needs to be reset.

See #2 for more information.
This commit is contained in:
Torsten Grote
2018-04-27 11:29:10 -03:00
parent 44f5a9db1e
commit 99dba69c87
1 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java
View File

@@ -419,42 +419,44 @@ class IntroduceeProtocolEngine
s.getRemote().acceptTimestamp);
if (timestamp == -1) throw new AssertionError();
boolean contactAdded = false;
Map<TransportId, KeySetId> keys = null;
try {
contactManager
.addContact(txn, s.getRemote().author, localAuthor.getId(),
false, true);
contactAdded = true;
// Only add transport properties and keys when the contact was added
// This will be changed once we have a way to reset state for peers
// that were contacts already at some point in the past.
Contact c = contactManager
.getContact(txn, s.getRemote().author.getId(),
localAuthor.getId());
// bind the keys to the new contact
//noinspection ConstantConditions
keys = keyManager
.addUnboundKeys(txn, new SecretKey(s.getMasterKey()),
timestamp, s.getRemote().alice);
keyManager.bindKeys(txn, c.getId(), keys);
// add signed transport properties for the contact
//noinspection ConstantConditions
transportPropertyManager.addRemoteProperties(txn, c.getId(),
s.getRemote().transportProperties);
// Broadcast IntroductionSucceededEvent, because contact got added
IntroductionSucceededEvent e = new IntroductionSucceededEvent(c);
txn.attach(e);
} catch (ContactExistsException e) {
// Ignore this, because the other introducee might have deleted us.
// So we still want updated transport properties
// and new transport keys.
}
Contact c = contactManager.getContact(txn, s.getRemote().author.getId(),
localAuthor.getId());
// bind the keys to the new (or existing) contact
//noinspection ConstantConditions
Map<TransportId, KeySetId> keys = keyManager
.addUnboundKeys(txn, new SecretKey(s.getMasterKey()),
timestamp, s.getRemote().alice);
keyManager.bindKeys(txn, c.getId(), keys);
// add signed transport properties for the contact
//noinspection ConstantConditions
transportPropertyManager.addRemoteProperties(txn, c.getId(),
s.getRemote().transportProperties);
// send ACTIVATE message with a MAC
byte[] mac = crypto.activateMac(s);
Message sent = sendActivateMessage(txn, s, getLocalTimestamp(s), mac);
if (contactAdded) {
// Broadcast IntroductionSucceededEvent, because contact got added
IntroductionSucceededEvent e = new IntroductionSucceededEvent(c);
txn.attach(e);
}
// Move to AWAIT_ACTIVATE state and clear key material from session
return IntroduceeSession.awaitActivate(s, m, sent, keys);
}
@@ -469,12 +471,15 @@ class IntroduceeProtocolEngine
try {
crypto.verifyActivateMac(m.getMac(), s);
} catch (GeneralSecurityException e) {
// TODO remove transport keys?
return abort(txn, s);
}
// Activate transport keys
keyManager.activateKeys(txn, s.getTransportKeys());
// We might not have added transport keys
// if the contact existed when the remote AUTH was received.
if (s.getTransportKeys() != null) {
// Activate transport keys
keyManager.activateKeys(txn, s.getTransportKeys());
}
// Move back to START state
return IntroduceeSession.clear(s, START, s.getLastLocalMessageId(),