keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

rename SessionReset -> SessionRequest

Browse Source
pull/1166/head
Audric Ackermann 5 years ago
parent 2b58aff532
commit 7a797737e0
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
9 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
ts/session/crypto/MessageEncrypter.ts
Unescape Escape View File

@ -50,7 +50,7 @@ export async function encrypt(
}
let innerCipherText: CipherTextObject;
if (encryptionType === EncryptionType.SessionReset) {
if (encryptionType === EncryptionType.SessionRequest) {
const cipher = new libloki.crypto.FallBackSessionCipher(address);
innerCipherText = await cipher.encrypt(plainText.buffer);
} else {

4
ts/session/messages/outgoing/content/EndSessionMessage.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { SessionResetMessage } from './SessionResetMessage';
import { SessionRequestMessage } from './SessionRequestMessage';
import { SignalService } from '../../../../protobuf';
export class EndSessionMessage extends SessionResetMessage {
export class EndSessionMessage extends SessionRequestMessage {
public ttl(): number {
return 4 * 24 * 60 * 60 * 1000; // 4 days
}

6
ts/session/messages/outgoing/content/SessionResetMessage.ts → ts/session/messages/outgoing/content/SessionRequestMessage.ts
Unescape Escape View File

@ -12,14 +12,14 @@ export interface PreKeyBundleType {
signature: Uint8Array;
}
interface SessionResetParams extends MessageParams {
interface SessionRequestParams extends MessageParams {
preKeyBundle: PreKeyBundleType;
}
export class SessionResetMessage extends ContentMessage {
export class SessionRequestMessage extends ContentMessage {
private readonly preKeyBundle: PreKeyBundleType;
constructor(params: SessionResetParams) {
constructor(params: SessionRequestParams) {
super({ timestamp: params.timestamp, identifier: params.identifier });
this.preKeyBundle = params.preKeyBundle;
}

2
ts/session/messages/outgoing/content/index.ts
Unescape Escape View File

@ -1,7 +1,7 @@
export * from './ContentMessage';
export * from './EndSessionMessage';
export * from './SessionEstablishedMessage';
export * from './SessionResetMessage';
export * from './SessionRequestMessage';
export * from './TypingMessage';
export * from './data';
export * from './link';

19
ts/session/protocols/SessionProtocol.ts
Unescape Escape View File

@ -1,4 +1,4 @@
import { SessionResetMessage } from '../messages/outgoing';
import { SessionRequestMessage } from '../messages/outgoing';
// import { MessageSender } from '../sending';
import { createOrUpdateItem, getItemById } from '../../../js/modules/data';
import { libloki, libsignal, textsecure } from '../../window';
@ -74,7 +74,7 @@ export class SessionProtocol {
}
/**
* Triggers a SessionResetMessage to be sent if:
* Triggers a SessionRequestMessage to be sent if:
* - we do not already have a session and
* - we did not sent a session request already to that device and
* - we do not have a session request currently being send to that device
@ -93,7 +93,7 @@ export class SessionProtocol {
pubkey.key
);
const sessionReset = new SessionResetMessage({
const sessionReset = new SessionRequestMessage({
preKeyBundle,
timestamp: Date.now(),
});
@ -101,13 +101,17 @@ export class SessionProtocol {
try {
await SessionProtocol.sendSessionRequest(sessionReset, pubkey);
} catch (error) {
window.console.warn('Failed to send session request to:', pubkey.key, error);
window.console.warn(
'Failed to send session request to:',
pubkey.key,
error
);
}
}
/** */
public static async sendSessionRequest(
message: SessionResetMessage,
message: SessionRequestMessage,
pubkey: PubKey
): Promise<void> {
const timestamp = Date.now();
@ -151,7 +155,10 @@ export class SessionProtocol {
}
public static async onSessionRequestProcessed(pubkey: PubKey) {
return SessionProtocol.updateProcessedSessionTimestamp(pubkey.key, Date.now());
return SessionProtocol.updateProcessedSessionTimestamp(
pubkey.key,
Date.now()
);
}
public static reset() {

2
ts/session/types/EncryptionType.ts
Unescape Escape View File

@ -1,5 +1,5 @@
export enum EncryptionType {
Signal,
SessionReset,
SessionRequest,
MediumGroup,
}

18
ts/test/session/crypto/MessageEncrypter_test.ts
Unescape Escape View File

@ -59,14 +59,18 @@ describe('MessageEncrypter', () => {
});
});
describe('SessionReset', () => {
describe('SessionRequest', () => {
it('should call FallbackSessionCipher encrypt', async () => {
const data = crypto.randomBytes(10);
const spy = sandbox.spy(
Stubs.FallBackSessionCipherStub.prototype,
'encrypt'
);
await MessageEncrypter.encrypt('1', data, EncryptionType.SessionReset);
await MessageEncrypter.encrypt(
'1',
data,
EncryptionType.SessionRequest
);
expect(spy.called).to.equal(
true,
'FallbackSessionCipher.encrypt should be called.'
@ -79,7 +83,11 @@ describe('MessageEncrypter', () => {
Stubs.FallBackSessionCipherStub.prototype,
'encrypt'
);
await MessageEncrypter.encrypt('1', data, EncryptionType.SessionReset);
await MessageEncrypter.encrypt(
'1',
data,
EncryptionType.SessionRequest
);
const paddedData = MessageEncrypter.padPlainTextBuffer(data);
const firstArgument = new Uint8Array(spy.args[0][0]);
@ -91,7 +99,7 @@ describe('MessageEncrypter', () => {
const result = await MessageEncrypter.encrypt(
'1',
data,
EncryptionType.SessionReset
EncryptionType.SessionRequest
);
expect(result.envelopeType).to.deep.equal(
SignalService.Envelope.Type.UNIDENTIFIED_SENDER
@ -136,7 +144,7 @@ describe('MessageEncrypter', () => {
describe('Sealed Sender', () => {
it('should pass the correct values to SecretSessionCipher encrypt', async () => {
const types = [EncryptionType.SessionReset, EncryptionType.Signal];
const types = [EncryptionType.SessionRequest, EncryptionType.Signal];
for (const type of types) {
const spy = sandbox.spy(
Stubs.SecretSessionCipherStub.prototype,

8
ts/test/session/messages/SessionResetMessage_test.ts
Unescape Escape View File

@ -1,12 +1,12 @@
import { expect } from 'chai';
import { beforeEach } from 'mocha';
import { SessionResetMessage } from '../../../session/messages/outgoing';
import { SessionRequestMessage } from '../../../session/messages/outgoing';
import { SignalService } from '../../../protobuf';
import { TextDecoder, TextEncoder } from 'util';
describe('SessionResetMessage', () => {
let message: SessionResetMessage;
describe('SessionRequestMessage', () => {
let message: SessionRequestMessage;
const preKeyBundle = {
deviceId: 123456,
preKeyId: 654321,
@ -19,7 +19,7 @@ describe('SessionResetMessage', () => {
beforeEach(() => {
const timestamp = Date.now();
message = new SessionResetMessage({ timestamp, preKeyBundle });
message = new SessionRequestMessage({ timestamp, preKeyBundle });
});
it('has a preKeyBundle', () => {

24
ts/test/session/protocols/SessionProtocol_test.ts
Unescape Escape View File

@ -3,7 +3,7 @@ import { SessionProtocol } from '../../../session/protocols';
import * as sinon from 'sinon';
import { Stubs, TestUtils, timeout } from '../../test-utils';
import { UserUtil } from '../../../util';
import { SessionResetMessage } from '../../../session/messages/outgoing';
import { SessionRequestMessage } from '../../../session/messages/outgoing';
import { TextEncoder } from 'util';
import { MessageSender } from '../../../session/sending';
import { PubKey } from '../../../session/types';
@ -16,7 +16,7 @@ describe('SessionProtocol', () => {
let getItemById: sinon.SinonStub;
let send: sinon.SinonStub;
const resetMessage: SessionResetMessage = new SessionResetMessage({
const resetMessage: SessionRequestMessage = new SessionRequestMessage({
timestamp: Date.now(),
preKeyBundle: {
identityKey: new TextEncoder().encode('identityKey'),
@ -117,7 +117,10 @@ describe('SessionProtocol', () => {
it('protocol: onSessionEstablished should remove the device in sentTimestamps and ONLY that one', async () => {
// add a second item to the map
await SessionProtocol.sendSessionRequest(resetMessage, new PubKey('deviceid2'));
await SessionProtocol.sendSessionRequest(
resetMessage,
new PubKey('deviceid2')
);
expect(SessionProtocol.getSentSessionsTimestamp()).to.have.property(
'deviceid'
@ -231,10 +234,7 @@ describe('SessionProtocol', () => {
it('protocol: shouldProcessSessionRequest returns true if timestamp is more recent than processed timestamp', async () => {
await SessionProtocol.onSessionRequestProcessed(pubkey); // adds a Date.now() entry
expect(
SessionProtocol.shouldProcessSessionRequest(
pubkey,
Date.now() + 1000
)
SessionProtocol.shouldProcessSessionRequest(pubkey, Date.now() + 1000)
).to.be.eventually.equal(
true,
'shouldProcessSessionRequest should return true when existingProcessed is less recent'
@ -273,10 +273,7 @@ describe('SessionProtocol', () => {
it('protocol: shouldProcessSessionRequest returns true if timestamp is more recent than current sent timestamp', async () => {
await SessionProtocol.sendSessionRequest(resetMessage, pubkey); // adds a Date.now() entry
expect(
SessionProtocol.shouldProcessSessionRequest(
pubkey,
Date.now() + 1000
)
SessionProtocol.shouldProcessSessionRequest(pubkey, Date.now() + 1000)
).to.be.eventually.equal(
true,
'shouldProcessSessionRequest should return true when existingSent is less recent'
@ -322,10 +319,7 @@ describe('SessionProtocol', () => {
await SessionProtocol.onSessionRequestProcessed(pubkey); // adds a Date.now() entry
await SessionProtocol.sendSessionRequest(resetMessage, pubkey); // adds a Date.now() entry
expect(
SessionProtocol.shouldProcessSessionRequest(
pubkey,
Date.now() + 1000
)
SessionProtocol.shouldProcessSessionRequest(pubkey, Date.now() + 1000)
).to.be.eventually.equal(
true,
'shouldProcessSessionRequest should return true if there if both processed and sent are set but are older'

Write Preview
Loading…
Cancel
Save