Paths

Table of Contentst

-
.gitignore
-
services/backup/
-
backup/
-
CMakeLists.txt
-
Dockerfile
-
blob_client/
-
Cargo.lock
-
Cargo.toml
-
build.rs
-
src/
-
constants.rs
-
get_client.rs
-
lib.rs
-
put_client.rs
-
old/
-
CMakeLists.txt
-
blob_client/
-
Cargo.lock
-
Cargo.toml
-
build.rs
-
src/
-
constants.rs
-
get_client.rs
-
lib.rs
-
put_client.rs
-
src/
-
BackupServiceImpl.h
-
BackupServiceImpl.cpp
-
Constants.h
-
DatabaseEntities/
-
BackupItem.h
-
BackupItem.cpp
-
LogItem.h
-
LogItem.cpp
-
DatabaseManager.h
-
DatabaseManager.cpp
-
Reactors/server/
-
server/
-
AddAttachmentsUtility.h
-
AddAttachmentsUtility.cpp
-
CreateNewBackupReactor.h
-
CreateNewBackupReactor.cpp
-
PullBackupReactor.h
-
PullBackupReactor.cpp
-
RecoverBackupKeyReactor.h
-
SendLogReactor.h
-
SendLogReactor.cpp
-
Tools.h
-
Tools.cpp
-
server.cpp
-
test/
-
BackupTest.cpp
-
DatabaseManagerTest.cpp
-
src/
-
BackupServiceImpl.h
-
BackupServiceImpl.cpp
-
Constants.h
-
DatabaseEntities/
-
BackupItem.h
-
BackupItem.cpp
-
LogItem.h
-
LogItem.cpp
-
DatabaseManager.h
-
DatabaseManager.cpp
-
Reactors/server/
-
server/
-
AddAttachmentsUtility.h
-
AddAttachmentsUtility.cpp
-
CreateNewBackupReactor.h
-
CreateNewBackupReactor.cpp
-
PullBackupReactor.h
-
PullBackupReactor.cpp
-
RecoverBackupKeyReactor.h
-
SendLogReactor.h
-
SendLogReactor.cpp
-
Tools.h
-
Tools.cpp
-
server.cpp
-
test/
-
BackupTest.cpp
-
DatabaseManagerTest.cpp

[services][backup] Move C++ impl to 'old' directory
ClosedPublic
Actions

Authored by bartek on Dec 8 2022, 4:03 AM.

Details

Reviewers

tomek
varun
• jon

Commits

rCOMM97f2b69903cf: [services][backup] Move C++ impl to 'old' directory

Summary

For the needs of the Rust service development, I moved the C++ implementation to the old dir.

Modified Dockerfile accordingly
Modified CMakeLists accordingly
Left blob_client untouched as it is convenient for me to keep it where it is.

Test Plan

Docker container builds
Service integration tests are passing

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bartek created this revision.Dec 8 2022, 4:03 AM

bartek held this revision as a draft.

Herald added subscribers: atul, ashoat. · View Herald TranscriptDec 8 2022, 4:03 AM

bartek added a child revision: D5842: [services][backup] Bootstrap new Rust project.Dec 8 2022, 4:08 AM

bartek published this revision for review.Dec 8 2022, 4:13 AM

bartek edited the summary of this revision. (Show Details)

Harbormaster completed remote builds in B14059: Diff 19246.Dec 8 2022, 4:15 AM

• jon requested changes to this revision.Dec 8 2022, 12:21 PM

• jon added inline comments.

services/backup/Dockerfile
26 ↗	(On Diff #19246)	would like to avoid adding conditional cmake logic around our particular usage of docker, and would prefer the docker context to reflect the shape of the repository. or you could do `COPY services/backup/old/ /transferred/services/backup/old`

This revision now requires changes to proceed.Dec 8 2022, 12:21 PM

bartek added inline comments.Dec 11 2022, 11:49 PM

services/backup/Dockerfile
26 ↗	(On Diff #19246)	Yeah, me neither like this solution, however there are just two reasons I did this: The same technique was used for blob service CMake (see snippet) before I ever touched it, so I just copy-pasted this solution This is temporary solution, this CMake is going to be removed anyway But I like your suggestion with `COPY` into the `[...]/old` dir in docker image, so I'll go with that.

Moved the blob_client to the old directory, reverted the CMake logic.

I decided to do this as it turned out I won't be re-using this code anyway.

Harbormaster completed remote builds in B15076: Diff 20567.Jan 4 2023, 5:15 AM

• jon accepted this revision.Jan 4 2023, 9:15 AM

This revision is now accepted and ready to land.Jan 4 2023, 9:15 AM

If we're not going to use it, should we just delete it?

In D5841#184931, @ashoat wrote:

If we're not going to use it, should we just delete it?

Yes, the blob_client Rust library is going to be deleted along with the C++ codebase in ENG-2403.

tomek accepted this revision.Jan 9 2023, 3:23 AM

Closed by commit rCOMM97f2b69903cf: [services][backup] Move C++ impl to 'old' directory (authored by bartek). · Explain WhyJan 11 2023, 1:30 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM97f2b69903cf: [services][backup] Move C++ impl to 'old' directory.

Revision Contents
Changeset List

Path

Size

.gitignore

2 lines

services/

backup/

CMakeLists.txt

Dockerfile

2 lines

blob_client/

src/

	old/

blob_client/

src/

src/

BackupServiceImpl.cpp

DatabaseEntities/

Reactors/

server/

AddAttachmentsUtility.h

AddAttachmentsUtility.cpp

CreateNewBackupReactor.h

CreateNewBackupReactor.cpp

PullBackupReactor.h

PullBackupReactor.cpp

RecoverBackupKeyReactor.h

test/

DatabaseManagerTest.cpp

src/

BackupServiceImpl.h

BackupServiceImpl.cpp

DatabaseEntities/

Reactors/

server/

AddAttachmentsUtility.h

AddAttachmentsUtility.cpp

CreateNewBackupReactor.h

CreateNewBackupReactor.cpp

PullBackupReactor.h

PullBackupReactor.cpp

RecoverBackupKeyReactor.h

test/

DatabaseManagerTest.cpp

Diff 20778

View Options

.gitignore

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/CMakeLists.txt

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/Dockerfile

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/blob_client/Cargo.lock

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/blob_client/Cargo.toml

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