Page MenuHomePhabricator
Differential D8657

[native] add CommRustModule implementation
ClosedPublic
Actions

Authored by kamil on Jul 28 2023, 9:54 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 21, 1:30 PM
Unknown Object (File)
Mon, Apr 21, 3:38 AM
Unknown Object (File)
Mon, Apr 21, 12:34 AM
Unknown Object (File)
Mon, Apr 21, 12:04 AM
Unknown Object (File)
Sun, Apr 20, 11:33 PM
Unknown Object (File)
Sun, Apr 20, 3:41 AM
Unknown Object (File)
Wed, Apr 9, 1:09 AM
Unknown Object (File)
Tue, Apr 8, 10:48 PM
View All Files
Subscribers
ashoat

Details

Reviewers
bartek
michal
tomek
varun
Commits
rCOMM1cf20e92d07a: [native] add CommRustModule implementation
Summary

ENG-4232

Creating a separate module for Rust API. This is a part of CommCoreModule refactor.

Methods implementation is a copy from CommCoreModule (but without changes to CommCoreModule yet).

Depends on D8656

Test Plan

Build Android nad iOS

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Jul 28 2023, 9:54 AM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptJul 28 2023, 9:54 AM
kamil added a child revision: D8658: [native] install CommRustModule.Jul 28 2023, 9:55 AM
kamil published this revision for review.Jul 28 2023, 10:21 AM
Harbormaster failed remote builds in B21309: Diff 29185!Jul 28 2023, 10:41 AM
bartek accepted this revision.Jul 31 2023, 2:46 AM
This revision is now accepted and ready to land.Jul 31 2023, 2:46 AM
kamil updated this revision to Diff 29289.Jul 31 2023, 8:52 AM

rebase

Harbormaster completed remote builds in B21377: Diff 29289.Jul 31 2023, 10:14 AM
kamil updated this revision to Diff 29408.Aug 1 2023, 1:25 AM

rebase once more

Harbormaster completed remote builds in B21446: Diff 29408.Aug 1 2023, 1:45 AM
Closed by commit rCOMM1cf20e92d07a: [native] add CommRustModule implementation (authored by kamil). · Explain WhyAug 1 2023, 2:17 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM1cf20e92d07a: [native] add CommRustModule implementation.
kamil mentioned this in D8692: [native] fix Xcode dependencies order.Aug 1 2023, 2:38 AM
kamil mentioned this in rCOMM6ec64752932e: [native] fix Xcode dependencies order.Aug 1 2023, 3:04 AM
tomek mentioned this in D10449: [native] Expose get keyserver keys Identity RPC.Dec 22 2023, 7:18 AM

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
2 lines
57 lines
176 lines
ios/
Comm.xcodeproj/
6 lines

Diff 29185

View Options

native/cpp/CommonCpp/NativeModules/CMakeLists.txt

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import type { import type {
Account as OlmAccount, Account as OlmAccount,
Utility as OlmUtility, Utility as OlmUtility,
Session as OlmSession,
} from '@commapp/olm'; } from '@commapp/olm';
import uuid from 'uuid'; import uuid from 'uuid';
type PickledOlmAccount = { type PickledOlmAccount = {
+picklingKey: string, +picklingKey: string,
+pickledAccount: string, +pickledAccount: string,
}; };
Show All 22 Lines): Promise<OlmAccount> {
account.unpickle( account.unpickle(
pickledOlmAccount.picklingKey, pickledOlmAccount.picklingKey,
pickledOlmAccount.pickledAccount, pickledOlmAccount.pickledAccount,
); );
return account; return account;
} }
async function createPickledOlmSession(
account: OlmAccount,
accountPicklingKey: string,
initialEncryptedMessage: string,
): Promise<string> {
await olm.init();
const session = new olm.Session();
session.create_inbound(account, initialEncryptedMessage);
account.remove_one_time_keys(session);
session.decrypt(0, initialEncryptedMessage);
ashoatUnsubmitted
Not Done
Inline Actions

Let's avoid passing constants as number literals like this. Instead, please define something like eg. threadTypes, so that this code is more "readable" at the callsite (eg. we would see something like olmMessageTypes.TEXT or something)

ashoat: Let's avoid passing constants as number literals like this. Instead, please define something…
return session.pickle(accountPicklingKey);
}
async function unpickleOlmSession(
pickledSession: string,
picklingKey: string,
): Promise<OlmSession> {
await olm.init();
const session = new olm.Session();
session.unpickle(picklingKey, pickledSession);
return session;
}
let cachedOLMUtility: OlmUtility; let cachedOLMUtility: OlmUtility;
function getOlmUtility(): OlmUtility { function getOlmUtility(): OlmUtility {
if (cachedOLMUtility) { if (cachedOLMUtility) {
return cachedOLMUtility; return cachedOLMUtility;
} }
cachedOLMUtility = new olm.Utility(); cachedOLMUtility = new olm.Utility();
return cachedOLMUtility; return cachedOLMUtility;
} }
Show All 26 Lines if (
currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge
) { ) {
account.forget_old_prekey(); account.forget_old_prekey();
} }
} }
export { export {
createPickledOlmAccount, createPickledOlmAccount,
createPickledOlmSession,
getOlmUtility, getOlmUtility,
unpickleOlmAccount, unpickleOlmAccount,
unpickleOlmSession,
validateAccountPrekey, validateAccountPrekey,
}; };
View Options

