diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/settings.cpp | 48 | ||||
m--------- | subprojects/keychain | 0 |
4 files changed, 60 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 17c4c23..d091843 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "subprojects/ixwebsocket"] path = subprojects/ixwebsocket url = https://github.com/machinezone/ixwebsocket +[submodule "subprojects/keychain"] + path = subprojects/keychain + url = https://github.com/hrantzsch/keychain diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e28791..0a9e17a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") option(USE_LIBHANDY "Enable features that require libhandy (default)" ON) +option(USE_KEYCHAIN "Store the token in the keychain (default)" ON) find_package(nlohmann_json REQUIRED) find_package(CURL) @@ -106,3 +107,13 @@ if (USE_LIBHANDY) target_compile_definitions(abaddon PRIVATE WITH_LIBHANDY) endif () endif () + +if (USE_KEYCHAIN) + find_package(keychain QUIET) + if (NOT keychain_FOUND) + message("keychain was not found and will be included as a submodule") + add_subdirectory(subprojects/keychain) + target_link_libraries(abaddon keychain) + target_compile_definitions(abaddon PRIVATE WITH_KEYCHAIN) + endif () +endif () diff --git a/src/settings.cpp b/src/settings.cpp index 0019a00..c1a2fd2 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1,6 +1,15 @@ #include "settings.hpp" #include <filesystem> #include <fstream> +#include <glibmm/miscutils.h> + +#ifdef WITH_KEYCHAIN + #include <keychain/keychain.h> +#endif + +const std::string KeychainPackage = "com.github.uowuo.abaddon"; +const std::string KeychainService = "abaddon-client-token"; +const std::string KeychainUser = ""; SettingsManager::SettingsManager(const std::string &filename) : m_filename(filename) { @@ -36,7 +45,6 @@ void SettingsManager::ReadSettings() { SMSTR("discord", "api_base", APIBaseURL); SMSTR("discord", "gateway", GatewayURL); - SMSTR("discord", "token", DiscordToken); SMBOOL("discord", "memory_db", UseMemoryDB); SMBOOL("discord", "prefetch", Prefetch); SMBOOL("discord", "autoconnect", Autoconnect); @@ -61,6 +69,32 @@ void SettingsManager::ReadSettings() { SMSTR("style", "mentionbadgetextcolor", MentionBadgeTextColor); SMSTR("style", "unreadcolor", UnreadIndicatorColor); +#ifdef WITH_KEYCHAIN + keychain::Error error {}; + + // convert to keychain if present in normal settings + SMSTR("discord", "token", DiscordToken); + + if (!m_settings.DiscordToken.empty()) { + keychain::Error set_error {}; + + keychain::setPassword(KeychainPackage, KeychainService, KeychainUser, m_settings.DiscordToken, set_error); + if (set_error) { + printf("keychain error setting token: %s\n", set_error.message.c_str()); + } else { + m_file.remove_key("discord", "token"); + } + } + + m_settings.DiscordToken = keychain::getPassword(KeychainPackage, KeychainService, KeychainUser, error); + if (error && error.type != keychain::ErrorType::NotFound) { + printf("keychain error reading token: %s (%d)\n", error.message.c_str(), error.code); + } + +#else + SMSTR("discord", "token", DiscordToken); +#endif + #undef SMBOOL #undef SMSTR #undef SMINT @@ -92,7 +126,6 @@ void SettingsManager::Close() { SMSTR("discord", "api_base", APIBaseURL); SMSTR("discord", "gateway", GatewayURL); - SMSTR("discord", "token", DiscordToken); SMBOOL("discord", "memory_db", UseMemoryDB); SMBOOL("discord", "prefetch", Prefetch); SMBOOL("discord", "autoconnect", Autoconnect); @@ -117,6 +150,17 @@ void SettingsManager::Close() { SMSTR("style", "mentionbadgetextcolor", MentionBadgeTextColor); SMSTR("style", "unreadcolor", UnreadIndicatorColor); +#ifdef WITH_KEYCHAIN + keychain::Error error {}; + + keychain::setPassword(KeychainPackage, KeychainService, KeychainUser, m_settings.DiscordToken, error); + if (error) { + printf("keychain error setting token: %s\n", error.message.c_str()); + } +#else + SMSTR("discord", "token", DiscordToken); +#endif + #undef SMSTR #undef SMBOOL #undef SMINT diff --git a/subprojects/keychain b/subprojects/keychain new file mode 160000 +Subproject 44b517d0962c83cce31c190a6be44c3ddbf52d5 |