tests: sync common testing infrastructure with ndn-cxx
Change-Id: I6feab5247231abc35b8daa96bca21ad17c9cc4b3
diff --git a/tests/daemon/mgmt/command-authenticator.t.cpp b/tests/daemon/mgmt/command-authenticator.t.cpp
index fc24ccd..4415b11 100644
--- a/tests/daemon/mgmt/command-authenticator.t.cpp
+++ b/tests/daemon/mgmt/command-authenticator.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -106,9 +106,9 @@
Name id0("/localhost/CommandAuthenticator/0");
Name id1("/localhost/CommandAuthenticator/1");
Name id2("/localhost/CommandAuthenticator/2");
- BOOST_REQUIRE(addIdentity(id0));
- BOOST_REQUIRE(saveIdentityCertificate(id1, "1.ndncert", true));
- BOOST_REQUIRE(saveIdentityCertificate(id2, "2.ndncert", true));
+ BOOST_REQUIRE(m_keyChain.createIdentity(id0));
+ BOOST_REQUIRE(saveIdentityCert(id1, "1.ndncert", true));
+ BOOST_REQUIRE(saveIdentityCert(id2, "2.ndncert", true));
makeModules({"module0", "module1", "module2", "module3", "module4", "module5", "module6", "module7"});
const std::string& config = R"CONFIG(
@@ -196,8 +196,8 @@
{
Name id0("/localhost/CommandAuthenticator/0");
Name id1("/localhost/CommandAuthenticator/1");
- BOOST_REQUIRE(addIdentity(id0));
- BOOST_REQUIRE(saveIdentityCertificate(id1, "1.ndncert", true));
+ BOOST_REQUIRE(m_keyChain.createIdentity(id0));
+ BOOST_REQUIRE(saveIdentityCert(id1, "1.ndncert", true));
makeModules({"module0", "module1"});
const std::string& config = R"CONFIG(
@@ -241,7 +241,7 @@
IdentityAuthorizedFixture()
: id1("/localhost/CommandAuthenticator/1")
{
- BOOST_REQUIRE(saveIdentityCertificate(id1, "1.ndncert", true));
+ BOOST_REQUIRE(saveIdentityCert(id1, "1.ndncert", true));
makeModules({"module1"});
const std::string& config = R"CONFIG(
@@ -322,7 +322,7 @@
BOOST_AUTO_TEST_CASE(NotAuthorized)
{
Name id0("/localhost/CommandAuthenticator/0");
- BOOST_REQUIRE(addIdentity(id0));
+ BOOST_REQUIRE(m_keyChain.createIdentity(id0));
BOOST_CHECK_EQUAL(authorize("module1", id0), false);
BOOST_CHECK(lastRejectReply == ndn::mgmt::RejectReply::STATUS403);
@@ -357,7 +357,7 @@
BOOST_FIXTURE_TEST_CASE(MissingAuthorizationsSection, CommandAuthenticatorFixture)
{
Name id0("/localhost/CommandAuthenticator/0");
- BOOST_REQUIRE(addIdentity(id0));
+ BOOST_REQUIRE(m_keyChain.createIdentity(id0));
makeModules({"module42"});
loadConfig("");
diff --git a/tests/daemon/mgmt/manager-common-fixture.cpp b/tests/daemon/mgmt/manager-common-fixture.cpp
index ebead64..67ac46b 100644
--- a/tests/daemon/mgmt/manager-common-fixture.cpp
+++ b/tests/daemon/mgmt/manager-common-fixture.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -25,8 +25,6 @@
#include "manager-common-fixture.hpp"
-#include <ndn-cxx/security/signing-helpers.hpp>
-
namespace nfd {
namespace tests {
@@ -35,7 +33,7 @@
CommandInterestSignerFixture::CommandInterestSignerFixture()
: m_commandInterestSigner(m_keyChain)
{
- BOOST_REQUIRE(this->addIdentity(DEFAULT_COMMAND_SIGNER_IDENTITY));
+ BOOST_REQUIRE(m_keyChain.createIdentity(DEFAULT_COMMAND_SIGNER_IDENTITY));
}
Interest
@@ -196,7 +194,7 @@
void
ManagerFixtureWithAuthenticator::setPrivilege(const std::string& privilege)
{
- saveIdentityCertificate(DEFAULT_COMMAND_SIGNER_IDENTITY, "ManagerCommonFixture.ndncert");
+ saveIdentityCert(DEFAULT_COMMAND_SIGNER_IDENTITY, "ManagerCommonFixture.ndncert");
const std::string& config = R"CONFIG(
authorizations
diff --git a/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp b/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
index 9c8b87a..616b6e8 100644
--- a/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
+++ b/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2020, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -30,6 +30,9 @@
#include "tests/daemon/global-io-fixture.hpp"
#include "tests/daemon/rib/fib-updates-common.hpp"
+#include <ndn-cxx/security/transform/base64-encode.hpp>
+#include <ndn-cxx/security/transform/buffer-source.hpp>
+#include <ndn-cxx/security/transform/stream-sink.hpp>
#include <ndn-cxx/util/dummy-client-face.hpp>
#include <boost/property_tree/info_parser.hpp>
@@ -137,7 +140,7 @@
/** \brief Lookup a route with PREFIXANN origin.
*/
Route*
- findAnnRoute(const Name& name, uint64_t faceId)
+ findAnnRoute(const Name& name, uint64_t faceId) const
{
Route routeQuery;
routeQuery.faceId = faceId;
@@ -145,6 +148,21 @@
return rib.find(name, routeQuery);
}
+ /** \brief Retrieve an identity certificate as a base64 string.
+ */
+ std::string
+ getIdentityCertificateBase64(const Name& identity) const
+ {
+ auto cert = m_keyChain.getPib().getIdentity(identity).getDefaultKey().getDefaultCertificate();
+ const auto& block = cert.wireEncode();
+
+ namespace tr = ndn::security::transform;
+ std::ostringstream oss;
+ tr::bufferSource(block.wire(), block.size()) >> tr::base64Encode(false) >> tr::streamSink(oss);
+
+ return oss.str();
+ }
+
private:
void
loadDefaultPaConfig()
@@ -158,7 +176,7 @@
manager->applyPaConfig(makeSection(CONFIG), "default");
}
-public:
+protected:
rib::Rib rib;
unique_ptr<RibManager> manager;
diff --git a/tests/daemon/mgmt/rib-manager.t.cpp b/tests/daemon/mgmt/rib-manager.t.cpp
index 6ed5b0a..b688996 100644
--- a/tests/daemon/mgmt/rib-manager.t.cpp
+++ b/tests/daemon/mgmt/rib-manager.t.cpp
@@ -31,7 +31,6 @@
#include <ndn-cxx/lp/tags.hpp>
#include <ndn-cxx/mgmt/nfd/face-status.hpp>
#include <ndn-cxx/mgmt/nfd/rib-entry.hpp>
-#include <ndn-cxx/security/signing-helpers.hpp>
#include <boost/property_tree/info_parser.hpp>
@@ -129,8 +128,8 @@
, m_fibUpdater(m_rib, m_nfdController)
, m_manager(m_rib, m_face, m_keyChain, m_nfdController, m_dispatcher)
{
- addIdentity(m_anchorId);
- addIdentity(m_derivedId);
+ m_keyChain.createIdentity(m_anchorId);
+ m_keyChain.createIdentity(m_derivedId);
m_derivedCert = m_keyChain.getPib().getIdentity(m_derivedId).getDefaultKey().getDefaultCertificate();
ndn::SignatureInfo signatureInfo;
@@ -138,7 +137,7 @@
ndn::security::SigningInfo signingInfo(ndn::security::SigningInfo::SIGNER_TYPE_ID,
m_anchorId, signatureInfo);
m_keyChain.sign(m_derivedCert, signingInfo);
- saveIdentityCertificate(m_anchorId, "signer.ndncert", true);
+ saveIdentityCert(m_anchorId, "signer.ndncert", true);
if (m_status.isLocalhostConfigured) {
m_manager.applyLocalhostConfig(getValidatorConfigSection(), "test");