Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keyring Module #2

Merged
merged 18 commits into from
Dec 5, 2023
Merged

Keyring Module #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d8fa567
Keyring - Start Store and Keyring
nlogozzo Dec 1, 2023
c90dbfe
Keyring - Implement Store
nlogozzo Dec 4, 2023
7f4292b
All - Cleanup
nlogozzo Dec 4, 2023
c2287e7
Keyring - Make Store Thread Safe
nlogozzo Dec 4, 2023
cd959ff
Revert "All - Cleanup"
nlogozzo Dec 4, 2023
adedc8e
Keyring - Keyring Implementation
nlogozzo Dec 4, 2023
52ac687
Keyring - Better SystemCredentials API
nlogozzo Dec 4, 2023
fb73d3e
Keyring - Fix Linux Build
nlogozzo Dec 4, 2023
07413fe
Keyring - Blank KeyringDialogController + Enum Flag Macros
nlogozzo Dec 4, 2023
a626f1f
Update appinfo.cpp
nlogozzo Dec 4, 2023
dc923ed
All - Cleanup
nlogozzo Dec 4, 2023
f675149
All - Don't Use Optional Everywhere + Ensure Thread Safety
nlogozzo Dec 4, 2023
daff19b
Keyring - Better Store and Keyring Handling
nlogozzo Dec 4, 2023
781c759
Keyring - Store Overload =
nlogozzo Dec 4, 2023
4602878
All - Add gtest
nlogozzo Dec 4, 2023
e642385
Keyring - Implement KeyringDialogController
nlogozzo Dec 5, 2023
a6d4a5c
Update .gitattributes
nlogozzo Dec 5, 2023
798f449
Update .gitattributes
nlogozzo Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Keyring - Make Store Thread Safe
  • Loading branch information
@nlogozzo
nlogozzo committed Dec 4, 2023
commit c2287e7e763b175bd575f4f19fb2864fdb363725
12 changes: 9 additions & 3 deletions include/keyring/store.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define STORE_H