native/cpp/CommonCpp/NativeModules/CommRustModule.h

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import type { import type {
Account as OlmAccount, Account as OlmAccount,
Utility as OlmUtility, Utility as OlmUtility,
Session as OlmSession,
} from '@commapp/olm'; } from '@commapp/olm';
import uuid from 'uuid'; import uuid from 'uuid';
type PickledOlmAccount = { type PickledOlmAccount = {
+picklingKey: string, +picklingKey: string,
+pickledAccount: string, +pickledAccount: string,
}; };
Show All 22 Lines): Promise<OlmAccount> {
account.unpickle( account.unpickle(
pickledOlmAccount.picklingKey, pickledOlmAccount.picklingKey,
pickledOlmAccount.pickledAccount, pickledOlmAccount.pickledAccount,
); );
return account; return account;
} }
async function createPickledOlmSession(
account: OlmAccount,
accountPicklingKey: string,
initialEncryptedMessage: string,
): Promise<string> {
await olm.init();
const session = new olm.Session();
session.create_inbound(account, initialEncryptedMessage);
account.remove_one_time_keys(session);
session.decrypt(0, initialEncryptedMessage);
ashoatUnsubmitted
Not Done
Inline Actions

Let's avoid passing constants as number literals like this. Instead, please define something like eg. threadTypes, so that this code is more "readable" at the callsite (eg. we would see something like olmMessageTypes.TEXT or something)

ashoat: Let's avoid passing constants as number literals like this. Instead, please define something…
return session.pickle(accountPicklingKey);
}
async function unpickleOlmSession(
pickledSession: string,
picklingKey: string,
): Promise<OlmSession> {
await olm.init();
const session = new olm.Session();
session.unpickle(picklingKey, pickledSession);
return session;
}
let cachedOLMUtility: OlmUtility; let cachedOLMUtility: OlmUtility;
function getOlmUtility(): OlmUtility { function getOlmUtility(): OlmUtility {
if (cachedOLMUtility) { if (cachedOLMUtility) {
return cachedOLMUtility; return cachedOLMUtility;
} }
cachedOLMUtility = new olm.Utility(); cachedOLMUtility = new olm.Utility();
return cachedOLMUtility; return cachedOLMUtility;
} }
Show All 26 Lines if (
currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge
) { ) {
account.forget_old_prekey(); account.forget_old_prekey();
} }
} }
export { export {
createPickledOlmAccount, createPickledOlmAccount,
createPickledOlmSession,
getOlmUtility, getOlmUtility,
unpickleOlmAccount, unpickleOlmAccount,
unpickleOlmSession,
validateAccountPrekey, validateAccountPrekey,
}; };
View Options

