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

Sent automatic decline when other introducee declines.

Browse Source
This commit is contained in:
akwizgran
2018-04-27 15:57:56 +01:00
parent 31b69577e8
commit c0dfe3e85a
4 changed files with 121 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-core/src/main/java/org/briarproject/briar/introduction/AbstractProtocolEngine.java
View File

@@ -84,8 +84,7 @@ abstract class AbstractProtocolEngine<S extends Session>
Message sendAcceptMessage(Transaction txn, PeerSession s, long timestamp,
byte[] ephemeralPublicKey, long acceptTimestamp,
Map<TransportId, TransportProperties> transportProperties,
boolean visible)
throws DbException {
boolean visible) throws DbException {
Message m = messageEncoder
.encodeAcceptMessage(s.getContactGroupId(), timestamp,
s.getLastLocalMessageId(), s.getSessionId(),

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

@@ -357,9 +357,25 @@ class IntroduceeProtocolEngine
broadcastIntroductionResponseReceivedEvent(txn, s,
s.getIntroducer().getId(), m);
// Move back to START state
return IntroduceeSession.clear(s, START, s.getLastLocalMessageId(),
s.getLocalTimestamp(), m.getMessageId());
if (s.getState() == AWAIT_RESPONSES) {
// Mark the request message unavailable to answer
markRequestsUnavailableToAnswer(txn, s);
// Send a DECLINE message
Message sent =
sendDeclineMessage(txn, s, getLocalTimestamp(s), false);
// Track the message
messageTracker.trackOutgoingMessage(txn, sent);
// Move back to START state
return IntroduceeSession.clear(s, START, sent.getId(),
sent.getTimestamp(), m.getMessageId());
} else {
// Move back to START state
return IntroduceeSession.clear(s, START, s.getLastLocalMessageId(),
s.getLocalTimestamp(), m.getMessageId());
}
}
private IntroduceeSession onRemoteResponseWhenDeclined(Transaction txn,

66
briar-core/src/main/java/org/briarproject/briar/introduction/IntroducerProtocolEngine.java
View File

@@ -113,7 +113,7 @@ class IntroducerProtocolEngine
return onRemoteAccept(txn, s, m);
case A_DECLINED:
case B_DECLINED:
return onRemoteResponseWhenDeclined(txn, s, m);
return onRemoteAcceptWhenDeclined(txn, s, m);
case START:
case AWAIT_AUTHS:
case AWAIT_AUTH_A:
@@ -137,7 +137,7 @@ class IntroducerProtocolEngine
return onRemoteDecline(txn, s, m);
case A_DECLINED:
case B_DECLINED:
return onRemoteResponseWhenDeclined(txn, s, m);
return onRemoteDeclineWhenDeclined(txn, s, m);
case START:
case AWAIT_AUTHS:
case AWAIT_AUTH_A:
@@ -204,8 +204,8 @@ class IntroducerProtocolEngine
}
private IntroducerSession onLocalRequest(Transaction txn,
IntroducerSession s,
@Nullable String message, long timestamp) throws DbException {
IntroducerSession s, @Nullable String message, long timestamp)
throws DbException {
// Send REQUEST messages
long maxIntroduceeTimestamp =
Math.max(getLocalTimestamp(s, s.getIntroduceeA()),
@@ -285,6 +285,50 @@ class IntroducerProtocolEngine
return m.getGroupId().equals(s.getIntroduceeA().groupId);
}
private IntroducerSession onRemoteAcceptWhenDeclined(Transaction txn,
IntroducerSession s, AcceptMessage m) throws DbException {
// The timestamp must be higher than the last request message
if (m.getTimestamp() <= s.getRequestTimestamp())
return abort(txn, s);
// The dependency, if any, must be the last remote message
if (isInvalidDependency(s, m.getGroupId(), m.getPreviousMessageId()))
return abort(txn, s);
// The message must be expected in the current state
boolean senderIsAlice = senderIsAlice(s, m);
if (senderIsAlice && s.getState() != B_DECLINED)
return abort(txn, s);
else if (!senderIsAlice && s.getState() != A_DECLINED)
return abort(txn, s);
// Mark the response visible in the UI
markMessageVisibleInUi(txn, m.getMessageId());
// Track the incoming message
messageTracker
.trackMessage(txn, m.getGroupId(), m.getTimestamp(), false);
// Forward ACCEPT message
Introducee i = getOtherIntroducee(s, m.getGroupId());
Message sent = sendAcceptMessage(txn, i, getLocalTimestamp(s, i),
m.getEphemeralPublicKey(), m.getAcceptTimestamp(),
m.getTransportProperties(), false);
Introducee introduceeA, introduceeB;
if (senderIsAlice) {
introduceeA = new Introducee(s.getIntroduceeA(), m.getMessageId());
introduceeB = new Introducee(s.getIntroduceeB(), sent);
} else {
introduceeA = new Introducee(s.getIntroduceeA(), sent);
introduceeB = new Introducee(s.getIntroduceeB(), m.getMessageId());
}
// Broadcast IntroductionResponseReceivedEvent
Author sender = senderIsAlice ? introduceeA.author : introduceeB.author;
broadcastIntroductionResponseReceivedEvent(txn, s, sender.getId(), m);
return new IntroducerSession(s.getSessionId(), START,
s.getRequestTimestamp(), introduceeA, introduceeB);
}
private IntroducerSession onRemoteDecline(Transaction txn,
IntroducerSession s, DeclineMessage m) throws DbException {
// The timestamp must be higher than the last request message
@@ -334,9 +378,8 @@ class IntroducerProtocolEngine
s.getRequestTimestamp(), introduceeA, introduceeB);
}
private IntroducerSession onRemoteResponseWhenDeclined(Transaction txn,
IntroducerSession s, AbstractIntroductionMessage m)
throws DbException {
private IntroducerSession onRemoteDeclineWhenDeclined(Transaction txn,
IntroducerSession s, DeclineMessage m) throws DbException {
// The timestamp must be higher than the last request message
if (m.getTimestamp() <= s.getRequestTimestamp())
return abort(txn, s);
@@ -356,12 +399,17 @@ class IntroducerProtocolEngine
messageTracker
.trackMessage(txn, m.getGroupId(), m.getTimestamp(), false);
// Forward DECLINE message
Introducee i = getOtherIntroducee(s, m.getGroupId());
long timestamp = getLocalTimestamp(s, i);
Message sent = sendDeclineMessage(txn, i, timestamp, false);
Introducee introduceeA, introduceeB;
if (senderIsAlice) {
introduceeA = new Introducee(s.getIntroduceeA(), m.getMessageId());
introduceeB = s.getIntroduceeB();
introduceeB = new Introducee(s.getIntroduceeB(), sent);
} else {
introduceeA = s.getIntroduceeA();
introduceeA = new Introducee(s.getIntroduceeA(), sent);
introduceeB = new Introducee(s.getIntroduceeB(), m.getMessageId());
}