From a2d75efab5dca4e9a9721afef61cad0f62d4825f Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sun, 6 Feb 2022 13:29:01 +0800 Subject: (core, ui): Adjust the core code directory structure. --- src/core/function/KeyPackageOperator.cpp | 108 +++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 src/core/function/KeyPackageOperator.cpp (limited to 'src/core/function/KeyPackageOperator.cpp') diff --git a/src/core/function/KeyPackageOperator.cpp b/src/core/function/KeyPackageOperator.cpp new file mode 100644 index 00000000..89210987 --- /dev/null +++ b/src/core/function/KeyPackageOperator.cpp @@ -0,0 +1,108 @@ +/** + * 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 "KeyPackageOperator.h" + +#include "qt-aes/qaesencryption.h" + +#include "FileOperator.h" +#include "function/gpg/GpgKeyGetter.h" +#include "function/gpg/GpgKeyImportExporter.h" + +namespace GpgFrontend { + +bool KeyPackageOperator::GeneratePassphrase( + const std::filesystem::path& phrase_path, std::string& phrase) { + phrase = generate_passphrase(256); + return FileOperator::WriteFileStd(phrase_path, phrase); +} + +bool KeyPackageOperator::GenerateKeyPackage( + const std::filesystem::path& key_package_path, + const std::string& key_package_name, KeyIdArgsListPtr& key_ids, + std::string& phrase, bool secret) { + ByteArrayPtr key_export_data = nullptr; + if (!GpgKeyImportExporter::GetInstance().ExportKeys(key_ids, key_export_data, + secret)) { + return false; + } + + auto key = QByteArray::fromStdString(phrase); + auto data = QString::fromStdString(*key_export_data).toLocal8Bit().toBase64(); + + auto hash_key = QCryptographicHash::hash(key, QCryptographicHash::Sha256); + QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB, + QAESEncryption::Padding::ISO); + auto encoded = encryption.encode(data, hash_key); + + return FileOperator::WriteFileStd(key_package_path, encoded.toStdString()); +} + +bool KeyPackageOperator::ImportKeyPackage( + const std::filesystem::path& key_package_path, + const std::filesystem::path& phrase_path, GpgFrontend::GpgImportInformation &import_info) { + + std::string encrypted_data; + FileOperator::ReadFileStd(key_package_path, encrypted_data); + + if (encrypted_data.empty()) { + return false; + }; + + std::string passphrase; + FileOperator::ReadFileStd(phrase_path, passphrase); + if (passphrase.size() != 256) { + return false; + } + + auto hash_key = QCryptographicHash::hash( + QByteArray::fromStdString(passphrase), QCryptographicHash::Sha256); + auto encoded = QByteArray::fromStdString(encrypted_data); + + QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB, + QAESEncryption::Padding::ISO); + + auto decoded = encryption.removePadding(encryption.decode(encoded, hash_key)); + auto key_data = QByteArray::fromBase64(decoded); + + if (!key_data.startsWith(GpgConstants::PGP_PUBLIC_KEY_BEGIN) && + !key_data.startsWith(GpgConstants::PGP_PRIVATE_KEY_BEGIN)) { + return false; + } + + auto key_data_ptr = std::make_unique(key_data.toStdString()); + import_info = + GpgKeyImportExporter::GetInstance().ImportKey(std::move(key_data_ptr)); + return true; +} + +std::string KeyPackageOperator::GenerateKeyPackageName() { + return generate_key_package_name(); +} + +} // namespace GpgFrontend -- cgit v1.2.3 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/KeyPackageOperator.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/function/KeyPackageOperator.cpp') diff --git a/src/core/function/KeyPackageOperator.cpp b/src/core/function/KeyPackageOperator.cpp index 89210987..7ff65b50 100644 --- a/src/core/function/KeyPackageOperator.cpp +++ b/src/core/function/KeyPackageOperator.cpp @@ -28,17 +28,17 @@ #include "KeyPackageOperator.h" -#include "qt-aes/qaesencryption.h" - #include "FileOperator.h" +#include "function/PassphraseGenerator.h" #include "function/gpg/GpgKeyGetter.h" #include "function/gpg/GpgKeyImportExporter.h" +#include "qt-aes/qaesencryption.h" namespace GpgFrontend { bool KeyPackageOperator::GeneratePassphrase( const std::filesystem::path& phrase_path, std::string& phrase) { - phrase = generate_passphrase(256); + phrase = PassphraseGenerator::GetInstance().Generate(256); return FileOperator::WriteFileStd(phrase_path, phrase); } @@ -65,8 +65,8 @@ bool KeyPackageOperator::GenerateKeyPackage( bool KeyPackageOperator::ImportKeyPackage( const std::filesystem::path& key_package_path, - const std::filesystem::path& phrase_path, GpgFrontend::GpgImportInformation &import_info) { - + const std::filesystem::path& phrase_path, + GpgFrontend::GpgImportInformation& import_info) { std::string encrypted_data; FileOperator::ReadFileStd(key_package_path, encrypted_data); -- cgit v1.2.3 From f129055af41c44eed2a6423dfaf52c054458f0b4 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sat, 12 Mar 2022 15:00:14 +0800 Subject: (core): Fix the existing problem of the key package 1. Fix the password generation function 2. Add some log output --- src/core/function/KeyPackageOperator.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/core/function/KeyPackageOperator.cpp') diff --git a/src/core/function/KeyPackageOperator.cpp b/src/core/function/KeyPackageOperator.cpp index 7ff65b50..2b2802f7 100644 --- a/src/core/function/KeyPackageOperator.cpp +++ b/src/core/function/KeyPackageOperator.cpp @@ -39,6 +39,7 @@ namespace GpgFrontend { bool KeyPackageOperator::GeneratePassphrase( const std::filesystem::path& phrase_path, std::string& phrase) { phrase = PassphraseGenerator::GetInstance().Generate(256); + LOG(INFO) << "Generated passphrase: " << phrase.size() << " bytes"; return FileOperator::WriteFileStd(phrase_path, phrase); } @@ -46,9 +47,12 @@ bool KeyPackageOperator::GenerateKeyPackage( const std::filesystem::path& key_package_path, const std::string& key_package_name, KeyIdArgsListPtr& key_ids, std::string& phrase, bool secret) { + LOG(INFO) << "Generating key package: " << key_package_name; + ByteArrayPtr key_export_data = nullptr; if (!GpgKeyImportExporter::GetInstance().ExportKeys(key_ids, key_export_data, secret)) { + LOG(ERROR) << "Failed to export keys"; return false; } @@ -60,6 +64,7 @@ bool KeyPackageOperator::GenerateKeyPackage( QAESEncryption::Padding::ISO); auto encoded = encryption.encode(data, hash_key); + LOG(INFO) << "Writing key package: " << key_package_name; return FileOperator::WriteFileStd(key_package_path, encoded.toStdString()); } @@ -67,16 +72,22 @@ bool KeyPackageOperator::ImportKeyPackage( const std::filesystem::path& key_package_path, const std::filesystem::path& phrase_path, GpgFrontend::GpgImportInformation& import_info) { + + LOG(INFO) << "Importing key package: " << key_package_path.string(); + std::string encrypted_data; FileOperator::ReadFileStd(key_package_path, encrypted_data); if (encrypted_data.empty()) { + LOG(ERROR) << "Failed to read key package: " << key_package_path.string(); return false; }; std::string passphrase; FileOperator::ReadFileStd(phrase_path, passphrase); + LOG(INFO) << "Passphrase: " << passphrase.size() << " bytes"; if (passphrase.size() != 256) { + LOG(ERROR) << "Failed to read passphrase: " << phrase_path.string(); return false; } @@ -90,6 +101,7 @@ bool KeyPackageOperator::ImportKeyPackage( auto decoded = encryption.removePadding(encryption.decode(encoded, hash_key)); auto key_data = QByteArray::fromBase64(decoded); + LOG(INFO) << "key data" << key_data.size(); if (!key_data.startsWith(GpgConstants::PGP_PUBLIC_KEY_BEGIN) && !key_data.startsWith(GpgConstants::PGP_PRIVATE_KEY_BEGIN)) { return false; -- 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/KeyPackageOperator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/function/KeyPackageOperator.cpp') diff --git a/src/core/function/KeyPackageOperator.cpp b/src/core/function/KeyPackageOperator.cpp index 2b2802f7..67fa3fac 100644 --- a/src/core/function/KeyPackageOperator.cpp +++ b/src/core/function/KeyPackageOperator.cpp @@ -73,13 +73,13 @@ bool KeyPackageOperator::ImportKeyPackage( const std::filesystem::path& phrase_path, GpgFrontend::GpgImportInformation& import_info) { - LOG(INFO) << "Importing key package: " << key_package_path.string(); + LOG(INFO) << "Importing key package: " << key_package_path.u8string(); std::string encrypted_data; FileOperator::ReadFileStd(key_package_path, encrypted_data); if (encrypted_data.empty()) { - LOG(ERROR) << "Failed to read key package: " << key_package_path.string(); + LOG(ERROR) << "Failed to read key package: " << key_package_path.u8string(); return false; }; @@ -87,7 +87,7 @@ bool KeyPackageOperator::ImportKeyPackage( FileOperator::ReadFileStd(phrase_path, passphrase); LOG(INFO) << "Passphrase: " << passphrase.size() << " bytes"; if (passphrase.size() != 256) { - LOG(ERROR) << "Failed to read passphrase: " << phrase_path.string(); + LOG(ERROR) << "Failed to read passphrase: " << phrase_path.u8string(); return false; } -- cgit v1.2.3