native/cpp/CommonCpp/NativeModules/CommRustModule.cpp

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import type { import type {
Account as OlmAccount, Account as OlmAccount,
Utility as OlmUtility, Utility as OlmUtility,
Session as OlmSession,
} from '@commapp/olm'; } from '@commapp/olm';
import uuid from 'uuid'; import uuid from 'uuid';
type PickledOlmAccount = { type PickledOlmAccount = {
+picklingKey: string, +picklingKey: string,
+pickledAccount: string, +pickledAccount: string,
}; };
Show All 22 Lines): Promise<OlmAccount> {
account.unpickle( account.unpickle(
pickledOlmAccount.picklingKey, pickledOlmAccount.picklingKey,
pickledOlmAccount.pickledAccount, pickledOlmAccount.pickledAccount,
); );
return account; return account;
} }
async function createPickledOlmSession(
account: OlmAccount,
accountPicklingKey: string,
initialEncryptedMessage: string,
): Promise<string> {
await olm.init();
const session = new olm.Session();
session.create_inbound(account, initialEncryptedMessage);
account.remove_one_time_keys(session);
session.decrypt(0, initialEncryptedMessage);
ashoatUnsubmitted
Not Done
Inline Actions

Let's avoid passing constants as number literals like this. Instead, please define something like eg. threadTypes, so that this code is more "readable" at the callsite (eg. we would see something like olmMessageTypes.TEXT or something)

ashoat: Let's avoid passing constants as number literals like this. Instead, please define something…
return session.pickle(accountPicklingKey);
}
async function unpickleOlmSession(
pickledSession: string,
picklingKey: string,
): Promise<OlmSession> {
await olm.init();
const session = new olm.Session();
session.unpickle(picklingKey, pickledSession);
return session;
}
let cachedOLMUtility: OlmUtility; let cachedOLMUtility: OlmUtility;
function getOlmUtility(): OlmUtility { function getOlmUtility(): OlmUtility {
if (cachedOLMUtility) { if (cachedOLMUtility) {
return cachedOLMUtility; return cachedOLMUtility;
} }
cachedOLMUtility = new olm.Utility(); cachedOLMUtility = new olm.Utility();
return cachedOLMUtility; return cachedOLMUtility;
} }
Show All 26 Lines if (
currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge
) { ) {
account.forget_old_prekey(); account.forget_old_prekey();
} }
} }
export { export {
createPickledOlmAccount, createPickledOlmAccount,
createPickledOlmSession,
getOlmUtility, getOlmUtility,
unpickleOlmAccount, unpickleOlmAccount,
unpickleOlmSession,
validateAccountPrekey, validateAccountPrekey,
}; };
View Options

native/ios/Comm.xcodeproj/project.pbxproj

// @flow // @flow
import olm from '@commapp/olm'; import olm from '@commapp/olm';
import type { import type {
Account as OlmAccount, Account as OlmAccount,
Utility as OlmUtility, Utility as OlmUtility,
Session as OlmSession,
} from '@commapp/olm'; } from '@commapp/olm';
import uuid from 'uuid'; import uuid from 'uuid';
type PickledOlmAccount = { type PickledOlmAccount = {
+picklingKey: string, +picklingKey: string,
+pickledAccount: string, +pickledAccount: string,
}; };
Show All 22 Lines): Promise<OlmAccount> {
account.unpickle( account.unpickle(
pickledOlmAccount.picklingKey, pickledOlmAccount.picklingKey,
pickledOlmAccount.pickledAccount, pickledOlmAccount.pickledAccount,
); );
return account; return account;
} }
async function createPickledOlmSession(
account: OlmAccount,
accountPicklingKey: string,
initialEncryptedMessage: string,
): Promise<string> {
await olm.init();
const session = new olm.Session();
session.create_inbound(account, initialEncryptedMessage);
account.remove_one_time_keys(session);
session.decrypt(0, initialEncryptedMessage);
ashoatUnsubmitted
Not Done
Inline Actions

Let's avoid passing constants as number literals like this. Instead, please define something like eg. threadTypes, so that this code is more "readable" at the callsite (eg. we would see something like olmMessageTypes.TEXT or something)

ashoat: Let's avoid passing constants as number literals like this. Instead, please define something…
return session.pickle(accountPicklingKey);
}
async function unpickleOlmSession(
pickledSession: string,
picklingKey: string,
): Promise<OlmSession> {
await olm.init();
const session = new olm.Session();
session.unpickle(picklingKey, pickledSession);
return session;
}
let cachedOLMUtility: OlmUtility; let cachedOLMUtility: OlmUtility;
function getOlmUtility(): OlmUtility { function getOlmUtility(): OlmUtility {
if (cachedOLMUtility) { if (cachedOLMUtility) {
return cachedOLMUtility; return cachedOLMUtility;
} }
cachedOLMUtility = new olm.Utility(); cachedOLMUtility = new olm.Utility();
return cachedOLMUtility; return cachedOLMUtility;
} }
Show All 26 Lines if (
currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge currentDate - lastPrekeyPublishDate >= maxOldPrekeyAge
) { ) {
account.forget_old_prekey(); account.forget_old_prekey();
} }
} }
export { export {
createPickledOlmAccount, createPickledOlmAccount,
createPickledOlmSession,
getOlmUtility, getOlmUtility,
unpickleOlmAccount, unpickleOlmAccount,
unpickleOlmSession,
validateAccountPrekey, validateAccountPrekey,
}; };