From cacca627a62ab2eba9eb4d37cfea40629ca0a89a Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sun, 6 Feb 2022 17:34:14 +0800 Subject: (src): Move and split the Global Settings Station 1. Move Global Settings Station to core 2. Separate the logic of DataObject 3. Resolve dependencies --- src/core/function/DataObjectOperator.cpp | 154 +++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 src/core/function/DataObjectOperator.cpp (limited to 'src/core/function/DataObjectOperator.cpp') diff --git a/src/core/function/DataObjectOperator.cpp b/src/core/function/DataObjectOperator.cpp new file mode 100644 index 00000000..f1395152 --- /dev/null +++ b/src/core/function/DataObjectOperator.cpp @@ -0,0 +1,154 @@ +/** + * Copyright (C) 2021 Saturneric + * + * This file is part of GpgFrontend. + * + * GpgFrontend is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GpgFrontend is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GpgFrontend. If not, see . + * + * The initial version of the source code is inherited from + * the gpg4usb project, which is under GPL-3.0-or-later. + * + * All the source code of GpgFrontend was modified and released by + * Saturneric starting on May 12, 2021. + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +#include "DataObjectOperator.h" + +#include + +#include "core/function/FileOperator.h" +#include "core/function/PassphraseGenerator.h" + +void GpgFrontend::DataObjectOperator::init_app_secure_key() { + FileOperator::WriteFileStd(app_secure_key_path_, + PassphraseGenerator::GetInstance().Generate(256)); + std::filesystem::permissions( + app_secure_key_path_, + std::filesystem::perms::owner_read | std::filesystem::perms::owner_write); +} + +GpgFrontend::DataObjectOperator::DataObjectOperator(int channel) + : SingletonFunctionObject(channel) { + if (!is_directory(app_secure_path_)) create_directory(app_secure_path_); + + if (!exists(app_secure_key_path_)) { + init_app_secure_key(); + } + + std::string key; + if (!FileOperator::ReadFileStd(app_secure_key_path_.string(), key)) { + LOG(ERROR) << _("Failed to read app secure key file") + << app_secure_key_path_; + } + hash_key_ = QCryptographicHash::hash(QByteArray::fromStdString(key), + QCryptographicHash::Sha256); + + if (!exists(app_data_objs_path_)) create_directory(app_data_objs_path_); +} + +std::string GpgFrontend::DataObjectOperator::SaveDataObj( + const std::string& _key, const nlohmann::json& value) { + std::string _hash_obj_key = {}; + if (_key.empty()) { + _hash_obj_key = + QCryptographicHash::hash( + hash_key_ + QByteArray::fromStdString( + PassphraseGenerator::GetInstance().Generate(32) + + to_iso_extended_string( + boost::posix_time::second_clock::local_time())), + QCryptographicHash::Sha256) + .toHex() + .toStdString(); + } else { + _hash_obj_key = + QCryptographicHash::hash(hash_key_ + QByteArray::fromStdString(_key), + QCryptographicHash::Sha256) + .toHex() + .toStdString(); + } + + const auto obj_path = app_data_objs_path_ / _hash_obj_key; + + QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB, + QAESEncryption::Padding::ISO); + auto encoded = + encryption.encode(QByteArray::fromStdString(to_string(value)), hash_key_); + + GpgFrontend::write_buffer_to_file(obj_path.string(), encoded.toStdString()); + + return _key.empty() ? _hash_obj_key : std::string(); +} + +std::optional GpgFrontend::DataObjectOperator::GetDataObject( + const std::string& _key) { + try { + auto _hash_obj_key = + QCryptographicHash::hash(hash_key_ + QByteArray::fromStdString(_key), + QCryptographicHash::Sha256) + .toHex() + .toStdString(); + + const auto obj_path = app_data_objs_path_ / _hash_obj_key; + + if (!std::filesystem::exists(obj_path)) { + return {}; + } + + std::string buffer; + if (!FileOperator::ReadFileStd(obj_path.string(), buffer)) { + return {}; + } + + auto encoded = QByteArray::fromStdString(buffer); + + QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB, + QAESEncryption::Padding::ISO); + + auto decoded = + encryption.removePadding(encryption.decode(encoded, hash_key_)); + + return nlohmann::json::parse(decoded.toStdString()); + } catch (...) { + return {}; + } +} + +std::optional +GpgFrontend::DataObjectOperator::GetDataObjectByRef(const std::string& _ref) { + if (_ref.size() != 64) return {}; + + try { + const auto& _hash_obj_key = _ref; + const auto obj_path = app_data_objs_path_ / _hash_obj_key; + + if (!std::filesystem::exists(obj_path)) return {}; + + std::string buffer; + if (!FileOperator::ReadFileStd(obj_path.string(), buffer)) return {}; + auto encoded = QByteArray::fromStdString(buffer); + + QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB, + QAESEncryption::Padding::ISO); + + auto decoded = + encryption.removePadding(encryption.decode(encoded, hash_key_)); + + return nlohmann::json::parse(decoded.toStdString()); + } catch (...) { + return {}; + } +} -- cgit v1.2.3 From e6f6731ad82fc4b7dda4267840df074f992f7442 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Mon, 7 Feb 2022 19:55:13 +0800 Subject: (core, ui): Fix the remaining problems in the data object --- src/core/function/DataObjectOperator.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/core/function/DataObjectOperator.cpp') diff --git a/src/core/function/DataObjectOperator.cpp b/src/core/function/DataObjectOperator.cpp index f1395152..1c7bd31a 100644 --- a/src/core/function/DataObjectOperator.cpp +++ b/src/core/function/DataObjectOperator.cpp @@ -62,6 +62,9 @@ GpgFrontend::DataObjectOperator::DataObjectOperator(int channel) std::string GpgFrontend::DataObjectOperator::SaveDataObj( const std::string& _key, const nlohmann::json& value) { + + LOG(INFO) << _("Save data object") << _key; + std::string _hash_obj_key = {}; if (_key.empty()) { _hash_obj_key = @@ -121,8 +124,11 @@ std::optional GpgFrontend::DataObjectOperator::GetDataObject( auto decoded = encryption.removePadding(encryption.decode(encoded, hash_key_)); + LOG(INFO) << _("Load data object") << _key; + return nlohmann::json::parse(decoded.toStdString()); } catch (...) { + LOG(ERROR) << _("Failed to get data object") << _key; return {}; } } -- cgit v1.2.3 From f65f0c7b7e6bf471ec80a1ab95df37a157f977e6 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sat, 12 Mar 2022 14:18:59 +0800 Subject: (core): Fix the setting loading IO problem under Windows --- src/core/function/DataObjectOperator.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/core/function/DataObjectOperator.cpp') diff --git a/src/core/function/DataObjectOperator.cpp b/src/core/function/DataObjectOperator.cpp index 1c7bd31a..a3f7fc70 100644 --- a/src/core/function/DataObjectOperator.cpp +++ b/src/core/function/DataObjectOperator.cpp @@ -34,6 +34,7 @@ #include "core/function/PassphraseGenerator.h" void GpgFrontend::DataObjectOperator::init_app_secure_key() { + LOG(INFO) << "Initializing application secure key"; FileOperator::WriteFileStd(app_secure_key_path_, PassphraseGenerator::GetInstance().Generate(256)); std::filesystem::permissions( @@ -51,11 +52,13 @@ GpgFrontend::DataObjectOperator::DataObjectOperator(int channel) std::string key; if (!FileOperator::ReadFileStd(app_secure_key_path_.string(), key)) { - LOG(ERROR) << _("Failed to read app secure key file") + LOG(FATAL) << _("Failed to read app secure key file") << app_secure_key_path_; + throw std::runtime_error(_("Failed to read app secure key file")); } hash_key_ = QCryptographicHash::hash(QByteArray::fromStdString(key), QCryptographicHash::Sha256); + LOG(INFO) << "App secure key loaded" << hash_key_.size() << "bytes"; if (!exists(app_data_objs_path_)) create_directory(app_data_objs_path_); } @@ -63,8 +66,6 @@ GpgFrontend::DataObjectOperator::DataObjectOperator(int channel) std::string GpgFrontend::DataObjectOperator::SaveDataObj( const std::string& _key, const nlohmann::json& value) { - LOG(INFO) << _("Save data object") << _key; - std::string _hash_obj_key = {}; if (_key.empty()) { _hash_obj_key = @@ -91,7 +92,9 @@ std::string GpgFrontend::DataObjectOperator::SaveDataObj( auto encoded = encryption.encode(QByteArray::fromStdString(to_string(value)), hash_key_); - GpgFrontend::write_buffer_to_file(obj_path.string(), encoded.toStdString()); + LOG(INFO) << _("Saving data object") << _hash_obj_key << "to" << obj_path << encoded.size() << "bytes"; + + FileOperator::WriteFileStd(obj_path.string(), encoded.toStdString()); return _key.empty() ? _hash_obj_key : std::string(); } @@ -99,6 +102,7 @@ std::string GpgFrontend::DataObjectOperator::SaveDataObj( std::optional GpgFrontend::DataObjectOperator::GetDataObject( const std::string& _key) { try { + LOG(INFO) << _("Get data object") << _key; auto _hash_obj_key = QCryptographicHash::hash(hash_key_ + QByteArray::fromStdString(_key), QCryptographicHash::Sha256) @@ -108,23 +112,28 @@ std::optional GpgFrontend::DataObjectOperator::GetDataObject( const auto obj_path = app_data_objs_path_ / _hash_obj_key; if (!std::filesystem::exists(obj_path)) { + LOG(ERROR) << _("Data object not found") << _key; return {}; } std::string buffer; if (!FileOperator::ReadFileStd(obj_path.string(), buffer)) { + LOG(ERROR) << _("Failed to read data object") << _key; return {}; } - auto encoded = QByteArray::fromStdString(buffer); + LOG(INFO) << _("Data object found") << _key; + auto encoded = QByteArray::fromStdString(buffer); QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB, QAESEncryption::Padding::ISO); + LOG(INFO) << _("Decrypting data object") << encoded.size() << hash_key_.size(); + auto decoded = encryption.removePadding(encryption.decode(encoded, hash_key_)); - LOG(INFO) << _("Load data object") << _key; + LOG(INFO) << _("Data object decoded") << _key; return nlohmann::json::parse(decoded.toStdString()); } catch (...) { -- cgit v1.2.3 From dad03e9ccc57da0a04d058ec418ce0068ce3841d Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sat, 19 Mar 2022 14:09:55 +0800 Subject: (core, ui): Fix path double-byte encoding problem under Windows --- src/core/function/DataObjectOperator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/function/DataObjectOperator.cpp') diff --git a/src/core/function/DataObjectOperator.cpp b/src/core/function/DataObjectOperator.cpp index a3f7fc70..1e216dd6 100644 --- a/src/core/function/DataObjectOperator.cpp +++ b/src/core/function/DataObjectOperator.cpp @@ -51,7 +51,7 @@ GpgFrontend::DataObjectOperator::DataObjectOperator(int channel) } std::string key; - if (!FileOperator::ReadFileStd(app_secure_key_path_.string(), key)) { + if (!FileOperator::ReadFileStd(app_secure_key_path_.u8string(), key)) { LOG(FATAL) << _("Failed to read app secure key file") << app_secure_key_path_; throw std::runtime_error(_("Failed to read app secure key file")); @@ -94,7 +94,7 @@ std::string GpgFrontend::DataObjectOperator::SaveDataObj( LOG(INFO) << _("Saving data object") << _hash_obj_key << "to" << obj_path << encoded.size() << "bytes"; - FileOperator::WriteFileStd(obj_path.string(), encoded.toStdString()); + FileOperator::WriteFileStd(obj_path.u8string(), encoded.toStdString()); return _key.empty() ? _hash_obj_key : std::string(); } @@ -117,7 +117,7 @@ std::optional GpgFrontend::DataObjectOperator::GetDataObject( } std::string buffer; - if (!FileOperator::ReadFileStd(obj_path.string(), buffer)) { + if (!FileOperator::ReadFileStd(obj_path.u8string(), buffer)) { LOG(ERROR) << _("Failed to read data object") << _key; return {}; } @@ -153,7 +153,7 @@ GpgFrontend::DataObjectOperator::GetDataObjectByRef(const std::string& _ref) { if (!std::filesystem::exists(obj_path)) return {}; std::string buffer; - if (!FileOperator::ReadFileStd(obj_path.string(), buffer)) return {}; + if (!FileOperator::ReadFileStd(obj_path.u8string(), buffer)) return {}; auto encoded = QByteArray::fromStdString(buffer); QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB, -- cgit v1.2.3