Page MenuHomePhabricator
Differential D6204

[services][backup] AddAttachments 1/4 - create handler module
ClosedPublic
Actions

Authored by bartek on Jan 9 2023, 12:00 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 1, 6:46 AM
Unknown Object (File)
Sun, Mar 16, 1:34 PM
Unknown Object (File)
Thu, Mar 13, 8:26 AM
Unknown Object (File)
Mar 4 2025, 4:51 AM
Unknown Object (File)
Mar 4 2025, 4:51 AM
Unknown Object (File)
Mar 4 2025, 4:51 AM
Unknown Object (File)
Mar 4 2025, 4:51 AM
Unknown Object (File)
Mar 4 2025, 4:50 AM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
varun
tomek
• jon
• max
Commits
rCOMM93b265f7635e: [services][backup] AddAttachments 1/4 - create handler module
Summary

Created module for AddAttachments endpoint and added its invocation in the grpc handler.

Depends on D6203

Test Plan

Service builds and starts. This code has no logic yet.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Jan 9 2023, 12:00 PM
bartek held this revision as a draft.
Herald added subscribers: atul, ashoat. · View Herald TranscriptJan 9 2023, 12:00 PM
bartek added a child revision: D6205: [services][backup] AddAttachments 2/4 - holders string utils.Jan 9 2023, 12:13 PM
Harbormaster completed remote builds in B15211: Diff 20736.Jan 9 2023, 12:15 PM
bartek published this revision for review.Jan 9 2023, 12:32 PM
tomek accepted this revision.Jan 11 2023, 5:31 AM
This revision is now accepted and ready to land.Jan 11 2023, 5:31 AM
bartek updated this revision to Diff 20883.Jan 12 2023, 9:18 AM
  • Removed logging of user_id
  • Cleaned up log message a bit
Harbormaster completed remote builds in B15308: Diff 20883.Jan 12 2023, 9:33 AM
bartek updated this revision to Diff 21086.Jan 19 2023, 9:40 AM

Rebase

Harbormaster completed remote builds in B15464: Diff 21086.Jan 19 2023, 9:59 AM
Closed by commit rCOMM93b265f7635e: [services][backup] AddAttachments 1/4 - create handler module (authored by bartek). · Explain WhyJan 19 2023, 10:07 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMM93b265f7635e: [services][backup] AddAttachments 1/4 - create handler module.

Revision Contents
Changeset List

PathSize
services/
backup/
src/
service/
handlers/
11 lines
23 lines

Diff 21102

View Options

services/backup/src/service/handlers/add_attachments.rs

