Page MenuHomePhabricator
Differential D13900

[lib] Implement getInboundP2PMessagesByID in SQLiteAPI
ClosedPublic
Actions

Authored by angelika on Nov 8 2024, 7:56 AM.
Tags
None
Referenced Files
F6201259: D13900.id45743.diff
Wed, Apr 23, 8:03 PM
F6200429: D13900.id45753.diff
Wed, Apr 23, 7:35 PM
Unknown Object (File)
Wed, Apr 23, 12:45 AM
Unknown Object (File)
Thu, Apr 3, 11:09 PM
Unknown Object (File)
Mar 15 2025, 2:13 AM
Unknown Object (File)
Mar 15 2025, 2:13 AM
Unknown Object (File)
Mar 15 2025, 2:13 AM
Unknown Object (File)
Mar 15 2025, 2:13 AM
View All 89 Files
Subscribers
ashoat

Details

Reviewers
tomek
kamil
Commits
rCOMM34c732abe671: [lib] Implement getInboundP2PMessagesByID in SQLiteAPI
Summary

https://linear.app/comm/issue/ENG-9713/mitigate-risk-of-olm-already-decrypted-or-keys-skipped

Depends on D13899

Test Plan

Test plan in the last diff in stack.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

angelika created this revision.Nov 8 2024, 7:56 AM
Herald added a subscriber: ashoat. · View Herald TranscriptNov 8 2024, 7:56 AM
angelika added a child revision: D13901: [lib] Do not reset a session when getting already decrypted message.Nov 8 2024, 8:07 AM
Harbormaster completed remote builds in B32595: Diff 45724.Nov 8 2024, 8:27 AM
angelika requested review of this revision.Nov 8 2024, 8:27 AM
kamil accepted this revision.Nov 12 2024, 2:56 AM
This revision is now accepted and ready to land.Nov 12 2024, 2:56 AM
angelika updated this revision to Diff 45738.Nov 12 2024, 5:26 AM

Rebase

Harbormaster failed remote builds in B32604: Diff 45738!Nov 12 2024, 5:40 AM
angelika updated this revision to Diff 45743.Nov 12 2024, 5:45 AM

Rebase

Harbormaster failed remote builds in B32609: Diff 45743!Nov 12 2024, 6:03 AM
angelika updated this revision to Diff 45753.Nov 12 2024, 7:35 AM

Rebase

Harbormaster completed remote builds in B32617: Diff 45753.Nov 12 2024, 8:00 AM
Closed by commit rCOMM34c732abe671: [lib] Implement getInboundP2PMessagesByID in SQLiteAPI (authored by angelika). · Explain WhyNov 13 2024, 4:17 AM
This revision was automatically updated to reflect the committed changes.
angelika added a commit: rCOMM34c732abe671: [lib] Implement getInboundP2PMessagesByID in SQLiteAPI.

Revision Contents
Changeset List

PathSize
lib/
types/
3 lines
utils/
__mocks__/
1 line
native/
database/
1 line
web/
database/
14 lines

Diff 45738

View Options

lib/types/sqlite-types.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines
View Options

lib/utils/__mocks__/config.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines
View Options

native/database/sqlite-api.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines
View Options

web/database/sqlite-api.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines