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

Remove unused remote timestamp from session.

Browse Source
This commit is contained in:
akwizgran
2021-06-01 14:47:52 +01:00
committed by Torsten Grote
parent 37e95d4ce6
commit 4853bcd724
6 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/Session.java
View File

@@ -18,19 +18,17 @@ class Session {
@Nullable
private final KeyPair localKeyPair;
@Nullable
private final Long localTimestamp, remoteTimestamp;
private final Long localTimestamp;
@Nullable
private final KeySetId keySetId;
Session(State state, @Nullable MessageId lastLocalMessageId,
@Nullable KeyPair localKeyPair,
@Nullable Long localTimestamp, @Nullable Long remoteTimestamp,
@Nullable KeyPair localKeyPair, @Nullable Long localTimestamp,
@Nullable KeySetId keySetId) {
this.state = state;
this.lastLocalMessageId = lastLocalMessageId;
this.localKeyPair = localKeyPair;
this.localTimestamp = localTimestamp;
this.remoteTimestamp = remoteTimestamp;
this.keySetId = keySetId;
}
@@ -53,11 +51,6 @@ class Session {
return localTimestamp;
}
@Nullable
Long getRemoteTimestamp() {
return remoteTimestamp;
}
@Nullable
KeySetId getKeySetId() {
return keySetId;

2
bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionEncoderImpl.java
View File

@@ -19,7 +19,6 @@ import static org.briarproject.bramble.transport.agreement.TransportKeyAgreement
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_LOCAL_PRIVATE_KEY;
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_LOCAL_PUBLIC_KEY;
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_LOCAL_TIMESTAMP;
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_REMOTE_TIMESTAMP;
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_STATE;
@Immutable
@@ -49,7 +48,6 @@ class SessionEncoderImpl implements SessionEncoder {
localKeyPair.getPrivate().getEncoded());
}
putNullable(meta, SESSION_KEY_LOCAL_TIMESTAMP, s.getLocalTimestamp());
putNullable(meta, SESSION_KEY_REMOTE_TIMESTAMP, s.getRemoteTimestamp());
KeySetId keySetId = s.getKeySetId();
if (keySetId == null) meta.put(SESSION_KEY_KEY_SET_ID, NULL_VALUE);
else meta.put(SESSION_KEY_KEY_SET_ID, keySetId.getInt());

5
bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/SessionParserImpl.java
View File

@@ -17,7 +17,6 @@ import static org.briarproject.bramble.transport.agreement.TransportKeyAgreement
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_LOCAL_PRIVATE_KEY;
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_LOCAL_PUBLIC_KEY;
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_LOCAL_TIMESTAMP;
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_REMOTE_TIMESTAMP;
import static org.briarproject.bramble.transport.agreement.TransportKeyAgreementConstants.SESSION_KEY_STATE;
@Immutable
@@ -55,8 +54,6 @@ class SessionParserImpl implements SessionParser {
}
Long localTimestamp = meta.getOptionalLong(SESSION_KEY_LOCAL_TIMESTAMP);
Long remoteTimestamp =
meta.getOptionalLong(SESSION_KEY_REMOTE_TIMESTAMP);
KeySetId keySetId = null;
Long keySetIdLong = meta.getOptionalLong(SESSION_KEY_KEY_SET_ID);
@@ -65,6 +62,6 @@ class SessionParserImpl implements SessionParser {
}
return new Session(state, lastLocalMessageId, localKeyPair,
localTimestamp, remoteTimestamp, keySetId);
localTimestamp, keySetId);
}
}

1
bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementConstants.java
View File

