aboutsummaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/function/gpg/GpgAbstractKeyGetter.cpp2
-rw-r--r--src/core/function/gpg/GpgAssuanHelper.cpp2
-rw-r--r--src/core/function/gpg/GpgAutomatonHandler.cpp2
-rw-r--r--src/core/function/gpg/GpgKeyGetter.cpp132
-rw-r--r--src/core/function/gpg/GpgKeyGetter.h16
-rw-r--r--src/core/function/gpg/GpgKeyGroupGetter.cpp71
-rw-r--r--src/core/function/gpg/GpgKeyGroupGetter.h17
-rw-r--r--src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp28
-rw-r--r--src/core/function/result_analyse/GpgSignResultAnalyse.cpp62
-rw-r--r--src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp40
-rw-r--r--src/core/model/GpgKeyGroup.cpp14
-rw-r--r--src/core/model/GpgKeyGroup.h7
-rw-r--r--src/core/model/GpgKeyTreeModel.cpp39
-rw-r--r--src/core/model/GpgKeyTreeModel.h7
14 files changed, 235 insertions, 204 deletions
diff --git a/src/core/function/gpg/GpgAbstractKeyGetter.cpp b/src/core/function/gpg/GpgAbstractKeyGetter.cpp
index 0b544469..193fec0e 100644
--- a/src/core/function/gpg/GpgAbstractKeyGetter.cpp
+++ b/src/core/function/gpg/GpgAbstractKeyGetter.cpp
@@ -66,7 +66,7 @@ auto GpgAbstractKeyGetter::GetKey(const QString& key_id) -> GpgAbstractKeyPtr {
if (IsKeyGroupID(key_id)) {
return kg_.KeyGroup(key_id);
}
- return key_.GetKeyPtr(key_id);
+ return key_.GetKeyORSubkeyPtr(key_id);
}
auto GpgAbstractKeyGetter::GetKeys(const QStringList& key_ids)
diff --git a/src/core/function/gpg/GpgAssuanHelper.cpp b/src/core/function/gpg/GpgAssuanHelper.cpp
index 8fa311dc..2fa836e5 100644
--- a/src/core/function/gpg/GpgAssuanHelper.cpp
+++ b/src/core/function/gpg/GpgAssuanHelper.cpp
@@ -28,8 +28,6 @@
#include "GpgAssuanHelper.h"
-#include <utility>
-
#include "core/module/ModuleManager.h"
#include "core/utils/GpgUtils.h"
diff --git a/src/core/function/gpg/GpgAutomatonHandler.cpp b/src/core/function/gpg/GpgAutomatonHandler.cpp
index b2d9d562..33c94436 100644
--- a/src/core/function/gpg/GpgAutomatonHandler.cpp
+++ b/src/core/function/gpg/GpgAutomatonHandler.cpp
@@ -28,8 +28,6 @@
#include "GpgAutomatonHandler.h"
-#include <utility>
-
#include "core/model/GpgData.h"
#include "core/model/GpgKey.h"
#include "core/utils/GpgUtils.h"
diff --git a/src/core/function/gpg/GpgKeyGetter.cpp b/src/core/function/gpg/GpgKeyGetter.cpp
index 86218a94..3419c18d 100644
--- a/src/core/function/gpg/GpgKeyGetter.cpp
+++ b/src/core/function/gpg/GpgKeyGetter.cpp
@@ -32,9 +32,7 @@
#include <mutex>
-#include "core/GpgModel.h"
#include "core/function/gpg/GpgContext.h"
-#include "core/function/gpg/GpgKeyGroupGetter.h"
#include "core/utils/GpgUtils.h"
namespace GpgFrontend {
@@ -44,48 +42,65 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> {
explicit Impl(int channel)
: SingletonFunctionObject<GpgKeyGetter::Impl>(channel) {}
- auto GetKey(const QString& fpr, bool use_cache) -> GpgKey {
+ auto GetKeyPtr(const QString& key_id, bool cache) -> GpgKeyPtr {
// find in cache first
- if (use_cache) {
- auto key = get_key_in_cache(fpr);
- if (key.IsGood()) return key;
+ if (cache) {
+ auto key = get_key_in_cache(key_id);
+ if (key != nullptr) return qSharedPointerDynamicCast<GpgKey>(key);
+
+ LOG_W() << "get gpg key" << key_id
+ << "from cache failed, channel: " << GetChannel();
}
gpgme_key_t p_key = nullptr;
- gpgme_get_key(ctx_.DefaultContext(), fpr.toUtf8(), &p_key, 1);
+ gpgme_get_key(ctx_.DefaultContext(), key_id.toUtf8(), &p_key, 1);
if (p_key == nullptr) {
- LOG_W() << "GpgKeyGetter GetKey Private _p_key Null, fpr: " << fpr;
- return GetPubkey(fpr, true);
+ LOG_W() << "GpgKeyGetter GetKey p_key is null, fpr: " << key_id;
+ return GetPubkeyPtr(key_id, true);
}
- return GpgKey(std::move(p_key));
+
+ return QSharedPointer<GpgKey>::create(p_key);
+ }
+
+ auto GetKey(const QString& key_id, bool cache) -> GpgKey {
+ auto key = GetKeyPtr(key_id, cache);
+
+ if (key != nullptr) return *key;
+ return {};
+ }
+
+ auto GetPubkey(const QString& key_id, bool cache) -> GpgKey {
+ auto key = GetKeyPtr(key_id, cache);
+
+ if (key != nullptr) return *key;
+ return {};
}
- auto GetPubkey(const QString& fpr, bool use_cache) -> GpgKey {
+ auto GetPubkeyPtr(const QString& key_id, bool cache) -> GpgKeyPtr {
// find in cache first
- if (use_cache) {
- auto key = get_key_in_cache(fpr);
- if (key.IsGood()) return key;
+ if (cache) {
+ auto key = get_key_in_cache(key_id);
+ if (key != nullptr) return qSharedPointerDynamicCast<GpgKey>(key);
+
+ LOG_W() << "get public gpg key" << key_id
+ << "from cache failed, channel: " << GetChannel();
}
gpgme_key_t p_key = nullptr;
- gpgme_get_key(ctx_.DefaultContext(), fpr.toUtf8(), &p_key, 0);
- if (p_key == nullptr)
- LOG_W() << "GpgKeyGetter GetKey _p_key Null, fpr: " << fpr;
- return GpgKey(p_key);
- }
-
- auto GetPubkeyPtr(const QString& fpr, bool use_cache) -> GpgKeyPtr {
- auto key = GetPubkey(fpr, use_cache);
- if (!key.IsGood()) return nullptr;
- return QSharedPointer<GpgKey>::create(key);
+ gpgme_get_key(ctx_.DefaultContext(), key_id.toUtf8(), &p_key, 0);
+ if (p_key == nullptr) {
+ LOG_W() << "GpgKeyGetter GetKey p_key is null, key id: " << key_id;
+ return nullptr;
+ }
+ return QSharedPointer<GpgKey>::create(p_key);
}
- auto FetchKey() -> GpgKeyList {
- if (keys_search_cache_.empty()) {
+ auto FetchKey() -> GpgKeyPtrList {
+ if (keys_cache_.empty() || keys_search_cache_.empty()) {
FlushKeyCache();
}
- auto keys_list = GpgKeyList{};
+ auto keys_list = GpgKeyPtrList{};
{
// get the lock
std::lock_guard<std::mutex> lock(keys_cache_mutex_);
@@ -106,7 +121,7 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> {
// get the lock
std::lock_guard<std::mutex> lock(keys_cache_mutex_);
for (const auto& key : keys_cache_) {
- keys_list.push_back(QSharedPointer<GpgKey>::create(key));
+ keys_list.push_back(key);
}
}
@@ -133,18 +148,25 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> {
gpgme_key_t key;
while ((err = gpgme_op_keylist_next(ctx_.DefaultContext(), &key)) ==
GPG_ERR_NO_ERROR) {
- auto gpg_key = GpgKey(std::move(key));
+ auto g_key = QSharedPointer<GpgKey>::create(key);
// detect if the key is in a smartcard
// if so, try to get full information using gpgme_get_key()
// this maybe a bug in gpgme
- if (gpg_key.IsHasCardKey()) {
- gpg_key = GetKey(gpg_key.ID(), false);
+ if (g_key->IsHasCardKey()) {
+ g_key = GetKeyPtr(g_key->ID(), false);
}
- keys_cache_.push_back(gpg_key);
- keys_search_cache_.insert(gpg_key.ID(), gpg_key);
- keys_search_cache_.insert(gpg_key.Fingerprint(), gpg_key);
+ keys_cache_.push_back(g_key);
+ keys_search_cache_.insert(g_key->ID(), g_key);
+ keys_search_cache_.insert(g_key->Fingerprint(), g_key);
+
+ for (const auto& s_key : g_key->SubKeys()) {
+ if (s_key.ID() == g_key->ID()) continue;
+ auto p_s_key = QSharedPointer<GpgSubKey>::create(s_key);
+ keys_search_cache_.insert(s_key.ID(), p_s_key);
+ keys_search_cache_.insert(s_key.Fingerprint(), p_s_key);
+ }
}
}
@@ -163,29 +185,25 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> {
return keys;
}
- auto GetKeysCopy(const GpgKeyList& keys) -> GpgKeyList {
- // get the lock
- std::lock_guard<std::mutex> lock(ctx_mutex_);
- auto keys_copy = GpgKeyList{};
- for (const auto& key : keys) keys_copy.push_back(key);
- return keys_copy;
- }
-
auto Fetch() -> QContainer<QSharedPointer<GpgKey>> {
auto keys = FetchKey();
auto ret = QContainer<QSharedPointer<GpgKey>>();
for (const auto& key : keys) {
- ret.append(QSharedPointer<GpgKey>::create(key));
+ ret.append(key);
}
return ret;
}
- auto GetKeyPtr(const QString& key_id,
- bool use_cache) -> QSharedPointer<GpgKey> {
- auto key = GetKey(key_id, use_cache);
- if (!key.IsGood()) return nullptr;
- return QSharedPointer<GpgKey>::create(key);
+ auto GetKeyORSubkeyPtr(const QString& key_id) -> GpgAbstractKeyPtr {
+ auto key = get_key_in_cache(key_id);
+
+ if (key != nullptr) return key;
+
+ LOG_W() << "get key" << key_id
+ << "from cache failed, channel: " << GetChannel();
+
+ return nullptr;
}
private:
@@ -206,13 +224,13 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> {
* @brief cache the keys with key id
*
*/
- QMap<QString, GpgKey> keys_search_cache_;
+ QMap<QString, GpgAbstractKeyPtr> keys_search_cache_;
/**
* @brief
*
*/
- QContainer<GpgKey> keys_cache_;
+ QContainer<GpgKeyPtr> keys_cache_;
/**
* @brief shared mutex for the keys cache
@@ -226,8 +244,9 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> {
* @param id
* @return GpgKey
*/
- auto get_key_in_cache(const QString& key_id) -> GpgKey {
+ auto get_key_in_cache(const QString& key_id) -> GpgAbstractKeyPtr {
std::lock_guard<std::mutex> lock(keys_cache_mutex_);
+
if (keys_search_cache_.find(key_id) != keys_search_cache_.end()) {
std::lock_guard<std::mutex> lock(ctx_mutex_);
// return a copy of the key in cache
@@ -269,13 +288,10 @@ auto GpgKeyGetter::GetKeys(const KeyIdArgsList& ids) -> GpgKeyList {
return p_->GetKeys(ids);
}
-auto GpgKeyGetter::GetKeysCopy(const GpgKeyList& keys) -> GpgKeyList {
- return p_->GetKeysCopy(keys);
-}
-
-auto GpgKeyGetter::FetchKey() -> GpgKeyList { return p_->FetchKey(); }
+auto GpgKeyGetter::Fetch() -> GpgKeyPtrList { return p_->Fetch(); }
-auto GpgKeyGetter::Fetch() -> QContainer<QSharedPointer<GpgKey>> {
- return p_->Fetch();
+auto GpgKeyGetter::GetKeyORSubkeyPtr(const QString& key_id)
+ -> GpgAbstractKeyPtr {
+ return p_->GetKeyORSubkeyPtr(key_id);
}
} // namespace GpgFrontend
diff --git a/src/core/function/gpg/GpgKeyGetter.h b/src/core/function/gpg/GpgKeyGetter.h
index b266bf17..1fe4aeb7 100644
--- a/src/core/function/gpg/GpgKeyGetter.h
+++ b/src/core/function/gpg/GpgKeyGetter.h
@@ -90,11 +90,13 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyGetter
auto GetPubkeyPtr(const QString& key_id, bool use_cache = true) -> GpgKeyPtr;
/**
- * @brief Get all the keys by receiving a linked list
+ * @brief Get the Pubkey Ptr object
*
- * @return KeyLinkListPtr
+ * @param key_id
+ * @param use_cache
+ * @return GpgKeyPtr
*/
- auto FetchKey() -> GpgKeyList;
+ auto GetKeyORSubkeyPtr(const QString& key_id) -> GpgAbstractKeyPtr;
/**
* @brief
@@ -117,14 +119,6 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyGetter
*/
auto GetKeys(const KeyIdArgsList& key_ids) -> GpgKeyList;
- /**
- * @brief Get the Keys Copy object
- *
- * @param keys
- * @return KeyListPtr
- */
- auto GetKeysCopy(const GpgKeyList& keys) -> GpgKeyList;
-
private:
class Impl;
SecureUniquePtr<Impl> p_;
diff --git a/src/core/function/gpg/GpgKeyGroupGetter.cpp b/src/core/function/gpg/GpgKeyGroupGetter.cpp
index 47878414..4d4a18cc 100644
--- a/src/core/function/gpg/GpgKeyGroupGetter.cpp
+++ b/src/core/function/gpg/GpgKeyGroupGetter.cpp
@@ -76,9 +76,10 @@ void GpgKeyGroupGetter::fetch_key_groups() {
LOG_D() << "load raw key group:" << key_group.id
<< "key ids: " << key_group.key_ids;
- key_groups_forest_.insert(
- key_group.id,
- QSharedPointer<GpgKeyGroupTreeNode>::create(GpgKeyGroup{key_group}));
+ auto node =
+ QSharedPointer<GpgKeyGroupTreeNode>::create(GpgKeyGroup{key_group});
+ node->key_group->SetKeyGroupGetter(this);
+ key_groups_forest_.insert(key_group.id, node);
}
build_gpg_key_group_tree();
@@ -108,30 +109,30 @@ auto GpgKeyGroupGetter::KeyGroup(const QString& id)
}
void GpgKeyGroupGetter::check_key_group(
- const QSharedPointer<GpgKeyGroup>& key_group) {
- if (key_group == nullptr || key_group->IsDisabled()) return;
+ const QSharedPointer<GpgKeyGroupTreeNode>& node) {
+ if (node == nullptr || node->disabled) return;
- for (const auto& key_id : key_group->KeyIds()) {
- LOG_D() << "check" << key_id << "of" << key_group->UID();
+ for (const auto& key_id : node->KeyIds()) {
+ assert(key_id != node->key_group->ID());
+ if (key_id == node->key_group->ID()) continue;
- if (IsKeyGroupID(key_id) || key_id == key_group->ID()) {
+ if (IsKeyGroupID(key_id)) {
if (!key_groups_forest_.contains(key_id)) {
- key_group->SetDisabled(true);
return;
}
auto s_node = key_groups_forest_.value(key_id, nullptr);
- check_key_group(s_node->key_group);
+ check_key_group(s_node);
if (s_node->key_group->IsDisabled()) {
- key_group->SetDisabled(true);
+ node->disabled = true;
return;
}
} else {
auto key = GpgKeyGetter::GetInstance(GetChannel()).GetKeyPtr(key_id);
if (key == nullptr || !key->IsHasEncrCap()) {
- key_group->SetDisabled(true);
+ node->disabled = true;
return;
}
}
@@ -139,20 +140,23 @@ void GpgKeyGroupGetter::check_key_group(
}
void GpgKeyGroupGetter::check_all_key_groups() {
- for (const auto& node : key_groups_forest_) {
- node->key_group->SetDisabled(false);
- }
+ for (const auto& node : key_groups_forest_) node->disabled = false;
for (const auto& node : key_groups_forest_) {
- auto key_group = node->key_group;
- check_key_group(key_group);
+ check_key_group(node);
- LOG_D() << "key group" << key_group->ID() << "ids: " << key_group->KeyIds()
- << "status: " << key_group->IsDisabled();
+ assert(node->key_group != nullptr);
+ LOG_D() << "key group" << node->key_group->ID()
+ << "ids: " << node->key_group->KeyIds()
+ << "status: " << node->disabled;
}
}
auto GpgKeyGroupGetter::FlushCache() -> bool {
+ for (const auto& node : key_groups_forest_.values()) {
+ node->Apply();
+ }
+
check_all_key_groups();
persist_key_groups();
return true;
@@ -180,6 +184,7 @@ void GpgKeyGroupGetter::build_gpg_key_group_tree() {
void GpgKeyGroupGetter::AddKeyGroup(const GpgKeyGroup& key_group) {
auto node = QSharedPointer<GpgKeyGroupTreeNode>::create(key_group);
+ node->key_group->SetKeyGroupGetter(this);
key_groups_forest_.insert(node->key_group->ID(), node);
LOG_D() << "add new key group" << key_group.ID()
@@ -249,18 +254,7 @@ GpgKeyGroupTreeNode::GpgKeyGroupTreeNode(GpgKeyGroup kg)
}
}
-void GpgKeyGroupTreeNode::Apply() {
- QStringList key_ids;
- for (const auto& child : children) {
- key_ids.push_back(child->key_group->ID());
- }
-
- for (const auto& key_id : non_key_group_ids) {
- key_ids.push_back(key_id);
- }
-
- key_group->SetKeyIds(key_ids);
-}
+void GpgKeyGroupTreeNode::Apply() { key_group->SetKeyIds(KeyIds()); }
auto GpgKeyGroupTreeNode::AddNonKeyGroupKey(const GpgAbstractKeyPtr& key)
-> bool {
@@ -308,4 +302,19 @@ auto GpgKeyGroupTreeNode::RemoveNonKeyGroupKey(const QString& key) -> bool {
Apply();
return true;
}
+
+auto GpgKeyGroupGetter::IsKeyGroupDisabled(const QString& id) -> bool {
+ if (!key_groups_forest_.contains(id)) return false;
+ auto node = key_groups_forest_.value(id);
+ return node->disabled;
+}
+
+auto GpgKeyGroupTreeNode::KeyIds() const -> QStringList {
+ QStringList ret;
+ for (const auto& child : children) {
+ ret.push_back(child->key_group->ID());
+ }
+ ret.append(non_key_group_ids);
+ return ret;
+}
} // namespace GpgFrontend \ No newline at end of file
diff --git a/src/core/function/gpg/GpgKeyGroupGetter.h b/src/core/function/gpg/GpgKeyGroupGetter.h
index 9eabccde..823fe338 100644
--- a/src/core/function/gpg/GpgKeyGroupGetter.h
+++ b/src/core/function/gpg/GpgKeyGroupGetter.h
@@ -42,6 +42,7 @@ struct GpgKeyGroupTreeNode {
// over take
QStringList non_key_group_ids;
+ bool disabled;
/**
* @brief Construct a new Gpg Key Group Tree Node object
@@ -106,6 +107,13 @@ struct GpgKeyGroupTreeNode {
* @return false
*/
auto RemoveNonKeyGroupKey(const QString& key) -> bool;
+
+ /**
+ * @brief
+ *
+ * @return QStringList
+ */
+ [[nodiscard]] auto KeyIds() const -> QStringList;
};
class GPGFRONTEND_CORE_EXPORT GpgKeyGroupGetter
@@ -173,6 +181,13 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyGroupGetter
*/
auto KeyGroup(const QString& id) -> QSharedPointer<GpgKeyGroup>;
+ /**
+ * @brief
+ *
+ * @param id
+ */
+ auto IsKeyGroupDisabled(const QString& id) -> bool;
+
private:
GpgContext& ctx_ =
GpgContext::GetInstance(SingletonFunctionObject::GetChannel());
@@ -203,7 +218,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyGroupGetter
* @brief
*
*/
- void check_key_group(const QSharedPointer<GpgKeyGroup>&);
+ void check_key_group(const QSharedPointer<GpgKeyGroupTreeNode>&);
/**
* @brief
diff --git a/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp b/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp
index f84e9b85..1fcda489 100644
--- a/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp
+++ b/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp
@@ -28,8 +28,7 @@
#include "GpgDecryptResultAnalyse.h"
-#include "core/GpgModel.h"
-#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgAbstractKeyGetter.h"
GpgFrontend::GpgDecryptResultAnalyse::GpgDecryptResultAnalyse(
int channel, GpgError m_error, GpgDecryptResult m_result)
@@ -107,12 +106,13 @@ void GpgFrontend::GpgDecryptResultAnalyse::doAnalyse() {
void GpgFrontend::GpgDecryptResultAnalyse::print_recipient(
QTextStream &stream, gpgme_recipient_t recipient) {
- auto key = GpgFrontend::GpgKeyGetter::GetInstance(GetChannel())
- .GetKey(recipient->keyid);
- if (key.IsGood()) {
- stream << key.Name();
- if (!key.Comment().isEmpty()) stream << "(" << key.Comment() << ")";
- if (!key.Email().isEmpty()) stream << "<" << key.Email() << ">";
+ auto key =
+ GpgAbstractKeyGetter::GetInstance(GetChannel()).GetKey(recipient->keyid);
+
+ if (key != nullptr) {
+ stream << key->Name();
+ if (!key->Comment().isEmpty()) stream << "(" << key->Comment() << ")";
+ if (!key->Email().isEmpty()) stream << "<" << key->Email() << ">";
} else {
stream << "<" << tr("unknown") << ">";
setStatus(0);
@@ -120,7 +120,17 @@ void GpgFrontend::GpgDecryptResultAnalyse::print_recipient(
stream << Qt::endl;
- stream << "- " << tr("Key ID") << ": " << recipient->keyid << Qt::endl;
+ stream << "- " << tr("Key ID") << ": " << recipient->keyid;
+ if (key != nullptr) {
+ stream << " ("
+ << (key->KeyType() == GpgAbstractKeyType::kGPG_SUBKEY
+ ? tr("Subkey")
+ : tr("Primary Key"))
+ << ")";
+ }
+
+ stream << Qt::endl;
+
stream << "- " << tr("Public Key Algo") << ": "
<< gpgme_pubkey_algo_name(recipient->pubkey_algo) << Qt::endl;
stream << "- " << tr("Status") << ": " << gpgme_strerror(recipient->status)
diff --git a/src/core/function/result_analyse/GpgSignResultAnalyse.cpp b/src/core/function/result_analyse/GpgSignResultAnalyse.cpp
index 262d0692..0cecc96b 100644
--- a/src/core/function/result_analyse/GpgSignResultAnalyse.cpp
+++ b/src/core/function/result_analyse/GpgSignResultAnalyse.cpp
@@ -28,8 +28,7 @@
#include "GpgSignResultAnalyse.h"
-#include "core/GpgModel.h"
-#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgAbstractKeyGetter.h"
#include "core/utils/LocalizedUtils.h"
namespace GpgFrontend {
@@ -54,66 +53,61 @@ void GpgSignResultAnalyse::doAnalyse() {
if (result != nullptr &&
(result->signatures != nullptr || result->invalid_signers != nullptr)) {
stream_ << Qt::endl;
- auto *new_sign = result->signatures;
+ auto *sign = result->signatures;
auto index = 0;
- while (new_sign != nullptr) {
+ while (sign != nullptr) {
stream_ << "## " << tr("New Signature") << " [" << ++index
<< "]: " << Qt::endl;
stream_ << "- " << tr("Sign Mode") << ": ";
- if (new_sign->type == GPGME_SIG_MODE_NORMAL) {
+ if (sign->type == GPGME_SIG_MODE_NORMAL) {
stream_ << tr("Normal");
- } else if (new_sign->type == GPGME_SIG_MODE_CLEAR) {
+ } else if (sign->type == GPGME_SIG_MODE_CLEAR) {
stream_ << tr("Clear");
- } else if (new_sign->type == GPGME_SIG_MODE_DETACH) {
+ } else if (sign->type == GPGME_SIG_MODE_DETACH) {
stream_ << tr("Detach");
}
stream_ << Qt::endl;
- QString fpr = new_sign->fpr == nullptr ? "" : new_sign->fpr;
- auto singer_key = GpgKeyGetter::GetInstance(GetChannel()).GetKey(fpr);
- if (singer_key.IsGood()) {
- stream_ << "- " << tr("Signed By") << ": "
- << singer_key.UIDs().front().GetUID() << Qt::endl;
-
- auto s_keys = singer_key.SubKeys();
- auto it = std::find_if(
- s_keys.begin(), s_keys.end(),
- [fpr](const GpgSubKey &k) { return k.Fingerprint() == fpr; });
-
- if (it != s_keys.end()) {
- auto &subkey = *it;
- if (subkey.Fingerprint() != singer_key.Fingerprint()) {
- stream_ << "- " << tr("Key ID") << ": " << singer_key.ID() << " ("
- << tr("Subkey") << ")" << Qt::endl;
- } else {
- stream_ << "- " << tr("Key ID") << ": " << singer_key.ID() << " ("
- << tr("Primary Key") << ")" << Qt::endl;
- }
- stream_ << "- " << tr("Key Create Date") << ": "
- << QLocale().toString(subkey.CreationTime()) << Qt::endl;
+ QString fpr = sign->fpr == nullptr ? "" : sign->fpr;
+ auto sign_key =
+ GpgAbstractKeyGetter::GetInstance(GetChannel()).GetKey(fpr);
+ if (sign_key != nullptr) {
+ stream_ << "- " << tr("Signed By") << ": " << sign_key->UID()
+ << Qt::endl;
+
+ if (sign_key->KeyType() == GpgAbstractKeyType::kGPG_SUBKEY) {
+ stream_ << "- " << tr("Key ID") << ": " << sign_key->ID() << " ("
+ << tr("Subkey") << ")" << Qt::endl;
+ } else {
+ stream_ << "- " << tr("Key ID") << ": " << sign_key->ID() << " ("
+ << tr("Primary Key") << ")" << Qt::endl;
}
+ stream_ << "- " << tr("Key Create Date") << ": "
+ << QLocale().toString(sign_key->CreationTime()) << Qt::endl;
+
} else {
stream_ << "- " << tr("Signed By") << "(" << tr("Fingerprint") << ")"
<< ": " << (fpr.isEmpty() ? tr("<unknown>") : fpr) << Qt::endl;
}
+
stream_ << "- " << tr("Public Key Algo") << ": "
- << gpgme_pubkey_algo_name(new_sign->pubkey_algo) << Qt::endl;
+ << gpgme_pubkey_algo_name(sign->pubkey_algo) << Qt::endl;
stream_ << "- " << tr("Hash Algo") << ": "
- << gpgme_hash_algo_name(new_sign->hash_algo) << Qt::endl;
+ << gpgme_hash_algo_name(sign->hash_algo) << Qt::endl;
stream_ << "- " << tr("Sign Date") << "(" << tr("UTC") << ")" << ": "
- << GetUTCDateByTimestamp(new_sign->timestamp) << Qt::endl;
+ << GetUTCDateByTimestamp(sign->timestamp) << Qt::endl;
stream_ << "- " << tr("Sign Date") << "(" << tr("Localized") << ")"
- << ": " << GetLocalizedDateByTimestamp(new_sign->timestamp)
+ << ": " << GetLocalizedDateByTimestamp(sign->timestamp)
<< Qt::endl;
stream_ << Qt::endl
<< "---------------------------------------" << Qt::endl
<< Qt::endl;
- new_sign = new_sign->next;
+ sign = sign->next;
}
auto *invalid_signer = result->invalid_signers;
diff --git a/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp b/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp
index 09b7da7e..66a607b8 100644
--- a/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp
+++ b/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp
@@ -28,8 +28,7 @@
#include "GpgVerifyResultAnalyse.h"
-#include "core/GpgModel.h"
-#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgAbstractKeyGetter.h"
#include "core/utils/CommonUtils.h"
#include "core/utils/LocalizedUtils.h"
@@ -200,29 +199,19 @@ auto GpgFrontend::GpgVerifyResultAnalyse::print_signer(
QTextStream &stream, GpgSignature sign) -> bool {
auto fingerprint = sign.GetFingerprint();
auto key =
- GpgFrontend::GpgKeyGetter::GetInstance(GetChannel()).GetKey(fingerprint);
- if (key.IsGood()) {
- stream << "- " << tr("Signed By") << ": " << key.UIDs().front().GetUID()
- << Qt::endl;
-
- auto s_keys = key.SubKeys();
- auto it = std::find_if(s_keys.begin(), s_keys.end(),
- [fingerprint](const GpgSubKey &k) {
- return k.Fingerprint() == fingerprint;
- });
-
- if (it != s_keys.end()) {
- auto &s_key = *it;
- if (s_key.Fingerprint() != key.Fingerprint()) {
- stream << "- " << tr("Key ID") << ": " << key.ID() << " ("
- << tr("Subkey") << ")" << Qt::endl;
- } else {
- stream << "- " << tr("Key ID") << ": " << key.ID() << " ("
- << tr("Primary Key") << ")" << Qt::endl;
- }
- stream << "- " << tr("Key Create Date") << ": "
- << QLocale().toString(s_key.CreationTime()) << Qt::endl;
+ GpgAbstractKeyGetter::GetInstance(GetChannel()).GetKey(fingerprint);
+ if (key != nullptr) {
+ stream << "- " << tr("Signed By") << ": " << key->UID() << Qt::endl;
+
+ if (key->KeyType() == GpgAbstractKeyType::kGPG_SUBKEY) {
+ stream << "- " << tr("Key ID") << ": " << key->ID() << " ("
+ << tr("Subkey") << ")" << Qt::endl;
+ } else {
+ stream << "- " << tr("Key ID") << ": " << key->ID() << " ("
+ << tr("Primary Key") << ")" << Qt::endl;
}
+ stream << "- " << tr("Key Create Date") << ": "
+ << QLocale().toString(key->CreationTime()) << Qt::endl;
} else {
stream_ << "- " << tr("Signed By") << "(" << tr("Fingerprint") << ")"
@@ -239,7 +228,8 @@ auto GpgFrontend::GpgVerifyResultAnalyse::print_signer(
stream << "- " << tr("Sign Date") << "(" << tr("Localized") << ")" << ": "
<< QLocale().toString(sign.GetCreateTime()) << Qt::endl;
stream << Qt::endl;
- return key.IsGood();
+
+ return key != nullptr;
}
auto GpgFrontend::GpgVerifyResultAnalyse::GetSignatures() const
diff --git a/src/core/model/GpgKeyGroup.cpp b/src/core/model/GpgKeyGroup.cpp
index b572deac..13c0d542 100644
--- a/src/core/model/GpgKeyGroup.cpp
+++ b/src/core/model/GpgKeyGroup.cpp
@@ -28,7 +28,7 @@
#include "core/model/GpgKeyGroup.h"
-#include <utility>
+#include "core/function/gpg/GpgKeyGroupGetter.h"
namespace GpgFrontend {
@@ -50,13 +50,15 @@ auto GpgKeyGroup::Email() const -> QString { return email_; }
auto GpgKeyGroup::Comment() const -> QString { return comment_; }
-auto GpgKeyGroup::Fingerprint() const -> QString { return {}; }
+auto GpgKeyGroup::Fingerprint() const -> QString { return ID(); }
auto GpgKeyGroup::PublicKeyAlgo() const -> QString { return {}; }
auto GpgKeyGroup::Algo() const -> QString { return {}; }
-auto GpgKeyGroup::ExpirationTime() const -> QDateTime { return {}; };
+auto GpgKeyGroup::ExpirationTime() const -> QDateTime {
+ return QDateTime::fromSecsSinceEpoch(0);
+};
auto GpgKeyGroup::CreationTime() const -> QDateTime { return creation_time_; };
@@ -75,7 +77,7 @@ auto GpgKeyGroup::IsExpired() const -> bool { return false; }
auto GpgKeyGroup::IsRevoked() const -> bool { return false; }
auto GpgKeyGroup::IsDisabled() const -> bool {
- return key_ids_.isEmpty() || disabled_;
+ return getter_ == nullptr ? true : getter_->IsKeyGroupDisabled(ID());
}
auto GpgKeyGroup::KeyType() const -> GpgAbstractKeyType {
@@ -116,5 +118,7 @@ void GpgKeyGroup::SetKeyIds(QStringList key_ids) {
key_ids_ = std::move(key_ids);
}
-void GpgKeyGroup::SetDisabled(bool disabled) { disabled_ = disabled; }
+void GpgKeyGroup::SetKeyGroupGetter(GpgKeyGroupGetter *getter) {
+ getter_ = getter;
+}
} // namespace GpgFrontend \ No newline at end of file
diff --git a/src/core/model/GpgKeyGroup.h b/src/core/model/GpgKeyGroup.h
index d3ae8e03..887fd13f 100644
--- a/src/core/model/GpgKeyGroup.h
+++ b/src/core/model/GpgKeyGroup.h
@@ -33,6 +33,8 @@
namespace GpgFrontend {
+class GpgKeyGroupGetter;
+
/**
* @brief
*
@@ -248,7 +250,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyGroup : public GpgAbstractKey {
* @brief Set the Disabled object
*
*/
- void SetDisabled(bool);
+ void SetKeyGroupGetter(GpgKeyGroupGetter*);
private:
QString id_;
@@ -257,7 +259,8 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyGroup : public GpgAbstractKey {
QString comment_;
QStringList key_ids_;
QDateTime creation_time_;
- bool disabled_;
+
+ GpgKeyGroupGetter* getter_ = nullptr;
};
} // namespace GpgFrontend
diff --git a/src/core/model/GpgKeyTreeModel.cpp b/src/core/model/GpgKeyTreeModel.cpp
index a62878c9..92a0f77c 100644
--- a/src/core/model/GpgKeyTreeModel.cpp
+++ b/src/core/model/GpgKeyTreeModel.cpp
@@ -28,14 +28,12 @@
#include "GpgKeyTreeModel.h"
-#include <utility>
-
#include "core/model/GpgKey.h"
#include "core/utils/GpgUtils.h"
namespace GpgFrontend {
-GpgKeyTreeModel::GpgKeyTreeModel(int channel, const GpgKeyList &keys,
+GpgKeyTreeModel::GpgKeyTreeModel(int channel, const GpgAbstractKeyPtrList &keys,
Detector checkable_detector, QObject *parent)
: QAbstractItemModel(parent),
gpg_context_channel_(channel),
@@ -165,13 +163,13 @@ auto GpgKeyTreeModel::GetGpgContextChannel() const -> int {
return gpg_context_channel_;
}
-void GpgKeyTreeModel::setup_model_data(const GpgKeyList &keys) {
+void GpgKeyTreeModel::setup_model_data(const GpgAbstractKeyPtrList &keys) {
auto root = QSharedPointer<GpgKeyTreeItem>::create(nullptr, column_headers_);
cached_items_.clear();
for (const auto &key : keys) {
auto pi_key = create_gpg_key_tree_items(key);
- root->AppendChild(pi_key);
+ if (pi_key != nullptr) root->AppendChild(pi_key);
}
std::swap(root_, root);
@@ -197,36 +195,39 @@ auto GpgKeyTreeModel::GetAllCheckedKeyIds() -> KeyIdArgsList {
return ret;
}
-auto GpgKeyTreeModel::create_gpg_key_tree_items(const GpgKey &key)
+auto GpgKeyTreeModel::create_gpg_key_tree_items(const GpgAbstractKeyPtr &key)
-> QSharedPointer<GpgKeyTreeItem> {
QVariantList columns;
columns << "/";
+ if (key->KeyType() != GpgAbstractKeyType::kGPG_KEY) return nullptr;
+
+ auto g_key = qSharedPointerDynamicCast<GpgKey>(key);
+
QString type;
- type += key.IsPrivateKey() ? "pub/sec" : "pub";
- if (key.IsPrivateKey() && !key.IsHasMasterKey()) type += "#";
- if (key.IsHasCardKey()) type += "^";
+ type += g_key->IsPrivateKey() ? "pub/sec" : "pub";
+ if (g_key->IsPrivateKey() && !g_key->IsHasMasterKey()) type += "#";
+ if (g_key->IsHasCardKey()) type += "^";
columns << type;
- columns << key.UIDs().front().GetUID();
- columns << key.ID();
+ columns << g_key->UIDs().front().GetUID();
+ columns << g_key->ID();
- columns << GetUsagesByAbstractKey(&key);
- columns << key.PublicKeyAlgo();
- columns << key.Algo();
- columns << QLocale().toString(key.CreationTime(), "yyyy-MM-dd");
+ columns << GetUsagesByAbstractKey(key.get());
+ columns << g_key->PublicKeyAlgo();
+ columns << g_key->Algo();
+ columns << QLocale().toString(g_key->CreationTime(), "yyyy-MM-dd");
- auto i_key = QSharedPointer<GpgKeyTreeItem>::create(
- QSharedPointer<GpgKey>::create(key), columns);
+ auto i_key = QSharedPointer<GpgKeyTreeItem>::create(key, columns);
i_key->SetEnable(true);
i_key->SetCheckable(checkable_detector_(i_key->Key()));
cached_items_.push_back(i_key);
- for (const auto &s_key : key.SubKeys()) {
+ for (const auto &s_key : g_key->SubKeys()) {
QVariantList columns;
columns << "/";
columns << (s_key.IsHasCertCap() ? "primary" : "sub");
- columns << key.UIDs().front().GetUID();
+ columns << g_key->UIDs().front().GetUID();
columns << s_key.ID();
columns << GetUsagesByAbstractKey(&s_key);
columns << s_key.PublicKeyAlgo();
diff --git a/src/core/model/GpgKeyTreeModel.h b/src/core/model/GpgKeyTreeModel.h
index 20b63e01..bc27d2bd 100644
--- a/src/core/model/GpgKeyTreeModel.h
+++ b/src/core/model/GpgKeyTreeModel.h
@@ -32,7 +32,6 @@
* @brief
*
*/
-#include <utility>
#include "core/model/GpgAbstractKey.h"
#include "core/model/GpgKey.h"
@@ -250,7 +249,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyTreeModel : public QAbstractItemModel {
* @param keys
* @param parent
*/
- explicit GpgKeyTreeModel(int channel, const GpgKeyList &keys,
+ explicit GpgKeyTreeModel(int channel, const GpgAbstractKeyPtrList &keys,
Detector checkable, QObject *parent = nullptr);
/**
@@ -372,7 +371,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyTreeModel : public QAbstractItemModel {
* @brief
*
*/
- void setup_model_data(const GpgKeyList &keys);
+ void setup_model_data(const GpgAbstractKeyPtrList &keys);
/**
* @brief Create a gpg key tree items object
@@ -380,7 +379,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyTreeModel : public QAbstractItemModel {
* @param key
* @return QSharedPointer<GpgKeyTreeItem>
*/
- auto create_gpg_key_tree_items(const GpgKey &key)
+ auto create_gpg_key_tree_items(const GpgAbstractKeyPtr &key)
-> QSharedPointer<GpgKeyTreeItem>;
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 05:02:22 +0000