lib/facts/backup-service.js
3–6 ↗	(On Diff #30468)	Requesting changes to address https://phab.comm.dev/D8991#inline-57473 Might be also worth doing for Blob service facts: // lib/facts/blob-service.js type BlobServicePath = '/blob/:blobHash' \| '/blob'; export type BlobServiceHTTPEndpoint = { +path: BlobServicePath, +method: 'GET' \| 'POST' \| 'PUT' \| 'DELETE', };

This revision now requires changes to proceed.Aug 29 2023, 5:57 AM

michal added inline comments.Aug 29 2023, 7:12 AM

lib/facts/backup-service.js
14–30 ↗	(On Diff #30468)	I would probably name them like this

michal added inline comments.Aug 29 2023, 7:39 AM

lib/facts/backup-service.js
15–19 ↗	(On Diff #30468)	Also we can probably use JS style naming convention (blob facts also use camelCase) (remember to also change all calls to `makeBackupServiceEndpointURL` with the different names!)

This is a larger change that we probably don't need to implement but what about creating something more like this:

const httpEndpoints = Object.freeze({
  UPLOAD_BACKUP: () => {
    path: '/backups',
    method: 'POST',
  },
  GET_USER_KEYS_AUTH: (backup_id) => {
    path: `/backups/${backup_id}/user_keys`,
    method: 'GET',
  },

Maybe even add an argument for auth identity, and make the returned objects contain headers?: string[], that would be added with spread operator to the other headers?

improve types

Thanks for all the suggestions, I improved the type for path - for the rest I created ENG-4819.

lib/facts/backup-service.js
3–6 ↗	(On Diff #30468)	Done! For blob see: D9012

Harbormaster completed remote builds in B22229: Diff 30513.Aug 29 2023, 9:02 AM

michal accepted this revision.Aug 29 2023, 9:06 AM

bartek accepted this revision.Aug 29 2023, 10:10 AM

This revision is now accepted and ready to land.Aug 29 2023, 10:10 AM

Closed by commit rCOMM84ce71bd0714: [client-backup] add backup-service facts (authored by kamil). · Explain WhyAug 30 2023, 11:29 AM

This revision was automatically updated to reflect the committed changes.

kamil mentioned this in rCOMM313efebf3489: [client-backup] add function to create backup-service URL.

kamil added a commit: rCOMM84ce71bd0714: [client-backup] add backup-service facts.

Revision Contents
Changeset List

Path

Size

lib/

facts/

backup-service.js

45 lines

Diff 30513

View Options

lib/facts/backup-service.js

Show First 20 Lines • Show All 487 Lines • ▼ Show 20 Lines	attempt_delete_file(
"Failed to delete unencrypted database.");		"Failed to delete unencrypted database.");
attempt_rename_file(		attempt_rename_file(
temp_encrypted_db_path,		temp_encrypted_db_path,
SQLiteQueryExecutor::sqliteFilePath,		SQLiteQueryExecutor::sqliteFilePath,
"Failed to move encrypted database to default location.");		"Failed to move encrypted database to default location.");
Logger::log("Encryption completed successfully.");		Logger::log("Encryption completed successfully.");
}		}

		auto &SQLiteQueryExecutor::getStorage() {
		static auto storage = make_storage(
		SQLiteQueryExecutor::sqliteFilePath,
		make_index("messages_idx_thread_time", &Message::thread, &Message::time),
		make_index("media_idx_container", &Media::container),
		make_table(
		"drafts",
		make_column("key", &Draft::key, unique(), primary_key()),
		make_column("text", &Draft::text)),
		make_table(
		"messages",
		make_column("id", &Message::id, unique(), primary_key()),
		make_column("local_id", &Message::local_id),
		make_column("thread", &Message::thread),
		make_column("user", &Message::user),
		make_column("type", &Message::type),
		make_column("future_type", &Message::future_type),
		make_column("content", &Message::content),
		make_column("time", &Message::time)),
		make_table(
		"olm_persist_account",
		make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
		make_column("account_data", &OlmPersistAccount::account_data)),
		make_table(
		"olm_persist_sessions",
		make_column(
		"target_user_id",
		&OlmPersistSession::target_user_id,
		unique(),
		primary_key()),
		make_column("session_data", &OlmPersistSession::session_data)),
		make_table(
		"media",
		make_column("id", &Media::id, unique(), primary_key()),
		make_column("container", &Media::container),
		make_column("thread", &Media::thread),
		make_column("uri", &Media::uri),
		make_column("type", &Media::type),
		make_column("extras", &Media::extras)),
		make_table(
		"threads",
		make_column("id", &Thread::id, unique(), primary_key()),
		make_column("type", &Thread::type),
		make_column("name", &Thread::name),
		make_column("description", &Thread::description),
		make_column("color", &Thread::color),
		make_column("creation_time", &Thread::creation_time),
		make_column("parent_thread_id", &Thread::parent_thread_id),
		make_column("containing_thread_id", &Thread::containing_thread_id),
		make_column("community", &Thread::community),
		make_column("members", &Thread::members),
		make_column("roles", &Thread::roles),
		make_column("current_user", &Thread::current_user),
		make_column("source_message_id", &Thread::source_message_id),
		make_column("replies_count", &Thread::replies_count)),
		make_table(
		"metadata",
		make_column("name", &Metadata::name, unique(), primary_key()),
		make_column("data", &Metadata::data)));
		storage.on_open = on_database_open;
		return storage;
		}

typedef bool ShouldBeInTransaction;		typedef bool ShouldBeInTransaction;
typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction>		typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction>
SQLiteMigration;		SQLiteMigration;
std::vector<std::pair<uint, SQLiteMigration>> migrations{		std::vector<std::pair<uint, SQLiteMigration>> migrations{
{{1, {create_drafts_table, true}},		{{1, {create_drafts_table, true}},
{2, {rename_threadID_to_key, true}},		{2, {rename_threadID_to_key, true}},
{4, {create_persist_account_table, true}},		{4, {create_persist_account_table, true}},
{5, {create_persist_sessions_table, true}},		{5, {create_persist_sessions_table, true}},
Show All 28 Lines	void SQLiteQueryExecutor::migrate() const {

int current_user_version = sqlite3_column_int(user_version_stmt, 0);		int current_user_version = sqlite3_column_int(user_version_stmt, 0);
sqlite3_finalize(user_version_stmt);		sqlite3_finalize(user_version_stmt);

std::stringstream version_msg;		std::stringstream version_msg;
version_msg << "db version: " << current_user_version << std::endl;		version_msg << "db version: " << current_user_version << std::endl;
Logger::log(version_msg.str());		Logger::log(version_msg.str());

		if (current_user_version == 0) {
		SQLiteQueryExecutor::getStorage().sync_schema();

		Logger::log("Creating new database, syncing structure with ORM storage.");

		auto latest_version = migrations.back().first;

		std::stringstream update_version;
		update_version << "PRAGMA user_version=" << latest_version << ";";
		auto update_version_str = update_version.str();

		char *error;
		sqlite3_exec(db, update_version_str.c_str(), nullptr, nullptr, &error);

		if (error) {
		std::ostringstream errorStream;
		errorStream << "Error saving database version: " << error;
		Logger::log(errorStream.str());
		marcinUnsubmitted Not Done Inline Actions How is application going to function if this error occurs? In most places we the runtime error to kill the app if database operation fails since application is not going to work correctly. I just want to know whether it is also the case here. marcin: How is application going to function if this error occurs? In most places we the runtime error…
		sqlite3_free(error);
		}

		return;
		}

for (const auto &[idx, migration] : migrations) {		for (const auto &[idx, migration] : migrations) {
if (idx <= current_user_version) {		if (idx <= current_user_version) {
continue;		continue;
}		}
const auto &[applyMigration, shouldBeInTransaction] = migration;		const auto &[applyMigration, shouldBeInTransaction] = migration;

std::stringstream migration_msg;		std::stringstream migration_msg;

Show All 28 Lines	void SQLiteQueryExecutor::assign_encryption_key() {
CommSecureStore commSecureStore{};		CommSecureStore commSecureStore{};
std::string encryptionKey = comm::crypto::Tools::generateRandomHexString(		std::string encryptionKey = comm::crypto::Tools::generateRandomHexString(
SQLiteQueryExecutor::sqlcipherEncryptionKeySize);		SQLiteQueryExecutor::sqlcipherEncryptionKeySize);
commSecureStore.set(		commSecureStore.set(
SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey);		SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey);
SQLiteQueryExecutor::encryptionKey = encryptionKey;		SQLiteQueryExecutor::encryptionKey = encryptionKey;
}		}

auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}

void SQLiteQueryExecutor::initialize(std::string &databasePath) {		void SQLiteQueryExecutor::initialize(std::string &databasePath) {
std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() {		std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() {
SQLiteQueryExecutor::sqliteFilePath = databasePath;		SQLiteQueryExecutor::sqliteFilePath = databasePath;
CommSecureStore commSecureStore{};		CommSecureStore commSecureStore{};
folly::Optional<std::string> maybeEncryptionKey =		folly::Optional<std::string> maybeEncryptionKey =
commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID);		commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID);

if (file_exists(databasePath) && maybeEncryptionKey) {		if (file_exists(databasePath) && maybeEncryptionKey) {
▲ Show 20 Lines • Show All 277 Lines • Show Last 20 Lines

[client-backup] add backup-service factsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30513

lib/facts/backup-service.js

[client-backup] add backup-service facts
ClosedPublic
Actions

Revision Contents
Changeset List