@@ -16,7 +16,6 @@ interface TransportKeyAgreementConstants {
String SESSION_KEY_LOCAL_PUBLIC_KEY = "localPublicKey";
String SESSION_KEY_LOCAL_PRIVATE_KEY = "localPrivateKey";
String SESSION_KEY_LOCAL_TIMESTAMP = "localTimestamp";
String SESSION_KEY_REMOTE_TIMESTAMP = "remoteTimestamp";
String SESSION_KEY_KEY_SET_ID = "keySetId";
/**

8
bramble-core/src/main/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImpl.java
View File

@@ -236,7 +236,7 @@ class TransportKeyAgreementManagerImpl extends BdfIncomingMessageHook
KeySetId keySetId = requireNonNull(ss.session.getKeySetId());
keyManager.activateKeys(txn, singletonMap(t, keySetId));
Session session = new Session(ACTIVATED,
ss.session.getLastLocalMessageId(), null, null, null, null);
ss.session.getLastLocalMessageId(), null, null, null);
saveSession(txn, t, ss.storageId, session);
return ACCEPT_DO_NOT_SHARE;
} else {
@@ -266,7 +266,7 @@ class TransportKeyAgreementManagerImpl extends BdfIncomingMessageHook
Message activateMessage =
sendActivateMessage(txn, m.getGroupId(), t, keyMessage.getId());
Session session = new Session(AWAIT_ACTIVATE, activateMessage.getId(),
null, null, null, keySetId);
null, null, keySetId);
saveNewSession(txn, m.getGroupId(), t, session);
return ACCEPT_DO_NOT_SHARE;
}
@@ -294,7 +294,7 @@ class TransportKeyAgreementManagerImpl extends BdfIncomingMessageHook
Message activateMessage =
sendActivateMessage(txn, m.getGroupId(), t, previousMessageId);
Session session = new Session(AWAIT_ACTIVATE, activateMessage.getId(),
null, null, null, keySetId);
null, null, keySetId);
saveSession(txn, t, ss.storageId, session);
return ACCEPT_DO_NOT_SHARE;
}
@@ -305,7 +305,7 @@ class TransportKeyAgreementManagerImpl extends BdfIncomingMessageHook
Message keyMessage = sendKeyMessage(txn, contactGroupId, t,
localKeyPair.getPublic());
Session session = new Session(AWAIT_KEY, keyMessage.getId(),
localKeyPair, keyMessage.getTimestamp(), null, null);
localKeyPair, keyMessage.getTimestamp(), null);
saveNewSession(txn, contactGroupId, t, session);
}

18
bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementManagerImplTest.java
View File

@@ -270,7 +270,6 @@ public class TransportKeyAgreementManagerImplTest extends BrambleMockTestCase {
assertEquals(localKeyPair, savedSession.get().getLocalKeyPair());
assertEquals(Long.valueOf(localTimestamp),
savedSession.get().getLocalTimestamp());
assertNull(savedSession.get().getRemoteTimestamp());
assertNull(savedSession.get().getKeySetId());
}
@@ -289,8 +288,7 @@ public class TransportKeyAgreementManagerImplTest extends BrambleMockTestCase {
public void testAcceptsKeyMessageInAwaitKeyState() throws Exception {
Transaction txn = new Transaction(null, false);
Session loadedSession = new Session(AWAIT_KEY,
localKeyMessage.getId(), localKeyPair, localTimestamp,
null, null);
localKeyMessage.getId(), localKeyPair, localTimestamp, null);
AtomicReference<Session> savedSession = new AtomicReference<>();
context.checking(new Expectations() {{
@@ -355,7 +353,6 @@ public class TransportKeyAgreementManagerImplTest extends BrambleMockTestCase {
savedSession.get().getLastLocalMessageId());
assertNull(savedSession.get().getLocalKeyPair());
assertNull(savedSession.get().getLocalTimestamp());
assertNull(savedSession.get().getRemoteTimestamp());
assertEquals(keySetId, savedSession.get().getKeySetId());
}
@@ -438,21 +435,20 @@ public class TransportKeyAgreementManagerImplTest extends BrambleMockTestCase {
savedSession.get().getLastLocalMessageId());
assertNull(savedSession.get().getLocalKeyPair());
assertNull(savedSession.get().getLocalTimestamp());
assertNull(savedSession.get().getRemoteTimestamp());
assertEquals(keySetId, savedSession.get().getKeySetId());
}
@Test
public void testRejectsKeyMessageInAwaitActivateState() throws Exception {
Session loadedSession = new Session(AWAIT_ACTIVATE,
localActivateMessage.getId(), null, null, null, keySetId);
localActivateMessage.getId(), null, null, keySetId);
testRejectsKeyMessageWithExistingSession(loadedSession);
}
@Test
public void testRejectsKeyMessageInActivatedState() throws Exception {
Session loadedSession = new Session(ACTIVATED,
localActivateMessage.getId(), null, null, null, null);
localActivateMessage.getId(), null, null, null);
testRejectsKeyMessageWithExistingSession(loadedSession);
}
@@ -491,7 +487,7 @@ public class TransportKeyAgreementManagerImplTest extends BrambleMockTestCase {
throws Exception {
Transaction txn = new Transaction(null, false);
Session loadedSession = new Session(AWAIT_ACTIVATE,
localActivateMessage.getId(), null, null, null, keySetId);
localActivateMessage.getId(), null, null, keySetId);
AtomicReference<Session> savedSession = new AtomicReference<>();
context.checking(new Expectations() {{
@@ -528,7 +524,6 @@ public class TransportKeyAgreementManagerImplTest extends BrambleMockTestCase {
savedSession.get().getLastLocalMessageId());
assertNull(savedSession.get().getLocalKeyPair());
assertNull(savedSession.get().getLocalTimestamp());
assertNull(savedSession.get().getRemoteTimestamp());
assertNull(savedSession.get().getKeySetId());
}
@@ -552,15 +547,14 @@ public class TransportKeyAgreementManagerImplTest extends BrambleMockTestCase {
@Test
public void testRejectsActivateMessageInAwaitKeyState() throws Exception {
Session loadedSession = new Session(AWAIT_KEY,
localActivateMessage.getId(), localKeyPair, localTimestamp,
null, null);
localKeyMessage.getId(), localKeyPair, localTimestamp, null);
testRejectsActivateMessageWithExistingSession(loadedSession);
}
@Test
public void testRejectsActivateMessageInActivatedState() throws Exception {
Session loadedSession = new Session(ACTIVATED,
localActivateMessage.getId(), null, null, null, null);
localActivateMessage.getId(), null, null, null);
testRejectsActivateMessageWithExistingSession(loadedSession);
}