Page MenuHomePhabricator
Differential D10051

[identity] Move X3DH message types to auth proto
ClosedPublic
Actions

Authored by bartek on Nov 27 2023, 4:26 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 17, 9:05 PM
Unknown Object (File)
Thu, Apr 17, 1:01 AM
Unknown Object (File)
Wed, Apr 16, 11:24 PM
Unknown Object (File)
Wed, Apr 16, 10:00 PM
Unknown Object (File)
Wed, Apr 16, 11:41 AM
Unknown Object (File)
Wed, Apr 9, 11:26 AM
Unknown Object (File)
Mar 7 2025, 5:24 AM
Unknown Object (File)
Mar 7 2025, 12:42 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
Commits
rCOMMac49739d0cd7: [identity] Move X3DH message types to auth proto
Summary

Moved message types specific to GetOutboundKeys (these have been partially here already) and GetInboundKeys to the auth proto

Depends on D10050

Test Plan

Identity Service and clients still compile, I'm able to make successful RPC calls

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
keyserver/
addons/
rust-node-addon/
src/
identity_client/
6 lines
native/
native_rust_library/
src/
4 lines
services/
identity/
src/
grpc_services/
25 lines
8 lines
shared/
protos/
29 lines
29 lines

Diff 33723

View Options

keyserver/addons/rust-node-addon/src/identity_client/mod.rs

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import { getOlmUtility } from '../utils/olm-utils.js'; import { getOlmUtility } from '../utils/olm-utils.js';
describe('olm.Account', () => { describe('olm.Account', () => {
const alphabet = const alphabet =
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 '; 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 ';
const randomString = length => const randomString = (length: number) =>
Array.from( Array.from(
{ length }, { length },
() => alphabet[Math.floor(Math.random() * alphabet.length)], () => alphabet[Math.floor(Math.random() * alphabet.length)],
).join(''); ).join('');
const initAccount = (mark_prekey_published = true) => { const initAccount = (mark_prekey_published: boolean = true) => {
const account = new olm.Account(); const account = new olm.Account();
account.create(); account.create();
account.generate_prekey(); account.generate_prekey();
account.generate_one_time_keys(1); account.generate_one_time_keys(1);
if (mark_prekey_published) { if (mark_prekey_published) {
account.mark_prekey_as_published(); account.mark_prekey_as_published();
} }
return account; return account;
}; };
const createSession = ( const createSession = (
aliceSession, aliceSession: olm.Session,
aliceAccount, aliceAccount: olm.Account,
bobAccount, bobAccount: olm.Account,
regen = false, regen: boolean = false,
forget = false, forget: boolean = false,
invalid_sign = false, invalid_sign: boolean = false,
) => { ) => {
const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519; const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519;
bobAccount.mark_keys_as_published(); bobAccount.mark_keys_as_published();
const otk_id = Object.keys(bobOneTimeKeys)[0]; const otk_id = Object.keys(bobOneTimeKeys)[0];
if (regen) { if (regen) {
bobAccount.generate_prekey(); bobAccount.generate_prekey();
if (forget) { if (forget) {
Show All 38 Lines aliceSession.create_outbound(
String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]), String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]),
String(bobAccount.prekey_signature()), String(bobAccount.prekey_signature()),
bobOneTimeKeys[otk_id], bobOneTimeKeys[otk_id],
); );
return aliceSession; return aliceSession;
}; };
const testRatchet = (aliceSession, bobSession, bobAccount, num_msg = 1) => { const testRatchet = (
aliceSession: olm.Session,
bobSession: olm.Session,
bobAccount: olm.Account,
num_msg: number = 1,
) => {
let test_text = randomString(40); let test_text = randomString(40);
let encrypted = aliceSession.encrypt(test_text); let encrypted = aliceSession.encrypt(test_text);
expect(encrypted.type).toEqual(0); expect(encrypted.type).toEqual(0);
try { try {
bobSession.create_inbound(bobAccount, encrypted.body); bobSession.create_inbound(bobAccount, encrypted.body);
} catch (error) { } catch (error) {
expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID'); expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID');
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines
View Options

native/native_rust_library/src/lib.rs

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import { getOlmUtility } from '../utils/olm-utils.js'; import { getOlmUtility } from '../utils/olm-utils.js';
describe('olm.Account', () => { describe('olm.Account', () => {
const alphabet = const alphabet =
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 '; 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 ';
const randomString = length => const randomString = (length: number) =>
Array.from( Array.from(
{ length }, { length },
() => alphabet[Math.floor(Math.random() * alphabet.length)], () => alphabet[Math.floor(Math.random() * alphabet.length)],
).join(''); ).join('');
const initAccount = (mark_prekey_published = true) => { const initAccount = (mark_prekey_published: boolean = true) => {
const account = new olm.Account(); const account = new olm.Account();
account.create(); account.create();
account.generate_prekey(); account.generate_prekey();
account.generate_one_time_keys(1); account.generate_one_time_keys(1);
if (mark_prekey_published) { if (mark_prekey_published) {
account.mark_prekey_as_published(); account.mark_prekey_as_published();
} }
return account; return account;
}; };
const createSession = ( const createSession = (
aliceSession, aliceSession: olm.Session,
aliceAccount, aliceAccount: olm.Account,
bobAccount, bobAccount: olm.Account,
regen = false, regen: boolean = false,
forget = false, forget: boolean = false,
invalid_sign = false, invalid_sign: boolean = false,
) => { ) => {
const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519; const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519;
bobAccount.mark_keys_as_published(); bobAccount.mark_keys_as_published();
const otk_id = Object.keys(bobOneTimeKeys)[0]; const otk_id = Object.keys(bobOneTimeKeys)[0];
if (regen) { if (regen) {
bobAccount.generate_prekey(); bobAccount.generate_prekey();
if (forget) { if (forget) {
Show All 38 Lines aliceSession.create_outbound(
String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]), String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]),
String(bobAccount.prekey_signature()), String(bobAccount.prekey_signature()),
bobOneTimeKeys[otk_id], bobOneTimeKeys[otk_id],
); );
return aliceSession; return aliceSession;
}; };
const testRatchet = (aliceSession, bobSession, bobAccount, num_msg = 1) => { const testRatchet = (
aliceSession: olm.Session,
bobSession: olm.Session,
bobAccount: olm.Account,
num_msg: number = 1,
) => {
let test_text = randomString(40); let test_text = randomString(40);
let encrypted = aliceSession.encrypt(test_text); let encrypted = aliceSession.encrypt(test_text);
expect(encrypted.type).toEqual(0); expect(encrypted.type).toEqual(0);
try { try {
bobSession.create_inbound(bobAccount, encrypted.body); bobSession.create_inbound(bobAccount, encrypted.body);
} catch (error) { } catch (error) {
expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID'); expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID');
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines
View Options

services/identity/src/grpc_services/authenticated.rs

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import { getOlmUtility } from '../utils/olm-utils.js'; import { getOlmUtility } from '../utils/olm-utils.js';
describe('olm.Account', () => { describe('olm.Account', () => {
const alphabet = const alphabet =
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 '; 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 ';
const randomString = length => const randomString = (length: number) =>
Array.from( Array.from(
{ length }, { length },
() => alphabet[Math.floor(Math.random() * alphabet.length)], () => alphabet[Math.floor(Math.random() * alphabet.length)],
).join(''); ).join('');
const initAccount = (mark_prekey_published = true) => { const initAccount = (mark_prekey_published: boolean = true) => {
const account = new olm.Account(); const account = new olm.Account();
account.create(); account.create();
account.generate_prekey(); account.generate_prekey();
account.generate_one_time_keys(1); account.generate_one_time_keys(1);
if (mark_prekey_published) { if (mark_prekey_published) {
account.mark_prekey_as_published(); account.mark_prekey_as_published();
} }
return account; return account;
}; };
const createSession = ( const createSession = (
aliceSession, aliceSession: olm.Session,
aliceAccount, aliceAccount: olm.Account,
bobAccount, bobAccount: olm.Account,
regen = false, regen: boolean = false,
forget = false, forget: boolean = false,
invalid_sign = false, invalid_sign: boolean = false,
) => { ) => {
const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519; const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519;
bobAccount.mark_keys_as_published(); bobAccount.mark_keys_as_published();
const otk_id = Object.keys(bobOneTimeKeys)[0]; const otk_id = Object.keys(bobOneTimeKeys)[0];
if (regen) { if (regen) {
bobAccount.generate_prekey(); bobAccount.generate_prekey();
if (forget) { if (forget) {
Show All 38 Lines aliceSession.create_outbound(
String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]), String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]),
String(bobAccount.prekey_signature()), String(bobAccount.prekey_signature()),
bobOneTimeKeys[otk_id], bobOneTimeKeys[otk_id],
); );
return aliceSession; return aliceSession;
}; };
const testRatchet = (aliceSession, bobSession, bobAccount, num_msg = 1) => { const testRatchet = (
aliceSession: olm.Session,
bobSession: olm.Session,
bobAccount: olm.Account,
num_msg: number = 1,
) => {
let test_text = randomString(40); let test_text = randomString(40);
let encrypted = aliceSession.encrypt(test_text); let encrypted = aliceSession.encrypt(test_text);
expect(encrypted.type).toEqual(0); expect(encrypted.type).toEqual(0);
try { try {
bobSession.create_inbound(bobAccount, encrypted.body); bobSession.create_inbound(bobAccount, encrypted.body);
} catch (error) { } catch (error) {
expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID'); expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID');
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines
View Options

services/identity/src/grpc_utils.rs

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import { getOlmUtility } from '../utils/olm-utils.js'; import { getOlmUtility } from '../utils/olm-utils.js';
describe('olm.Account', () => { describe('olm.Account', () => {
const alphabet = const alphabet =
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 '; 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 ';
const randomString = length => const randomString = (length: number) =>
Array.from( Array.from(
{ length }, { length },
() => alphabet[Math.floor(Math.random() * alphabet.length)], () => alphabet[Math.floor(Math.random() * alphabet.length)],
).join(''); ).join('');
const initAccount = (mark_prekey_published = true) => { const initAccount = (mark_prekey_published: boolean = true) => {
const account = new olm.Account(); const account = new olm.Account();
account.create(); account.create();
account.generate_prekey(); account.generate_prekey();
account.generate_one_time_keys(1); account.generate_one_time_keys(1);
if (mark_prekey_published) { if (mark_prekey_published) {
account.mark_prekey_as_published(); account.mark_prekey_as_published();
} }
return account; return account;
}; };
const createSession = ( const createSession = (
aliceSession, aliceSession: olm.Session,
aliceAccount, aliceAccount: olm.Account,
bobAccount, bobAccount: olm.Account,
regen = false, regen: boolean = false,
forget = false, forget: boolean = false,
invalid_sign = false, invalid_sign: boolean = false,
) => { ) => {
const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519; const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519;
bobAccount.mark_keys_as_published(); bobAccount.mark_keys_as_published();
const otk_id = Object.keys(bobOneTimeKeys)[0]; const otk_id = Object.keys(bobOneTimeKeys)[0];
if (regen) { if (regen) {
bobAccount.generate_prekey(); bobAccount.generate_prekey();
if (forget) { if (forget) {
Show All 38 Lines aliceSession.create_outbound(
String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]), String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]),
String(bobAccount.prekey_signature()), String(bobAccount.prekey_signature()),
bobOneTimeKeys[otk_id], bobOneTimeKeys[otk_id],
); );
return aliceSession; return aliceSession;
}; };
const testRatchet = (aliceSession, bobSession, bobAccount, num_msg = 1) => { const testRatchet = (
aliceSession: olm.Session,
bobSession: olm.Session,
bobAccount: olm.Account,
num_msg: number = 1,
) => {
let test_text = randomString(40); let test_text = randomString(40);
let encrypted = aliceSession.encrypt(test_text); let encrypted = aliceSession.encrypt(test_text);
expect(encrypted.type).toEqual(0); expect(encrypted.type).toEqual(0);
try { try {
bobSession.create_inbound(bobAccount, encrypted.body); bobSession.create_inbound(bobAccount, encrypted.body);
} catch (error) { } catch (error) {
expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID'); expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID');
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines
View Options

shared/protos/identity_authenticated.proto

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import { getOlmUtility } from '../utils/olm-utils.js'; import { getOlmUtility } from '../utils/olm-utils.js';
describe('olm.Account', () => { describe('olm.Account', () => {
const alphabet = const alphabet =
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 '; 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 ';
const randomString = length => const randomString = (length: number) =>
Array.from( Array.from(
{ length }, { length },
() => alphabet[Math.floor(Math.random() * alphabet.length)], () => alphabet[Math.floor(Math.random() * alphabet.length)],
).join(''); ).join('');
const initAccount = (mark_prekey_published = true) => { const initAccount = (mark_prekey_published: boolean = true) => {
const account = new olm.Account(); const account = new olm.Account();
account.create(); account.create();
account.generate_prekey(); account.generate_prekey();
account.generate_one_time_keys(1); account.generate_one_time_keys(1);
if (mark_prekey_published) { if (mark_prekey_published) {
account.mark_prekey_as_published(); account.mark_prekey_as_published();
} }
return account; return account;
}; };
const createSession = ( const createSession = (
aliceSession, aliceSession: olm.Session,
aliceAccount, aliceAccount: olm.Account,
bobAccount, bobAccount: olm.Account,
regen = false, regen: boolean = false,
forget = false, forget: boolean = false,
invalid_sign = false, invalid_sign: boolean = false,
) => { ) => {
const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519; const bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519;
bobAccount.mark_keys_as_published(); bobAccount.mark_keys_as_published();
const otk_id = Object.keys(bobOneTimeKeys)[0]; const otk_id = Object.keys(bobOneTimeKeys)[0];
if (regen) { if (regen) {
bobAccount.generate_prekey(); bobAccount.generate_prekey();
if (forget) { if (forget) {
Show All 38 Lines aliceSession.create_outbound(
String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]), String(Object.values(JSON.parse(bobAccount.prekey()).curve25519)[0]),
String(bobAccount.prekey_signature()), String(bobAccount.prekey_signature()),
bobOneTimeKeys[otk_id], bobOneTimeKeys[otk_id],
); );
return aliceSession; return aliceSession;
}; };
const testRatchet = (aliceSession, bobSession, bobAccount, num_msg = 1) => { const testRatchet = (
aliceSession: olm.Session,
bobSession: olm.Session,
bobAccount: olm.Account,
num_msg: number = 1,
) => {
let test_text = randomString(40); let test_text = randomString(40);
let encrypted = aliceSession.encrypt(test_text); let encrypted = aliceSession.encrypt(test_text);
expect(encrypted.type).toEqual(0); expect(encrypted.type).toEqual(0);
try { try {
bobSession.create_inbound(bobAccount, encrypted.body); bobSession.create_inbound(bobAccount, encrypted.body);
} catch (error) { } catch (error) {
expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID'); expect(error.message).toBe('OLM.BAD_MESSAGE_KEY_ID');
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines
View Options

shared/protos/identity_client.proto

Loading...