Show First 20 Lines • Show All 638 Lines • ▼ Show 20 Lines return {
cookieInsertedThisRequest: true, cookieInsertedThisRequest: true,
isScriptViewer: false, isScriptViewer: false,
}; };
} }
type UserCookieCreationParams = { type UserCookieCreationParams = {
platformDetails: PlatformDetails, platformDetails: PlatformDetails,
deviceToken?: ?string, deviceToken?: ?string,
primaryIdentityPublicKey?: ?string,
}; };
// The result of this function should never be passed directly to the Viewer // The result of this function should never be passed directly to the Viewer
// constructor. Instead, it should be passed to viewer.setNewCookie. There are // constructor. Instead, it should be passed to viewer.setNewCookie. There are
// several fields on UserViewerData that are not set by this function: // several fields on UserViewerData that are not set by this function:
// sessionID, sessionIdentifierType, cookieSource, and ipAddress. These // sessionID, sessionIdentifierType, cookieSource, and ipAddress. These
// parameters all depend on the initial request. If the result of this function // parameters all depend on the initial request. If the result of this function
// is passed to the Viewer constructor directly, the resultant Viewer object // is passed to the Viewer constructor directly, the resultant Viewer object
// will throw whenever anybody attempts to access the relevant properties. // will throw whenever anybody attempts to access the relevant properties.
async function createNewUserCookie( async function createNewUserCookie(
userID: string, userID: string,
params: UserCookieCreationParams, params: UserCookieCreationParams,
): Promise<UserViewerData> { ): Promise<UserViewerData> {
const { platformDetails, deviceToken } = params; const { platformDetails, deviceToken, primaryIdentityPublicKey } = params;
const { platform, ...versions } = platformDetails || defaultPlatformDetails; const { platform, ...versions } = platformDetails || defaultPlatformDetails;
const versionsString = const versionsString =
Object.keys(versions).length > 0 ? JSON.stringify(versions) : null; Object.keys(versions).length > 0 ? JSON.stringify(versions) : null;
const time = Date.now(); const time = Date.now();
const cookiePassword = crypto.randomBytes(32).toString('hex'); const cookiePassword = crypto.randomBytes(32).toString('hex');
const cookieHash = bcrypt.hashSync(cookiePassword); const cookieHash = bcrypt.hashSync(cookiePassword);
const [[cookieID]] = await Promise.all([ const [[cookieID]] = await Promise.all([
createIDs('cookies', 1), createIDs('cookies', 1),
deviceToken ? clearDeviceToken(deviceToken) : undefined, deviceToken ? clearDeviceToken(deviceToken) : undefined,
]); ]);
const cookieRow = [ const cookieRow = [
cookieID, cookieID,
cookieHash, cookieHash,
userID, userID,
platform, platform,
time, time,
time, time,
deviceToken, deviceToken,
versionsString, versionsString,
primaryIdentityPublicKey,
]; ];
const query = SQL` const query = SQL`
INSERT INTO cookies(id, hash, user, platform, creation_time, last_used, INSERT INTO cookies(id, hash, user, platform, creation_time, last_used,
device_token, versions) device_token, versions, public_key)
VALUES ${[cookieRow]} VALUES ${[cookieRow]}
`; `;
await dbQuery(query); await dbQuery(query);
return { return {
loggedIn: true, loggedIn: true,
id: userID, id: userID,
platformDetails, platformDetails,
deviceToken, deviceToken,
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines
View Options

services/backup/src/service/mod.rs

Show First 20 Lines • Show All 638 Lines • ▼ Show 20 Lines return {
cookieInsertedThisRequest: true, cookieInsertedThisRequest: true,
isScriptViewer: false, isScriptViewer: false,
}; };
} }
type UserCookieCreationParams = { type UserCookieCreationParams = {
platformDetails: PlatformDetails, platformDetails: PlatformDetails,
deviceToken?: ?string, deviceToken?: ?string,
primaryIdentityPublicKey?: ?string,
}; };
// The result of this function should never be passed directly to the Viewer // The result of this function should never be passed directly to the Viewer
// constructor. Instead, it should be passed to viewer.setNewCookie. There are // constructor. Instead, it should be passed to viewer.setNewCookie. There are
// several fields on UserViewerData that are not set by this function: // several fields on UserViewerData that are not set by this function:
// sessionID, sessionIdentifierType, cookieSource, and ipAddress. These // sessionID, sessionIdentifierType, cookieSource, and ipAddress. These
// parameters all depend on the initial request. If the result of this function // parameters all depend on the initial request. If the result of this function
// is passed to the Viewer constructor directly, the resultant Viewer object // is passed to the Viewer constructor directly, the resultant Viewer object
// will throw whenever anybody attempts to access the relevant properties. // will throw whenever anybody attempts to access the relevant properties.
async function createNewUserCookie( async function createNewUserCookie(
userID: string, userID: string,
params: UserCookieCreationParams, params: UserCookieCreationParams,
): Promise<UserViewerData> { ): Promise<UserViewerData> {
const { platformDetails, deviceToken } = params; const { platformDetails, deviceToken, primaryIdentityPublicKey } = params;
const { platform, ...versions } = platformDetails || defaultPlatformDetails; const { platform, ...versions } = platformDetails || defaultPlatformDetails;
const versionsString = const versionsString =
Object.keys(versions).length > 0 ? JSON.stringify(versions) : null; Object.keys(versions).length > 0 ? JSON.stringify(versions) : null;
const time = Date.now(); const time = Date.now();
const cookiePassword = crypto.randomBytes(32).toString('hex'); const cookiePassword = crypto.randomBytes(32).toString('hex');
const cookieHash = bcrypt.hashSync(cookiePassword); const cookieHash = bcrypt.hashSync(cookiePassword);
const [[cookieID]] = await Promise.all([ const [[cookieID]] = await Promise.all([
createIDs('cookies', 1), createIDs('cookies', 1),
deviceToken ? clearDeviceToken(deviceToken) : undefined, deviceToken ? clearDeviceToken(deviceToken) : undefined,
]); ]);
const cookieRow = [ const cookieRow = [
cookieID, cookieID,
cookieHash, cookieHash,
userID, userID,
platform, platform,
time, time,
time, time,
deviceToken, deviceToken,
versionsString, versionsString,
primaryIdentityPublicKey,
]; ];
const query = SQL` const query = SQL`
INSERT INTO cookies(id, hash, user, platform, creation_time, last_used, INSERT INTO cookies(id, hash, user, platform, creation_time, last_used,
device_token, versions) device_token, versions, public_key)
VALUES ${[cookieRow]} VALUES ${[cookieRow]}
`; `;
await dbQuery(query); await dbQuery(query);
return { return {
loggedIn: true, loggedIn: true,
id: userID, id: userID,
platformDetails, platformDetails,
deviceToken, deviceToken,
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines