Page MenuHomePhabricator
Differential D14046

[CommCoreModule] sign message with custom Olm Account
ClosedPublic
Actions

Authored by kamil on Nov 26 2024, 6:07 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 12, 1:59 PM
Unknown Object (File)
Wed, Mar 12, 1:58 PM
Unknown Object (File)
Wed, Mar 12, 1:55 PM
Unknown Object (File)
Wed, Mar 12, 1:54 PM
Unknown Object (File)
Feb 20 2025, 4:13 AM
Unknown Object (File)
Feb 3 2025, 3:28 PM
Unknown Object (File)
Feb 3 2025, 3:28 PM
Unknown Object (File)
Jan 26 2025, 4:25 AM
View All 57 Files
Subscribers
ashoat

Details

Reviewers
bartek
tomek
Commits
rCOMM45130c2f0341: [CommCoreModule] sign message with custom Olm Account
Summary

ENG-9603.

Needed to sign a new device list with the old primary device account.

This doesn't need to be scheduled on cryptoThread because it is using the ephemeral CryptoModule, but perhaps it's better to keep it similar to all crypto-related operations and use a dedicated thread.

Depends on D14045

Test Plan

Tested in next diff in the stack

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Nov 26 2024, 6:07 AM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptNov 26 2024, 6:07 AM
kamil edited the summary of this revision. (Show Details)Nov 26 2024, 6:07 AM
kamil added a child revision: D14047: [native] make it possible to test signing using Olm Account from User Keys.Nov 26 2024, 6:08 AM
kamil retitled this revision from [CommCoreModule] sing message with custom Olm Account to [CommCoreModule] sign message with custom Olm Account.Nov 26 2024, 6:17 AM
kamil published this revision for review.Nov 26 2024, 6:45 AM
Harbormaster completed remote builds in B32864: Diff 46079.Nov 26 2024, 8:30 AM
bartek accepted this revision.Nov 27 2024, 1:31 AM
This revision is now accepted and ready to land.Nov 27 2024, 1:31 AM
Closed by commit rCOMM45130c2f0341: [CommCoreModule] sign message with custom Olm Account (authored by kamil). · Explain WhyDec 3 2024, 6:28 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM45130c2f0341: [CommCoreModule] sign message with custom Olm Account.

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
5 lines
37 lines
_generated/
schema/
5 lines

Diff 46194

View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

native/cpp/CommonCpp/_generated/commJSI-generated.cpp

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

native/cpp/CommonCpp/_generated/commJSI.h

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

native/schema/CommCoreModuleSchema.js

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };