Page MenuHomePhabricator
Differential D12129

[web][native] implement encrypting and persisting OutboundP2PMessage's content in the same SQLite transaction as persisting `olm` session
ClosedPublic
Actions

Authored by kamil on May 20 2024, 4:00 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 3, 6:53 AM
Unknown Object (File)
Mar 4 2025, 10:48 AM
Unknown Object (File)
Mar 2 2025, 10:22 PM
Unknown Object (File)
Mar 2 2025, 1:02 PM
Unknown Object (File)
Feb 24 2025, 2:27 AM
Unknown Object (File)
Feb 21 2025, 7:09 AM
Unknown Object (File)
Feb 21 2025, 7:09 AM
Unknown Object (File)
Feb 21 2025, 7:09 AM
View All 70 Files
Subscribers
ashoat

Details

Reviewers
tomek
marcin
Commits
rCOMMcf875d56dede: [web][native] implement encrypting and persisting OutboundP2PMessage's content…
Summary

To make sure the order is correct also on the sender's side we have to do it in exactly the same SQLite transaction.

A similar approach to decryptSequentialAndPersist.

Depends on D12080

Test Plan

Call this method and make sure data is persisted. Tested end-to-end in D12133.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.May 20 2024, 4:00 PM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptMay 20 2024, 4:00 PM
Harbormaster completed remote builds in B29071: Diff 40420.May 20 2024, 4:19 PM
kamil added a child revision: D12130: [web][native] persist Outbound P2P messages when processing store ops.May 20 2024, 4:20 PM
kamil edited the summary of this revision. (Show Details)May 21 2024, 1:19 AM
kamil edited the test plan for this revision. (Show Details)
kamil published this revision for review.May 21 2024, 1:22 AM
kamil added inline comments.
native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
1392 ↗(On Diff #40420)

This is some code duplication with CommCoreModule::encrypt but it's not that easy to dedupplicate it

1421–1427 ↗(On Diff #40420)

we have to do it here in C++ to keep this in one transaction. Alternative would be updated table to have two columns: ciphertext_message and ciphertext_message_type but I think this approach is okay too, there are multiple usages of folly::toJson in our codebase

marcin accepted this revision.May 24 2024, 5:24 AM
This revision is now accepted and ready to land.May 24 2024, 5:24 AM
Closed by commit rCOMMcf875d56dede: [web][native] implement encrypting and persisting OutboundP2PMessage's content… (authored by kamil). · Explain WhyMay 24 2024, 8:39 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMcf875d56dede: [web][native] implement encrypting and persisting OutboundP2PMessage's content….

Revision Contents
Changeset List

PathSize
lib/
types/
5 lines
utils/
__mocks__/
1 line
native/
cpp/
CommonCpp/
NativeModules/
5 lines
80 lines
_generated/
crypto/
1 line
schema/
5 lines
web/
crypto/
1 line
shared-worker/
worker/
44 lines

Diff 40638

View Options

lib/types/crypto-types.js

Show All 16 Linesimport {
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult, type BlobServiceUploadResult,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
uploadMultimedia, uploadMultimedia,
useBlobServiceUpload, useBlobServiceUpload,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { import {
type SendMultimediaMessagePayload, type SendMultimediaMessagePayload,
useInputStateContainerSendMultimediaMessage, useInputStateContainerSendMultimediaMessage,
useInputStateContainerSendTextMessage, useInputStateContainerSendTextMessage,
} from 'lib/hooks/input-state-container-hooks.js'; } from 'lib/hooks/input-state-container-hooks.js';
import { useNewThickThread } from 'lib/hooks/thread-hooks.js'; import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import type { import type {
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
Show All 14 Linesimport {
createMediaMessageInfo, createMediaMessageInfo,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js'; import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js';
import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js'; import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js';
import { import {
patchThreadInfoToIncludeMentionedMembersOfParent, patchThreadInfoToIncludeMentionedMembersOfParent,
threadInfoInsideCommunity,
threadIsPending, threadIsPending,
threadIsPendingSidebar, threadIsPendingSidebar,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { import type {
Media, Media,
MediaMission, MediaMission,
MediaMissionResult, MediaMissionResult,
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines try {
throw new SendMessageError( throw new SendMessageError(
`Exception when sending text message: ${exceptionMessage}`, `Exception when sending text message: ${exceptionMessage}`,
messageInfo.localID ?? '', messageInfo.localID ?? '',
messageInfo.threadID, messageInfo.threadID,
); );
} }
} }
// eslint-disable-next-line no-unused-vars
shouldEncryptMedia(threadInfo: ThreadInfo): boolean { shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return ( return true;
threadTypeIsThick(threadInfo.type) ||
threadInfoInsideCommunity(threadInfo, commStaffCommunity.id)
);
} }
bartekAuthorUnsubmitted
Done
Inline Actions

This function is removed in D13892

bartek: This function is removed in D13892
sendMultimediaMessage = async ( sendMultimediaMessage = async (
selections: $ReadOnlyArray<NativeMediaSelection>, selections: $ReadOnlyArray<NativeMediaSelection>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
) => { ) => {
this.sendCallbacks.forEach(callback => callback()); this.sendCallbacks.forEach(callback => callback());
const localMessageID = getNextLocalID(); const localMessageID = getNextLocalID();
void this.startThreadCreation(threadInfo); void this.startThreadCreation(threadInfo);
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines
View Options

lib/utils/__mocks__/config.js

Show All 16 Linesimport {
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult, type BlobServiceUploadResult,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
uploadMultimedia, uploadMultimedia,
useBlobServiceUpload, useBlobServiceUpload,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { import {
type SendMultimediaMessagePayload, type SendMultimediaMessagePayload,
useInputStateContainerSendMultimediaMessage, useInputStateContainerSendMultimediaMessage,
useInputStateContainerSendTextMessage, useInputStateContainerSendTextMessage,
} from 'lib/hooks/input-state-container-hooks.js'; } from 'lib/hooks/input-state-container-hooks.js';
import { useNewThickThread } from 'lib/hooks/thread-hooks.js'; import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import type { import type {
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
Show All 14 Linesimport {
createMediaMessageInfo, createMediaMessageInfo,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js'; import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js';
import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js'; import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js';
import { import {
patchThreadInfoToIncludeMentionedMembersOfParent, patchThreadInfoToIncludeMentionedMembersOfParent,
threadInfoInsideCommunity,
threadIsPending, threadIsPending,
threadIsPendingSidebar, threadIsPendingSidebar,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { import type {
Media, Media,
MediaMission, MediaMission,
MediaMissionResult, MediaMissionResult,
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines try {
throw new SendMessageError( throw new SendMessageError(
`Exception when sending text message: ${exceptionMessage}`, `Exception when sending text message: ${exceptionMessage}`,
messageInfo.localID ?? '', messageInfo.localID ?? '',
messageInfo.threadID, messageInfo.threadID,
); );
} }
} }
// eslint-disable-next-line no-unused-vars
shouldEncryptMedia(threadInfo: ThreadInfo): boolean { shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return ( return true;
threadTypeIsThick(threadInfo.type) ||
threadInfoInsideCommunity(threadInfo, commStaffCommunity.id)
);
} }
bartekAuthorUnsubmitted
Done
Inline Actions

This function is removed in D13892

bartek: This function is removed in D13892
sendMultimediaMessage = async ( sendMultimediaMessage = async (
selections: $ReadOnlyArray<NativeMediaSelection>, selections: $ReadOnlyArray<NativeMediaSelection>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
) => { ) => {
this.sendCallbacks.forEach(callback => callback()); this.sendCallbacks.forEach(callback => callback());
const localMessageID = getNextLocalID(); const localMessageID = getNextLocalID();
void this.startThreadCreation(threadInfo); void this.startThreadCreation(threadInfo);
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

Show All 16 Linesimport {
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult, type BlobServiceUploadResult,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
uploadMultimedia, uploadMultimedia,
useBlobServiceUpload, useBlobServiceUpload,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { import {
type SendMultimediaMessagePayload, type SendMultimediaMessagePayload,
useInputStateContainerSendMultimediaMessage, useInputStateContainerSendMultimediaMessage,
useInputStateContainerSendTextMessage, useInputStateContainerSendTextMessage,
} from 'lib/hooks/input-state-container-hooks.js'; } from 'lib/hooks/input-state-container-hooks.js';
import { useNewThickThread } from 'lib/hooks/thread-hooks.js'; import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import type { import type {
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
Show All 14 Linesimport {
createMediaMessageInfo, createMediaMessageInfo,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js'; import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js';
import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js'; import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js';
import { import {
patchThreadInfoToIncludeMentionedMembersOfParent, patchThreadInfoToIncludeMentionedMembersOfParent,
threadInfoInsideCommunity,
threadIsPending, threadIsPending,
threadIsPendingSidebar, threadIsPendingSidebar,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { import type {
Media, Media,
MediaMission, MediaMission,
MediaMissionResult, MediaMissionResult,
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines try {
throw new SendMessageError( throw new SendMessageError(
`Exception when sending text message: ${exceptionMessage}`, `Exception when sending text message: ${exceptionMessage}`,
messageInfo.localID ?? '', messageInfo.localID ?? '',
messageInfo.threadID, messageInfo.threadID,
); );
} }
} }
// eslint-disable-next-line no-unused-vars
shouldEncryptMedia(threadInfo: ThreadInfo): boolean { shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return ( return true;
threadTypeIsThick(threadInfo.type) ||
threadInfoInsideCommunity(threadInfo, commStaffCommunity.id)
);
} }
bartekAuthorUnsubmitted
Done
Inline Actions

This function is removed in D13892

bartek: This function is removed in D13892
sendMultimediaMessage = async ( sendMultimediaMessage = async (
selections: $ReadOnlyArray<NativeMediaSelection>, selections: $ReadOnlyArray<NativeMediaSelection>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
) => { ) => {
this.sendCallbacks.forEach(callback => callback()); this.sendCallbacks.forEach(callback => callback());
const localMessageID = getNextLocalID(); const localMessageID = getNextLocalID();
void this.startThreadCreation(threadInfo); void this.startThreadCreation(threadInfo);
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

Show All 16 Linesimport {
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult, type BlobServiceUploadResult,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
uploadMultimedia, uploadMultimedia,
useBlobServiceUpload, useBlobServiceUpload,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { import {
type SendMultimediaMessagePayload, type SendMultimediaMessagePayload,
useInputStateContainerSendMultimediaMessage, useInputStateContainerSendMultimediaMessage,
useInputStateContainerSendTextMessage, useInputStateContainerSendTextMessage,
} from 'lib/hooks/input-state-container-hooks.js'; } from 'lib/hooks/input-state-container-hooks.js';
import { useNewThickThread } from 'lib/hooks/thread-hooks.js'; import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import type { import type {
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
Show All 14 Linesimport {
createMediaMessageInfo, createMediaMessageInfo,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js'; import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js';
import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js'; import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js';
import { import {
patchThreadInfoToIncludeMentionedMembersOfParent, patchThreadInfoToIncludeMentionedMembersOfParent,
threadInfoInsideCommunity,
threadIsPending, threadIsPending,
threadIsPendingSidebar, threadIsPendingSidebar,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { import type {
Media, Media,
MediaMission, MediaMission,
MediaMissionResult, MediaMissionResult,
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines try {
throw new SendMessageError( throw new SendMessageError(
`Exception when sending text message: ${exceptionMessage}`, `Exception when sending text message: ${exceptionMessage}`,
messageInfo.localID ?? '', messageInfo.localID ?? '',
messageInfo.threadID, messageInfo.threadID,
); );
} }
} }
// eslint-disable-next-line no-unused-vars
shouldEncryptMedia(threadInfo: ThreadInfo): boolean { shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return ( return true;
threadTypeIsThick(threadInfo.type) ||
threadInfoInsideCommunity(threadInfo, commStaffCommunity.id)
);
} }
bartekAuthorUnsubmitted
Done
Inline Actions

This function is removed in D13892

bartek: This function is removed in D13892
sendMultimediaMessage = async ( sendMultimediaMessage = async (
selections: $ReadOnlyArray<NativeMediaSelection>, selections: $ReadOnlyArray<NativeMediaSelection>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
) => { ) => {
this.sendCallbacks.forEach(callback => callback()); this.sendCallbacks.forEach(callback => callback());
const localMessageID = getNextLocalID(); const localMessageID = getNextLocalID();
void this.startThreadCreation(threadInfo); void this.startThreadCreation(threadInfo);
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines
View Options

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

Loading...
View Options

native/cpp/CommonCpp/_generated/commJSI.h

Loading...
View Options

native/crypto/olm-api.js

Loading...
View Options

native/schema/CommCoreModuleSchema.js

Loading...
View Options

web/crypto/olm-api.js

Loading...
View Options

web/shared-worker/worker/worker-crypto.js

Loading...