Page MenuHomePhabricator
Differential D3526

[services] Tunnelbroker - Validate sessionID and deviceID in database entities.
ClosedPublic
Actions

Authored by • max on Mar 28 2022, 6:47 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 24, 5:27 PM
Unknown Object (File)
Thu, Apr 17, 3:03 PM
Unknown Object (File)
Thu, Apr 17, 3:00 PM
Unknown Object (File)
Thu, Apr 17, 2:18 PM
Unknown Object (File)
Thu, Apr 17, 1:46 PM
Unknown Object (File)
Thu, Apr 17, 10:15 AM
Unknown Object (File)
Thu, Apr 17, 5:11 AM
Unknown Object (File)
Wed, Apr 16, 12:38 AM
View All Files
Subscribers
• adrian
ashoat
atul
• benschac
• karol
tomek

Details

Reviewers
tomek
• karol
varun
Commits
rCOMMfb186959aef0: [services] Tunnelbroker - Validate sessionID and deviceID in database entities.
Summary

Validating sessionID and deviceID fields in database item entities using validation functions in Tools.

Note:
Validating empty strings are moved to D3525 which will be merged.

Related linear task: ENG-618

Test Plan

Successfully built and run service using yarn run-tunnelbroker-service.

Diff Detail

Repository
rCOMM Comm
Branch
deviceid-sessionid-validation
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• max created this revision.Mar 28 2022, 6:47 AM
Herald added subscribers: • benschac, • karol, atul and 3 others. · View Herald TranscriptMar 28 2022, 6:47 AM
• max edited the summary of this revision. (Show Details)Mar 28 2022, 6:50 AM
• max added reviewers: tomek, • karol, varun.
Harbormaster completed remote builds in B7646: Diff 10740.Mar 28 2022, 6:57 AM
• max requested review of this revision.Mar 28 2022, 6:57 AM
ashoat added a comment.EditedMar 28 2022, 10:45 AM

If this diff has a dependency on D3525, please specify it! You can do this by hitting "Edit Related Revisions..." in the UI on this page, or you can do it by specifying "Depends on Dsomething" in the diff description when creating the diff with arc diff.

(Apologies if there is no dependency, I may be misunderstanding your diff description.)

tomek requested changes to this revision.Mar 29 2022, 5:51 AM
tomek added inline comments.
services/tunnelbroker/src/Database/MessageItem.cpp
36–47 ↗(On Diff #10740)

Shouldn't we keep checking messageID and expire?

This revision now requires changes to proceed.Mar 29 2022, 5:51 AM
• max planned changes to this revision.Mar 30 2022, 4:24 AM
• max updated this revision to Diff 10877.Mar 31 2022, 6:06 AM

Moving it on top of D3525 to be more clear.

• max added a parent revision: D3525: [services] Tunnelbroker - Empty field checks in database items.Mar 31 2022, 6:07 AM
• max marked an inline comment as done.
• max added inline comments.
services/tunnelbroker/src/Database/MessageItem.cpp
36–47 ↗(On Diff #10740)

Shouldn't we keep checking messageID and expire?

Right, but it's on the other diff.
Moved it on top of the D3525 to be more clear.

Harbormaster completed remote builds in B7761: Diff 10877.Mar 31 2022, 6:13 AM
• max mentioned this in D3525: [services] Tunnelbroker - Empty field checks in database items.Mar 31 2022, 6:16 AM
• max marked an inline comment as done.Mar 31 2022, 6:20 AM
In D3526#96388, @ashoat wrote:

If this diff has a dependency on D3525, please specify it! You can do this by hitting "Edit Related Revisions..." in the UI on this page, or you can do it by specifying "Depends on Dsomething" in the diff description when creating the diff with arc diff.

(Apologies if there is no dependency, I may be misunderstanding your diff description.)

It was like two separate parallel diffs that will be merged. But I'm changing to Parent-Child diffs stack right now to be more clear.
Thanks!

tomek accepted this revision.Mar 31 2022, 8:43 AM
This revision is now accepted and ready to land.Mar 31 2022, 8:43 AM
• max updated this revision to Diff 11148.Apr 7 2022, 2:41 AM

Rebasing on master. Merging changes.

Harbormaster completed remote builds in B7954: Diff 11148.Apr 7 2022, 2:48 AM
• max updated this revision to Diff 11158.Apr 7 2022, 2:50 AM

Rebase on master.

This revision was landed with ongoing or failed builds.Apr 7 2022, 2:51 AM
Closed by commit rCOMMfb186959aef0: [services] Tunnelbroker - Validate sessionID and deviceID in database entities. (authored by • max). · Explain Why
This revision was automatically updated to reflect the committed changes.
• max added a commit: rCOMMfb186959aef0: [services] Tunnelbroker - Validate sessionID and deviceID in database entities..
Harbormaster completed remote builds in B7955: Diff 11158.Apr 7 2022, 2:57 AM

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
src/
Database/
6 lines
6 lines
3 lines
3 lines

Diff 11148

View Options

services/tunnelbroker/src/Database/DeviceSessionItem.cpp

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 Linesvoid 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 Linesvoid 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
View Options

services/tunnelbroker/src/Database/MessageItem.cpp

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 Linesvoid 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 Linesvoid 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
View Options

services/tunnelbroker/src/Database/PublicKeyItem.cpp

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 Linesvoid 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 Linesvoid 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
View Options

services/tunnelbroker/src/Database/SessionSignItem.cpp

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 Linesvoid 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 Linesvoid 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