Paths

Table of Contentst

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

[services][backup] SendLog 2/4 - handle non-data inputs
ClosedPublic
Actions

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

Details

Reviewers

varun
tomek
• jon
• max
michal

Commits

rCOMM063beea85ccf: [services][backup] SendLog 2/4 - handle non-data inputs

Summary

This diff adds logic for processing non-data inputs (handler non-data-mode). After all of them are provided,
log ID is generated and handler switches to "data mode" (waits for data chunks), which is implemented in next diff.

Depends on D6211

Test Plan

The service builds and starts. Logic of this diff can be tested altogether with the grandchild diff - see the description there.

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

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

bartek held this revision as a draft.

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

bartek added a child revision: D6213: [services][backup] SendLog 3/4 - handle log data.Jan 10 2023, 8:40 AM

Harbormaster completed remote builds in B15223: Diff 20753.Jan 10 2023, 8:51 AM

bartek added a reviewer: michal.Jan 11 2023, 10:39 AM

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

tomek accepted this revision.Jan 12 2023, 7:09 AM

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

Removed logging user_id

Harbormaster completed remote builds in B15314: Diff 20889.Jan 12 2023, 10:25 AM

Rebase

Harbormaster completed remote builds in B15469: Diff 21091.Jan 19 2023, 9:56 AM

Closed by commit rCOMM063beea85ccf: [services][backup] SendLog 2/4 - handle non-data inputs (authored by bartek). · Explain WhyJan 19 2023, 10:08 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM063beea85ccf: [services][backup] SendLog 2/4 - handle non-data inputs.

Revision Contents
Changeset List

Path

Size

services/

backup/

src/

service/

handlers/

send_log.rs

60 lines

Diff 21107

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 2/4 - handle non-data inputsClosedPublicActions