diff options
| author | saturneric <[email protected]> | 2025-04-12 11:36:45 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2025-04-12 11:36:45 +0000 |
| commit | e0264d85090dd119d48df28477db2fe3b17eb60a (patch) | |
| tree | e7711bfe4f03c4b97eb2f37129b07a9ec5eb85d1 | |
| parent | fix: wrong ui dialog order after switching apps (diff) | |
| download | GpgFrontend-e0264d85090dd119d48df28477db2fe3b17eb60a.tar.gz GpgFrontend-e0264d85090dd119d48df28477db2fe3b17eb60a.zip | |
refactor: GpgKey and GpgSubKey
40 files changed, 681 insertions, 835 deletions
diff --git a/src/core/function/gpg/GpgAutomatonHandler.cpp b/src/core/function/gpg/GpgAutomatonHandler.cpp index 352400a4..802279ed 100644 --- a/src/core/function/gpg/GpgAutomatonHandler.cpp +++ b/src/core/function/gpg/GpgAutomatonHandler.cpp @@ -97,7 +97,7 @@ auto GpgAutomatonHandler::interator_cb_func(void* handle, const char* status, auto GpgAutomatonHandler::DoInteract( const GpgKey& key, AutomatonNextStateHandler next_state_handler, AutomatonActionHandler action_handler) -> bool { - auto key_fpr = key.GetFingerprint(); + auto key_fpr = key.Fingerprint(); AutomatonHandelStruct handel_struct(key_fpr); handel_struct.SetHandler(std::move(next_state_handler), std::move(action_handler)); diff --git a/src/core/function/gpg/GpgBasicOperator.cpp b/src/core/function/gpg/GpgBasicOperator.cpp index 30fd8912..2548409e 100644 --- a/src/core/function/gpg/GpgBasicOperator.cpp +++ b/src/core/function/gpg/GpgBasicOperator.cpp @@ -49,7 +49,7 @@ void SetSignersImpl(GpgContext& ctx_, const KeyArgsList& signers, bool ascii) { gpgme_signers_clear(ctx); for (const GpgKey& key : signers) { - LOG_D() << "signer's key fpr: " << key.GetFingerprint(); + LOG_D() << "signer's key fpr: " << key.Fingerprint(); if (key.IsHasActualSignCap()) { auto error = gpgme_signers_add(ctx, gpgme_key_t(key)); CheckGpgError(error); diff --git a/src/core/function/gpg/GpgKeyGetter.cpp b/src/core/function/gpg/GpgKeyGetter.cpp index a4ca6021..14145f7f 100644 --- a/src/core/function/gpg/GpgKeyGetter.cpp +++ b/src/core/function/gpg/GpgKeyGetter.cpp @@ -131,12 +131,12 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> { // 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.GetId(), false); + gpg_key = GetKey(gpg_key.ID(), false); } keys_cache_.push_back(gpg_key); - keys_search_cache_.insert(gpg_key.GetId(), gpg_key); - keys_search_cache_.insert(gpg_key.GetFingerprint(), gpg_key); + keys_search_cache_.insert(gpg_key.ID(), gpg_key); + keys_search_cache_.insert(gpg_key.Fingerprint(), gpg_key); } } diff --git a/src/core/function/gpg/GpgKeyManager.cpp b/src/core/function/gpg/GpgKeyManager.cpp index 36f68bdc..bd514cf3 100644 --- a/src/core/function/gpg/GpgKeyManager.cpp +++ b/src/core/function/gpg/GpgKeyManager.cpp @@ -85,7 +85,7 @@ auto GpgKeyManager::SetExpire(const GpgKey& key, const char* sub_fprs = nullptr; - if (subkey != nullptr) sub_fprs = subkey->GetFingerprint().toUtf8(); + if (subkey != nullptr) sub_fprs = subkey->Fingerprint().toUtf8(); auto err = CheckGpgError(gpgme_op_setexpire(ctx_.DefaultContext(), static_cast<gpgme_key_t>(key), @@ -174,7 +174,7 @@ auto GpgKeyManager::SetOwnerTrustLevel(const GpgKey& key, auto GpgKeyManager::DeleteSubkey(const GpgKey& key, int subkey_index) -> bool { if (subkey_index < 0 || - subkey_index >= static_cast<int>(key.GetSubKeys()->size())) { + subkey_index >= static_cast<int>(key.SubKeys().size())) { LOG_W() << "illegal subkey index: " << subkey_index; return false; } @@ -246,7 +246,7 @@ auto GpgKeyManager::DeleteSubkey(const GpgKey& key, int subkey_index) -> bool { return QString(""); }; - auto key_fpr = key.GetFingerprint(); + auto key_fpr = key.Fingerprint(); AutomatonHandelStruct handel_struct(key_fpr); handel_struct.SetHandler(next_state_handler, action_handler); @@ -260,7 +260,7 @@ auto GpgKeyManager::RevokeSubkey(const GpgKey& key, int subkey_index, int reason_code, const QString& reason_text) -> bool { if (subkey_index < 0 || - subkey_index >= static_cast<int>(key.GetSubKeys()->size())) { + subkey_index >= static_cast<int>(key.SubKeys().size())) { LOG_W() << "illegal subkey index: " << subkey_index; return false; } @@ -369,7 +369,7 @@ auto GpgKeyManager::RevokeSubkey(const GpgKey& key, int subkey_index, return QString(""); }; - auto key_fpr = key.GetFingerprint(); + auto key_fpr = key.Fingerprint(); AutomatonHandelStruct handel_struct(key_fpr); handel_struct.SetHandler(next_state_handler, action_handler); diff --git a/src/core/function/gpg/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp index 2378b518..3d9b8eda 100644 --- a/src/core/function/gpg/GpgKeyOpera.cpp +++ b/src/core/function/gpg/GpgKeyOpera.cpp @@ -81,7 +81,7 @@ auto GpgKeyOpera::SetExpire(const GpgKey& key, const SubkeyId& subkey_fpr, } GpgError err; - if (key.GetFingerprint() == subkey_fpr || subkey_fpr.isEmpty()) { + if (key.Fingerprint() == subkey_fpr || subkey_fpr.isEmpty()) { err = gpgme_op_setexpire(ctx_.DefaultContext(), static_cast<gpgme_key_t>(key), expires_time, nullptr, 0); @@ -119,7 +119,7 @@ void GpgKeyOpera::GenerateRevokeCert(const GpgKey& key, GpgCommandExecutor::ExecuteSync( {app_path, QStringList{"--command-fd", "0", "--status-fd", "1", "--no-tty", "-o", - output_path, "--gen-revoke", key.GetFingerprint()}, + output_path, "--gen-revoke", key.Fingerprint()}, [=](int exit_code, const QString& p_out, const QString& p_err) { if (exit_code != 0) { LOG_W() << "gnupg gen revoke execute error, process stderr: " @@ -246,8 +246,7 @@ auto GenerateSubKeyImpl(GpgContext& ctx, const GpgKey& key, if (params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE; if (params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD; - LOG_D() << "subkey generation args: " << key.GetId() << algo << expires - << flags; + LOG_D() << "subkey generation args: " << key.ID() << algo << expires << flags; auto err = gpgme_op_createsubkey(ctx.DefaultContext(), static_cast<gpgme_key_t>(key), @@ -367,10 +366,10 @@ void GpgKeyOpera::DeleteKey(const KeyId& key_id) { auto AddADSKImpl(GpgContext& ctx, const GpgKey& key, const GpgSubKey& adsk, const DataObjectPtr& data_object) -> GpgError { - auto algo = adsk.GetFingerprint(); + auto algo = adsk.Fingerprint(); unsigned int flags = GPGME_CREATE_ADSK; - LOG_D() << "add adsk args: " << key.GetId() << algo; + LOG_D() << "add adsk args: " << key.ID() << algo; auto err = gpgme_op_createsubkey(ctx.DefaultContext(), static_cast<gpgme_key_t>(key), diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index b9312745..f3e4fcc2 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -59,7 +59,7 @@ auto GpgUIDOperator::AddUID(const GpgKey& key, const QString& name, } auto GpgUIDOperator::DeleteUID(const GpgKey& key, int uid_index) -> bool { - if (uid_index < 2 || uid_index > static_cast<int>(key.GetUIDs()->size())) { + if (uid_index < 2 || uid_index > static_cast<int>(key.UIDs().size())) { LOG_W() << "illegal uid_index index: " << uid_index; return false; } @@ -131,7 +131,7 @@ auto GpgUIDOperator::DeleteUID(const GpgKey& key, int uid_index) -> bool { return QString(""); }; - auto key_fpr = key.GetFingerprint(); + auto key_fpr = key.Fingerprint(); AutomatonHandelStruct handel_struct(key_fpr); handel_struct.SetHandler(next_state_handler, action_handler); @@ -144,7 +144,7 @@ auto GpgUIDOperator::DeleteUID(const GpgKey& key, int uid_index) -> bool { auto GpgUIDOperator::RevokeUID(const GpgKey& key, int uid_index, int reason_code, const QString& reason_text) -> bool { - if (uid_index < 2 || uid_index > static_cast<int>(key.GetUIDs()->size())) { + if (uid_index < 2 || uid_index > static_cast<int>(key.UIDs().size())) { LOG_W() << "illegal uid index: " << uid_index; return false; } @@ -253,7 +253,7 @@ auto GpgUIDOperator::RevokeUID(const GpgKey& key, int uid_index, return QString(""); }; - auto key_fpr = key.GetFingerprint(); + auto key_fpr = key.Fingerprint(); AutomatonHandelStruct handel_struct(key_fpr); handel_struct.SetHandler(next_state_handler, action_handler); diff --git a/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp b/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp index 6e948705..f84e9b85 100644 --- a/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp +++ b/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp @@ -110,9 +110,9 @@ void GpgFrontend::GpgDecryptResultAnalyse::print_recipient( auto key = GpgFrontend::GpgKeyGetter::GetInstance(GetChannel()) .GetKey(recipient->keyid); if (key.IsGood()) { - stream << key.GetName(); - if (!key.GetComment().isEmpty()) stream << "(" << key.GetComment() << ")"; - if (!key.GetEmail().isEmpty()) stream << "<" << key.GetEmail() << ">"; + stream << key.Name(); + if (!key.Comment().isEmpty()) stream << "(" << key.Comment() << ")"; + if (!key.Email().isEmpty()) stream << "<" << key.Email() << ">"; } else { stream << "<" << tr("unknown") << ">"; setStatus(0); diff --git a/src/core/function/result_analyse/GpgSignResultAnalyse.cpp b/src/core/function/result_analyse/GpgSignResultAnalyse.cpp index 2530b823..262d0692 100644 --- a/src/core/function/result_analyse/GpgSignResultAnalyse.cpp +++ b/src/core/function/result_analyse/GpgSignResultAnalyse.cpp @@ -76,24 +76,24 @@ void GpgSignResultAnalyse::doAnalyse() { auto singer_key = GpgKeyGetter::GetInstance(GetChannel()).GetKey(fpr); if (singer_key.IsGood()) { stream_ << "- " << tr("Signed By") << ": " - << singer_key.GetUIDs()->front().GetUID() << Qt::endl; + << singer_key.UIDs().front().GetUID() << Qt::endl; - auto subkeys = singer_key.GetSubKeys(); + auto s_keys = singer_key.SubKeys(); auto it = std::find_if( - subkeys->begin(), subkeys->end(), - [fpr](const GpgSubKey &k) { return k.GetFingerprint() == fpr; }); + s_keys.begin(), s_keys.end(), + [fpr](const GpgSubKey &k) { return k.Fingerprint() == fpr; }); - if (it != subkeys->end()) { + if (it != s_keys.end()) { auto &subkey = *it; - if (subkey.GetFingerprint() != singer_key.GetFingerprint()) { - stream_ << "- " << tr("Key ID") << ": " << singer_key.GetId() - << " (" << tr("Subkey") << ")" << Qt::endl; + if (subkey.Fingerprint() != singer_key.Fingerprint()) { + stream_ << "- " << tr("Key ID") << ": " << singer_key.ID() << " (" + << tr("Subkey") << ")" << Qt::endl; } else { - stream_ << "- " << tr("Key ID") << ": " << singer_key.GetId() - << " (" << tr("Primary Key") << ")" << Qt::endl; + stream_ << "- " << tr("Key ID") << ": " << singer_key.ID() << " (" + << tr("Primary Key") << ")" << Qt::endl; } stream_ << "- " << tr("Key Create Date") << ": " - << QLocale().toString(subkey.GetCreateTime()) << Qt::endl; + << QLocale().toString(subkey.CreationTime()) << Qt::endl; } } else { stream_ << "- " << tr("Signed By") << "(" << tr("Fingerprint") << ")" diff --git a/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp b/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp index e2fc21f0..09b7da7e 100644 --- a/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp +++ b/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp @@ -202,26 +202,26 @@ auto GpgFrontend::GpgVerifyResultAnalyse::print_signer( auto key = GpgFrontend::GpgKeyGetter::GetInstance(GetChannel()).GetKey(fingerprint); if (key.IsGood()) { - stream << "- " << tr("Signed By") << ": " << key.GetUIDs()->front().GetUID() + stream << "- " << tr("Signed By") << ": " << key.UIDs().front().GetUID() << Qt::endl; - auto subkeys = key.GetSubKeys(); - auto it = std::find_if(subkeys->begin(), subkeys->end(), + auto s_keys = key.SubKeys(); + auto it = std::find_if(s_keys.begin(), s_keys.end(), [fingerprint](const GpgSubKey &k) { - return k.GetFingerprint() == fingerprint; + return k.Fingerprint() == fingerprint; }); - if (it != subkeys->end()) { - auto &subkey = *it; - if (subkey.GetFingerprint() != key.GetFingerprint()) { - stream << "- " << tr("Key ID") << ": " << key.GetId() << " (" + 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.GetId() << " (" + stream << "- " << tr("Key ID") << ": " << key.ID() << " (" << tr("Primary Key") << ")" << Qt::endl; } stream << "- " << tr("Key Create Date") << ": " - << QLocale().toString(subkey.GetCreateTime()) << Qt::endl; + << QLocale().toString(s_key.CreationTime()) << Qt::endl; } } else { diff --git a/src/core/model/GpgAbstractKey.h b/src/core/model/GpgAbstractKey.h index b34643cd..97171daa 100644 --- a/src/core/model/GpgAbstractKey.h +++ b/src/core/model/GpgAbstractKey.h @@ -35,11 +35,19 @@ class GpgAbstractKey { [[nodiscard]] virtual auto ID() const -> QString = 0; [[nodiscard]] virtual auto Fingerprint() const -> QString = 0; [[nodiscard]] virtual auto IsSubKey() const -> bool = 0; - [[nodiscard]] virtual auto CreationTime() const -> QDateTime = 0; + [[nodiscard]] virtual auto IsHasEncrCap() const -> bool = 0; [[nodiscard]] virtual auto IsHasSignCap() const -> bool = 0; [[nodiscard]] virtual auto IsHasCertCap() const -> bool = 0; [[nodiscard]] virtual auto IsHasAuthCap() const -> bool = 0; + [[nodiscard]] virtual auto IsRevoked() const -> bool = 0; + [[nodiscard]] virtual auto IsDisabled() const -> bool = 0; + [[nodiscard]] virtual auto IsExpired() const -> bool = 0; + [[nodiscard]] virtual auto IsGood() const -> bool = 0; + [[nodiscard]] virtual auto PublicKeyAlgo() const -> QString = 0; + [[nodiscard]] virtual auto Algo() const -> QString = 0; + [[nodiscard]] virtual auto CreationTime() const -> QDateTime = 0; + [[nodiscard]] virtual auto ExpirationTime() const -> QDateTime = 0; // diff --git a/src/core/model/GpgKey.cpp b/src/core/model/GpgKey.cpp index ce6f1c10..0c644217 100644 --- a/src/core/model/GpgKey.cpp +++ b/src/core/model/GpgKey.cpp @@ -30,60 +30,38 @@ namespace GpgFrontend { -GpgKey::GpgKey(gpgme_key_t &&key) : key_ref_(key) {} +GpgKey::GpgKey() = default; -GpgKey::GpgKey(GpgKey &&k) noexcept { swap(key_ref_, k.key_ref_); } +GpgKey::GpgKey(gpgme_key_t key) + : key_ref_(key, [](struct _gpgme_key *ptr) { + if (ptr != nullptr) gpgme_key_unref(ptr); + }) {} -auto GpgKey::operator=(GpgKey &&k) noexcept -> GpgKey & { - swap(key_ref_, k.key_ref_); - return *this; -} - -GpgKey::GpgKey(const GpgKey &key) { - auto *key_ref = key.key_ref_.get(); - gpgme_key_ref(key_ref); - this->key_ref_ = KeyRefHandler(key_ref); -} - -auto GpgKey::operator=(const GpgKey &key) -> GpgKey & { - if (this == &key) { - return *this; - } +GpgKey::operator gpgme_key_t() const { return key_ref_.get(); } - auto *key_ref = key.key_ref_.get(); - gpgme_key_ref(key_ref); +GpgKey::GpgKey(const GpgKey &) = default; - this->key_ref_ = KeyRefHandler(key_ref); - return *this; -} +GpgKey::~GpgKey() = default; -auto GpgKey::operator==(const GpgKey &o) const -> bool { - return o.GetId() == this->GetId(); -} - -auto GpgKey::operator<=(const GpgKey &o) const -> bool { - return this->GetId() < o.GetId(); -} - -GpgKey::operator gpgme_key_t() const { return key_ref_.get(); } +auto GpgKey::operator=(const GpgKey &) -> GpgKey & = default; auto GpgKey::IsGood() const -> bool { return key_ref_ != nullptr; } -auto GpgKey::GetId() const -> QString { return key_ref_->subkeys->keyid; } +auto GpgKey::ID() const -> QString { return key_ref_->subkeys->keyid; } -auto GpgKey::GetName() const -> QString { return key_ref_->uids->name; }; +auto GpgKey::Name() const -> QString { return key_ref_->uids->name; }; -auto GpgKey::GetEmail() const -> QString { return key_ref_->uids->email; } +auto GpgKey::Email() const -> QString { return key_ref_->uids->email; } -auto GpgKey::GetComment() const -> QString { return key_ref_->uids->comment; } +auto GpgKey::Comment() const -> QString { return key_ref_->uids->comment; } -auto GpgKey::GetFingerprint() const -> QString { return key_ref_->fpr; } +auto GpgKey::Fingerprint() const -> QString { return key_ref_->fpr; } -auto GpgKey::GetProtocol() const -> QString { +auto GpgKey::Protocol() const -> QString { return gpgme_get_protocol_name(key_ref_->protocol); } -auto GpgKey::GetOwnerTrust() const -> QString { +auto GpgKey::OwnerTrust() const -> QString { switch (key_ref_->owner_trust) { case GPGME_VALIDITY_UNKNOWN: return tr("Unknown"); @@ -101,7 +79,7 @@ auto GpgKey::GetOwnerTrust() const -> QString { return "Invalid"; } -auto GpgKey::GetOwnerTrustLevel() const -> int { +auto GpgKey::OwnerTrustLevel() const -> int { switch (key_ref_->owner_trust) { case GPGME_VALIDITY_UNKNOWN: return 0; @@ -119,31 +97,31 @@ auto GpgKey::GetOwnerTrustLevel() const -> int { return 0; } -auto GpgKey::GetPublicKeyAlgo() const -> QString { +auto GpgKey::PublicKeyAlgo() const -> QString { return gpgme_pubkey_algo_name(key_ref_->subkeys->pubkey_algo); } -auto GpgKey::GetKeyAlgo() const -> QString { +auto GpgKey::Algo() const -> QString { auto *buffer = gpgme_pubkey_algo_string(key_ref_->subkeys); auto algo = QString(buffer); gpgme_free(buffer); return algo.toUpper(); } -auto GpgKey::GetLastUpdateTime() const -> QDateTime { +auto GpgKey::LastUpdateTime() const -> QDateTime { return QDateTime::fromSecsSinceEpoch( static_cast<time_t>(key_ref_->last_update)); } -auto GpgKey::GetExpireTime() const -> QDateTime { +auto GpgKey::ExpirationTime() const -> QDateTime { return QDateTime::fromSecsSinceEpoch(key_ref_->subkeys->expires); }; -auto GpgKey::GetCreateTime() const -> QDateTime { +auto GpgKey::CreationTime() const -> QDateTime { return QDateTime::fromSecsSinceEpoch(key_ref_->subkeys->timestamp); }; -auto GpgKey::GetPrimaryKeyLength() const -> unsigned int { +auto GpgKey::PrimaryKeyLength() const -> unsigned int { return key_ref_->subkeys->length; } @@ -156,9 +134,9 @@ auto GpgKey::IsHasCertCap() const -> bool { return key_ref_->can_certify; } auto GpgKey::IsHasAuthCap() const -> bool { return key_ref_->can_authenticate; } auto GpgKey::IsHasCardKey() const -> bool { - auto subkeys = GetSubKeys(); + auto sub_keys = SubKeys(); return std::any_of( - subkeys->begin(), subkeys->end(), + sub_keys.begin(), sub_keys.end(), [](const GpgSubKey &subkey) -> bool { return subkey.IsCardKey(); }); } @@ -174,44 +152,42 @@ auto GpgKey::IsHasMasterKey() const -> bool { return key_ref_->subkeys->secret; } -auto GpgKey::GetSubKeys() const -> std::unique_ptr<QContainer<GpgSubKey>> { - auto p_keys = std::make_unique<QContainer<GpgSubKey>>(); +auto GpgKey::SubKeys() const -> QContainer<GpgSubKey> { + QContainer<GpgSubKey> ret; auto *next = key_ref_->subkeys; while (next != nullptr) { - p_keys->push_back(GpgSubKey(next)); + ret.push_back(GpgSubKey(next)); next = next->next; } - return p_keys; + return ret; } -auto GpgKey::GetUIDs() const -> std::unique_ptr<QContainer<GpgUID>> { - auto p_uids = std::make_unique<QContainer<GpgUID>>(); +auto GpgKey::UIDs() const -> QContainer<GpgUID> { + QContainer<GpgUID> uids; auto *uid_next = key_ref_->uids; while (uid_next != nullptr) { - p_uids->push_back(GpgUID(uid_next)); + uids.push_back(GpgUID(uid_next)); uid_next = uid_next->next; } - return p_uids; + return uids; } auto GpgKey::IsHasActualSignCap() const -> bool { - auto subkeys = GetSubKeys(); - return std::any_of(subkeys->begin(), subkeys->end(), - [](const GpgSubKey &subkey) -> bool { - return subkey.IsSecretKey() && subkey.IsHasSignCap() && - !subkey.IsDisabled() && !subkey.IsRevoked() && - !subkey.IsExpired(); - }); + auto s_keys = SubKeys(); + return std::any_of( + s_keys.begin(), s_keys.end(), [](const GpgSubKey &s_key) -> bool { + return s_key.IsSecretKey() && s_key.IsHasSignCap() && + !s_key.IsDisabled() && !s_key.IsRevoked() && !s_key.IsExpired(); + }); } auto GpgKey::IsHasActualAuthCap() const -> bool { - auto subkeys = GetSubKeys(); - return std::any_of(subkeys->begin(), subkeys->end(), - [](const GpgSubKey &subkey) -> bool { - return subkey.IsSecretKey() && subkey.IsHasAuthCap() && - !subkey.IsDisabled() && !subkey.IsRevoked() && - !subkey.IsExpired(); - }); + auto s_keys = SubKeys(); + return std::any_of( + s_keys.begin(), s_keys.end(), [](const GpgSubKey &s_key) -> bool { + return s_key.IsSecretKey() && s_key.IsHasAuthCap() && + !s_key.IsDisabled() && !s_key.IsRevoked() && !s_key.IsExpired(); + }); } /** @@ -229,19 +205,17 @@ auto GpgKey::IsHasActualCertCap() const -> bool { * @return if key encrypt */ auto GpgKey::IsHasActualEncrCap() const -> bool { - auto subkeys = GetSubKeys(); - return std::any_of(subkeys->begin(), subkeys->end(), - [](const GpgSubKey &subkey) -> bool { - return subkey.IsHasEncrCap() && !subkey.IsDisabled() && - !subkey.IsRevoked() && !subkey.IsExpired(); + auto s_keys = SubKeys(); + return std::any_of(s_keys.begin(), s_keys.end(), + [](const GpgSubKey &s_key) -> bool { + return s_key.IsHasEncrCap() && !s_key.IsDisabled() && + !s_key.IsRevoked() && !s_key.IsExpired(); }); } -void GpgKey::KeyRefDeleter::operator()(gpgme_key_t _key) { - if (_key != nullptr) gpgme_key_unref(_key); -} - -auto GpgKey::GetPrimaryKey() const -> GpgSubKey { +auto GpgKey::PrimaryKey() const -> GpgSubKey { return GpgSubKey(key_ref_->subkeys); } + +auto GpgKey::IsSubKey() const -> bool { return false; } } // namespace GpgFrontend
\ No newline at end of file diff --git a/src/core/model/GpgKey.h b/src/core/model/GpgKey.h index e2743670..2102cdc4 100644 --- a/src/core/model/GpgKey.h +++ b/src/core/model/GpgKey.h @@ -28,6 +28,7 @@ #pragma once +#include "core/model/GpgAbstractKey.h" #include "core/model/GpgSubKey.h" #include "core/model/GpgUID.h" @@ -37,56 +38,34 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgKey { +class GPGFRONTEND_CORE_EXPORT GpgKey : public GpgAbstractKey { Q_DECLARE_TR_FUNCTIONS(GpgKey) public: /** * @brief Construct a new Gpg Key object * */ - GpgKey() = default; + GpgKey(); /** * @brief Construct a new Gpg Key object * * @param key */ - explicit GpgKey(gpgme_key_t&& key); - - /** - * @brief Destroy the Gpg Key objects - * - */ - ~GpgKey() = default; - - /** - * @brief Construct a new Gpg Key object - * - * @param key - */ - GpgKey(const gpgme_key_t& key) = delete; + explicit GpgKey(gpgme_key_t key); /** * @brief Construct a new Gpg Key object * * @param k */ - GpgKey(GpgKey&&) noexcept; - - /** - * @brief - * - * @param k - * @return GpgKey& - */ - auto operator=(GpgKey&&) noexcept -> GpgKey&; + GpgKey(const GpgKey&); /** - * @brief Construct a new Gpg Key object + * @brief Destroy the Gpg Key objects * - * @param k */ - GpgKey(const GpgKey&); + virtual ~GpgKey() override; /** * @brief @@ -99,36 +78,18 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { /** * @brief * - * @param key - * @return GpgKey& - */ - auto operator=(const gpgme_key_t&) -> GpgKey& = delete; - - /** - * @brief - * - * @param o - * @return true - * @return false + * @return gpgme_key_t */ - auto operator==(const GpgKey&) const -> bool; + // NOLINTNEXTLINE(google-explicit-constructor) + operator gpgme_key_t() const; /** * @brief * - * @param o * @return true * @return false */ - auto operator<=(const GpgKey&) const -> bool; - - /** - * @brief - * - * @return gpgme_key_t - */ - // NOLINTNEXTLINE(google-explicit-constructor) - operator gpgme_key_t() const; + [[nodiscard]] auto IsSubKey() const -> bool override; /** * @brief @@ -136,105 +97,105 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { * @return true * @return false */ - [[nodiscard]] auto IsGood() const -> bool; + [[nodiscard]] auto IsGood() const -> bool override; /** * @brief * * @return QString */ - [[nodiscard]] auto GetId() const -> QString; + [[nodiscard]] auto ID() const -> QString override; /** * @brief * * @return QString */ - [[nodiscard]] auto GetName() const -> QString; + [[nodiscard]] auto Name() const -> QString; /** * @brief * * @return QString */ - [[nodiscard]] auto GetEmail() const -> QString; + [[nodiscard]] auto Email() const -> QString; /** * @brief * * @return QString */ - [[nodiscard]] auto GetComment() const -> QString; + [[nodiscard]] auto Comment() const -> QString; /** * @brief * * @return QString */ - [[nodiscard]] auto GetFingerprint() const -> QString; + [[nodiscard]] auto Fingerprint() const -> QString override; /** * @brief * * @return QString */ - [[nodiscard]] auto GetProtocol() const -> QString; + [[nodiscard]] auto Protocol() const -> QString; /** * @brief * * @return QString */ - [[nodiscard]] auto GetOwnerTrust() const -> QString; + [[nodiscard]] auto OwnerTrust() const -> QString; /** * @brief * * @return int */ - [[nodiscard]] auto GetOwnerTrustLevel() const -> int; + [[nodiscard]] auto OwnerTrustLevel() const -> int; /** * @brief * * @return QString */ - [[nodiscard]] auto GetPublicKeyAlgo() const -> QString; + [[nodiscard]] auto PublicKeyAlgo() const -> QString override; /** * @brief * * @return QString */ - [[nodiscard]] auto GetKeyAlgo() const -> QString; + [[nodiscard]] auto Algo() const -> QString override; /** * @brief * * @return QDateTime */ - [[nodiscard]] auto GetLastUpdateTime() const -> QDateTime; + [[nodiscard]] auto LastUpdateTime() const -> QDateTime; /** * @brief * * @return QDateTime */ - [[nodiscard]] auto GetExpireTime() const -> QDateTime; + [[nodiscard]] auto ExpirationTime() const -> QDateTime override; /** * @brief Create a time object * * @return QDateTime */ - [[nodiscard]] auto GetCreateTime() const -> QDateTime; + [[nodiscard]] auto CreationTime() const -> QDateTime override; /** * @brief s * * @return unsigned int */ - [[nodiscard]] auto GetPrimaryKeyLength() const -> unsigned int; + [[nodiscard]] auto PrimaryKeyLength() const -> unsigned int; /** * @brief @@ -242,7 +203,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { * @return true * @return false */ - [[nodiscard]] auto IsHasEncrCap() const -> bool; + [[nodiscard]] auto IsHasEncrCap() const -> bool override; /** * @brief @@ -259,7 +220,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { * @return true * @return false */ - [[nodiscard]] auto IsHasSignCap() const -> bool; + [[nodiscard]] auto IsHasSignCap() const -> bool override; /** * @brief @@ -275,7 +236,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { * @return true * @return false */ - [[nodiscard]] auto IsHasCertCap() const -> bool; + [[nodiscard]] auto IsHasCertCap() const -> bool override; /** * @brief @@ -291,7 +252,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { * @return true * @return false */ - [[nodiscard]] auto IsHasAuthCap() const -> bool; + [[nodiscard]] auto IsHasAuthCap() const -> bool override; /** * @brief @@ -323,7 +284,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { * @return true * @return false */ - [[nodiscard]] auto IsExpired() const -> bool; + [[nodiscard]] auto IsExpired() const -> bool override; /** * @brief @@ -331,7 +292,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { * @return true * @return false */ - [[nodiscard]] auto IsRevoked() const -> bool; + [[nodiscard]] auto IsRevoked() const -> bool override; /** * @brief @@ -339,7 +300,7 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { * @return true * @return false */ - [[nodiscard]] auto IsDisabled() const -> bool; + [[nodiscard]] auto IsDisabled() const -> bool override; /** * @brief @@ -354,35 +315,25 @@ class GPGFRONTEND_CORE_EXPORT GpgKey { * * @return std::unique_ptr<QContainer<GpgSubKey>> */ - [[nodiscard]] auto GetSubKeys() const - -> std::unique_ptr<QContainer<GpgSubKey>>; + [[nodiscard]] auto SubKeys() const -> QContainer<GpgSubKey>; /** * @brief * * @return std::unique_ptr<QContainer<GpgUID>> */ - [[nodiscard]] auto GetUIDs() const -> std::unique_ptr<QContainer<GpgUID>>; + [[nodiscard]] auto UIDs() const -> QContainer<GpgUID>; /** - * @brief Get the Primary Key object + * @brief the Primary Key object * * @return GpgSubKey */ - [[nodiscard]] auto GetPrimaryKey() const -> GpgSubKey; + [[nodiscard]] auto PrimaryKey() const -> GpgSubKey; private: - /** - * @brief - * - */ - struct GPGFRONTEND_CORE_EXPORT KeyRefDeleter { - void operator()(gpgme_key_t _key); - }; - - using KeyRefHandler = std::unique_ptr<struct _gpgme_key, KeyRefDeleter>; ///< - - KeyRefHandler key_ref_ = nullptr; ///< + using KeyRefHandler = QSharedPointer<struct _gpgme_key>; ///< + KeyRefHandler key_ref_ = nullptr; ///< }; } // namespace GpgFrontend diff --git a/src/core/model/GpgKeyTableModel.cpp b/src/core/model/GpgKeyTableModel.cpp index 53f5d1b1..1e38cb47 100644 --- a/src/core/model/GpgKeyTableModel.cpp +++ b/src/core/model/GpgKeyTableModel.cpp @@ -82,31 +82,31 @@ auto GpgKeyTableModel::data(const QModelIndex &index, return type_sym; } case 2: { - return key.GetName(); + return key.Name(); } case 3: { - return key.GetEmail(); + return key.Email(); } case 4: { return GetUsagesByKey(key); } case 5: { - return key.GetOwnerTrust(); + return key.OwnerTrust(); } case 6: { - return key.GetId(); + return key.ID(); } case 7: { - return QLocale().toString(key.GetCreateTime(), "yyyy-MM-dd"); + return QLocale().toString(key.CreationTime(), "yyyy-MM-dd"); } case 8: { - return key.GetKeyAlgo(); + return key.Algo(); } case 9: { - return static_cast<int>(key.GetSubKeys()->size()); + return static_cast<int>(key.SubKeys().size()); } case 10: { - return key.GetComment(); + return key.Comment(); } default: return {}; @@ -167,7 +167,7 @@ auto GpgKeyTableModel::setData(const QModelIndex &index, const QVariant &value, auto GpgKeyTableModel::GetAllKeyIds() -> KeyIdArgsList { KeyIdArgsList keys; for (auto &key : buffered_keys_) { - keys.push_back(key.GetId()); + keys.push_back(key.ID()); } return keys; } @@ -175,7 +175,7 @@ auto GpgKeyTableModel::GetAllKeyIds() -> KeyIdArgsList { auto GpgKeyTableModel::GetKeyIDByRow(int row) const -> QString { if (buffered_keys_.size() <= row) return {}; - return buffered_keys_[row].GetId(); + return buffered_keys_[row].ID(); } auto GpgKeyTableModel::IsPrivateKeyByRow(int row) const -> bool { diff --git a/src/core/model/GpgKeyTreeModel.cpp b/src/core/model/GpgKeyTreeModel.cpp index ce43d2d1..3925444c 100644 --- a/src/core/model/GpgKeyTreeModel.cpp +++ b/src/core/model/GpgKeyTreeModel.cpp @@ -203,34 +203,33 @@ auto GpgKeyTreeModel::create_gpg_key_tree_items(const GpgKey &key) -> QSharedPointer<GpgKeyTreeItem> { QVariantList columns; columns << "/"; - columns << key.GetUIDs()->front().GetUID(); - columns << key.GetId(); + columns << key.UIDs().front().GetUID(); + columns << key.ID(); columns << "C"; columns << GetUsagesByKey(key); - columns << key.GetPublicKeyAlgo(); - columns << key.GetKeyAlgo(); - columns << QLocale().toString(key.GetCreateTime(), "yyyy-MM-dd"); + columns << key.PublicKeyAlgo(); + columns << key.Algo(); + columns << QLocale().toString(key.CreationTime(), "yyyy-MM-dd"); auto i_key = QSharedPointer<GpgKeyTreeItem>::create( - QSharedPointer<GpgKeyAdapter>::create(key), columns); + QSharedPointer<GpgKey>::create(key), columns); i_key->SetEnable(enable_detector_(i_key->Key())); i_key->SetCheckable(checkable_detector_(i_key->Key())); cached_items_.push_back(i_key); - auto s_keys = key.GetSubKeys(); - for (const auto &s_key : *s_keys) { + for (const auto &s_key : key.SubKeys()) { QVariantList columns; columns << "/"; - columns << key.GetUIDs()->front().GetUID(); - columns << s_key.GetID(); + columns << key.UIDs().front().GetUID(); + columns << s_key.ID(); columns << (s_key.IsHasCertCap() ? "P" : "S"); columns << GetUsagesBySubkey(s_key); - columns << s_key.GetPubkeyAlgo(); - columns << s_key.GetKeyAlgo(); - columns << QLocale().toString(s_key.GetCreateTime(), "yyyy-MM-dd"); + columns << s_key.PublicKeyAlgo(); + columns << s_key.Algo(); + columns << QLocale().toString(s_key.CreationTime(), "yyyy-MM-dd"); auto i_s_key = QSharedPointer<GpgKeyTreeItem>::create( - QSharedPointer<GpgSubKeyAdapter>::create(s_key), columns); + QSharedPointer<GpgSubKey>::create(s_key), columns); i_s_key->SetEnable(enable_detector_(i_s_key->Key())); i_s_key->SetCheckable(checkable_detector_(i_s_key->Key())); i_key->AppendChild(i_s_key); @@ -245,10 +244,10 @@ auto GpgKeyTreeModel::GetAllCheckedSubKey() -> QContainer<GpgSubKey> { for (const auto &i : cached_items_) { if (!i->Key()->IsSubKey() || !i->Checkable() || !i->Checked()) continue; - auto *adaptor = dynamic_cast<GpgSubKeyAdapter *>(i->Key()); - if (adaptor == nullptr) continue; + auto *s_key = dynamic_cast<GpgSubKey *>(i->Key()); + if (s_key == nullptr) continue; - ret.push_back(adaptor->GetRawKey()); + ret.push_back(*s_key); } return ret; } diff --git a/src/core/model/GpgKeyTreeModel.h b/src/core/model/GpgKeyTreeModel.h index 96b78400..42b29055 100644 --- a/src/core/model/GpgKeyTreeModel.h +++ b/src/core/model/GpgKeyTreeModel.h @@ -82,82 +82,6 @@ inline auto operator~(GpgKeyTreeColumn hs) -> GpgKeyTreeColumn { return static_cast<GpgKeyTreeColumn>(~static_cast<T>(hs)); } -class GPGFRONTEND_CORE_EXPORT GpgKeyAdapter : public GpgAbstractKey { - public: - [[nodiscard]] auto ID() const -> QString override { return key_.GetId(); } - - [[nodiscard]] auto Fingerprint() const -> QString override { - return key_.GetFingerprint(); - } - - [[nodiscard]] auto IsSubKey() const -> bool override { return false; } - - [[nodiscard]] auto CreationTime() const -> QDateTime override { - return key_.GetCreateTime(); - } - - [[nodiscard]] auto IsHasEncrCap() const -> bool override { - return key_.IsHasActualEncrCap(); - } - - [[nodiscard]] auto IsHasSignCap() const -> bool override { - return key_.IsHasActualSignCap(); - } - - [[nodiscard]] auto IsHasCertCap() const -> bool override { - return key_.IsHasActualCertCap(); - } - - [[nodiscard]] auto IsHasAuthCap() const -> bool override { - return key_.IsHasActualAuthCap(); - } - - [[nodiscard]] auto GetRawKey() const -> const GpgKey & { return key_; } - - explicit GpgKeyAdapter(GpgKey key) : key_(std::move(key)) {} - - private: - GpgKey key_; -}; - -class GPGFRONTEND_CORE_EXPORT GpgSubKeyAdapter : public GpgAbstractKey { - public: - [[nodiscard]] auto ID() const -> QString override { return key_.GetID(); } - - [[nodiscard]] auto Fingerprint() const -> QString override { - return key_.GetFingerprint(); - } - - [[nodiscard]] auto IsSubKey() const -> bool override { return true; } - - [[nodiscard]] auto CreationTime() const -> QDateTime override { - return key_.GetCreateTime(); - } - - [[nodiscard]] auto IsHasEncrCap() const -> bool override { - return key_.IsHasEncrCap(); - } - - [[nodiscard]] auto IsHasSignCap() const -> bool override { - return key_.IsHasSignCap(); - } - - [[nodiscard]] auto IsHasCertCap() const -> bool override { - return key_.IsHasCertCap(); - } - - [[nodiscard]] auto IsHasAuthCap() const -> bool override { - return key_.IsHasAuthCap(); - } - - [[nodiscard]] auto GetRawKey() const -> const GpgSubKey & { return key_; } - - explicit GpgSubKeyAdapter(const GpgSubKey &key) : key_(key) {} - - private: - GpgSubKey key_; -}; - class GPGFRONTEND_CORE_EXPORT GpgKeyTreeItem { public: GpgKeyTreeItem() = default; diff --git a/src/core/model/GpgSubKey.cpp b/src/core/model/GpgSubKey.cpp index dbabf085..62f0981a 100644 --- a/src/core/model/GpgSubKey.cpp +++ b/src/core/model/GpgSubKey.cpp @@ -35,32 +35,26 @@ GpgSubKey::GpgSubKey(gpgme_subkey_t subkey) : subkey_ref_(subkey) {} GpgSubKey::GpgSubKey(const GpgSubKey&) = default; -auto GpgSubKey::operator=(const GpgSubKey&) -> GpgSubKey& = default; - -auto GpgSubKey::operator==(const GpgSubKey& o) const -> bool { - return GetFingerprint() == o.GetFingerprint(); -} +GpgSubKey::~GpgSubKey() = default; -auto GpgSubKey::operator<(const GpgSubKey& o) const -> bool { - return GetID() < o.GetID(); -} +auto GpgSubKey::operator=(const GpgSubKey&) -> GpgSubKey& = default; -auto GpgSubKey::GetID() const -> QString { return subkey_ref_->keyid; } +auto GpgSubKey::ID() const -> QString { return subkey_ref_->keyid; } -auto GpgSubKey::GetFingerprint() const -> QString { return subkey_ref_->fpr; } +auto GpgSubKey::Fingerprint() const -> QString { return subkey_ref_->fpr; } -auto GpgSubKey::GetPubkeyAlgo() const -> QString { +auto GpgSubKey::PublicKeyAlgo() const -> QString { return gpgme_pubkey_algo_name(subkey_ref_->pubkey_algo); } -auto GpgSubKey::GetKeyAlgo() const -> QString { +auto GpgSubKey::Algo() const -> QString { auto* buffer = gpgme_pubkey_algo_string(subkey_ref_); auto algo = QString(buffer); gpgme_free(buffer); return algo.toUpper(); } -auto GpgSubKey::GetKeyLength() const -> unsigned int { +auto GpgSubKey::KeyLength() const -> unsigned int { return subkey_ref_->length; } @@ -90,11 +84,11 @@ auto GpgSubKey::IsSecretKey() const -> bool { return subkey_ref_->secret; } auto GpgSubKey::IsCardKey() const -> bool { return subkey_ref_->is_cardkey; } -auto GpgSubKey::GetCreateTime() const -> QDateTime { +auto GpgSubKey::CreationTime() const -> QDateTime { return QDateTime::fromSecsSinceEpoch(subkey_ref_->timestamp); } -auto GpgSubKey::GetExpireTime() const -> QDateTime { +auto GpgSubKey::ExpirationTime() const -> QDateTime { return QDateTime::fromSecsSinceEpoch(subkey_ref_->expires); } @@ -104,4 +98,7 @@ auto GpgSubKey::SmartCardSerialNumber() -> QString { return subkey_ref_->card_number; } +auto GpgSubKey::IsSubKey() const -> bool { return true; } + +auto GpgSubKey::IsGood() const -> bool { return subkey_ref_ != nullptr; } } // namespace GpgFrontend diff --git a/src/core/model/GpgSubKey.h b/src/core/model/GpgSubKey.h index 6577ff5a..255d209f 100644 --- a/src/core/model/GpgSubKey.h +++ b/src/core/model/GpgSubKey.h @@ -31,6 +31,7 @@ #include <gpgme.h> #include "core/GpgFrontendCoreExport.h" +#include "core/model/GpgAbstractKey.h" namespace GpgFrontend { @@ -38,7 +39,7 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgSubKey { +class GPGFRONTEND_CORE_EXPORT GpgSubKey : public GpgAbstractKey { public: /** * @brief Construct a new Gpg Sub Key object @@ -60,6 +61,12 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { GpgSubKey(const GpgSubKey&); /** + * @brief Destroy the Gpg Sub Key object + * + */ + virtual ~GpgSubKey() override; + + /** * @brief * * @return GpgSubKey& @@ -69,55 +76,53 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { /** * @brief * - * @param o - * @return true - * @return false + * @return QString */ - auto operator==(const GpgSubKey& o) const -> bool; + [[nodiscard]] auto ID() const -> QString override; /** * @brief * - * @param o - * @return true - * @return false + * @return QString */ - auto operator<(const GpgSubKey& o) const -> bool; + [[nodiscard]] auto Fingerprint() const -> QString override; /** * @brief * - * @return QString + * @return true + * @return false */ - [[nodiscard]] auto GetID() const -> QString; + [[nodiscard]] auto IsSubKey() const -> bool override; /** * @brief * - * @return QString + * @return true + * @return false */ - [[nodiscard]] auto GetFingerprint() const -> QString; + [[nodiscard]] auto IsGood() const -> bool override; /** * @brief * * @return QString */ - [[nodiscard]] auto GetPubkeyAlgo() const -> QString; + [[nodiscard]] auto PublicKeyAlgo() const -> QString override; /** * @brief * * @return QString */ - [[nodiscard]] auto GetKeyAlgo() const -> QString; + [[nodiscard]] auto Algo() const -> QString override; /** * @brief * * @return unsigned int */ - [[nodiscard]] auto GetKeyLength() const -> unsigned int; + [[nodiscard]] auto KeyLength() const -> unsigned int; /** * @brief @@ -125,7 +130,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { * @return true * @return false */ - [[nodiscard]] auto IsHasEncrCap() const -> bool; + [[nodiscard]] auto IsHasEncrCap() const -> bool override; /** * @brief @@ -133,7 +138,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { * @return true * @return false */ - [[nodiscard]] auto IsHasSignCap() const -> bool; + [[nodiscard]] auto IsHasSignCap() const -> bool override; /** * @brief @@ -141,7 +146,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { * @return true * @return false */ - [[nodiscard]] auto IsHasCertCap() const -> bool; + [[nodiscard]] auto IsHasCertCap() const -> bool override; /** * @brief @@ -149,7 +154,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { * @return true * @return false */ - [[nodiscard]] auto IsHasAuthCap() const -> bool; + [[nodiscard]] auto IsHasAuthCap() const -> bool override; /** * @brief @@ -165,7 +170,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { * @return true * @return false */ - [[nodiscard]] auto IsExpired() const -> bool; + [[nodiscard]] auto IsExpired() const -> bool override; /** * @brief @@ -173,7 +178,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { * @return true * @return false */ - [[nodiscard]] auto IsRevoked() const -> bool; + [[nodiscard]] auto IsRevoked() const -> bool override; /** * @brief @@ -181,7 +186,7 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { * @return true * @return false */ - [[nodiscard]] auto IsDisabled() const -> bool; + [[nodiscard]] auto IsDisabled() const -> bool override; /** * @brief @@ -204,14 +209,14 @@ class GPGFRONTEND_CORE_EXPORT GpgSubKey { * * @return QDateTime */ - [[nodiscard]] auto GetCreateTime() const -> QDateTime; + [[nodiscard]] auto CreationTime() const -> QDateTime override; /** * @brief * * @return QDateTime */ - [[nodiscard]] auto GetExpireTime() const -> QDateTime; + [[nodiscard]] auto ExpirationTime() const -> QDateTime override; /** * @brief diff --git a/src/sdk/GFSDKGpg.cpp b/src/sdk/GFSDKGpg.cpp index 409be457..918e4520 100644 --- a/src/sdk/GFSDKGpg.cpp +++ b/src/sdk/GFSDKGpg.cpp @@ -124,8 +124,8 @@ auto GPGFRONTEND_MODULE_SDK_EXPORT GFGpgKeyPrimaryUID(int channel, char* key_id, if (!key.IsGood()) return -1; - auto uids = key.GetUIDs(); - auto& primary_uid = uids->front(); + auto uids = key.UIDs(); + auto& primary_uid = uids.front(); *ps = static_cast<GFGpgKeyUID*>(GFAllocateMemory(sizeof(GFGpgKeyUID))); diff --git a/src/test/core/GpgCoreTestKeyManagement.cpp b/src/test/core/GpgCoreTestKeyManagement.cpp index 4d80f7d0..6ba24b80 100644 --- a/src/test/core/GpgCoreTestKeyManagement.cpp +++ b/src/test/core/GpgCoreTestKeyManagement.cpp @@ -119,10 +119,10 @@ TEST_F(GpgCoreTest, CoreDeleteSubkeyTestA) { .GetKey("822D7E13F5B85D7D"); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); + auto s_key = key.SubKeys(); - ASSERT_EQ(subkeys->size(), 5); - ASSERT_EQ((*subkeys)[2].GetID(), "2D1F9FC59B568A8C"); + ASSERT_EQ(s_key.size(), 5); + ASSERT_EQ(s_key[2].ID(), "2D1F9FC59B568A8C"); auto res = GpgKeyManager::GetInstance().DeleteSubkey(key, 2); @@ -133,12 +133,12 @@ TEST_F(GpgCoreTest, CoreDeleteSubkeyTestA) { .GetKey("822D7E13F5B85D7D"); ASSERT_TRUE(key.IsGood()); - subkeys = key.GetSubKeys(); + s_key = key.SubKeys(); - ASSERT_EQ(subkeys->size(), 4); - ASSERT_EQ((*subkeys)[2].GetID(), "CE038203C4D03C3D"); + ASSERT_EQ(s_key.size(), 4); + ASSERT_EQ(s_key[2].ID(), "CE038203C4D03C3D"); - GpgKeyOpera::GetInstance().DeleteKey(key.GetId()); + GpgKeyOpera::GetInstance().DeleteKey(key.ID()); } TEST_F(GpgCoreTest, CoreSetOwnerTrustA) { @@ -161,7 +161,7 @@ TEST_F(GpgCoreTest, CoreSetOwnerTrustA) { ASSERT_TRUE(key.IsGood()); // why? - ASSERT_EQ(key.GetOwnerTrustLevel(), 0); + ASSERT_EQ(key.OwnerTrustLevel(), 0); res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 2); ASSERT_TRUE(res); @@ -171,7 +171,7 @@ TEST_F(GpgCoreTest, CoreSetOwnerTrustA) { .GetKey("822D7E13F5B85D7D"); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetOwnerTrustLevel(), 2); + ASSERT_EQ(key.OwnerTrustLevel(), 2); res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 3); ASSERT_TRUE(res); @@ -181,7 +181,7 @@ TEST_F(GpgCoreTest, CoreSetOwnerTrustA) { .GetKey("822D7E13F5B85D7D"); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetOwnerTrustLevel(), 3); + ASSERT_EQ(key.OwnerTrustLevel(), 3); res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 4); ASSERT_TRUE(res); @@ -191,7 +191,7 @@ TEST_F(GpgCoreTest, CoreSetOwnerTrustA) { .GetKey("822D7E13F5B85D7D"); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetOwnerTrustLevel(), 4); + ASSERT_EQ(key.OwnerTrustLevel(), 4); res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 5); ASSERT_TRUE(res); @@ -201,7 +201,7 @@ TEST_F(GpgCoreTest, CoreSetOwnerTrustA) { .GetKey("822D7E13F5B85D7D"); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); + ASSERT_EQ(key.OwnerTrustLevel(), 5); res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 0); ASSERT_FALSE(res); @@ -212,7 +212,7 @@ TEST_F(GpgCoreTest, CoreSetOwnerTrustA) { res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 6); ASSERT_FALSE(res); - GpgKeyOpera::GetInstance().DeleteKey(key.GetId()); + GpgKeyOpera::GetInstance().DeleteKey(key.ID()); } TEST_F(GpgCoreTest, CoreRevokeSubkeyTestA) { @@ -226,10 +226,10 @@ TEST_F(GpgCoreTest, CoreRevokeSubkeyTestA) { .GetKey("822D7E13F5B85D7D"); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); + auto s_key = key.SubKeys(); - ASSERT_EQ(subkeys->size(), 5); - ASSERT_EQ((*subkeys)[2].GetID(), "2D1F9FC59B568A8C"); + ASSERT_EQ(s_key.size(), 5); + ASSERT_EQ(s_key[2].ID(), "2D1F9FC59B568A8C"); auto res = GpgKeyManager::GetInstance().RevokeSubkey( key, 2, 2, QString("H\nE\nLL\nO\n\n")); @@ -241,14 +241,14 @@ TEST_F(GpgCoreTest, CoreRevokeSubkeyTestA) { .GetKey("822D7E13F5B85D7D"); ASSERT_TRUE(key.IsGood()); - subkeys = key.GetSubKeys(); + s_key = key.SubKeys(); - ASSERT_EQ(subkeys->size(), 5); - ASSERT_EQ((*subkeys)[2].GetID(), "2D1F9FC59B568A8C"); + ASSERT_EQ(s_key.size(), 5); + ASSERT_EQ(s_key[2].ID(), "2D1F9FC59B568A8C"); - ASSERT_TRUE((*subkeys)[2].IsRevoked()); + ASSERT_TRUE(s_key[2].IsRevoked()); - GpgKeyOpera::GetInstance().DeleteKey(key.GetId()); + GpgKeyOpera::GetInstance().DeleteKey(key.ID()); } } // namespace GpgFrontend::Test
\ No newline at end of file diff --git a/src/test/core/GpgCoreTestKeyModel.cpp b/src/test/core/GpgCoreTestKeyModel.cpp index 622d7009..878ea953 100644 --- a/src/test/core/GpgCoreTestKeyModel.cpp +++ b/src/test/core/GpgCoreTestKeyModel.cpp @@ -64,10 +64,10 @@ TEST_F(GpgCoreTest, GpgKeyTest) { ASSERT_FALSE(key.IsDisabled()); ASSERT_FALSE(key.IsRevoked()); - ASSERT_EQ(key.GetProtocol(), "OpenPGP"); + ASSERT_EQ(key.Protocol(), "OpenPGP"); - ASSERT_EQ(key.GetSubKeys()->size(), 2); - ASSERT_EQ(key.GetUIDs()->size(), 1); + ASSERT_EQ(key.SubKeys().size(), 2); + ASSERT_EQ(key.UIDs().size(), 1); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_FALSE(key.IsHasEncrCap()); @@ -78,78 +78,76 @@ TEST_F(GpgCoreTest, GpgKeyTest) { ASSERT_FALSE(key.IsHasActualSignCap()); ASSERT_FALSE(key.IsHasActualAuthCap()); - ASSERT_EQ(key.GetName(), "GpgFrontendTest"); - ASSERT_TRUE(key.GetComment().isEmpty()); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetId(), "81704859182661FB"); - ASSERT_EQ(key.GetFingerprint(), "9490795B78F8AFE9F93BD09281704859182661FB"); - ASSERT_EQ(key.GetExpireTime(), + ASSERT_EQ(key.Name(), "GpgFrontendTest"); + ASSERT_TRUE(key.Comment().isEmpty()); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.ID(), "81704859182661FB"); + ASSERT_EQ(key.Fingerprint(), "9490795B78F8AFE9F93BD09281704859182661FB"); + ASSERT_EQ(key.ExpirationTime(), QDateTime::fromString("2023-09-05T04:00:00Z", Qt::ISODate)); - ASSERT_EQ(key.GetPublicKeyAlgo(), "RSA"); - ASSERT_EQ(key.GetKeyAlgo(), "RSA3072"); - ASSERT_EQ(key.GetPrimaryKeyLength(), 3072); - ASSERT_EQ(key.GetLastUpdateTime(), + ASSERT_EQ(key.PublicKeyAlgo(), "RSA"); + ASSERT_EQ(key.Algo(), "RSA3072"); + ASSERT_EQ(key.PrimaryKeyLength(), 3072); + ASSERT_EQ(key.LastUpdateTime(), QDateTime::fromString("1970-01-01T00:00:00Z", Qt::ISODate)); - ASSERT_EQ(key.GetCreateTime(), + ASSERT_EQ(key.CreationTime(), QDateTime::fromString("2021-09-05T06:01:53Z", Qt::ISODate)); - ASSERT_EQ(key.GetOwnerTrust(), "Unknown"); + ASSERT_EQ(key.OwnerTrust(), "Unknown"); ASSERT_EQ(key.IsExpired(), - key.GetExpireTime() < QDateTime::currentDateTime()); + key.ExpirationTime() < QDateTime::currentDateTime()); } TEST_F(GpgCoreTest, GpgSubKeyTest) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel) .GetKey("9490795B78F8AFE9F93BD09281704859182661FB"); - auto sub_keys = key.GetSubKeys(); - ASSERT_EQ(sub_keys->size(), 2); + auto s_keys = key.SubKeys(); + ASSERT_EQ(s_keys.size(), 2); - auto& main_key = sub_keys->front(); + auto& p_key = s_keys.front(); - ASSERT_EQ(main_key.GetID(), "81704859182661FB"); - ASSERT_EQ(main_key.GetFingerprint(), - "9490795B78F8AFE9F93BD09281704859182661FB"); - ASSERT_EQ(main_key.GetExpireTime(), + ASSERT_EQ(p_key.ID(), "81704859182661FB"); + ASSERT_EQ(p_key.Fingerprint(), "9490795B78F8AFE9F93BD09281704859182661FB"); + ASSERT_EQ(p_key.ExpirationTime(), QDateTime::fromString("2023-09-05T04:00:00Z", Qt::ISODate)); - ASSERT_EQ(main_key.GetPubkeyAlgo(), "RSA"); - ASSERT_EQ(main_key.GetKeyAlgo(), "RSA3072"); - ASSERT_EQ(main_key.GetKeyLength(), 3072); - ASSERT_EQ(main_key.GetCreateTime(), + ASSERT_EQ(p_key.PublicKeyAlgo(), "RSA"); + ASSERT_EQ(p_key.Algo(), "RSA3072"); + ASSERT_EQ(p_key.KeyLength(), 3072); + ASSERT_EQ(p_key.CreationTime(), QDateTime::fromString("2021-09-05T06:01:53Z", Qt::ISODate)); - ASSERT_FALSE(main_key.IsCardKey()); + ASSERT_FALSE(p_key.IsCardKey()); - auto& sub_key = sub_keys->back(); + auto& s_key = s_keys.back(); - ASSERT_FALSE(sub_key.IsRevoked()); - ASSERT_FALSE(sub_key.IsDisabled()); - ASSERT_EQ(sub_key.GetCreateTime(), + ASSERT_FALSE(s_key.IsRevoked()); + ASSERT_FALSE(s_key.IsDisabled()); + ASSERT_EQ(s_key.CreationTime(), QDateTime::fromString("2021-09-05T06:01:53Z", Qt::ISODate)); - ASSERT_FALSE(sub_key.IsCardKey()); - ASSERT_TRUE(sub_key.IsPrivateKey()); - ASSERT_EQ(sub_key.GetID(), "2B36803235B5E25B"); - ASSERT_EQ(sub_key.GetFingerprint(), - "50D37E8F8EE7340A6794E0592B36803235B5E25B"); - ASSERT_EQ(sub_key.GetKeyLength(), 3072); - ASSERT_EQ(sub_key.GetKeyAlgo(), "RSA3072"); - ASSERT_EQ(sub_key.GetPubkeyAlgo(), "RSA"); - ASSERT_FALSE(sub_key.IsHasCertCap()); - ASSERT_FALSE(sub_key.IsHasAuthCap()); - ASSERT_FALSE(sub_key.IsHasSignCap()); - ASSERT_TRUE(sub_key.IsHasEncrCap()); - ASSERT_EQ(sub_key.GetExpireTime(), + ASSERT_FALSE(s_key.IsCardKey()); + ASSERT_TRUE(s_key.IsPrivateKey()); + ASSERT_EQ(s_key.ID(), "2B36803235B5E25B"); + ASSERT_EQ(s_key.Fingerprint(), "50D37E8F8EE7340A6794E0592B36803235B5E25B"); + ASSERT_EQ(s_key.KeyLength(), 3072); + ASSERT_EQ(s_key.Algo(), "RSA3072"); + ASSERT_EQ(s_key.PublicKeyAlgo(), "RSA"); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromString("2023-09-05T04:00:00Z", Qt::ISODate)); - ASSERT_EQ(sub_key.IsExpired(), - sub_key.GetExpireTime() < QDateTime::currentDateTime()); + ASSERT_EQ(s_key.IsExpired(), + s_key.ExpirationTime() < QDateTime::currentDateTime()); } TEST_F(GpgCoreTest, GpgUIDTest) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel) .GetKey("9490795B78F8AFE9F93BD09281704859182661FB"); - auto uids = key.GetUIDs(); - ASSERT_EQ(uids->size(), 1); - auto& uid = uids->front(); + auto uids = key.UIDs(); + ASSERT_EQ(uids.size(), 1); + auto& uid = uids.front(); ASSERT_EQ(uid.GetName(), "GpgFrontendTest"); ASSERT_TRUE(uid.GetComment().isEmpty()); @@ -162,9 +160,9 @@ TEST_F(GpgCoreTest, GpgUIDTest) { TEST_F(GpgCoreTest, GpgKeySignatureTest) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel) .GetKey("9490795B78F8AFE9F93BD09281704859182661FB"); - auto uids = key.GetUIDs(); - ASSERT_EQ(uids->size(), 1); - auto& uid = uids->front(); + auto uids = key.UIDs(); + ASSERT_EQ(uids.size(), 1); + auto& uid = uids.front(); auto signatures = uid.GetSignatures(); ASSERT_EQ(signatures->size(), 1); diff --git a/src/test/core/GpgCoreTestKeyOpera.cpp b/src/test/core/GpgCoreTestKeyOpera.cpp index 6f1f41d5..84aa29f9 100644 --- a/src/test/core/GpgCoreTestKeyOpera.cpp +++ b/src/test/core/GpgCoreTestKeyOpera.cpp @@ -28,9 +28,9 @@ #include "GpgCoreTest.h" #include "core/GpgConstants.h" +#include "core/function/gpg/GpgKeyImportExporter.h" #include "core/function/gpg/GpgKeyOpera.h" #include "core/model/GpgGenerateKeyResult.h" -#include "core/function/gpg/GpgKeyImportExporter.h" #include "core/model/GpgImportInformation.h" #include "core/utils/GpgUtils.h" @@ -88,10 +88,11 @@ TEST_F(GpgCoreTest, CoreAddADSKTestA) { ASSERT_TRUE(key_b.IsPrivateKey()); ASSERT_TRUE(key_b.IsHasMasterKey()); - auto key_b_subkeys = key_b.GetSubKeys(); - ASSERT_EQ(key_b_subkeys->size(), 2); + auto key_b_s_keys = key_b.SubKeys(); + ASSERT_EQ(key_b_s_keys.size(), 2); - auto [err, data_object] = GpgKeyOpera::GetInstance().AddADSKSync(key, key_b_subkeys->last()); + auto [err, data_object] = + GpgKeyOpera::GetInstance().AddADSKSync(key, key_b_s_keys.last()); ASSERT_EQ(CheckGpgError(err), GPG_ERR_NO_ERROR); ASSERT_EQ(data_object->GetObjectSize(), 1); @@ -107,11 +108,11 @@ TEST_F(GpgCoreTest, CoreAddADSKTestA) { ASSERT_TRUE(key.IsPrivateKey()); ASSERT_TRUE(key.IsHasMasterKey()); - auto key_subkeys = key.GetSubKeys(); - ASSERT_EQ(key_subkeys->size(), 2); - ASSERT_EQ(key_subkeys->last().GetID(), "F89C95A05088CC93"); - ASSERT_EQ(key_subkeys->last().IsADSK(), true); + auto s_keys = key.SubKeys(); + ASSERT_EQ(s_keys.size(), 2); + ASSERT_EQ(s_keys.last().ID(), "F89C95A05088CC93"); + ASSERT_EQ(s_keys.last().IsADSK(), true); - GpgKeyOpera::GetInstance().DeleteKey(key.GetId()); + GpgKeyOpera::GetInstance().DeleteKey(key.ID()); } -};
\ No newline at end of file +}; // namespace GpgFrontend::Test
\ No newline at end of file diff --git a/src/test/core/GpgCoreTestKeyUIDOpera.cpp b/src/test/core/GpgCoreTestKeyUIDOpera.cpp index b4177dea..7b141670 100644 --- a/src/test/core/GpgCoreTestKeyUIDOpera.cpp +++ b/src/test/core/GpgCoreTestKeyUIDOpera.cpp @@ -73,10 +73,10 @@ TEST_F(GpgCoreTest, CoreDeleteUIDTestA) { .GetKey("F2D8DFA5F109DE47"); ASSERT_TRUE(key.IsGood()); - auto uids = key.GetUIDs(); + auto uids = key.UIDs(); - ASSERT_EQ(uids->size(), 4); - ASSERT_EQ((*uids)[2].GetUID(), "gggggg(ggggg)<[email protected]>"); + ASSERT_EQ(uids.size(), 4); + ASSERT_EQ(uids[2].GetUID(), "gggggg(ggggg)<[email protected]>"); auto res = GpgUIDOperator::GetInstance().DeleteUID(key, 3); @@ -87,12 +87,12 @@ TEST_F(GpgCoreTest, CoreDeleteUIDTestA) { .GetKey("F2D8DFA5F109DE47"); ASSERT_TRUE(key.IsGood()); - uids = key.GetUIDs(); + uids = key.UIDs(); - ASSERT_EQ(uids->size(), 3); - ASSERT_EQ((*uids)[2].GetUID(), "hhhhhh(hhhhhhh)<[email protected]>"); + ASSERT_EQ(uids.size(), 3); + ASSERT_EQ(uids[2].GetUID(), "hhhhhh(hhhhhhh)<[email protected]>"); - GpgKeyOpera::GetInstance().DeleteKey(key.GetId()); + GpgKeyOpera::GetInstance().DeleteKey(key.ID()); GpgKeyGetter::GetInstance().FlushKeyCache(); } @@ -108,10 +108,10 @@ TEST_F(GpgCoreTest, CoreRevokeUIDTestA) { .GetKey("F2D8DFA5F109DE47"); ASSERT_TRUE(key.IsGood()); - auto uids = key.GetUIDs(); + auto uids = key.UIDs(); - ASSERT_EQ(uids->size(), 4); - ASSERT_EQ((*uids)[2].GetUID(), "gggggg(ggggg)<[email protected]>"); + ASSERT_EQ(uids.size(), 4); + ASSERT_EQ(uids[2].GetUID(), "gggggg(ggggg)<[email protected]>"); auto res = GpgUIDOperator::GetInstance().RevokeUID( key, 3, 4, "H\nEEEEEL\n\n\n\nL \n0\n"); @@ -123,13 +123,13 @@ TEST_F(GpgCoreTest, CoreRevokeUIDTestA) { .GetKey("F2D8DFA5F109DE47"); ASSERT_TRUE(key.IsGood()); - uids = key.GetUIDs(); + uids = key.UIDs(); - ASSERT_EQ(uids->size(), 4); - ASSERT_EQ((*uids)[2].GetUID(), "gggggg(ggggg)<[email protected]>"); - ASSERT_TRUE((*uids)[2].GetRevoked()); + ASSERT_EQ(uids.size(), 4); + ASSERT_EQ(uids[2].GetUID(), "gggggg(ggggg)<[email protected]>"); + ASSERT_TRUE(uids[2].GetRevoked()); - GpgKeyOpera::GetInstance().DeleteKey(key.GetId()); + GpgKeyOpera::GetInstance().DeleteKey(key.ID()); GpgKeyGetter::GetInstance().FlushKeyCache(); } diff --git a/src/test/core/GpgCoreTestKeygen.cpp b/src/test/core/GpgCoreTestKeygen.cpp index a6c28219..a8ad7005 100644 --- a/src/test/core/GpgCoreTestKeygen.cpp +++ b/src/test/core/GpgCoreTestKeygen.cpp @@ -84,13 +84,13 @@ TEST_F(GpgCoreTest, GenerateKeyRSA2048Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetName(), "foo_0"); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetComment(), "foobar"); - ASSERT_EQ(key.GetPublicKeyAlgo(), "RSA"); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); - ASSERT_EQ(key.GetPrimaryKeyLength(), 2048); - ASSERT_EQ(key.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(key.Name(), "foo_0"); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.Comment(), "foobar"); + ASSERT_EQ(key.PublicKeyAlgo(), "RSA"); + ASSERT_EQ(key.OwnerTrustLevel(), 5); + ASSERT_EQ(key.PrimaryKeyLength(), 2048); + ASSERT_EQ(key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_TRUE(key.IsHasAuthCap()); @@ -139,7 +139,7 @@ TEST_F(GpgCoreTest, GenerateKeyRSA4096Test) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel) .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetExpireTime().date(), expire_time.date()); + ASSERT_EQ(key.ExpirationTime().date(), expire_time.date()); GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel) .DeleteKey(result.GetFingerprint()); @@ -177,13 +177,13 @@ TEST_F(GpgCoreTest, GenerateKeyDSA2048Test) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel) .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetName(), "foo_1"); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetComment(), "hello gpgfrontend"); - ASSERT_EQ(key.GetPublicKeyAlgo(), "DSA"); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); - ASSERT_EQ(key.GetPrimaryKeyLength(), 2048); - ASSERT_GT(key.GetExpireTime(), QDateTime::currentDateTime()); + ASSERT_EQ(key.Name(), "foo_1"); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.Comment(), "hello gpgfrontend"); + ASSERT_EQ(key.PublicKeyAlgo(), "DSA"); + ASSERT_EQ(key.OwnerTrustLevel(), 5); + ASSERT_EQ(key.PrimaryKeyLength(), 2048); + ASSERT_GT(key.ExpirationTime(), QDateTime::currentDateTime()); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_TRUE(key.IsHasAuthCap()); @@ -231,13 +231,13 @@ TEST_F(GpgCoreTest, GenerateKeyED25519Test) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel) .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetName(), "foo_4"); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetComment(), "hello gpgfrontend"); - ASSERT_EQ(key.GetPublicKeyAlgo(), "EdDSA"); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); - ASSERT_EQ(key.GetPrimaryKeyLength(), 255); - ASSERT_GT(key.GetExpireTime(), QDateTime::currentDateTime()); + ASSERT_EQ(key.Name(), "foo_4"); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.Comment(), "hello gpgfrontend"); + ASSERT_EQ(key.PublicKeyAlgo(), "EdDSA"); + ASSERT_EQ(key.OwnerTrustLevel(), 5); + ASSERT_EQ(key.PrimaryKeyLength(), 255); + ASSERT_GT(key.ExpirationTime(), QDateTime::currentDateTime()); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_TRUE(key.IsHasAuthCap()); @@ -291,34 +291,34 @@ TEST_F(GpgCoreTest, GenerateKeyED25519CV25519Test) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel).GetKey(fpr); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetName(), "foo_ec"); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetComment(), "ecccc"); - ASSERT_EQ(key.GetPublicKeyAlgo(), "EdDSA"); - ASSERT_EQ(key.GetKeyAlgo(), "ED25519"); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); - ASSERT_EQ(key.GetPrimaryKeyLength(), 255); - ASSERT_EQ(key.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(key.Name(), "foo_ec"); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.Comment(), "ecccc"); + ASSERT_EQ(key.PublicKeyAlgo(), "EdDSA"); + ASSERT_EQ(key.Algo(), "ED25519"); + ASSERT_EQ(key.OwnerTrustLevel(), 5); + ASSERT_EQ(key.PrimaryKeyLength(), 255); + ASSERT_EQ(key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_TRUE(key.IsHasAuthCap()); ASSERT_TRUE(key.IsHasEncrCap()); ASSERT_TRUE(key.IsHasSignCap()); - ASSERT_FALSE(key.GetSubKeys()->empty()); - ASSERT_EQ(key.GetSubKeys()->size(), 2); + ASSERT_FALSE(key.SubKeys().empty()); + ASSERT_EQ(key.SubKeys().size(), 2); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), "ECDH"); - ASSERT_EQ(subkey.GetKeyAlgo(), "CV25519"); - ASSERT_EQ(subkey.GetKeyLength(), 255); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); + ASSERT_EQ(s_key.PublicKeyAlgo(), "ECDH"); + ASSERT_EQ(s_key.Algo(), "CV25519"); + ASSERT_EQ(s_key.KeyLength(), 255); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_FALSE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_FALSE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); ASSERT_TRUE(key.IsHasActualCertCap()); ASSERT_TRUE(key.IsHasActualAuthCap()); @@ -366,34 +366,34 @@ TEST_F(GpgCoreTest, GenerateKeyED25519NISTP256Test) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel).GetKey(fpr); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetName(), "foo_ec2"); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetComment(), "ecccc"); - ASSERT_EQ(key.GetPublicKeyAlgo(), "EdDSA"); - ASSERT_EQ(key.GetKeyAlgo(), "ED25519"); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); - ASSERT_EQ(key.GetPrimaryKeyLength(), 255); - ASSERT_EQ(key.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(key.Name(), "foo_ec2"); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.Comment(), "ecccc"); + ASSERT_EQ(key.PublicKeyAlgo(), "EdDSA"); + ASSERT_EQ(key.Algo(), "ED25519"); + ASSERT_EQ(key.OwnerTrustLevel(), 5); + ASSERT_EQ(key.PrimaryKeyLength(), 255); + ASSERT_EQ(key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_TRUE(key.IsHasAuthCap()); ASSERT_TRUE(key.IsHasEncrCap()); ASSERT_TRUE(key.IsHasSignCap()); - ASSERT_FALSE(key.GetSubKeys()->empty()); - ASSERT_EQ(key.GetSubKeys()->size(), 2); + ASSERT_FALSE(key.SubKeys().empty()); + ASSERT_EQ(key.SubKeys().size(), 2); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), "ECDH"); - ASSERT_EQ(subkey.GetKeyAlgo(), "NISTP256"); - ASSERT_EQ(subkey.GetKeyLength(), 256); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); + ASSERT_EQ(s_key.PublicKeyAlgo(), "ECDH"); + ASSERT_EQ(s_key.Algo(), "NISTP256"); + ASSERT_EQ(s_key.KeyLength(), 256); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_FALSE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_FALSE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); ASSERT_TRUE(key.IsHasActualCertCap()); ASSERT_TRUE(key.IsHasActualAuthCap()); @@ -441,34 +441,34 @@ TEST_F(GpgCoreTest, GenerateKeyED25519BRAINPOOLP256R1Test) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel).GetKey(fpr); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetName(), "foo_ec3"); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetComment(), "ecccc3"); - ASSERT_EQ(key.GetPublicKeyAlgo(), "EdDSA"); - ASSERT_EQ(key.GetKeyAlgo(), "ED25519"); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); - ASSERT_EQ(key.GetPrimaryKeyLength(), 255); - ASSERT_EQ(key.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(key.Name(), "foo_ec3"); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.Comment(), "ecccc3"); + ASSERT_EQ(key.PublicKeyAlgo(), "EdDSA"); + ASSERT_EQ(key.Algo(), "ED25519"); + ASSERT_EQ(key.OwnerTrustLevel(), 5); + ASSERT_EQ(key.PrimaryKeyLength(), 255); + ASSERT_EQ(key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_TRUE(key.IsHasAuthCap()); ASSERT_TRUE(key.IsHasEncrCap()); ASSERT_TRUE(key.IsHasSignCap()); - ASSERT_FALSE(key.GetSubKeys()->empty()); - ASSERT_EQ(key.GetSubKeys()->size(), 2); + ASSERT_FALSE(key.SubKeys().empty()); + ASSERT_EQ(key.SubKeys().size(), 2); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), "ECDH"); - ASSERT_EQ(subkey.GetKeyAlgo(), "BRAINPOOLP256R1"); - ASSERT_EQ(subkey.GetKeyLength(), 256); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); + ASSERT_EQ(s_key.PublicKeyAlgo(), "ECDH"); + ASSERT_EQ(s_key.Algo(), "BRAINPOOLP256R1"); + ASSERT_EQ(s_key.KeyLength(), 256); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_FALSE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_FALSE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); ASSERT_TRUE(key.IsHasActualCertCap()); ASSERT_TRUE(key.IsHasActualAuthCap()); @@ -510,14 +510,14 @@ TEST_F(GpgCoreTest, GenerateKeyNISTP256Test) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel) .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetName(), "foo_4"); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetComment(), "hello gpgfrontend"); - ASSERT_EQ(key.GetPublicKeyAlgo(), "ECDSA"); - ASSERT_EQ(key.GetKeyAlgo(), "NISTP256"); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); - ASSERT_EQ(key.GetPrimaryKeyLength(), 256); - ASSERT_GT(key.GetExpireTime(), QDateTime::currentDateTime()); + ASSERT_EQ(key.Name(), "foo_4"); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.Comment(), "hello gpgfrontend"); + ASSERT_EQ(key.PublicKeyAlgo(), "ECDSA"); + ASSERT_EQ(key.Algo(), "NISTP256"); + ASSERT_EQ(key.OwnerTrustLevel(), 5); + ASSERT_EQ(key.PrimaryKeyLength(), 256); + ASSERT_GT(key.ExpirationTime(), QDateTime::currentDateTime()); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_TRUE(key.IsHasAuthCap()); @@ -565,14 +565,14 @@ TEST_F(GpgCoreTest, GenerateKeyED448Test) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel) .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetName(), "foo_4"); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetComment(), "hello gpgfrontend"); - ASSERT_EQ(key.GetPublicKeyAlgo(), "EdDSA"); - ASSERT_EQ(key.GetKeyAlgo(), "ED448"); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); - ASSERT_EQ(key.GetPrimaryKeyLength(), 448); - ASSERT_GT(key.GetExpireTime(), QDateTime::currentDateTime()); + ASSERT_EQ(key.Name(), "foo_4"); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.Comment(), "hello gpgfrontend"); + ASSERT_EQ(key.PublicKeyAlgo(), "EdDSA"); + ASSERT_EQ(key.Algo(), "ED448"); + ASSERT_EQ(key.OwnerTrustLevel(), 5); + ASSERT_EQ(key.PrimaryKeyLength(), 448); + ASSERT_GT(key.ExpirationTime(), QDateTime::currentDateTime()); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_TRUE(key.IsHasAuthCap()); @@ -620,14 +620,14 @@ TEST_F(GpgCoreTest, GenerateKeySECP256K1Test) { auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel) .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - ASSERT_EQ(key.GetName(), "foo_4"); - ASSERT_EQ(key.GetEmail(), "[email protected]"); - ASSERT_EQ(key.GetComment(), "hello gpgfrontend"); - ASSERT_EQ(key.GetPublicKeyAlgo(), "ECDSA"); - ASSERT_EQ(key.GetKeyAlgo(), "SECP256K1"); - ASSERT_EQ(key.GetOwnerTrustLevel(), 5); - ASSERT_EQ(key.GetPrimaryKeyLength(), 256); - ASSERT_GT(key.GetExpireTime(), QDateTime::currentDateTime()); + ASSERT_EQ(key.Name(), "foo_4"); + ASSERT_EQ(key.Email(), "[email protected]"); + ASSERT_EQ(key.Comment(), "hello gpgfrontend"); + ASSERT_EQ(key.PublicKeyAlgo(), "ECDSA"); + ASSERT_EQ(key.Algo(), "SECP256K1"); + ASSERT_EQ(key.OwnerTrustLevel(), 5); + ASSERT_EQ(key.PrimaryKeyLength(), 256); + ASSERT_GT(key.ExpirationTime(), QDateTime::currentDateTime()); ASSERT_TRUE(key.IsHasCertCap()); ASSERT_TRUE(key.IsHasAuthCap()); diff --git a/src/test/core/GpgCoreTestSubkeygen.cpp b/src/test/core/GpgCoreTestSubkeygen.cpp index bbaa2be0..09c47903 100644 --- a/src/test/core/GpgCoreTestSubkeygen.cpp +++ b/src/test/core/GpgCoreTestSubkeygen.cpp @@ -66,18 +66,18 @@ TEST_F(GpgCoreTest, GenerateSubkeyRSA2048Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); - - ASSERT_EQ(subkey.GetPubkeyAlgo(), "RSA"); - ASSERT_EQ(subkey.GetKeyAlgo(), "RSA2048"); - ASSERT_EQ(subkey.GetKeyLength(), 2048); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); - - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_TRUE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_TRUE(subkey.IsHasSignCap()); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); + + ASSERT_EQ(s_key.PublicKeyAlgo(), "RSA"); + ASSERT_EQ(s_key.Algo(), "RSA2048"); + ASSERT_EQ(s_key.KeyLength(), 2048); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); + + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_TRUE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_TRUE(s_key.IsHasSignCap()); } TEST_F(GpgCoreTest, GenerateSubkeyDSA2048Test) { @@ -109,18 +109,18 @@ TEST_F(GpgCoreTest, GenerateSubkeyDSA2048Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), "DSA"); - ASSERT_EQ(subkey.GetKeyAlgo(), "DSA2048"); - ASSERT_EQ(subkey.GetKeyLength(), 2048); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(s_key.PublicKeyAlgo(), "DSA"); + ASSERT_EQ(s_key.Algo(), "DSA2048"); + ASSERT_EQ(s_key.KeyLength(), 2048); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_TRUE(subkey.IsHasAuthCap()); - ASSERT_FALSE(subkey.IsHasEncrCap()); - ASSERT_TRUE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_TRUE(s_key.IsHasAuthCap()); + ASSERT_FALSE(s_key.IsHasEncrCap()); + ASSERT_TRUE(s_key.IsHasSignCap()); } TEST_F(GpgCoreTest, GenerateSubkeyELG2048Test) { @@ -152,18 +152,18 @@ TEST_F(GpgCoreTest, GenerateSubkeyELG2048Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), "ELG-E"); - ASSERT_EQ(subkey.GetKeyAlgo(), "ELG2048"); - ASSERT_EQ(subkey.GetKeyLength(), 2048); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(s_key.PublicKeyAlgo(), "ELG-E"); + ASSERT_EQ(s_key.Algo(), "ELG2048"); + ASSERT_EQ(s_key.KeyLength(), 2048); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_FALSE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_FALSE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); } TEST_F(GpgCoreTest, GenerateSubkeyED25519Test) { @@ -195,18 +195,18 @@ TEST_F(GpgCoreTest, GenerateSubkeyED25519Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), "EdDSA"); - ASSERT_EQ(subkey.GetKeyAlgo(), "ED25519"); - ASSERT_EQ(subkey.GetKeyLength(), 255); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(s_key.PublicKeyAlgo(), "EdDSA"); + ASSERT_EQ(s_key.Algo(), "ED25519"); + ASSERT_EQ(s_key.KeyLength(), 255); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_TRUE(subkey.IsHasAuthCap()); - ASSERT_FALSE(subkey.IsHasEncrCap()); - ASSERT_TRUE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_TRUE(s_key.IsHasAuthCap()); + ASSERT_FALSE(s_key.IsHasEncrCap()); + ASSERT_TRUE(s_key.IsHasSignCap()); } TEST_F(GpgCoreTest, GenerateSubkeyCV25519Test) { @@ -238,18 +238,18 @@ TEST_F(GpgCoreTest, GenerateSubkeyCV25519Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), QString("ECDH")); - ASSERT_EQ(subkey.GetKeyAlgo(), QString("CV25519")); - ASSERT_EQ(subkey.GetKeyLength(), 255); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(s_key.PublicKeyAlgo(), QString("ECDH")); + ASSERT_EQ(s_key.Algo(), QString("CV25519")); + ASSERT_EQ(s_key.KeyLength(), 255); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_FALSE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_FALSE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); } TEST_F(GpgCoreTest, GenerateSubkeyNISTP256Test) { @@ -280,18 +280,18 @@ TEST_F(GpgCoreTest, GenerateSubkeyNISTP256Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), QString("ECDH")); - ASSERT_EQ(subkey.GetKeyAlgo(), QString("NISTP256")); - ASSERT_EQ(subkey.GetKeyLength(), 256); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(s_key.PublicKeyAlgo(), QString("ECDH")); + ASSERT_EQ(s_key.Algo(), QString("NISTP256")); + ASSERT_EQ(s_key.KeyLength(), 256); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_FALSE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_FALSE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); } TEST_F(GpgCoreTest, GenerateSubkeyBRAINPOOLP256R1Test) { @@ -322,18 +322,18 @@ TEST_F(GpgCoreTest, GenerateSubkeyBRAINPOOLP256R1Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), QString("ECDH")); - ASSERT_EQ(subkey.GetKeyAlgo(), QString("BRAINPOOLP256R1")); - ASSERT_EQ(subkey.GetKeyLength(), 256); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(s_key.PublicKeyAlgo(), QString("ECDH")); + ASSERT_EQ(s_key.Algo(), QString("BRAINPOOLP256R1")); + ASSERT_EQ(s_key.KeyLength(), 256); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_FALSE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_FALSE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); } TEST_F(GpgCoreTest, GenerateSubkeyX448Test) { @@ -364,18 +364,18 @@ TEST_F(GpgCoreTest, GenerateSubkeyX448Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), QString("ECDH")); - ASSERT_EQ(subkey.GetKeyAlgo(), QString("CV448")); - ASSERT_EQ(subkey.GetKeyLength(), 448); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(s_key.PublicKeyAlgo(), QString("ECDH")); + ASSERT_EQ(s_key.Algo(), QString("CV448")); + ASSERT_EQ(s_key.KeyLength(), 448); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_FALSE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_FALSE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); } TEST_F(GpgCoreTest, GenerateSubkeySECP256K1Test) { @@ -406,18 +406,18 @@ TEST_F(GpgCoreTest, GenerateSubkeySECP256K1Test) { .GetKey(result.GetFingerprint()); ASSERT_TRUE(key.IsGood()); - auto subkeys = key.GetSubKeys(); - auto& subkey = subkeys->back(); + auto s_keys = key.SubKeys(); + auto& s_key = s_keys.back(); - ASSERT_EQ(subkey.GetPubkeyAlgo(), QString("ECDH")); - ASSERT_EQ(subkey.GetKeyAlgo(), QString("SECP256K1")); - ASSERT_EQ(subkey.GetKeyLength(), 256); - ASSERT_EQ(subkey.GetExpireTime(), QDateTime::fromMSecsSinceEpoch(0)); + ASSERT_EQ(s_key.PublicKeyAlgo(), QString("ECDH")); + ASSERT_EQ(s_key.Algo(), QString("SECP256K1")); + ASSERT_EQ(s_key.KeyLength(), 256); + ASSERT_EQ(s_key.ExpirationTime(), QDateTime::fromMSecsSinceEpoch(0)); - ASSERT_FALSE(subkey.IsHasCertCap()); - ASSERT_FALSE(subkey.IsHasAuthCap()); - ASSERT_TRUE(subkey.IsHasEncrCap()); - ASSERT_FALSE(subkey.IsHasSignCap()); + ASSERT_FALSE(s_key.IsHasCertCap()); + ASSERT_FALSE(s_key.IsHasAuthCap()); + ASSERT_TRUE(s_key.IsHasEncrCap()); + ASSERT_FALSE(s_key.IsHasSignCap()); } } // namespace GpgFrontend::Test
\ No newline at end of file diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp index 22752a19..f23eada0 100644 --- a/src/ui/UserInterfaceUtils.cpp +++ b/src/ui/UserInterfaceUtils.cpp @@ -505,7 +505,7 @@ auto CommonUtils::KeyExistsInFavoriteList(const QString &key_db_name, auto &key_ids = cache_obj.key_dbs[key_db_name].key_ids; - return key_ids.contains(key.GetId()); + return key_ids.contains(key.ID()); } void CommonUtils::AddKey2Favorite(const QString &key_db_name, @@ -519,7 +519,7 @@ void CommonUtils::AddKey2Favorite(const QString &key_db_name, } auto &key_ids = cache_obj.key_dbs[key_db_name].key_ids; - if (!key_ids.contains(key.GetId())) key_ids.append(key.GetId()); + if (!key_ids.contains(key.ID())) key_ids.append(key.ID()); json_data.setObject(cache_obj.ToJson()); LOG_D() << "current favorite key pairs: " << json_data; @@ -538,7 +538,7 @@ void CommonUtils::RemoveKeyFromFavorite(const QString &key_db_name, QMutableListIterator<QString> i(cache_obj.key_dbs[key_db_name].key_ids); while (i.hasNext()) { - if (i.next() == key.GetId()) i.remove(); + if (i.next() == key.ID()) i.remove(); } json_data.setObject(cache_obj.ToJson()); LOG_D() << "current favorite key pairs: " << json_data; diff --git a/src/ui/dialog/import_export/KeyImportDetailDialog.cpp b/src/ui/dialog/import_export/KeyImportDetailDialog.cpp index 0a5f5005..34a050ce 100644 --- a/src/ui/dialog/import_export/KeyImportDetailDialog.cpp +++ b/src/ui/dialog/import_export/KeyImportDetailDialog.cpp @@ -151,8 +151,8 @@ void KeyImportDetailDialog::create_keys_table() { auto key = GpgKeyGetter::GetInstance(current_gpg_context_channel_) .GetKey(imp_key.fpr); if (!key.IsGood()) continue; - keys_table_->setItem(row, 0, new QTableWidgetItem(key.GetName())); - keys_table_->setItem(row, 1, new QTableWidgetItem(key.GetEmail())); + keys_table_->setItem(row, 0, new QTableWidgetItem(key.Name())); + keys_table_->setItem(row, 1, new QTableWidgetItem(key.Email())); keys_table_->setItem( row, 2, new QTableWidgetItem(get_status_string(imp_key.import_status))); keys_table_->setItem(row, 3, new QTableWidgetItem(imp_key.fpr)); diff --git a/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp b/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp index d48cbdb7..b3cb3a9d 100644 --- a/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp @@ -41,24 +41,24 @@ KeyDetailsDialog::KeyDetailsDialog(int channel, const GpgKey& key, : GeneralDialog(typeid(KeyDetailsDialog).name(), parent), current_gpg_context_channel_(channel) { tab_widget_ = new QTabWidget(); - tab_widget_->addTab(new KeyPairDetailTab(current_gpg_context_channel_, - key.GetId(), tab_widget_), - tr("KeyPair")); + tab_widget_->addTab( + new KeyPairDetailTab(current_gpg_context_channel_, key.ID(), tab_widget_), + tr("KeyPair")); if (!key.IsRevoked()) { - tab_widget_->addTab(new KeyPairUIDTab(current_gpg_context_channel_, - key.GetId(), tab_widget_), - tr("UIDs")); + tab_widget_->addTab( + new KeyPairUIDTab(current_gpg_context_channel_, key.ID(), tab_widget_), + tr("UIDs")); tab_widget_->addTab(new KeyPairSubkeyTab(current_gpg_context_channel_, - key.GetId(), tab_widget_), + key.ID(), tab_widget_), tr("Keychain")); tab_widget_->addTab(new KeyPairOperaTab(current_gpg_context_channel_, - key.GetId(), tab_widget_), + key.ID(), tab_widget_), tr("Operations")); } - QString m_key_id = key.GetId(); + QString m_key_id = key.ID(); connect(UISignalStation::GetInstance(), &UISignalStation::SignalKeyRevoked, this, [this, m_key_id](const QString& key_id) { if (key_id == m_key_id) this->close(); diff --git a/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp b/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp index 88c7fbf5..5a646ec0 100644 --- a/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp +++ b/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp @@ -206,11 +206,11 @@ void KeyPairDetailTab::slot_refresh_key_info() { expire_var_label_->setPalette(palette_valid); } - name_var_label_->setText(key_.GetName()); - email_var_label_->setText(key_.GetEmail()); + name_var_label_->setText(key_.Name()); + email_var_label_->setText(key_.Email()); - comment_var_label_->setText(key_.GetComment()); - key_id_var_label_->setText(key_.GetId()); + comment_var_label_->setText(key_.Comment()); + key_id_var_label_->setText(key_.ID()); QString buffer; QTextStream usage_steam(&buffer); @@ -241,7 +241,7 @@ void KeyPairDetailTab::slot_refresh_key_info() { } actual_usage_var_label_->setText(actual_usage_steam.readAll()); - owner_trust_var_label_->setText(key_.GetOwnerTrust()); + owner_trust_var_label_->setText(key_.OwnerTrust()); QString key_size_val; QString key_expire_val; @@ -250,30 +250,29 @@ void KeyPairDetailTab::slot_refresh_key_info() { QString key_algo_detail_val; QString key_last_update_val; - key_size_val = QString::number(key_.GetPrimaryKeyLength()); + key_size_val = QString::number(key_.PrimaryKeyLength()); - if (key_.GetExpireTime().toSecsSinceEpoch() == 0) { + if (key_.ExpirationTime().toSecsSinceEpoch() == 0) { expire_var_label_->setText(tr("Never Expire")); } else { - expire_var_label_->setText(QLocale().toString((key_.GetExpireTime()))); + expire_var_label_->setText(QLocale().toString((key_.ExpirationTime()))); } - key_algo_val = key_.GetPublicKeyAlgo(); - key_algo_detail_val = key_.GetKeyAlgo(); + key_algo_val = key_.PublicKeyAlgo(); + key_algo_detail_val = key_.Algo(); - created_var_label_->setText(QLocale().toString(key_.GetCreateTime())); + created_var_label_->setText(QLocale().toString(key_.CreationTime())); - if (key_.GetLastUpdateTime().toSecsSinceEpoch() == 0) { + if (key_.LastUpdateTime().toSecsSinceEpoch() == 0) { last_update_var_label_->setText(tr("No Data")); } else { - last_update_var_label_->setText( - QLocale().toString(key_.GetLastUpdateTime())); + last_update_var_label_->setText(QLocale().toString(key_.LastUpdateTime())); } key_size_var_label_->setText(key_size_val); algorithm_var_label_->setText(key_algo_val); algorithm_detail_var_label_->setText(key_algo_detail_val); - fingerprint_var_label_->setText(BeautifyFingerprint(key_.GetFingerprint())); + fingerprint_var_label_->setText(BeautifyFingerprint(key_.Fingerprint())); fingerprint_var_label_->setWordWrap(true); // for x448 and ed448 icon_label_->hide(); @@ -295,8 +294,8 @@ void KeyPairDetailTab::slot_refresh_key_info() { void KeyPairDetailTab::slot_refresh_key() { // refresh the key - GpgKey refreshed_key = GpgKeyGetter::GetInstance(current_gpg_context_channel_) - .GetKey(key_.GetId()); + GpgKey refreshed_key = + GpgKeyGetter::GetInstance(current_gpg_context_channel_).GetKey(key_.ID()); assert(refreshed_key.IsGood()); std::swap(this->key_, refreshed_key); @@ -317,7 +316,7 @@ void KeyPairDetailTab::slot_query_key_publish_state() { return; } - const auto fpr = key_.GetFingerprint(); + const auto fpr = key_.Fingerprint(); Module::TriggerEvent( "REQUEST_GET_PUBLIC_KEY_BY_FINGERPRINT", diff --git a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp index c4f0dad1..936997a9 100644 --- a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp +++ b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp @@ -189,8 +189,7 @@ void KeyPairOperaTab::CreateOperaMenu() { secret_key_export_opera_menu_->addAction(export_shortest_secret_key); // only work with RSA - if (m_key_.GetKeyAlgo() == "RSA" && - Module::IsModuleActivate(kPaperKeyModuleID)) { + if (m_key_.Algo() == "RSA" && Module::IsModuleActivate(kPaperKeyModuleID)) { auto* export_secret_key_as_paper_key = new QAction( tr("Export Secret Key As A Paper Key") + QString(" (BETA)"), this); connect(export_secret_key_as_paper_key, &QAction::triggered, this, @@ -229,11 +228,11 @@ void KeyPairOperaTab::slot_export_public_key() { // generate a file name #if defined(_WIN32) || defined(WIN32) - auto file_string = m_key_.GetName() + "[" + m_key_.GetEmail() + "](" + - m_key_.GetId() + ")_pub.asc"; + auto file_string = + m_key_.Name() + "[" + m_key_.Email() + "](" + m_key_.ID() + ")_pub.asc"; #else - auto file_string = m_key_.GetName() + "<" + m_key_.GetEmail() + ">(" + - m_key_.GetId() + ")_pub.asc"; + auto file_string = + m_key_.Name() + "<" + m_key_.Email() + ">(" + m_key_.ID() + ")_pub.asc"; #endif std::replace(file_string.begin(), file_string.end(), ' ', '_'); @@ -278,11 +277,11 @@ void KeyPairOperaTab::slot_export_short_private_key() { // generate a file name #if defined(_WIN32) || defined(WIN32) - auto file_string = m_key_.GetName() + "[" + m_key_.GetEmail() + "](" + - m_key_.GetId() + ")_short_secret.asc"; + auto file_string = m_key_.Name() + "[" + m_key_.Email() + "](" + + m_key_.ID() + ")_short_secret.asc"; #else - auto file_string = m_key_.GetName() + "<" + m_key_.GetEmail() + ">(" + - m_key_.GetId() + ")_short_secret.asc"; + auto file_string = m_key_.Name() + "<" + m_key_.Email() + ">(" + + m_key_.ID() + ")_short_secret.asc"; #endif std::replace(file_string.begin(), file_string.end(), ' ', '_'); @@ -329,11 +328,11 @@ void KeyPairOperaTab::slot_export_private_key() { // generate a file name #if defined(_WIN32) || defined(WIN32) - auto file_string = m_key_.GetName() + "[" + m_key_.GetEmail() + "](" + - m_key_.GetId() + ")_full_secret.asc"; + auto file_string = m_key_.Name() + "[" + m_key_.Email() + "](" + + m_key_.ID() + ")_full_secret.asc"; #else - auto file_string = m_key_.GetName() + "<" + m_key_.GetEmail() + ">(" + - m_key_.GetId() + ")_full_secret.asc"; + auto file_string = m_key_.Name() + "<" + m_key_.Email() + ">(" + + m_key_.ID() + ")_full_secret.asc"; #endif std::replace(file_string.begin(), file_string.end(), ' ', '_'); @@ -353,7 +352,7 @@ void KeyPairOperaTab::slot_export_private_key() { void KeyPairOperaTab::slot_modify_edit_datetime() { auto* dialog = new KeySetExpireDateDialog(current_gpg_context_channel_, - m_key_.GetId(), this); + m_key_.ID(), this); dialog->show(); } @@ -363,7 +362,7 @@ void KeyPairOperaTab::slot_publish_key_to_server() { GpgKeyImportExporter::GetInstance(current_gpg_context_channel_) .ExportKey(m_key_, false, true, false); - auto fpr = m_key_.GetFingerprint(); + auto fpr = m_key_.Fingerprint(); auto key_text = gf_buffer.ConvertToQByteArray(); Module::TriggerEvent( @@ -435,7 +434,7 @@ void KeyPairOperaTab::slot_publish_key_to_server() { return; } - auto keys = KeyIdArgsList{m_key_.GetId()}; + auto keys = KeyIdArgsList{m_key_.ID()}; auto* dialog = new KeyUploadDialog(current_gpg_context_channel_, keys, this); dialog->show(); dialog->SlotUpload(); @@ -444,11 +443,11 @@ void KeyPairOperaTab::slot_publish_key_to_server() { void KeyPairOperaTab::slot_update_key_from_server() { if (Module::IsModuleActivate(kKeyServerSyncModuleID)) { CommonUtils::GetInstance()->ImportKeyByKeyServerSyncModule( - this, current_gpg_context_channel_, {m_key_.GetFingerprint()}); + this, current_gpg_context_channel_, {m_key_.Fingerprint()}); return; } CommonUtils::GetInstance()->ImportKeyFromKeyServer( - current_gpg_context_channel_, {m_key_.GetId()}); + current_gpg_context_channel_, {m_key_.ID()}); } void KeyPairOperaTab::slot_gen_revoke_cert() { @@ -465,11 +464,11 @@ void KeyPairOperaTab::slot_gen_revoke_cert() { QString m_output_file_name; #if defined(_WIN32) || defined(WIN32) - auto file_string = m_key_.GetName() + "[" + m_key_.GetEmail() + - "](" + m_key_.GetId() + ").rev"; + auto file_string = m_key_.Name() + "[" + m_key_.Email() + "](" + + m_key_.ID() + ").rev"; #else - auto file_string = m_key_.GetName() + "<" + m_key_.GetEmail() + - ">(" + m_key_.GetId() + ").rev"; + auto file_string = m_key_.Name() + "<" + m_key_.Email() + + ">(" + m_key_.ID() + ").rev"; #endif QFileDialog dialog(this, tr("Generate revocation certificate"), @@ -530,7 +529,7 @@ void KeyPairOperaTab::slot_modify_tofu_policy() { void KeyPairOperaTab::slot_set_owner_trust_level() { auto* function = new SetOwnerTrustLevel(this); - function->Exec(current_gpg_context_channel_, m_key_.GetId()); + function->Exec(current_gpg_context_channel_, m_key_.ID()); function->deleteLater(); } @@ -582,7 +581,7 @@ void KeyPairOperaTab::slot_import_revoke_cert() { return; } - emit UISignalStation::GetInstance() -> SignalKeyRevoked(m_key_.GetId()); + emit UISignalStation::GetInstance() -> SignalKeyRevoked(m_key_.ID()); CommonUtils::GetInstance()->SlotImportKeys( nullptr, current_gpg_context_channel_, rev_file.readAll()); } @@ -621,11 +620,11 @@ void KeyPairOperaTab::slot_export_paper_key() { // generate a file name #if defined(_WIN32) || defined(WIN32) - auto file_string = m_key_.GetName() + "[" + m_key_.GetEmail() + "](" + - m_key_.GetId() + ")_paper_key.txt"; + auto file_string = m_key_.Name() + "[" + m_key_.Email() + "](" + + m_key_.ID() + ")_paper_key.txt"; #else - auto file_string = m_key_.GetName() + "<" + m_key_.GetEmail() + ">(" + - m_key_.GetId() + ")_paper_key.txt"; + auto file_string = m_key_.Name() + "<" + m_key_.Email() + ">(" + + m_key_.ID() + ")_paper_key.txt"; #endif std::replace(file_string.begin(), file_string.end(), ' ', '_'); @@ -675,11 +674,11 @@ void KeyPairOperaTab::slot_import_paper_key() { // generate a file name #if defined(_WIN32) || defined(WIN32) - auto file_string = m_key_.GetName() + "[" + m_key_.GetEmail() + "](" + - m_key_.GetId() + ")_paper_key.txt"; + auto file_string = m_key_.Name() + "[" + m_key_.Email() + "](" + m_key_.ID() + + ")_paper_key.txt"; #else - auto file_string = m_key_.GetName() + "<" + m_key_.GetEmail() + ">(" + - m_key_.GetId() + ")_paper_key.txt"; + auto file_string = m_key_.Name() + "<" + m_key_.Email() + ">(" + m_key_.ID() + + ")_paper_key.txt"; #endif std::replace(file_string.begin(), file_string.end(), ' ', '_'); diff --git a/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp b/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp index a85f05f5..ea175f3e 100644 --- a/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp +++ b/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp @@ -202,46 +202,44 @@ void KeyPairSubkeyTab::slot_refresh_subkey_list() { subkey_list_->setSelectionMode(QAbstractItemView::SingleSelection); this->buffered_subkeys_.clear(); - auto sub_keys = key_.GetSubKeys(); - for (auto& sub_key : *sub_keys) { - this->buffered_subkeys_.push_back(std::move(sub_key)); + for (auto& s_key : key_.SubKeys()) { + this->buffered_subkeys_.push_back(std::move(s_key)); } subkey_list_->setRowCount(buffered_subkeys_.size()); - for (const auto& subkey : buffered_subkeys_) { - auto* tmp0 = new QTableWidgetItem(subkey.GetID()); + for (const auto& s_key : buffered_subkeys_) { + auto* tmp0 = new QTableWidgetItem(s_key.ID()); tmp0->setTextAlignment(Qt::AlignCenter); subkey_list_->setItem(row, 0, tmp0); - auto type = subkey.IsHasCertCap() ? tr("Primary Key") : tr("Subkey"); - if (subkey.IsADSK()) type = tr("ADSK"); + auto type = s_key.IsHasCertCap() ? tr("Primary Key") : tr("Subkey"); + if (s_key.IsADSK()) type = tr("ADSK"); auto* tmp1 = new QTableWidgetItem(type); tmp1->setTextAlignment(Qt::AlignCenter); subkey_list_->setItem(row, 1, tmp1); - auto* tmp2 = new QTableWidgetItem(QString::number(subkey.GetKeyLength())); + auto* tmp2 = new QTableWidgetItem(QString::number(s_key.KeyLength())); tmp2->setTextAlignment(Qt::AlignCenter); subkey_list_->setItem(row, 2, tmp2); - auto* tmp3 = new QTableWidgetItem(subkey.GetPubkeyAlgo()); + auto* tmp3 = new QTableWidgetItem(s_key.PublicKeyAlgo()); tmp3->setTextAlignment(Qt::AlignCenter); subkey_list_->setItem(row, 3, tmp3); - auto* tmp4 = new QTableWidgetItem(subkey.GetKeyAlgo()); + auto* tmp4 = new QTableWidgetItem(s_key.Algo()); tmp4->setTextAlignment(Qt::AlignCenter); subkey_list_->setItem(row, 4, tmp4); - auto* tmp5 = - new QTableWidgetItem(QLocale().toString(subkey.GetCreateTime())); + auto* tmp5 = new QTableWidgetItem(QLocale().toString(s_key.CreationTime())); tmp5->setTextAlignment(Qt::AlignCenter); subkey_list_->setItem(row, 5, tmp5); auto* tmp6 = - new QTableWidgetItem(subkey.GetExpireTime().toSecsSinceEpoch() == 0 + new QTableWidgetItem(s_key.ExpirationTime().toSecsSinceEpoch() == 0 ? tr("Never Expire") - : QLocale().toString(subkey.GetExpireTime())); + : QLocale().toString(s_key.ExpirationTime())); tmp6->setTextAlignment(Qt::AlignCenter); subkey_list_->setItem(row, 6, tmp6); @@ -256,7 +254,7 @@ void KeyPairSubkeyTab::slot_refresh_subkey_list() { } } - if (subkey.IsExpired() || subkey.IsRevoked()) { + if (s_key.IsExpired() || s_key.IsRevoked()) { for (auto i = 0; i < subkey_list_->columnCount(); i++) { auto font = subkey_list_->item(row, i)->font(); font.setStrikeOut(true); @@ -264,7 +262,7 @@ void KeyPairSubkeyTab::slot_refresh_subkey_list() { } } - if (!subkey.IsSecretKey()) { + if (!s_key.IsSecretKey()) { for (auto i = 0; i < subkey_list_->columnCount(); i++) { auto font = subkey_list_->item(row, i)->font(); font.setWeight(QFont::ExtraLight); @@ -282,17 +280,16 @@ void KeyPairSubkeyTab::slot_refresh_subkey_list() { } void KeyPairSubkeyTab::slot_add_subkey() { - auto* dialog = new SubkeyGenerateDialog(current_gpg_context_channel_, - key_.GetId(), this); + auto* dialog = + new SubkeyGenerateDialog(current_gpg_context_channel_, key_.ID(), this); dialog->show(); } void KeyPairSubkeyTab::slot_add_adsk() { QStringList except_key_ids; - except_key_ids.append(key_.GetId()); - auto except_sub_keys = key_.GetSubKeys(); - for (const auto& sub_key : *except_sub_keys) { - except_key_ids.append(sub_key.GetID()); + except_key_ids.append(key_.ID()); + for (const auto& s_key : key_.SubKeys()) { + except_key_ids.append(s_key.ID()); } auto* dialog = new ADSKsPicker( @@ -311,7 +308,7 @@ void KeyPairSubkeyTab::slot_add_adsk() { if (sub_keys.isEmpty()) { QMessageBox::information(this, tr("No Subkeys Selected"), - tr("Please select at least one subkey.")); + tr("Please select at least one s_key.")); return; } @@ -331,8 +328,8 @@ void KeyPairSubkeyTab::slot_add_adsk() { tr("All selected subkeys were successfully added as ADSKs.")); } else { QStringList failed_info; - for (const auto& sub_key : err_sub_keys) { - QString key_id = sub_key.GetID(); + for (const auto& s_key : err_sub_keys) { + QString key_id = s_key.ID(); failed_info << tr("Key ID: %1").arg(key_id); } @@ -354,19 +351,19 @@ void KeyPairSubkeyTab::slot_add_adsk() { } void KeyPairSubkeyTab::slot_refresh_subkey_detail() { - const auto& subkey = get_selected_subkey(); + const auto& s_key = get_selected_subkey(); - key_id_var_label_->setText(subkey.GetID()); - key_size_var_label_->setText(QString::number(subkey.GetKeyLength())); + key_id_var_label_->setText(s_key.ID()); + key_size_var_label_->setText(QString::number(s_key.KeyLength())); - time_t subkey_time_t = subkey.GetExpireTime().toSecsSinceEpoch(); + time_t subkey_time_t = s_key.ExpirationTime().toSecsSinceEpoch(); expire_var_label_->setText(subkey_time_t == 0 ? tr("Never Expires") - : QLocale().toString(subkey.GetExpireTime())); + : QLocale().toString(s_key.ExpirationTime())); if (subkey_time_t != 0 && - subkey.GetExpireTime() < QDateTime::currentDateTime()) { + s_key.ExpirationTime() < QDateTime::currentDateTime()) { auto palette_expired = expire_var_label_->palette(); palette_expired.setColor(expire_var_label_->foregroundRole(), Qt::red); expire_var_label_->setPalette(palette_expired); @@ -376,23 +373,23 @@ void KeyPairSubkeyTab::slot_refresh_subkey_detail() { expire_var_label_->setPalette(palette_valid); } - algorithm_var_label_->setText(subkey.GetPubkeyAlgo()); - algorithm_detail_var_label_->setText(subkey.GetKeyAlgo()); - created_var_label_->setText(QLocale().toString(subkey.GetCreateTime())); + algorithm_var_label_->setText(s_key.PublicKeyAlgo()); + algorithm_detail_var_label_->setText(s_key.Algo()); + created_var_label_->setText(QLocale().toString(s_key.CreationTime())); QString buffer; QTextStream usage_steam(&buffer); - usage_var_label_->setText(GetUsagesBySubkey(subkey)); + usage_var_label_->setText(GetUsagesBySubkey(s_key)); // Show the situation that secret key not exists. - master_key_exist_var_label_->setText(subkey.IsSecretKey() ? tr("Exists") - : tr("Not Exists")); + master_key_exist_var_label_->setText(s_key.IsSecretKey() ? tr("Exists") + : tr("Not Exists")); // Show the situation if key in a smart card. - card_key_label_->setText(subkey.IsCardKey() ? tr("Yes") : tr("No")); + card_key_label_->setText(s_key.IsCardKey() ? tr("Yes") : tr("No")); - if (!subkey.IsSecretKey()) { + if (!s_key.IsSecretKey()) { auto palette_expired = master_key_exist_var_label_->palette(); palette_expired.setColor(master_key_exist_var_label_->foregroundRole(), Qt::red); @@ -404,7 +401,7 @@ void KeyPairSubkeyTab::slot_refresh_subkey_detail() { master_key_exist_var_label_->setPalette(palette_valid); } - if (!subkey.IsCardKey()) { + if (!s_key.IsCardKey()) { auto palette_expired = card_key_label_->palette(); palette_expired.setColor(card_key_label_->foregroundRole(), Qt::red); card_key_label_->setPalette(palette_expired); @@ -414,19 +411,19 @@ void KeyPairSubkeyTab::slot_refresh_subkey_detail() { card_key_label_->setPalette(palette_valid); } - fingerprint_var_label_->setText(BeautifyFingerprint(subkey.GetFingerprint())); + fingerprint_var_label_->setText(BeautifyFingerprint(s_key.Fingerprint())); fingerprint_var_label_->setWordWrap(true); // for x448 and ed448 - export_subkey_button_->setText( - subkey.IsHasCertCap() ? tr("Export Primary Key") : tr("Export Subkey")); + export_subkey_button_->setText(s_key.IsHasCertCap() ? tr("Export Primary Key") + : tr("Export Subkey")); export_subkey_button_->setDisabled( - !key_.IsPrivateKey() || subkey.IsHasCertCap() || !subkey.IsSecretKey()); + !key_.IsPrivateKey() || s_key.IsHasCertCap() || !s_key.IsSecretKey()); - key_type_var_label_->setText(subkey.IsHasCertCap() ? tr("Primary Key") - : tr("Subkey")); + key_type_var_label_->setText(s_key.IsHasCertCap() ? tr("Primary Key") + : tr("Subkey")); - revoke_var_label_->setText(subkey.IsRevoked() ? tr("Yes") : tr("No")); - if (!subkey.IsRevoked()) { + revoke_var_label_->setText(s_key.IsRevoked() ? tr("Yes") : tr("No")); + if (!s_key.IsRevoked()) { auto palette_expired = revoke_var_label_->palette(); palette_expired.setColor(revoke_var_label_->foregroundRole(), Qt::red); revoke_var_label_->setPalette(palette_expired); @@ -463,23 +460,22 @@ void KeyPairSubkeyTab::create_subkey_opera_menu() { void KeyPairSubkeyTab::slot_edit_subkey() { auto* dialog = - new KeySetExpireDateDialog(current_gpg_context_channel_, key_.GetId(), - get_selected_subkey().GetFingerprint(), this); + new KeySetExpireDateDialog(current_gpg_context_channel_, key_.ID(), + get_selected_subkey().Fingerprint(), this); dialog->show(); } void KeyPairSubkeyTab::contextMenuEvent(QContextMenuEvent* event) { // must have primary key before do any actions on subkey if (key_.IsHasMasterKey() && !subkey_list_->selectedItems().isEmpty()) { - const auto& subkey = get_selected_subkey(); + const auto& s_key = get_selected_subkey(); - if (subkey.IsHasCertCap()) return; + if (s_key.IsHasCertCap()) return; - export_subkey_act_->setDisabled(!subkey.IsSecretKey()); - edit_subkey_act_->setDisabled(!subkey.IsSecretKey()); - delete_subkey_act_->setDisabled(!subkey.IsSecretKey()); - revoke_subkey_act_->setDisabled(!subkey.IsSecretKey() || - subkey.IsRevoked()); + export_subkey_act_->setDisabled(!s_key.IsSecretKey()); + edit_subkey_act_->setDisabled(!s_key.IsSecretKey()); + delete_subkey_act_->setDisabled(!s_key.IsSecretKey()); + revoke_subkey_act_->setDisabled(!s_key.IsSecretKey() || s_key.IsRevoked()); subkey_opera_menu_->exec(event->globalPos()); } @@ -497,15 +493,15 @@ auto KeyPairSubkeyTab::get_selected_subkey() -> const GpgSubKey& { } void KeyPairSubkeyTab::slot_refresh_key_info() { - key_ = GpgKeyGetter::GetInstance(current_gpg_context_channel_) - .GetKey(key_.GetId()); + key_ = + GpgKeyGetter::GetInstance(current_gpg_context_channel_).GetKey(key_.ID()); assert(key_.IsGood()); } void KeyPairSubkeyTab::slot_export_subkey() { int ret = QMessageBox::question( this, tr("Exporting Subkey"), - "<h3>" + tr("You are about to export a private subkey.") + "</h3>\n" + + "<h3>" + tr("You are about to export a private s_key.") + "</h3>\n" + tr("While subkeys are less critical than the primary key, " "they should still be handled with care.") + "<br /><br />" + @@ -514,11 +510,11 @@ void KeyPairSubkeyTab::slot_export_subkey() { if (ret != QMessageBox::Yes) return; - const auto& subkey = get_selected_subkey(); + const auto& s_key = get_selected_subkey(); auto [err, gf_buffer] = GpgKeyImportExporter::GetInstance(current_gpg_context_channel_) - .ExportSubkey(subkey.GetFingerprint(), true); + .ExportSubkey(s_key.Fingerprint(), true); if (CheckGpgError(err) != GPG_ERR_NO_ERROR) { CommonUtils::RaiseMessageBox(this, err); @@ -527,11 +523,11 @@ void KeyPairSubkeyTab::slot_export_subkey() { // generate a file name #if defined(_WIN32) || defined(WIN32) - auto file_string = key_.GetName() + "[" + key_.GetEmail() + "](" + - subkey.GetID() + ")_subkey.asc"; + auto file_string = + key_.Name() + "[" + key_.Email() + "](" + s_key.ID() + ")_s_key.asc"; #else - auto file_string = key_.GetName() + "<" + key_.GetEmail() + ">(" + - subkey.GetID() + ")_subkey.asc"; + auto file_string = + key_.Name() + "<" + key_.Email() + ">(" + s_key.ID() + ")_s_key.asc"; #endif std::replace(file_string.begin(), file_string.end(), ' ', '_'); @@ -549,13 +545,12 @@ void KeyPairSubkeyTab::slot_export_subkey() { } void KeyPairSubkeyTab::slot_delete_subkey() { - const auto& subkey = get_selected_subkey(); - const auto subkeys = key_.GetSubKeys(); + const auto& s_key = get_selected_subkey(); QString message = tr("<h3>You are about to delete the subkey:</h3><br />" "<b>KeyID:</b> %1<br /><br />" "This action is irreversible. Please confirm.") - .arg(subkey.GetID()); + .arg(s_key.ID()); int ret = QMessageBox::warning( this, tr("Delete Subkey Confirmation"), message, @@ -564,8 +559,8 @@ void KeyPairSubkeyTab::slot_delete_subkey() { if (ret != QMessageBox::Yes) return; int index = 0; - for (const auto& sk : *subkeys) { - if (sk.GetFingerprint() == subkey.GetFingerprint()) { + for (const auto& sk : key_.SubKeys()) { + if (sk.Fingerprint() == s_key.Fingerprint()) { break; } index++; @@ -574,7 +569,7 @@ void KeyPairSubkeyTab::slot_delete_subkey() { if (index == 0) { QMessageBox::critical( this, tr("Illegal Operation"), - tr("Cannot delete the primary key or an invalid subkey.")); + tr("Cannot delete the primary key or an invalid s_key.")); return; } @@ -591,21 +586,20 @@ void KeyPairSubkeyTab::slot_delete_subkey() { QMessageBox::information( this, tr("Operation Successful"), tr("The subkey with KeyID %1 has been successfully deleted.") - .arg(subkey.GetID())); + .arg(s_key.ID())); emit SignalKeyDatabaseRefresh(); } void KeyPairSubkeyTab::slot_revoke_subkey() { - const auto& subkey = get_selected_subkey(); - const auto subkeys = key_.GetSubKeys(); + const auto& s_key = get_selected_subkey(); QString message = tr("<h3>Revoke Subkey Confirmation</h3><br />" "<b>KeyID:</b> %1<br /><br />" "Revoking a subkey will make it permanently unusable. " "This action is <b>irreversible</b>.<br />" "Are you sure you want to revoke this subkey?") - .arg(subkey.GetID()); + .arg(s_key.ID()); int ret = QMessageBox::warning(this, tr("Revoke Subkey"), message, QMessageBox::Cancel | QMessageBox::Yes, @@ -614,8 +608,8 @@ void KeyPairSubkeyTab::slot_revoke_subkey() { if (ret != QMessageBox::Yes) return; int index = 0; - for (const auto& sk : *subkeys) { - if (sk.GetFingerprint() == subkey.GetFingerprint()) { + for (const auto& sk : key_.SubKeys()) { + if (sk.Fingerprint() == s_key.Fingerprint()) { break; } index++; @@ -624,7 +618,7 @@ void KeyPairSubkeyTab::slot_revoke_subkey() { if (index == 0) { QMessageBox::critical( this, tr("Illegal Operation"), - tr("Cannot revoke the primary key or an invalid subkey.")); + tr("Cannot revoke the primary key or an invalid s_key.")); return; } @@ -642,7 +636,7 @@ void KeyPairSubkeyTab::slot_revoke_subkey() { if (!res) { QMessageBox::critical( nullptr, tr("Revocation Failed"), - tr("Failed to revoke the subkey. Please try again.")); + tr("Failed to revoke the s_key. Please try again.")); } else { QMessageBox::information( nullptr, tr("Revocation Successful"), diff --git a/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp index 1d1231c7..a010a6ea 100644 --- a/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp +++ b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp @@ -176,8 +176,7 @@ void KeyPairUIDTab::slot_refresh_uid_list() { this->buffered_uids_.clear(); - auto uids = m_key_.GetUIDs(); - for (auto& uid : *uids) { + for (auto& uid : m_key_.UIDs()) { this->buffered_uids_.push_back(std::move(uid)); } @@ -317,7 +316,7 @@ void KeyPairUIDTab::slot_add_sign() { void KeyPairUIDTab::slot_add_uid() { auto* key_new_uid_dialog = - new KeyNewUIDDialog(current_gpg_context_channel_, m_key_.GetId(), this); + new KeyNewUIDDialog(current_gpg_context_channel_, m_key_.ID(), this); connect(key_new_uid_dialog, &KeyNewUIDDialog::finished, this, &KeyPairUIDTab::slot_add_uid_result); connect(key_new_uid_dialog, &KeyNewUIDDialog::finished, key_new_uid_dialog, @@ -518,7 +517,7 @@ void KeyPairUIDTab::slot_del_sign() { void KeyPairUIDTab::slot_refresh_key() { // refresh the key GpgKey refreshed_key = GpgKeyGetter::GetInstance(current_gpg_context_channel_) - .GetKey(m_key_.GetId()); + .GetKey(m_key_.ID()); assert(refreshed_key.IsGood()); std::swap(this->m_key_, refreshed_key); @@ -538,7 +537,7 @@ void KeyPairUIDTab::slot_rev_uid() { return; } - const auto uids = m_key_.GetUIDs(); + const auto uids = m_key_.UIDs(); QString message = tr("<h3>Revoke UID Confirmation</h3><br />" "<b>UID:</b> %1<br /><br />" diff --git a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp index 2f86b603..4880bd3d 100644 --- a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp +++ b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp @@ -101,7 +101,7 @@ void KeySetExpireDateDialog::init() { ui_->dateEdit->setMinimumDateTime(min_date_time); // set default date time to expire date time - auto current_expire_time = m_key_.GetExpireTime(); + auto current_expire_time = m_key_.ExpirationTime(); ui_->dateEdit->setDateTime(current_expire_time); ui_->timeEdit->setDateTime(current_expire_time); @@ -114,11 +114,11 @@ void KeySetExpireDateDialog::init() { UISignalStation::GetInstance(), &UISignalStation::SignalKeyDatabaseRefresh); - if (m_key_.GetExpireTime().toSecsSinceEpoch() == 0) { + if (m_key_.ExpirationTime().toSecsSinceEpoch() == 0) { ui_->noExpirationCheckBox->setCheckState(Qt::Checked); } else { - ui_->dateEdit->setDateTime(m_key_.GetExpireTime()); - ui_->timeEdit->setDateTime(m_key_.GetExpireTime()); + ui_->dateEdit->setDateTime(m_key_.ExpirationTime()); + ui_->timeEdit->setDateTime(m_key_.ExpirationTime()); } ui_->titleLabel->setText(tr("Modified Expiration Date (Local Time)")); diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp index 4b9d4726..2c4a8c59 100644 --- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp @@ -43,7 +43,7 @@ KeyUIDSignDialog::KeyUIDSignDialog(int channel, const GpgKey& key, m_key_(key) { assert(m_key_.IsGood()); - const auto key_id = m_key_.GetId(); + const auto key_id = m_key_.ID(); m_key_list_ = new KeyList( channel, KeyMenuAbility::kCOLUMN_FILTER | KeyMenuAbility::kSEARCH_BAR, GpgKeyTableColumn::kNAME | GpgKeyTableColumn::kEMAIL_ADDRESS | @@ -54,7 +54,7 @@ KeyUIDSignDialog::KeyUIDSignDialog(int channel, const GpgKey& key, [key_id](const GpgKey& key) -> bool { return !(key.IsDisabled() || !key.IsHasCertCap() || !key.IsHasMasterKey() || key.IsExpired() || key.IsRevoked() || - key_id == key.GetId()); + key_id == key.ID()); }); m_key_list_->SlotRefresh(); diff --git a/src/ui/function/SetOwnerTrustLevel.cpp b/src/ui/function/SetOwnerTrustLevel.cpp index b0fa8b0f..e99c3fa0 100644 --- a/src/ui/function/SetOwnerTrustLevel.cpp +++ b/src/ui/function/SetOwnerTrustLevel.cpp @@ -52,7 +52,7 @@ auto SetOwnerTrustLevel::Exec(int channel, const QString& key_id) -> bool { bool ok; QString item = QInputDialog::getItem(this, tr("Modify Owner Trust Level"), tr("Trust for the Key Pair:"), items, - key.GetOwnerTrustLevel(), false, &ok); + key.OwnerTrustLevel(), false, &ok); if (ok && !item.isEmpty()) { int trust_level = 0; // Unknown Level diff --git a/src/ui/main_window/KeyMgmt.cpp b/src/ui/main_window/KeyMgmt.cpp index 38a5399c..59e7a658 100644 --- a/src/ui/main_window/KeyMgmt.cpp +++ b/src/ui/main_window/KeyMgmt.cpp @@ -333,9 +333,9 @@ void KeyMgmt::delete_keys_with_warning(KeyIdArgsList uid_list) { GpgKeyGetter::GetInstance(key_list_->GetCurrentGpgContextChannel()) .GetKey(key_id); if (!key.IsGood()) continue; - keynames.append(key.GetName()); + keynames.append(key.Name()); keynames.append("<i> <"); - keynames.append(key.GetEmail()); + keynames.append(key.Email()); keynames.append("> </i><br/>"); } @@ -441,7 +441,8 @@ void KeyMgmt::SlotExportKeyToClipboard() { } void KeyMgmt::SlotGenerateKeyDialog() { - (new KeyGenerateDialog(key_list_->GetCurrentGpgContextChannel(), this))->exec(); + (new KeyGenerateDialog(key_list_->GetCurrentGpgContextChannel(), this)) + ->exec(); this->raise(); } @@ -456,8 +457,8 @@ void KeyMgmt::SlotGenerateSubKey() { return; } - (new SubkeyGenerateDialog(key_list_->GetCurrentGpgContextChannel(), - key.GetId(), this)) + (new SubkeyGenerateDialog(key_list_->GetCurrentGpgContextChannel(), key.ID(), + this)) ->exec(); this->raise(); } diff --git a/src/ui/main_window/MainWindowGpgOperaFunction.cpp b/src/ui/main_window/MainWindowGpgOperaFunction.cpp index 7632fdd6..dc65fd1c 100644 --- a/src/ui/main_window/MainWindowGpgOperaFunction.cpp +++ b/src/ui/main_window/MainWindowGpgOperaFunction.cpp @@ -172,7 +172,7 @@ auto MainWindow::check_keys_helper( QMessageBox::critical(nullptr, tr("Invalid KeyPair"), capability_err_string + "<br/><br/>" + tr("For example the Following Key:") + - " <br/>" + key.GetUIDs()->front().GetUID()); + " <br/>" + key.UIDs().front().GetUID()); return {}; } } diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp index 781c67d1..fb4f9e73 100644 --- a/src/ui/main_window/MainWindowSlotFunction.cpp +++ b/src/ui/main_window/MainWindowSlotFunction.cpp @@ -103,11 +103,11 @@ void MainWindow::slot_append_keys_create_datetime() { if (!succ) return; auto create_datetime_format_str_local = - QLocale().toString(key.GetCreateTime()) + " (" + tr("Localize") + ") " + + QLocale().toString(key.CreationTime()) + " (" + tr("Localize") + ") " + "\n"; auto create_datetime_format_str = - QLocale().toString(key.GetCreateTime().toUTC()) + " (" + tr("UTC") + - ") " + "\n "; + QLocale().toString(key.CreationTime().toUTC()) + " (" + tr("UTC") + ") " + + "\n "; edit_->SlotAppendText2CurTextPage(create_datetime_format_str_local + create_datetime_format_str); } @@ -117,10 +117,10 @@ void MainWindow::slot_append_keys_expire_datetime() { if (!succ) return; auto expire_datetime_format_str_local = - QLocale().toString(key.GetExpireTime()) + " (" + tr("Local Time") + ") " + - "\n"; + QLocale().toString(key.ExpirationTime()) + " (" + tr("Local Time") + + ") " + "\n"; auto expire_datetime_format_str = - QLocale().toString(key.GetExpireTime().toUTC()) + " (UTC) " + "\n"; + QLocale().toString(key.ExpirationTime().toUTC()) + " (UTC) " + "\n"; edit_->SlotAppendText2CurTextPage(expire_datetime_format_str_local + expire_datetime_format_str); @@ -130,8 +130,7 @@ void MainWindow::slot_append_keys_fingerprint() { auto [succ, key] = m_key_list_->GetSelectedGpgKey(); if (!succ) return; - auto fingerprint_format_str = - BeautifyFingerprint(key.GetFingerprint()) + "\n"; + auto fingerprint_format_str = BeautifyFingerprint(key.Fingerprint()) + "\n"; edit_->SlotAppendText2CurTextPage(fingerprint_format_str); } @@ -141,7 +140,7 @@ void MainWindow::slot_copy_mail_address_to_clipboard() { if (!succ) return; QClipboard* cb = QApplication::clipboard(); - cb->setText(key.GetEmail()); + cb->setText(key.Email()); } void MainWindow::slot_copy_default_uid_to_clipboard() { @@ -149,7 +148,7 @@ void MainWindow::slot_copy_default_uid_to_clipboard() { if (!succ) return; QClipboard* cb = QApplication::clipboard(); - cb->setText(key.GetUIDs()->front().GetUID()); + cb->setText(key.UIDs().front().GetUID()); } void MainWindow::slot_copy_key_id_to_clipboard() { @@ -157,7 +156,7 @@ void MainWindow::slot_copy_key_id_to_clipboard() { if (!succ) return; QClipboard* cb = QApplication::clipboard(); - cb->setText(key.GetId()); + cb->setText(key.ID()); } void MainWindow::slot_show_key_details() { @@ -174,7 +173,7 @@ void MainWindow::slot_add_key_2_favorite() { auto key_db_name = GetGpgKeyDatabaseName(m_key_list_->GetCurrentGpgContextChannel()); - LOG_D() << "add key" << key.GetId() << "to favorite at key db" << key_db_name; + LOG_D() << "add key" << key.ID() << "to favorite at key db" << key_db_name; CommonUtils::GetInstance()->AddKey2Favorite(key_db_name, key); emit SignalUIRefresh(); diff --git a/src/ui/model/GpgKeyTableProxyModel.cpp b/src/ui/model/GpgKeyTableProxyModel.cpp index 9dc98bcd..746f3344 100644 --- a/src/ui/model/GpgKeyTableProxyModel.cpp +++ b/src/ui/model/GpgKeyTableProxyModel.cpp @@ -95,8 +95,7 @@ auto GpgKeyTableProxyModel::filterAcceptsRow( auto index = sourceModel()->index(source_row, column, sourceParent); infos << sourceModel()->data(index).toString(); - const auto uids = key.GetUIDs(); - for (const auto &uid : *uids) { + for (const auto &uid : key.UIDs()) { infos << uid.GetUID(); } } @@ -109,7 +108,7 @@ auto GpgKeyTableProxyModel::filterAcceptsRow( } auto GpgKeyTableProxyModel::filterAcceptsColumn( - int sourceColumn, const QModelIndex &sourceParent) const -> bool { + int sourceColumn, const QModelIndex & /*sourceParent*/) const -> bool { switch (sourceColumn) { case 0: { return true; diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp index 877b5326..fb26295f 100644 --- a/src/ui/widgets/KeyList.cpp +++ b/src/ui/widgets/KeyList.cpp @@ -585,7 +585,7 @@ void KeyList::slot_sync_with_key_server() { auto status_str = tr("Sync [%1/%2] %3 %4") .arg(current_index) .arg(all_index) - .arg(key.GetUIDs()->front().GetUID()) + .arg(key.UIDs().front().GetUID()) .arg(status); emit SignalRefreshStatusBar(status_str, 1500); diff --git a/src/ui/widgets/VerifyKeyDetailBox.cpp b/src/ui/widgets/VerifyKeyDetailBox.cpp index 079c0e9d..eca7f03c 100644 --- a/src/ui/widgets/VerifyKeyDetailBox.cpp +++ b/src/ui/widgets/VerifyKeyDetailBox.cpp @@ -184,8 +184,8 @@ auto VerifyKeyDetailBox::create_key_info_grid(const GpgSignature& signature) grid->addWidget(new QLabel(tr("Valid") + ":"), 3, 0); grid->addWidget(new QLabel(tr("Flags") + ":"), 4, 0); - grid->addWidget(new QLabel(key.GetName()), 0, 1); - grid->addWidget(new QLabel(key.GetEmail()), 1, 1); + grid->addWidget(new QLabel(key.Name()), 0, 1); + grid->addWidget(new QLabel(key.Email()), 1, 1); grid->addWidget(new QLabel(BeautifyFingerprint(fpr_)), 2, 1); if ((signature.GetSummary() & GPGME_SIGSUM_VALID) != 0U) { |