ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove default ctors from SecretKey and PublicKey: (#4607)

Browse Source 
* It is now an invariant that all constructed Public Keys are valid,
  non-empty and contain 33 bytes of data.
* Additionally, the memory footprint of the PublicKey class is reduced.
  The size_ data member is declared as static.
* Distinguish and identify the PublisherList retrieved from the local
  config file, versus the ones obtained from other validators.
* Fixes #2942
This commit is contained in:
Chenna Keshava B S
2024-03-05 09:02:53 -08:00
committed by GitHub
parent 97863e0b62
commit 62dae3c6c6
39 changed files with 545 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/test/app/ValidatorList_test.cpp
View File

@@ -221,7 +221,6 @@ private:
jtx::Env env(
*this, jtx::envconfig(), nullptr, beast::severities::kDisabled);
auto& app = env.app();
PublicKey emptyLocalKey;
std::vector<std::string> const emptyCfgKeys;
std::vector<std::string> const emptyCfgPublishers;
@@ -278,8 +277,8 @@ private:
env.journal);
// Correct (empty) configuration
BEAST_EXPECT(trustedKeys->load(
emptyLocalKey, emptyCfgKeys, emptyCfgPublishers));
BEAST_EXPECT(
trustedKeys->load({}, emptyCfgKeys, emptyCfgPublishers));
// load local validator key with or without manifest
BEAST_EXPECT(trustedKeys->load(
@@ -303,8 +302,7 @@ private:
app.config().legacy("database_path"),
env.journal);
BEAST_EXPECT(
trustedKeys->load(emptyLocalKey, cfgKeys, emptyCfgPublishers));
BEAST_EXPECT(trustedKeys->load({}, cfgKeys, emptyCfgPublishers));
for (auto const& n : configList)
BEAST_EXPECT(trustedKeys->listed(n));
@@ -315,23 +313,21 @@ private:
std::vector<std::string> cfgMasterKeys(
{format(masterNode1), format(masterNode2, " Comment")});
BEAST_EXPECT(trustedKeys->load(
emptyLocalKey, cfgMasterKeys, emptyCfgPublishers));
BEAST_EXPECT(
trustedKeys->load({}, cfgMasterKeys, emptyCfgPublishers));
BEAST_EXPECT(trustedKeys->listed(masterNode1));
BEAST_EXPECT(trustedKeys->listed(masterNode2));
// load should reject invalid config keys
BEAST_EXPECT(
!trustedKeys->load({}, {"NotAPublicKey"}, emptyCfgPublishers));
BEAST_EXPECT(!trustedKeys->load(
emptyLocalKey, {"NotAPublicKey"}, emptyCfgPublishers));
BEAST_EXPECT(!trustedKeys->load(
emptyLocalKey,
{format(randomNode(), "!")},
emptyCfgPublishers));
{}, {format(randomNode(), "!")}, emptyCfgPublishers));
// load terminates when encountering an invalid entry
auto const goodKey = randomNode();
BEAST_EXPECT(!trustedKeys->load(
emptyLocalKey,
{},
{format(randomNode(), "!"), format(goodKey)},
emptyCfgPublishers));
BEAST_EXPECT(!trustedKeys->listed(goodKey));
@@ -408,8 +404,7 @@ private:
// load should reject invalid validator list signing keys
std::vector<std::string> badPublishers({"NotASigningKey"});
BEAST_EXPECT(
!trustedKeys->load(emptyLocalKey, emptyCfgKeys, badPublishers));
BEAST_EXPECT(!trustedKeys->load({}, emptyCfgKeys, badPublishers));
// load should reject validator list signing keys with invalid
// encoding
@@ -419,8 +414,7 @@ private:
for (auto const& key : keys)
badPublishers.push_back(toBase58(TokenType::NodePublic, key));
BEAST_EXPECT(
!trustedKeys->load(emptyLocalKey, emptyCfgKeys, badPublishers));
BEAST_EXPECT(!trustedKeys->load({}, emptyCfgKeys, badPublishers));
for (auto const& key : keys)
BEAST_EXPECT(!trustedKeys->trustedPublisher(key));
@@ -429,8 +423,7 @@ private:
for (auto const& key : keys)
cfgPublishers.push_back(strHex(key));
BEAST_EXPECT(
trustedKeys->load(emptyLocalKey, emptyCfgKeys, cfgPublishers));
BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgPublishers));
for (auto const& key : keys)
BEAST_EXPECT(trustedKeys->trustedPublisher(key));
}
@@ -464,8 +457,7 @@ private:
std::vector<std::string> cfgPublishers = {
strHex(pubRevokedPublic), strHex(legitKey)};
BEAST_EXPECT(
trustedKeys->load(emptyLocalKey, emptyCfgKeys, cfgPublishers));
BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgPublishers));
BEAST_EXPECT(!trustedKeys->trustedPublisher(pubRevokedPublic));
BEAST_EXPECT(trustedKeys->trustedPublisher(legitKey));
@@ -569,10 +561,9 @@ private:
1));
std::vector<std::string> cfgKeys1({strHex(publisherPublic)});
PublicKey emptyLocalKey;
std::vector<std::string> emptyCfgKeys;
BEAST_EXPECT(trustedKeys->load(emptyLocalKey, emptyCfgKeys, cfgKeys1));
BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgKeys1));
std::map<std::size_t, std::vector<Validator>> const lists = []() {
auto constexpr listSize = 20;
@@ -954,10 +945,9 @@ private:
1));
std::vector<std::string> cfgKeys1({strHex(publisherPublic)});
PublicKey emptyLocalKey;
std::vector<std::string> emptyCfgKeys;
BEAST_EXPECT(trustedKeys->load(emptyLocalKey, emptyCfgKeys, cfgKeys1));
BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgKeys1));
std::vector<Validator> const list = []() {
auto constexpr listSize = 20;
@@ -1066,7 +1056,6 @@ private:
std::string const siteUri = "testUpdateTrusted.test";
PublicKey emptyLocalKeyOuter;
ManifestCache manifestsOuter;
jtx::Env env(*this);
auto& app = env.app();
@@ -1096,8 +1085,8 @@ private:
unseenValidators.emplace(calcNodeID(valKey));
}
BEAST_EXPECT(trustedKeysOuter->load(
emptyLocalKeyOuter, cfgKeys, cfgPublishersOuter));
BEAST_EXPECT(
trustedKeysOuter->load({}, cfgKeys, cfgPublishersOuter));
// updateTrusted should make all configured validators trusted
// even if they are not active/seen
@@ -1147,8 +1136,8 @@ private:
std::vector<std::string> cfgKeys(
{toBase58(TokenType::NodePublic, masterPublic)});
BEAST_EXPECT(trustedKeysOuter->load(
emptyLocalKeyOuter, cfgKeys, cfgPublishersOuter));
BEAST_EXPECT(
trustedKeysOuter->load({}, cfgKeys, cfgPublishersOuter));
auto const signingKeys1 = randomKeyPair(KeyType::secp256k1);
auto const signingPublic1 = signingKeys1.first;
@@ -1260,8 +1249,7 @@ private:
std::vector<std::string> cfgPublishers({strHex(publisherPublic)});
std::vector<std::string> emptyCfgKeys;
BEAST_EXPECT(trustedKeys->load(
emptyLocalKeyOuter, emptyCfgKeys, cfgPublishers));
BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgPublishers));
TrustChanges changes = trustedKeys->updateTrusted(
activeValidatorsOuter,
@@ -1305,8 +1293,7 @@ private:
toBeSeen = calcNodeID(valKey);
}
BEAST_EXPECT(trustedKeys->load(
emptyLocalKeyOuter, cfgKeys, cfgPublishersOuter));
BEAST_EXPECT(trustedKeys->load({}, cfgKeys, cfgPublishersOuter));
TrustChanges changes = trustedKeys->updateTrusted(
activeValidators,
@@ -1339,7 +1326,6 @@ private:
app.config().legacy("database_path"),
env.journal);
PublicKey emptyLocalKey;
std::vector<std::string> emptyCfgKeys;
auto const publisherKeys = randomKeyPair(KeyType::secp256k1);
auto const pubSigningKeys = randomKeyPair(KeyType::secp256k1);
@@ -1352,8 +1338,7 @@ private:
std::vector<std::string> cfgKeys({strHex(publisherKeys.first)});
BEAST_EXPECT(
trustedKeys->load(emptyLocalKey, emptyCfgKeys, cfgKeys));
BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgKeys));
std::vector<Validator> list({randomValidator(), randomValidator()});
hash_set<NodeID> activeValidators(
@@ -1463,8 +1448,7 @@ private:
cfgKeys.push_back(toBase58(TokenType::NodePublic, valKey));
activeValidators.emplace(calcNodeID(valKey));
activeKeys.emplace(valKey);
BEAST_EXPECT(trustedKeys->load(
emptyLocalKeyOuter, cfgKeys, cfgPublishers));
BEAST_EXPECT(trustedKeys->load({}, cfgKeys, cfgPublishers));
TrustChanges changes = trustedKeys->updateTrusted(
activeValidators,
env.timeKeeper().now(),
@@ -1564,11 +1548,10 @@ private:
std::vector<std::string> cfgPublishers(
{strHex(publisherPublic)});
PublicKey emptyLocalKey;
std::vector<std::string> emptyCfgKeys;
BEAST_EXPECT(trustedKeys->load(
emptyLocalKey, emptyCfgKeys, cfgPublishers));
BEAST_EXPECT(
trustedKeys->load({}, emptyCfgKeys, cfgPublishers));
auto const version = 1;
auto const sequence = 1;
@@ -1640,9 +1623,8 @@ private:
BEAST_EXPECT(trustedKeys->expires() == std::nullopt);
// Config listed keys have maximum expiry
PublicKey emptyLocalKey;
PublicKey localCfgListed = randomNode();
trustedKeys->load(emptyLocalKey, {toStr(localCfgListed)}, {});
trustedKeys->load({}, {toStr(localCfgListed)}, {});
BEAST_EXPECT(
trustedKeys->expires() &&
trustedKeys->expires().value() == NetClock::time_point::max());
@@ -1688,11 +1670,10 @@ private:
std::vector<std::string> cfgPublishers(
{strHex(publisherPublic)});
PublicKey emptyLocalKey;
std::vector<std::string> emptyCfgKeys;
BEAST_EXPECT(trustedKeys->load(
emptyLocalKey, emptyCfgKeys, cfgPublishers));
BEAST_EXPECT(
trustedKeys->load({}, emptyCfgKeys, cfgPublishers));
auto const version = 2;
auto const sequence1 = 1;
@@ -1795,7 +1776,6 @@ private:
{
testcase("NegativeUNL");
jtx::Env env(*this);
PublicKey emptyLocalKey;
ManifestCache manifests;
auto createValidatorList =
@@ -1820,7 +1800,7 @@ private:
cfgKeys.push_back(toBase58(TokenType::NodePublic, valKey));
activeValidators.emplace(calcNodeID(valKey));
}
if (trustedKeys->load(emptyLocalKey, cfgKeys, cfgPublishers))
if (trustedKeys->load({}, cfgKeys, cfgPublishers))
{
trustedKeys->updateTrusted(
activeValidators,