#include <filesystem>
#include <memory>
#include <mutex>
#include <optional>
#include <string>
#include <vector>
Expand All @@ -17,6 +17,11 @@ namespace Nickvision::Aura::Keyring
class Store
{
public:
/**
* @brief Moves a Store object.
* @parma store The object to move
*/
Store(Store&& store);
/**
* @brief Gets the name of the store.
* @return The name of the store
Expand Down Expand Up @@ -69,8 +74,9 @@ namespace Nickvision::Aura::Keyring
bool destroy();

private:
Store(const std::string& name, std::unique_ptr<SQLite::Database> database);
std::unique_ptr<SQLite::Database> m_database;
mutable std::mutex m_mutex;
Store(const std::string& name, SQLite::Database& database);
SQLite::Database m_database;
std::string m_name;
std::filesystem::path m_path;

Expand Down
48 changes: 32 additions & 16 deletions src/keyring/store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,39 @@ namespace Nickvision::Aura::Keyring
return Store::getStoreDir() / (name + ".ring");
}

Store::Store(const std::string& name, std::unique_ptr<Database> database)
Store::Store(const std::string& name, Database& database)
: m_name{ name },
m_database{ std::move(database) },
m_path{ getPathFromName(name) }
{
m_database->exec("CREATE TABLE IF NOT EXISTS credentials (id TEXT PRIMARY KEY, name TEXT, uri TEXT, username TEXT, password TEXT)");
m_database.exec("CREATE TABLE IF NOT EXISTS credentials (id TEXT PRIMARY KEY, name TEXT, uri TEXT, username TEXT, password TEXT)");
}

Store::Store(Store&& store)
: m_name{ std::move(store.m_name) },
m_database{ std::move(store.m_database) },
m_path{ std::move(store.m_path) }
{

}

const std::string& Store::getName() const
{
std::lock_guard<std::mutex> m_lock{ m_mutex };
return m_name;
}

const std::filesystem::path& Store::getPath() const
{
std::lock_guard<std::mutex> m_lock{ m_mutex };
return m_path;
}

std::vector<Credential> Store::getAllCredentials() const
{
std::lock_guard<std::mutex> m_lock{ m_mutex };
std::vector<Credential> creds;
Statement query{ *m_database, "SELECT * FROM credentials" };
Statement query{ m_database, "SELECT * FROM credentials" };
while (query.executeStep())
{
creds.push_back({ query.getColumn(0).getInt(), query.getColumn(1).getString(), query.getColumn(2).getString(), query.getColumn(3).getString(), query.getColumn(4).getString() });
Expand All @@ -41,7 +52,8 @@ namespace Nickvision::Aura::Keyring

std::optional<Credential> Store::getCredential(int id) const
{
Statement query{ *m_database, "SELECT * FROM credentials where id = ?" };
std::lock_guard<std::mutex> m_lock{ m_mutex };
Statement query{ m_database, "SELECT * FROM credentials where id = ?" };
query.bind(1, id);
query.executeStep();
if (query.hasRow())
Expand All @@ -53,9 +65,9 @@ namespace Nickvision::Aura::Keyring

std::vector<Credential> Store::getCredentials(const std::string& name) const
{
std::lock_guard<std::mutex> m_lock{ m_mutex };
std::vector<Credential> creds;

Statement query{ *m_database, "SELECT * FROM credentials where name = ?" };
Statement query{ m_database, "SELECT * FROM credentials where name = ?" };
query.bind(1, name);
while (query.executeStep())
{
Expand All @@ -66,7 +78,8 @@ namespace Nickvision::Aura::Keyring

bool Store::addCredential(const Credential& credential)
{
Statement query{ *m_database, "INSERT INTO credentials (id, name, uri, username, password) VALUES (?, ?, ?, ?, ?)" };
std::lock_guard<std::mutex> m_lock{ m_mutex };
Statement query{ m_database, "INSERT INTO credentials (id, name, uri, username, password) VALUES (?, ?, ?, ?, ?)" };
query.bind(1, credential.getId());
query.bind(2, credential.getName());
query.bind(3, credential.getUri());
Expand All @@ -77,7 +90,8 @@ namespace Nickvision::Aura::Keyring

bool Store::updateCredential(const Credential& credential)
{
Statement query{ *m_database, "UPDATE credentials SET name = ?, uri = ?, username = ?, password = ? where id = ?" };
std::lock_guard<std::mutex> m_lock{ m_mutex };
Statement query{ m_database, "UPDATE credentials SET name = ?, uri = ?, username = ?, password = ? where id = ?" };
query.bind(5, credential.getId());
query.bind(1, credential.getName());
query.bind(2, credential.getUri());
Expand All @@ -88,14 +102,16 @@ namespace Nickvision::Aura::Keyring

bool Store::deleteCredential(int id)
{
Statement query{ *m_database, "DELETE FROM credentials WHERE id = ?" };
std::lock_guard<std::mutex> m_lock{ m_mutex };
Statement query{ m_database, "DELETE FROM credentials WHERE id = ?" };
query.bind(1, id);
return query.exec() > 0;
}

bool Store::destroy()
{
m_database.reset();
std::lock_guard<std::mutex> m_lock{ m_mutex };
m_database.~Database();
return std::filesystem::remove(m_path);
}

Expand Down Expand Up @@ -125,9 +141,9 @@ namespace Nickvision::Aura::Keyring
}
try
{
std::unique_ptr<Database> database{ std::make_unique<Database>(path.string(), OPEN_READWRITE | OPEN_CREATE) };
database->key(password);
return { { name, std::move(database) } };
Database database{ path.string(), OPEN_READWRITE | OPEN_CREATE };
database.key(password);
return { {name, database} };
}
catch (...)
{
Expand All @@ -148,9 +164,9 @@ namespace Nickvision::Aura::Keyring
}
try
{
std::unique_ptr<Database> database{ std::make_unique<Database>(path.string(), OPEN_READWRITE | OPEN_CREATE) };
database->key(password);
return { { name, std::move(database) } };
Database database{ path.string(), OPEN_READWRITE | OPEN_CREATE };
database.key(password);
return { {name, database} };
}
catch (...)
{
Expand Down