Page MenuHomePhabricator
Differential D14028

[keyserver] Extract getInboundKeys to a separate function
ClosedPublic
Actions

Authored by bartek on Nov 24 2024, 11:31 PM.
Tags
None
Referenced Files
F6241070: D14028.diff
Fri, Apr 25, 12:04 AM
Unknown Object (File)
Wed, Apr 23, 8:25 AM
Unknown Object (File)
Wed, Apr 23, 2:10 AM
Unknown Object (File)
Wed, Apr 23, 1:04 AM
Unknown Object (File)
Tue, Apr 22, 11:51 PM
Unknown Object (File)
Tue, Apr 22, 5:18 AM
Unknown Object (File)
Thu, Mar 27, 2:02 PM
Unknown Object (File)
Mar 24 2025, 2:15 AM
View All 47 Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
kamil
Commits
rCOMMd6994b2823f0: [keyserver] Extract getInboundKeys to a separate function
Summary

Needed for ENG-6544 to handle invalid auth from one place

Depends on D14027

Test Plan

Flow, ran keyserver locally

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
28 lines
utils/
30 lines

Diff 46063

View Options

keyserver/src/responders/user-responders.js

Show All 20 Linesimport {
type EditMessageContent, type EditMessageContent,
type MessageSelectionCriteria, type MessageSelectionCriteria,
type MessageTruncationStatus, type MessageTruncationStatus,
messageTruncationStatus, messageTruncationStatus,
type FetchMessageInfosResult, type FetchMessageInfosResult,
defaultMaxMessageAge, defaultMaxMessageAge,
type FetchPinnedMessagesRequest, type FetchPinnedMessagesRequest,
type FetchPinnedMessagesResult, type FetchPinnedMessagesResult,
isMessageSidebarSourceReactionOrEdit, isMessageSidebarSourceReactionEditOrPin,
type SearchMessagesResponse, type SearchMessagesResponse,
} from 'lib/types/message-types.js'; } from 'lib/types/message-types.js';
import { defaultNumberPerThread } from 'lib/types/message-types.js'; import { defaultNumberPerThread } from 'lib/types/message-types.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js'; import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import { import {
constructMediaFromMediaMessageContentsAndUploadRows, constructMediaFromMediaMessageContentsAndUploadRows,
▲ Show 20 Lines • Show All 702 Lines • ▼ Show 20 Lines const [result, edits] = await Promise.all([
fetchMessageRowsByIDs([...requiredIDs]), fetchMessageRowsByIDs([...requiredIDs]),
fetchLatestEditMessageContentByIDs([...requiredIDs]), fetchLatestEditMessageContentByIDs([...requiredIDs]),
]); ]);
const messages = await parseMessageSQLResult(result, new Map(), viewer); const messages = await parseMessageSQLResult(result, new Map(), viewer);
for (const message of messages) { for (const message of messages) {
let { rawMessageInfo } = message; let { rawMessageInfo } = message;
invariant( invariant(
!isMessageSidebarSourceReactionOrEdit(rawMessageInfo), !isMessageSidebarSourceReactionEditOrPin(rawMessageInfo),
'SIDEBAR_SOURCE or TOGGLE_PIN should not point to a ' + 'SIDEBAR_SOURCE or TOGGLE_PIN should not point to a ' +
'SIDEBAR_SOURCE, REACTION or EDIT_MESSAGE', 'SIDEBAR_SOURCE, REACTION, EDIT_MESSAGE or TOGGLE_PIN',
); );
if (rawMessageInfo.id) { if (rawMessageInfo.id) {
const editedContent = edits.get(rawMessageInfo.id); const editedContent = edits.get(rawMessageInfo.id);
if (editedContent && rawMessageInfo.type === messageTypes.TEXT) { if (editedContent && rawMessageInfo.type === messageTypes.TEXT) {
rawMessageInfo = { rawMessageInfo = {
...rawMessageInfo, ...rawMessageInfo,
text: editedContent.text, text: editedContent.text,
}; };
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines const query = SQL`
FROM messages m FROM messages m
LEFT JOIN uploads up ON up.container = m.id LEFT JOIN uploads up ON up.container = m.id
LEFT JOIN memberships stm ON m.type = ${messageTypes.CREATE_SUB_THREAD} LEFT JOIN memberships stm ON m.type = ${messageTypes.CREATE_SUB_THREAD}
AND stm.thread = m.content AND stm.user = m.user AND stm.thread = m.content AND stm.user = m.user
WHERE m.target_message IN (${originalMessageIDs}) WHERE m.target_message IN (${originalMessageIDs})
AND ( AND (
m.type = ${messageTypes.SIDEBAR_SOURCE} m.type = ${messageTypes.SIDEBAR_SOURCE}
OR m.type = ${messageTypes.REACTION} OR m.type = ${messageTypes.REACTION}
OR m.type = ${messageTypes.TOGGLE_PIN}
) )
UNION SELECT m.id, m.thread AS threadID, m.content, m.time, m.type, UNION SELECT m.id, m.thread AS threadID, m.content, m.time, m.type,
m.creation, m.user AS creatorID, m.target_message as targetMessageID, m.creation, m.user AS creatorID, m.target_message as targetMessageID,
stm.permissions AS subthread_permissions, up.id AS uploadID, stm.permissions AS subthread_permissions, up.id AS uploadID,
up.type AS uploadType, up.secret AS uploadSecret, up.extra AS uploadExtra up.type AS uploadType, up.secret AS uploadSecret, up.extra AS uploadExtra
FROM messages m2 FROM messages m2
INNER JOIN messages m ON m.id = ( INNER JOIN messages m ON m.id = (
SELECT m3.id FROM messages m3 SELECT m3.id FROM messages m3
Show All 24 Lines
): Promise<$ReadOnlyArray<RawMessageInfo>> { ): Promise<$ReadOnlyArray<RawMessageInfo>> {
const parsedResults = await parseMessageSQLResult(rows, new Map(), viewer); const parsedResults = await parseMessageSQLResult(rows, new Map(), viewer);
const rawMessageInfoMap = new Map< const rawMessageInfoMap = new Map<
string, string,
RawComposableMessageInfo | RawRobotextMessageInfo, RawComposableMessageInfo | RawRobotextMessageInfo,
>(); >();
for (const message of parsedResults) { for (const message of parsedResults) {
const { rawMessageInfo } = message; const { rawMessageInfo } = message;
if (isMessageSidebarSourceReactionOrEdit(rawMessageInfo)) { if (isMessageSidebarSourceReactionEditOrPin(rawMessageInfo)) {
continue; continue;
} }
invariant(rawMessageInfo.id, 'rawMessageInfo.id should not be null'); invariant(rawMessageInfo.id, 'rawMessageInfo.id should not be null');
rawMessageInfoMap.set(rawMessageInfo.id, rawMessageInfo); rawMessageInfoMap.set(rawMessageInfo.id, rawMessageInfo);
} }
const rawMessageInfos = parsedResults.map(item => item.rawMessageInfo); const rawMessageInfos = parsedResults.map(item => item.rawMessageInfo);
const rawRelatedMessageInfos = await fetchRelatedMessages( const rawRelatedMessageInfos = await fetchRelatedMessages(
▲ Show 20 Lines • Show All 90 Lines • Show Last 20 Lines
View Options

keyserver/src/utils/identity-utils.js

Show All 20 Linesimport {
type EditMessageContent, type EditMessageContent,
type MessageSelectionCriteria, type MessageSelectionCriteria,
type MessageTruncationStatus, type MessageTruncationStatus,
messageTruncationStatus, messageTruncationStatus,
type FetchMessageInfosResult, type FetchMessageInfosResult,
defaultMaxMessageAge, defaultMaxMessageAge,
type FetchPinnedMessagesRequest, type FetchPinnedMessagesRequest,
type FetchPinnedMessagesResult, type FetchPinnedMessagesResult,
isMessageSidebarSourceReactionOrEdit, isMessageSidebarSourceReactionEditOrPin,
type SearchMessagesResponse, type SearchMessagesResponse,
} from 'lib/types/message-types.js'; } from 'lib/types/message-types.js';
import { defaultNumberPerThread } from 'lib/types/message-types.js'; import { defaultNumberPerThread } from 'lib/types/message-types.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js'; import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import { import {
constructMediaFromMediaMessageContentsAndUploadRows, constructMediaFromMediaMessageContentsAndUploadRows,
▲ Show 20 Lines • Show All 702 Lines • ▼ Show 20 Lines const [result, edits] = await Promise.all([
fetchMessageRowsByIDs([...requiredIDs]), fetchMessageRowsByIDs([...requiredIDs]),
fetchLatestEditMessageContentByIDs([...requiredIDs]), fetchLatestEditMessageContentByIDs([...requiredIDs]),
]); ]);
const messages = await parseMessageSQLResult(result, new Map(), viewer); const messages = await parseMessageSQLResult(result, new Map(), viewer);
for (const message of messages) { for (const message of messages) {
let { rawMessageInfo } = message; let { rawMessageInfo } = message;
invariant( invariant(
!isMessageSidebarSourceReactionOrEdit(rawMessageInfo), !isMessageSidebarSourceReactionEditOrPin(rawMessageInfo),
'SIDEBAR_SOURCE or TOGGLE_PIN should not point to a ' + 'SIDEBAR_SOURCE or TOGGLE_PIN should not point to a ' +
'SIDEBAR_SOURCE, REACTION or EDIT_MESSAGE', 'SIDEBAR_SOURCE, REACTION, EDIT_MESSAGE or TOGGLE_PIN',
); );
if (rawMessageInfo.id) { if (rawMessageInfo.id) {
const editedContent = edits.get(rawMessageInfo.id); const editedContent = edits.get(rawMessageInfo.id);
if (editedContent && rawMessageInfo.type === messageTypes.TEXT) { if (editedContent && rawMessageInfo.type === messageTypes.TEXT) {
rawMessageInfo = { rawMessageInfo = {
...rawMessageInfo, ...rawMessageInfo,
text: editedContent.text, text: editedContent.text,
}; };
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines const query = SQL`
FROM messages m FROM messages m
LEFT JOIN uploads up ON up.container = m.id LEFT JOIN uploads up ON up.container = m.id
LEFT JOIN memberships stm ON m.type = ${messageTypes.CREATE_SUB_THREAD} LEFT JOIN memberships stm ON m.type = ${messageTypes.CREATE_SUB_THREAD}
AND stm.thread = m.content AND stm.user = m.user AND stm.thread = m.content AND stm.user = m.user
WHERE m.target_message IN (${originalMessageIDs}) WHERE m.target_message IN (${originalMessageIDs})
AND ( AND (
m.type = ${messageTypes.SIDEBAR_SOURCE} m.type = ${messageTypes.SIDEBAR_SOURCE}
OR m.type = ${messageTypes.REACTION} OR m.type = ${messageTypes.REACTION}
OR m.type = ${messageTypes.TOGGLE_PIN}
) )
UNION SELECT m.id, m.thread AS threadID, m.content, m.time, m.type, UNION SELECT m.id, m.thread AS threadID, m.content, m.time, m.type,
m.creation, m.user AS creatorID, m.target_message as targetMessageID, m.creation, m.user AS creatorID, m.target_message as targetMessageID,
stm.permissions AS subthread_permissions, up.id AS uploadID, stm.permissions AS subthread_permissions, up.id AS uploadID,
up.type AS uploadType, up.secret AS uploadSecret, up.extra AS uploadExtra up.type AS uploadType, up.secret AS uploadSecret, up.extra AS uploadExtra
FROM messages m2 FROM messages m2
INNER JOIN messages m ON m.id = ( INNER JOIN messages m ON m.id = (
SELECT m3.id FROM messages m3 SELECT m3.id FROM messages m3
Show All 24 Lines
): Promise<$ReadOnlyArray<RawMessageInfo>> { ): Promise<$ReadOnlyArray<RawMessageInfo>> {
const parsedResults = await parseMessageSQLResult(rows, new Map(), viewer); const parsedResults = await parseMessageSQLResult(rows, new Map(), viewer);
const rawMessageInfoMap = new Map< const rawMessageInfoMap = new Map<
string, string,
RawComposableMessageInfo | RawRobotextMessageInfo, RawComposableMessageInfo | RawRobotextMessageInfo,
>(); >();
for (const message of parsedResults) { for (const message of parsedResults) {
const { rawMessageInfo } = message; const { rawMessageInfo } = message;
if (isMessageSidebarSourceReactionOrEdit(rawMessageInfo)) { if (isMessageSidebarSourceReactionEditOrPin(rawMessageInfo)) {
continue; continue;
} }
invariant(rawMessageInfo.id, 'rawMessageInfo.id should not be null'); invariant(rawMessageInfo.id, 'rawMessageInfo.id should not be null');
rawMessageInfoMap.set(rawMessageInfo.id, rawMessageInfo); rawMessageInfoMap.set(rawMessageInfo.id, rawMessageInfo);
} }
const rawMessageInfos = parsedResults.map(item => item.rawMessageInfo); const rawMessageInfos = parsedResults.map(item => item.rawMessageInfo);
const rawRelatedMessageInfos = await fetchRelatedMessages( const rawRelatedMessageInfos = await fetchRelatedMessages(
▲ Show 20 Lines • Show All 90 Lines • Show Last 20 Lines