Page MenuHomePhabricator
Differential D11720

[lib] update P2P message handler to use sequential decrypt
ClosedPublic
Actions

Authored by kamil on Apr 22 2024, 3:53 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 24, 4:09 PM
Unknown Object (File)
Thu, Mar 6, 10:20 PM
Unknown Object (File)
Wed, Mar 5, 6:52 AM
Unknown Object (File)
Tue, Mar 4, 8:07 PM
Unknown Object (File)
Feb 22 2025, 11:31 AM
Unknown Object (File)
Feb 22 2025, 11:31 AM
Unknown Object (File)
Feb 22 2025, 11:31 AM
Unknown Object (File)
Feb 22 2025, 11:31 AM
View All 69 Files
Subscribers
ashoat

Details

Reviewers
tomek
marcin
Commits
rCOMM9c2c1d2788de: [lib] update P2P message handler to use sequential decrypt
Summary

In client <-> client communication we have to track messages order.

Depends on D11719

Test Plan

Created session between two clients:

  1. Sending a couple of encrypted messages
  2. Sending messages with wrong order -> OLM_MESSAGE_OUT_OF_ORDER
  3. Sending the same message multiple times -> OLM_ALREADY_DECRYPTED_OR_KEYS_SKIPPED

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Apr 22 2024, 3:53 PM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptApr 22 2024, 3:53 PM
kamil retitled this revision from [lib]update P2P message handler to use sequential decrypt to [lib] update P2P message handler to use sequential decrypt.Apr 22 2024, 3:54 PM
kamil added a child revision: D11721: [native/web] add SQL transaction to persisting crypto module.Apr 22 2024, 4:01 PM
Harbormaster completed remote builds in B28377: Diff 39371.Apr 22 2024, 4:08 PM
kamil added inline comments.Apr 23 2024, 5:29 AM
lib/utils/olm-utils.js
127 ↗(On Diff #39371)
kamil published this revision for review.Apr 23 2024, 6:38 AM
marcin accepted this revision.Apr 24 2024, 3:12 AM
This revision is now accepted and ready to land.Apr 24 2024, 3:12 AM
kamil updated this revision to Diff 39613.Apr 29 2024, 12:51 AM

update comment

Harbormaster completed remote builds in B28556: Diff 39613.Apr 29 2024, 1:06 AM
Closed by commit rCOMM9c2c1d2788de: [lib] update P2P message handler to use sequential decrypt (authored by kamil). · Explain WhyApr 29 2024, 1:11 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM9c2c1d2788de: [lib] update P2P message handler to use sequential decrypt.

Revision Contents
Changeset List

PathSize
lib/
handlers/
24 lines
tunnelbroker/
6 lines
utils/
6 lines

Diff 39618

View Options

lib/handlers/peer-to-peer-message-handler.js

Show First 20 Lines • Show All 1,213 Lines • ▼ Show 20 Lines const newState = {
...rest, ...rest,
alertStore: { alertStore: {
alertInfos: defaultAlertInfos, alertInfos: defaultAlertInfos,
}, },
}; };
return newState; return newState;
}, },
[70]: (state: any) => {
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
const unsupportedMessageIDsToRemove = clientDBMessageInfos
.filter(
message =>
parseInt(message.type) === messageTypes.UNSUPPORTED &&
parseInt(message.future_type) === messageTypes.UPDATE_RELATIONSHIP,
)
.map(message => message.id);
const messageStoreOperations: $ReadOnlyArray<ClientDBMessageStoreOperation> =
[
{
type: 'remove',
payload: { ids: unsupportedMessageIDsToRemove },
},
];
try {
commCoreModule.processMessageStoreOperationsSync(messageStoreOperations);
} catch (exception) {
console.log(exception);
if (isTaskCancelledError(exception)) {
return state;
}
return { ...state, cookie: null };
}
return state;
},
}; };
type PersistedReportStore = $Diff< type PersistedReportStore = $Diff<
ReportStore, ReportStore,
{ +queuedReports: $ReadOnlyArray<ClientReportCreationRequest> }, { +queuedReports: $ReadOnlyArray<ClientReportCreationRequest> },
>; >;
const reportStoreTransform: Transform = createTransform( const reportStoreTransform: Transform = createTransform(
(state: ReportStore): PersistedReportStore => { (state: ReportStore): PersistedReportStore => {
return { enabledReports: state.enabledReports }; return { enabledReports: state.enabledReports };
}, },
(state: PersistedReportStore): ReportStore => { (state: PersistedReportStore): ReportStore => {
return { ...state, queuedReports: [] }; return { ...state, queuedReports: [] };
}, },
{ whitelist: ['reportStore'] }, { whitelist: ['reportStore'] },
); );
const persistConfig = { const persistConfig = {
key: 'root', key: 'root',
storage: AsyncStorage, storage: AsyncStorage,
blacklist: persistBlacklist, blacklist: persistBlacklist,
debug: __DEV__, debug: __DEV__,
version: 69, version: 70,
transforms: [ transforms: [
messageStoreMessagesBlocklistTransform, messageStoreMessagesBlocklistTransform,
reportStoreTransform, reportStoreTransform,
keyserverStoreTransform, keyserverStoreTransform,
], ],
migrate: (createAsyncMigrate(migrations, { debug: __DEV__ }): any), migrate: (createAsyncMigrate(migrations, { debug: __DEV__ }): any),
timeout: ((__DEV__ ? 0 : undefined): number | void), timeout: ((__DEV__ ? 0 : undefined): number | void),
}; };
Show All 16 Lines
View Options

lib/tunnelbroker/tunnelbroker-context.js

