Page MenuHomePhabricator
Differential D6178

[services][backup] Provide database client to service
ClosedPublic
Actions

Authored by bartek on Jan 5 2023, 5:08 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 4, 6:28 AM
Unknown Object (File)
Tue, Apr 1, 11:19 AM
Unknown Object (File)
Thu, Mar 20, 9:09 PM
Unknown Object (File)
Sun, Mar 16, 2:04 PM
Unknown Object (File)
Sun, Mar 16, 2:04 PM
Unknown Object (File)
Mar 11 2025, 6:36 AM
Unknown Object (File)
Mar 6 2025, 2:58 PM
Unknown Object (File)
Mar 4 2025, 6:34 AM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
varun
• jon
tomek
• max
Commits
rCOMMf53bc6bb1d35: [services][backup] Provide database client to service
Summary
  • Added a helper to load AWS configuration
  • Provided DynamoDB client to the gRPC service.

This approach is mostly copy-pasted from blob service

Depends on D6177

Test Plan

The service builds and starts as expected

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Jan 5 2023, 5:08 AM
bartek held this revision as a draft.
Herald added subscribers: atul, ashoat. · View Herald TranscriptJan 5 2023, 5:08 AM
bartek added a child revision: D6179: [services][backup] Add database helpers.Jan 5 2023, 5:12 AM
bartek published this revision for review.Jan 5 2023, 5:20 AM
Harbormaster completed remote builds in B15121: Diff 20616.Jan 5 2023, 5:22 AM
bartek updated this revision to Diff 20657.Jan 9 2023, 2:43 AM

Rebase

Harbormaster completed remote builds in B15149: Diff 20657.Jan 9 2023, 2:58 AM
tomek accepted this revision.Jan 9 2023, 7:07 AM
This revision is now accepted and ready to land.Jan 9 2023, 7:07 AM
bartek updated this revision to Diff 20699.Jan 9 2023, 7:19 AM

Rebase

Harbormaster completed remote builds in B15187: Diff 20699.Jan 9 2023, 7:33 AM
bartek mentioned this in D6167: [services][backup] Implement blob Put client.Jan 10 2023, 1:42 AM
bartek updated this revision to Diff 20842.Jan 12 2023, 12:54 AM

Rebase

Harbormaster failed remote builds in B15283: Diff 20842!Jan 12 2023, 1:08 AM
Harbormaster completed remote builds in B15283: Diff 20842.Jan 12 2023, 7:55 AM
Closed by commit rCOMMf53bc6bb1d35: [services][backup] Provide database client to service (authored by bartek). · Explain WhyJan 13 2023, 9:04 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMf53bc6bb1d35: [services][backup] Provide database client to service.

Revision Contents
Changeset List

PathSize
services/
backup/
src/
25 lines
1 line
9 lines
service/
13 lines

Diff 20937

View Options

services/backup/src/config.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/constants.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/main.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