Page MenuHomePhabricator
Differential D8605

[Protos] Move GetKeyserverInfo to authtenticated service
ClosedPublic
Actions

Authored by • jon on Jul 24 2023, 6:50 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 16, 11:14 PM
Unknown Object (File)
Tue, Mar 4, 3:51 AM
Unknown Object (File)
Tue, Mar 4, 3:51 AM
Unknown Object (File)
Tue, Mar 4, 3:51 AM
Unknown Object (File)
Tue, Mar 4, 3:51 AM
Unknown Object (File)
Tue, Mar 4, 3:50 AM
Unknown Object (File)
Tue, Mar 4, 3:32 AM
Unknown Object (File)
Feb 21 2025, 11:48 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
bartek
Commits
rCOMM2406ff73d295: [Protos] Move GetKeyserverInfo to authtenticated service
Summary

We should only be issuing one-time keys to authenticated
devices. Move this to the authenticated service.

Part of https://linear.app/comm/issue/ENG-4445

Depends on D7691

Test Plan

N/A. Protobuf review

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• jon created this revision.Jul 24 2023, 6:50 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJul 24 2023, 6:50 AM
• jon added a child revision: D8606: [Identity] Refactor get user_id and device_id.Jul 24 2023, 6:52 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Jul 24 2023, 6:57 AM
Harbormaster failed remote builds in B21148: Diff 28970!
• jon updated this revision to Diff 29027.Jul 25 2023, 10:42 AM

Rebase on fixes

Harbormaster completed remote builds in B21191: Diff 29027.Jul 25 2023, 10:59 AM
• jon requested review of this revision.Jul 25 2023, 10:59 AM
varun requested changes to this revision.Jul 25 2023, 2:16 PM

OutboundKeyserverResponse can be deleted from identity_client.proto, right?

This revision now requires changes to proceed.Jul 25 2023, 2:16 PM
• jon updated this revision to Diff 29082.Jul 26 2023, 6:07 PM

Remove OutboundKeyserverResponse from identity_client.proto

• jon added a comment.Jul 26 2023, 6:07 PM

OutboundKeyserverResponse can be deleted from identity_client.proto, right?

It can, thanks.

Harbormaster completed remote builds in B21238: Diff 29082.Jul 26 2023, 6:26 PM
varun accepted this revision.Jul 27 2023, 9:51 AM
This revision is now accepted and ready to land.Jul 27 2023, 9:51 AM
• jon removed a parent revision: D7691: [Keyserver] Open websocket connection with tunnelbroker.Aug 8 2023, 8:53 AM
Closed by commit rCOMM2406ff73d295: [Protos] Move GetKeyserverInfo to authtenticated service (authored by • jon). · Explain WhyAug 8 2023, 9:00 AM
This revision was automatically updated to reflect the committed changes.
• jon added a commit: rCOMM2406ff73d295: [Protos] Move GetKeyserverInfo to authtenticated service.

Revision Contents
Changeset List

PathSize
services/
identity/
src/
23 lines
grpc_services/
11 lines
shared/
protos/
27 lines
12 lines

Diff 29625

View Options

services/identity/src/client_service.rs

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
import { creationString } from '../utils/idempotent.js'; import { creationString } from '../utils/idempotent.js';
type UserThreadInfo = { type UserThreadInfo = {
+devices: Map< +devices: Map<
string, string,
{ {
+platform: string, +platform: string,
+deviceToken: string, +deviceToken: string,
+cookieID: string,
+codeVersion: ?string, +codeVersion: ?string,
}, },
>, >,
+threadIDs: Set<string>, +threadIDs: Set<string>,
+notFocusedThreadIDs: Set<string>, +notFocusedThreadIDs: Set<string>,
+userNotMemberOfSubthreads: Set<string>, +userNotMemberOfSubthreads: Set<string>,
+subthreadsCanSetToUnread: Set<string>, +subthreadsCanSetToUnread: Set<string>,
}; };
▲ Show 20 Lines • Show All 255 Lines • ▼ Show 20 Lines for (const subthread of subthreadPermissionsToCheck) {
join.append(SQL`thread = ${subthread} AND `); join.append(SQL`thread = ${subthread} AND `);
join.append(`stm${index}.user = m.user`); join.append(`stm${index}.user = m.user`);
subthreadJoins.push(join); subthreadJoins.push(join);
} }
const time = earliestFocusedTimeConsideredExpired(); const time = earliestFocusedTimeConsideredExpired();
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`; const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL` const query = SQL`
SELECT m.user, m.thread, c.platform, c.device_token, c.versions, SELECT m.user, m.thread, c.platform, c.device_token, c.versions, c.id,
f.user AS focused_user f.user AS focused_user
`; `;
query.append(subthreadSelects); query.append(subthreadSelects);
query.append(SQL` query.append(SQL`
FROM memberships m FROM memberships m
LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL
LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread
AND f.time > ${time} AND f.time > ${time}
Show All 9 Lines) {
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
for (const row of result) { for (const row of result) {
const userID = row.user.toString(); const userID = row.user.toString();
const threadID = row.thread.toString(); const threadID = row.thread.toString();
const deviceToken = row.device_token; const deviceToken = row.device_token;
const focusedUser = !!row.focused_user; const focusedUser = !!row.focused_user;
const { platform } = row; const { platform } = row;
const versions = JSON.parse(row.versions); const versions = JSON.parse(row.versions);
const cookieID = row.id;
let thisUserInfo = perUserInfo.get(userID); let thisUserInfo = perUserInfo.get(userID);
if (!thisUserInfo) { if (!thisUserInfo) {
thisUserInfo = { thisUserInfo = {
devices: new Map(), devices: new Map(),
threadIDs: new Set(), threadIDs: new Set(),
notFocusedThreadIDs: new Set(), notFocusedThreadIDs: new Set(),
userNotMemberOfSubthreads: new Set(), userNotMemberOfSubthreads: new Set(),
subthreadsCanSetToUnread: new Set(), subthreadsCanSetToUnread: new Set(),
Show All 19 Lines if (!thisUserInfo) {
if ( if (
!isSubthreadMember || !isSubthreadMember ||
!permissionLookup(subthreadPermissions, threadPermissions.VISIBLE) !permissionLookup(subthreadPermissions, threadPermissions.VISIBLE)
) { ) {
thisUserInfo.userNotMemberOfSubthreads.add(subthread); thisUserInfo.userNotMemberOfSubthreads.add(subthread);
} }
} }
} }
if (deviceToken) { if (deviceToken && cookieID) {
thisUserInfo.devices.set(deviceToken, { thisUserInfo.devices.set(deviceToken, {
platform, platform,
deviceToken, deviceToken,
cookieID: cookieID.toString(),
codeVersion: versions ? versions.codeVersion : null, codeVersion: versions ? versions.codeVersion : null,
}); });
} }
thisUserInfo.threadIDs.add(threadID); thisUserInfo.threadIDs.add(threadID);
if (!focusedUser) { if (!focusedUser) {
thisUserInfo.notFocusedThreadIDs.add(threadID); thisUserInfo.notFocusedThreadIDs.add(threadID);
} }
} }
▲ Show 20 Lines • Show All 292 Lines • Show Last 20 Lines
View Options

services/identity/src/grpc_services/authenticated.rs

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
import { creationString } from '../utils/idempotent.js'; import { creationString } from '../utils/idempotent.js';
type UserThreadInfo = { type UserThreadInfo = {
+devices: Map< +devices: Map<
string, string,
{ {
+platform: string, +platform: string,
+deviceToken: string, +deviceToken: string,
+cookieID: string,
+codeVersion: ?string, +codeVersion: ?string,
}, },
>, >,
+threadIDs: Set<string>, +threadIDs: Set<string>,
+notFocusedThreadIDs: Set<string>, +notFocusedThreadIDs: Set<string>,
+userNotMemberOfSubthreads: Set<string>, +userNotMemberOfSubthreads: Set<string>,
+subthreadsCanSetToUnread: Set<string>, +subthreadsCanSetToUnread: Set<string>,
}; };
▲ Show 20 Lines • Show All 255 Lines • ▼ Show 20 Lines for (const subthread of subthreadPermissionsToCheck) {
join.append(SQL`thread = ${subthread} AND `); join.append(SQL`thread = ${subthread} AND `);
join.append(`stm${index}.user = m.user`); join.append(`stm${index}.user = m.user`);
subthreadJoins.push(join); subthreadJoins.push(join);
} }
const time = earliestFocusedTimeConsideredExpired(); const time = earliestFocusedTimeConsideredExpired();
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`; const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL` const query = SQL`
SELECT m.user, m.thread, c.platform, c.device_token, c.versions, SELECT m.user, m.thread, c.platform, c.device_token, c.versions, c.id,
f.user AS focused_user f.user AS focused_user
`; `;
query.append(subthreadSelects); query.append(subthreadSelects);
query.append(SQL` query.append(SQL`
FROM memberships m FROM memberships m
LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL
LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread
AND f.time > ${time} AND f.time > ${time}
Show All 9 Lines) {
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
for (const row of result) { for (const row of result) {
const userID = row.user.toString(); const userID = row.user.toString();
const threadID = row.thread.toString(); const threadID = row.thread.toString();
const deviceToken = row.device_token; const deviceToken = row.device_token;
const focusedUser = !!row.focused_user; const focusedUser = !!row.focused_user;
const { platform } = row; const { platform } = row;
const versions = JSON.parse(row.versions); const versions = JSON.parse(row.versions);
const cookieID = row.id;
let thisUserInfo = perUserInfo.get(userID); let thisUserInfo = perUserInfo.get(userID);
if (!thisUserInfo) { if (!thisUserInfo) {
thisUserInfo = { thisUserInfo = {
devices: new Map(), devices: new Map(),
threadIDs: new Set(), threadIDs: new Set(),
notFocusedThreadIDs: new Set(), notFocusedThreadIDs: new Set(),
userNotMemberOfSubthreads: new Set(), userNotMemberOfSubthreads: new Set(),
subthreadsCanSetToUnread: new Set(), subthreadsCanSetToUnread: new Set(),
Show All 19 Lines if (!thisUserInfo) {
if ( if (
!isSubthreadMember || !isSubthreadMember ||
!permissionLookup(subthreadPermissions, threadPermissions.VISIBLE) !permissionLookup(subthreadPermissions, threadPermissions.VISIBLE)
) { ) {
thisUserInfo.userNotMemberOfSubthreads.add(subthread); thisUserInfo.userNotMemberOfSubthreads.add(subthread);
} }
} }
} }
if (deviceToken) { if (deviceToken && cookieID) {
thisUserInfo.devices.set(deviceToken, { thisUserInfo.devices.set(deviceToken, {
platform, platform,
deviceToken, deviceToken,
cookieID: cookieID.toString(),
codeVersion: versions ? versions.codeVersion : null, codeVersion: versions ? versions.codeVersion : null,
}); });
} }
thisUserInfo.threadIDs.add(threadID); thisUserInfo.threadIDs.add(threadID);
if (!focusedUser) { if (!focusedUser) {
thisUserInfo.notFocusedThreadIDs.add(threadID); thisUserInfo.notFocusedThreadIDs.add(threadID);
} }
} }
▲ Show 20 Lines • Show All 292 Lines • Show Last 20 Lines
View Options

shared/protos/identity_authenticated.proto

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
import { creationString } from '../utils/idempotent.js'; import { creationString } from '../utils/idempotent.js';
type UserThreadInfo = { type UserThreadInfo = {
+devices: Map< +devices: Map<
string, string,
{ {
+platform: string, +platform: string,
+deviceToken: string, +deviceToken: string,
+cookieID: string,
+codeVersion: ?string, +codeVersion: ?string,
}, },
>, >,
+threadIDs: Set<string>, +threadIDs: Set<string>,
+notFocusedThreadIDs: Set<string>, +notFocusedThreadIDs: Set<string>,
+userNotMemberOfSubthreads: Set<string>, +userNotMemberOfSubthreads: Set<string>,
+subthreadsCanSetToUnread: Set<string>, +subthreadsCanSetToUnread: Set<string>,
}; };
▲ Show 20 Lines • Show All 255 Lines • ▼ Show 20 Lines for (const subthread of subthreadPermissionsToCheck) {
join.append(SQL`thread = ${subthread} AND `); join.append(SQL`thread = ${subthread} AND `);
join.append(`stm${index}.user = m.user`); join.append(`stm${index}.user = m.user`);
subthreadJoins.push(join); subthreadJoins.push(join);
} }
const time = earliestFocusedTimeConsideredExpired(); const time = earliestFocusedTimeConsideredExpired();
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`; const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL` const query = SQL`
SELECT m.user, m.thread, c.platform, c.device_token, c.versions, SELECT m.user, m.thread, c.platform, c.device_token, c.versions, c.id,
f.user AS focused_user f.user AS focused_user
`; `;
query.append(subthreadSelects); query.append(subthreadSelects);
query.append(SQL` query.append(SQL`
FROM memberships m FROM memberships m
LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL
LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread
AND f.time > ${time} AND f.time > ${time}
Show All 9 Lines) {
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
for (const row of result) { for (const row of result) {
const userID = row.user.toString(); const userID = row.user.toString();
const threadID = row.thread.toString(); const threadID = row.thread.toString();
const deviceToken = row.device_token; const deviceToken = row.device_token;
const focusedUser = !!row.focused_user; const focusedUser = !!row.focused_user;
const { platform } = row; const { platform } = row;
const versions = JSON.parse(row.versions); const versions = JSON.parse(row.versions);
const cookieID = row.id;
let thisUserInfo = perUserInfo.get(userID); let thisUserInfo = perUserInfo.get(userID);
if (!thisUserInfo) { if (!thisUserInfo) {
thisUserInfo = { thisUserInfo = {
devices: new Map(), devices: new Map(),
threadIDs: new Set(), threadIDs: new Set(),
notFocusedThreadIDs: new Set(), notFocusedThreadIDs: new Set(),
userNotMemberOfSubthreads: new Set(), userNotMemberOfSubthreads: new Set(),
subthreadsCanSetToUnread: new Set(), subthreadsCanSetToUnread: new Set(),
Show All 19 Lines if (!thisUserInfo) {
if ( if (
!isSubthreadMember || !isSubthreadMember ||
!permissionLookup(subthreadPermissions, threadPermissions.VISIBLE) !permissionLookup(subthreadPermissions, threadPermissions.VISIBLE)
) { ) {
thisUserInfo.userNotMemberOfSubthreads.add(subthread); thisUserInfo.userNotMemberOfSubthreads.add(subthread);
} }
} }
} }
if (deviceToken) { if (deviceToken && cookieID) {
thisUserInfo.devices.set(deviceToken, { thisUserInfo.devices.set(deviceToken, {
platform, platform,
deviceToken, deviceToken,
cookieID: cookieID.toString(),
codeVersion: versions ? versions.codeVersion : null, codeVersion: versions ? versions.codeVersion : null,
}); });
} }
thisUserInfo.threadIDs.add(threadID); thisUserInfo.threadIDs.add(threadID);
if (!focusedUser) { if (!focusedUser) {
thisUserInfo.notFocusedThreadIDs.add(threadID); thisUserInfo.notFocusedThreadIDs.add(threadID);
} }
} }
▲ Show 20 Lines • Show All 292 Lines • Show Last 20 Lines
View Options

shared/protos/identity_client.proto

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
import { creationString } from '../utils/idempotent.js'; import { creationString } from '../utils/idempotent.js';
type UserThreadInfo = { type UserThreadInfo = {
+devices: Map< +devices: Map<
string, string,
{ {
+platform: string, +platform: string,
+deviceToken: string, +deviceToken: string,
+cookieID: string,
+codeVersion: ?string, +codeVersion: ?string,
}, },
>, >,
+threadIDs: Set<string>, +threadIDs: Set<string>,
+notFocusedThreadIDs: Set<string>, +notFocusedThreadIDs: Set<string>,
+userNotMemberOfSubthreads: Set<string>, +userNotMemberOfSubthreads: Set<string>,
+subthreadsCanSetToUnread: Set<string>, +subthreadsCanSetToUnread: Set<string>,
}; };
▲ Show 20 Lines • Show All 255 Lines • ▼ Show 20 Lines for (const subthread of subthreadPermissionsToCheck) {
join.append(SQL`thread = ${subthread} AND `); join.append(SQL`thread = ${subthread} AND `);
join.append(`stm${index}.user = m.user`); join.append(`stm${index}.user = m.user`);
subthreadJoins.push(join); subthreadJoins.push(join);
} }
const time = earliestFocusedTimeConsideredExpired(); const time = earliestFocusedTimeConsideredExpired();
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`; const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL` const query = SQL`
SELECT m.user, m.thread, c.platform, c.device_token, c.versions, SELECT m.user, m.thread, c.platform, c.device_token, c.versions, c.id,
f.user AS focused_user f.user AS focused_user
`; `;
query.append(subthreadSelects); query.append(subthreadSelects);
query.append(SQL` query.append(SQL`
FROM memberships m FROM memberships m
LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL LEFT JOIN cookies c ON c.user = m.user AND c.device_token IS NOT NULL
LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread LEFT JOIN focused f ON f.user = m.user AND f.thread = m.thread
AND f.time > ${time} AND f.time > ${time}
Show All 9 Lines) {
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
for (const row of result) { for (const row of result) {
const userID = row.user.toString(); const userID = row.user.toString();
const threadID = row.thread.toString(); const threadID = row.thread.toString();
const deviceToken = row.device_token; const deviceToken = row.device_token;
const focusedUser = !!row.focused_user; const focusedUser = !!row.focused_user;
const { platform } = row; const { platform } = row;
const versions = JSON.parse(row.versions); const versions = JSON.parse(row.versions);
const cookieID = row.id;
let thisUserInfo = perUserInfo.get(userID); let thisUserInfo = perUserInfo.get(userID);
if (!thisUserInfo) { if (!thisUserInfo) {
thisUserInfo = { thisUserInfo = {
devices: new Map(), devices: new Map(),
threadIDs: new Set(), threadIDs: new Set(),
notFocusedThreadIDs: new Set(), notFocusedThreadIDs: new Set(),
userNotMemberOfSubthreads: new Set(), userNotMemberOfSubthreads: new Set(),
subthreadsCanSetToUnread: new Set(), subthreadsCanSetToUnread: new Set(),
Show All 19 Lines if (!thisUserInfo) {
if ( if (
!isSubthreadMember || !isSubthreadMember ||
!permissionLookup(subthreadPermissions, threadPermissions.VISIBLE) !permissionLookup(subthreadPermissions, threadPermissions.VISIBLE)
) { ) {
thisUserInfo.userNotMemberOfSubthreads.add(subthread); thisUserInfo.userNotMemberOfSubthreads.add(subthread);
} }
} }
} }
if (deviceToken) { if (deviceToken && cookieID) {
thisUserInfo.devices.set(deviceToken, { thisUserInfo.devices.set(deviceToken, {
platform, platform,
deviceToken, deviceToken,
cookieID: cookieID.toString(),
codeVersion: versions ? versions.codeVersion : null, codeVersion: versions ? versions.codeVersion : null,
}); });
} }
thisUserInfo.threadIDs.add(threadID); thisUserInfo.threadIDs.add(threadID);
if (!focusedUser) { if (!focusedUser) {
thisUserInfo.notFocusedThreadIDs.add(threadID); thisUserInfo.notFocusedThreadIDs.add(threadID);
} }
} }
▲ Show 20 Lines • Show All 292 Lines • Show Last 20 Lines