Show First 20 Lines • Show All 1,213 Lines • ▼ Show 20 Lines const newState = {
...rest, ...rest,
alertStore: { alertStore: {
alertInfos: defaultAlertInfos, alertInfos: defaultAlertInfos,
}, },
}; };
return newState; return newState;
}, },
[70]: (state: any) => {
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
const unsupportedMessageIDsToRemove = clientDBMessageInfos
.filter(
message =>
parseInt(message.type) === messageTypes.UNSUPPORTED &&
parseInt(message.future_type) === messageTypes.UPDATE_RELATIONSHIP,
)
.map(message => message.id);
const messageStoreOperations: $ReadOnlyArray<ClientDBMessageStoreOperation> =
[
{
type: 'remove',
payload: { ids: unsupportedMessageIDsToRemove },
},
];
try {
commCoreModule.processMessageStoreOperationsSync(messageStoreOperations);
} catch (exception) {
console.log(exception);
if (isTaskCancelledError(exception)) {
return state;
}
return { ...state, cookie: null };
}
return state;
},
}; };
type PersistedReportStore = $Diff< type PersistedReportStore = $Diff<
ReportStore, ReportStore,
{ +queuedReports: $ReadOnlyArray<ClientReportCreationRequest> }, { +queuedReports: $ReadOnlyArray<ClientReportCreationRequest> },
>; >;
const reportStoreTransform: Transform = createTransform( const reportStoreTransform: Transform = createTransform(
(state: ReportStore): PersistedReportStore => { (state: ReportStore): PersistedReportStore => {
return { enabledReports: state.enabledReports }; return { enabledReports: state.enabledReports };
}, },
(state: PersistedReportStore): ReportStore => { (state: PersistedReportStore): ReportStore => {
return { ...state, queuedReports: [] }; return { ...state, queuedReports: [] };
}, },
{ whitelist: ['reportStore'] }, { whitelist: ['reportStore'] },
); );
const persistConfig = { const persistConfig = {
key: 'root', key: 'root',
storage: AsyncStorage, storage: AsyncStorage,
blacklist: persistBlacklist, blacklist: persistBlacklist,
debug: __DEV__, debug: __DEV__,
version: 69, version: 70,
transforms: [ transforms: [
messageStoreMessagesBlocklistTransform, messageStoreMessagesBlocklistTransform,
reportStoreTransform, reportStoreTransform,
keyserverStoreTransform, keyserverStoreTransform,
], ],
migrate: (createAsyncMigrate(migrations, { debug: __DEV__ }): any), migrate: (createAsyncMigrate(migrations, { debug: __DEV__ }): any),
timeout: ((__DEV__ ? 0 : undefined): number | void), timeout: ((__DEV__ ? 0 : undefined): number | void),
}; };
Show All 16 Lines
View Options

lib/utils/olm-utils.js

Show First 20 Lines • Show All 1,213 Lines • ▼ Show 20 Lines const newState = {
...rest, ...rest,
alertStore: { alertStore: {
alertInfos: defaultAlertInfos, alertInfos: defaultAlertInfos,
}, },
}; };
return newState; return newState;
}, },
[70]: (state: any) => {
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
const unsupportedMessageIDsToRemove = clientDBMessageInfos
.filter(
message =>
parseInt(message.type) === messageTypes.UNSUPPORTED &&
parseInt(message.future_type) === messageTypes.UPDATE_RELATIONSHIP,
)
.map(message => message.id);
const messageStoreOperations: $ReadOnlyArray<ClientDBMessageStoreOperation> =
[
{
type: 'remove',
payload: { ids: unsupportedMessageIDsToRemove },
},
];
try {
commCoreModule.processMessageStoreOperationsSync(messageStoreOperations);
} catch (exception) {
console.log(exception);
if (isTaskCancelledError(exception)) {
return state;
}
return { ...state, cookie: null };
}
return state;
},
}; };
type PersistedReportStore = $Diff< type PersistedReportStore = $Diff<
ReportStore, ReportStore,
{ +queuedReports: $ReadOnlyArray<ClientReportCreationRequest> }, { +queuedReports: $ReadOnlyArray<ClientReportCreationRequest> },
>; >;
const reportStoreTransform: Transform = createTransform( const reportStoreTransform: Transform = createTransform(
(state: ReportStore): PersistedReportStore => { (state: ReportStore): PersistedReportStore => {
return { enabledReports: state.enabledReports }; return { enabledReports: state.enabledReports };
}, },
(state: PersistedReportStore): ReportStore => { (state: PersistedReportStore): ReportStore => {
return { ...state, queuedReports: [] }; return { ...state, queuedReports: [] };
}, },
{ whitelist: ['reportStore'] }, { whitelist: ['reportStore'] },
); );
const persistConfig = { const persistConfig = {
key: 'root', key: 'root',
storage: AsyncStorage, storage: AsyncStorage,
blacklist: persistBlacklist, blacklist: persistBlacklist,
debug: __DEV__, debug: __DEV__,
version: 69, version: 70,
transforms: [ transforms: [
messageStoreMessagesBlocklistTransform, messageStoreMessagesBlocklistTransform,
reportStoreTransform, reportStoreTransform,
keyserverStoreTransform, keyserverStoreTransform,
], ],
migrate: (createAsyncMigrate(migrations, { debug: __DEV__ }): any), migrate: (createAsyncMigrate(migrations, { debug: __DEV__ }): any),
timeout: ((__DEV__ ? 0 : undefined): number | void), timeout: ((__DEV__ ? 0 : undefined): number | void),
}; };
Show All 16 Lines