Paths

Table of Contentst

-
services/backup/src/service/handlers/
-
backup/
-
src/
-
service/
-
handlers/
-
send_log.rs

[services][backup] SendLog 4/4 - save and finish
ClosedPublic
Actions

Authored by bartek on Jan 10 2023, 8:48 AM.

Details

Reviewers

varun
tomek
• jon
• max
michal

Commits

rCOMM3e78189f6e16: [services][backup] SendLog 4/4 - save and finish

Summary

After all data is sent, the log item is saved to database and response is returned.
The value database field is either log contents or blob holder, depending on persistence method
determined when data was uploaded.

Depends on D6213

Test Plan

The endpoint can be tested manually (e.g. BloomRPC) or by yarn run-integration-tests backup - these will fail yet, but some logs should be created, which can be checked by e.g. looking at backup and blob services logs or using aws-cli.

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bartek created this revision.Jan 10 2023, 8:48 AM

bartek held this revision as a draft.

Herald added subscribers: atul, ashoat. · View Herald TranscriptJan 10 2023, 8:48 AM

Harbormaster completed remote builds in B15225: Diff 20755.Jan 10 2023, 9:02 AM

bartek published this revision for review.Jan 11 2023, 1:31 PM

bartek added a reviewer: michal.

bartek added a child revision: D6240: [services][backup] PullBackup 1/5 - create handler module.Jan 11 2023, 3:09 PM

tomek accepted this revision.Jan 12 2023, 8:08 AM

This revision is now accepted and ready to land.Jan 12 2023, 8:08 AM

Rebase

Harbormaster completed remote builds in B15319: Diff 20894.Jan 12 2023, 11:42 AM

Rebase

Harbormaster completed remote builds in B15471: Diff 21093.Jan 19 2023, 9:59 AM

Closed by commit rCOMM3e78189f6e16: [services][backup] SendLog 4/4 - save and finish (authored by bartek). · Explain WhyJan 19 2023, 10:08 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM3e78189f6e16: [services][backup] SendLog 4/4 - save and finish.

Revision Contents
Changeset List

Path

Size

services/

backup/

src/

service/

handlers/

send_log.rs

57 lines

Diff 21109

View Options

services/backup/src/service/handlers/send_log.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

[services][backup] SendLog 4/4 - save and finishClosedPublicActions