Page MenuHomePhorge
Files F32563448

D11314.1767354324.diff
No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

D11314.1767354324.diff
View Options

diff --git a/keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js b/keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js
--- a/keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js
+++ b/keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js
@@ -77,6 +77,7 @@
): boolean;
encrypt(plaintext: string): EncryptResult;
decrypt(message_type: number, message: string): string;
+ decrypt_sequential(message_type: number, message: string): string;
describe(): string;
}
diff --git a/keyserver/src/utils/olm-utils.test.js b/keyserver/src/utils/olm-utils.test.js
--- a/keyserver/src/utils/olm-utils.test.js
+++ b/keyserver/src/utils/olm-utils.test.js
@@ -113,6 +113,11 @@
decrypted = aliceSession.decrypt(encrypted.type, encrypted.body);
expect(decrypted).toEqual(test_text);
+ const aliceEncrypted = aliceSession.encrypt(test_text);
+ expect(() =>
+ aliceSession.decrypt(aliceEncrypted.type, aliceEncrypted.body),
+ ).toThrow('OLM.BAD_MESSAGE_MAC');
+
for (let index = 1; index < num_msg; index++) {
test_text = randomString(40);
encrypted = aliceSession.encrypt(test_text);
@@ -127,6 +132,75 @@
expect(decrypted).toEqual(test_text);
}
+ expect(() =>
+ aliceSession.decrypt_sequential(encrypted.type, encrypted.body),
+ ).toThrow('OLM.OLM_ALREADY_DECRYPTED_OR_KEYS_SKIPPED');
+
+ return true;
+ };
+
+ const testRatchetSequential = (
+ aliceSession: olm.Session,
+ bobSession: olm.Session,
+ bobAccount: olm.Account,
+ ) => {
+ let test_text = randomString(40);
+ let encrypted = aliceSession.encrypt(test_text);
+ expect(encrypted.type).toEqual(0);
+
+ try {
+ bobSession.create_inbound(bobAccount, encrypted.body);
+ } catch (error) {
+ expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID');
+ return false;
+ }
+
+ bobAccount.remove_one_time_keys(bobSession);
+ let decrypted = bobSession.decrypt(encrypted.type, encrypted.body);
+ expect(decrypted).toEqual(test_text);
+
+ test_text = randomString(40);
+ encrypted = bobSession.encrypt(test_text);
+ expect(encrypted.type).toEqual(1);
+ decrypted = aliceSession.decrypt(encrypted.type, encrypted.body);
+ expect(decrypted).toEqual(test_text);
+
+ const testText1 = 'message1';
+ const encrypted1 = bobSession.encrypt(testText1);
+ const testText2 = 'message2';
+ const encrypted2 = bobSession.encrypt(testText2);
+
+ // encrypt message using alice session and trying to decrypt with
+ // the same session => `BAD_MESSAGE_MAC`
+ const aliceEncrypted = aliceSession.encrypt(test_text);
+ expect(() =>
+ aliceSession.decrypt_sequential(aliceEncrypted.type, aliceEncrypted.body),
+ ).toThrow('OLM.BAD_MESSAGE_MAC');
+
+ // decrypting encrypted2 before encrypted1 using
+ // decrypt_sequential() => OLM_MESSAGE_OUT_OF_ORDER
+ expect(() =>
+ aliceSession.decrypt_sequential(encrypted2.type, encrypted2.body),
+ ).toThrow('OLM.OLM_MESSAGE_OUT_OF_ORDER');
+
+ // test correct order
+ const decrypted1 = aliceSession.decrypt_sequential(
+ encrypted1.type,
+ encrypted1.body,
+ );
+ expect(decrypted1).toEqual(testText1);
+ const decrypted2 = aliceSession.decrypt_sequential(
+ encrypted2.type,
+ encrypted2.body,
+ );
+ expect(decrypted2).toEqual(testText2);
+
+ // try to decrypt second time
+ // the same message => OLM_ALREADY_DECRYPTED_OR_KEYS_SKIPPED
+ expect(() =>
+ aliceSession.decrypt_sequential(encrypted2.type, encrypted2.body),
+ ).toThrow('OLM.OLM_ALREADY_DECRYPTED_OR_KEYS_SKIPPED');
+
return true;
};
@@ -177,6 +251,18 @@
expect(testRatchet(aliceSession, bobSession, bobAccount)).toBeTrue;
});
+ it('should encrypt and decrypt sequential', async () => {
+ await olm.init();
+ const aliceAccount = initAccount();
+ const bobAccount = initAccount();
+ const aliceSession = new olm.Session();
+ const bobSession = new olm.Session();
+
+ createSession(aliceSession, aliceAccount, bobAccount);
+ expect(testRatchetSequential(aliceSession, bobSession, bobAccount))
+ .toBeTrue;
+ });
+
it('should encrypt and decrypt, even after a prekey is rotated', async () => {
await olm.init();
const aliceAccount = initAccount();
diff --git a/lib/flow-typed/npm/@commapp/olm_vx.x.x.js b/lib/flow-typed/npm/@commapp/olm_vx.x.x.js
--- a/lib/flow-typed/npm/@commapp/olm_vx.x.x.js
+++ b/lib/flow-typed/npm/@commapp/olm_vx.x.x.js
@@ -77,6 +77,7 @@
): boolean;
encrypt(plaintext: string): EncryptResult;
decrypt(message_type: number, message: string): string;
+ decrypt_sequential(message_type: number, message: string): string;
describe(): string;
}
diff --git a/web/flow-typed/npm/@commapp/olm_vx.x.x.js b/web/flow-typed/npm/@commapp/olm_vx.x.x.js
--- a/web/flow-typed/npm/@commapp/olm_vx.x.x.js
+++ b/web/flow-typed/npm/@commapp/olm_vx.x.x.js
@@ -77,6 +77,7 @@
): boolean;
encrypt(plaintext: string): EncryptResult;
decrypt(message_type: number, message: string): string;
+ decrypt_sequential(message_type: number, message: string): string;
describe(): string;
}

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 2, 11:45 AM (4 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5879434
Default Alt Text
D11314.1767354324.diff (5 KB)

Event Timeline