Convert to v2::security and adapt to ndn-cxx changes
Change-Id: I54f1b758cfb8f3f6cbc66a1aec5120ae1640b0ec
refs: #3964
diff --git a/src/update/manager-base.cpp b/src/update/manager-base.cpp
index 5a1034c..a93aaba 100644
--- a/src/update/manager-base.cpp
+++ b/src/update/manager-base.cpp
@@ -55,7 +55,7 @@
const ndn::Interest& interest,
const ndn::mgmt::ControlParameters& parameters,
const ndn::mgmt::CommandContinuation& done)
- {
+{
const ndn::nfd::ControlParameters& castParams =
static_cast<const ndn::nfd::ControlParameters&>(parameters);
diff --git a/src/update/manager-base.hpp b/src/update/manager-base.hpp
index 33df589..0dddbd6 100644
--- a/src/update/manager-base.hpp
+++ b/src/update/manager-base.hpp
@@ -103,9 +103,9 @@
{
public:
CommandManagerBase(ndn::mgmt::Dispatcher& m_dispatcher,
- NamePrefixList& m_namePrefixList,
- Lsdb& lsdb,
- const std::string& module);
+ NamePrefixList& m_namePrefixList,
+ Lsdb& lsdb,
+ const std::string& module);
/*! \brief add desired name prefix to the advertised name prefix list
* or insert a prefix into the FIB if parameters is valid.
diff --git a/src/update/prefix-update-processor.cpp b/src/update/prefix-update-processor.cpp
index 4ad75dd..478380f 100644
--- a/src/update/prefix-update-processor.cpp
+++ b/src/update/prefix-update-processor.cpp
@@ -24,7 +24,7 @@
#include "nlsr.hpp"
#include <ndn-cxx/mgmt/nfd/control-response.hpp>
#include <ndn-cxx/tag.hpp>
-#include <ndn-cxx/util/io.hpp>
+#include <ndn-cxx/face.hpp>
namespace nlsr {
namespace update {
@@ -52,13 +52,10 @@
PrefixUpdateProcessor::PrefixUpdateProcessor(ndn::mgmt::Dispatcher& dispatcher,
ndn::Face& face,
NamePrefixList& namePrefixList,
- Lsdb& lsdb,
- const ndn::Name broadcastPrefix,
- ndn::KeyChain& keyChain,
- std::shared_ptr<ndn::CertificateCacheTtl> certificateCache,
- security::CertificateStore& certStore)
+ Lsdb& lsdb)
: CommandManagerBase(dispatcher, namePrefixList, lsdb, "prefix-update")
- , m_validator(face, broadcastPrefix, certificateCache, certStore)
+
+ , m_validator(ndn::make_unique<ndn::security::v2::CertificateFetcherDirectFetch>(face))
{
NLSR_LOG_DEBUG("Setting dispatcher to capture Interests for: "
<< ndn::Name(Nlsr::LOCALHOST_PREFIX).append("prefix-update"));
@@ -84,17 +81,16 @@
const ndn::mgmt::AcceptContinuation& accept,
const ndn::mgmt::RejectContinuation& reject) {
m_validator.validate(interest,
- [accept] (const std::shared_ptr<const ndn::Interest>& request) {
+ [accept] (const ndn::Interest& request) {
- auto signer1 = getSignerFromTag(*request);
+ auto signer1 = getSignerFromTag(request);
std::string signer = signer1.value_or("*");
- NLSR_LOG_DEBUG("accept " << request->getName() << " signer=" << signer);
+ NLSR_LOG_DEBUG("accept " << request.getName() << " signer=" << signer);
accept(signer);
},
- [reject] (const std::shared_ptr<const ndn::Interest>& request,
- const std::string& failureInfo) {
- NLSR_LOG_DEBUG("reject " << request->getName() << " signer=" <<
- getSignerFromTag(*request).value_or("?") << ' ' << failureInfo);
+ [reject] (const ndn::Interest& request, const ndn::security::v2::ValidationError& error) {
+ NLSR_LOG_DEBUG("reject " << request.getName() << " signer=" <<
+ getSignerFromTag(request).value_or("?") << ' ' << error);
reject(ndn::mgmt::RejectReply::STATUS403);
});
};
diff --git a/src/update/prefix-update-processor.hpp b/src/update/prefix-update-processor.hpp
index 52780e6..a602497 100644
--- a/src/update/prefix-update-processor.hpp
+++ b/src/update/prefix-update-processor.hpp
@@ -25,11 +25,11 @@
#include "manager-base.hpp"
#include "prefix-update-commands.hpp"
#include "test-access-control.hpp"
-#include "validator.hpp"
-#include <ndn-cxx/security/certificate-cache-ttl.hpp>
+#include <ndn-cxx/util/io.hpp>
#include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/security/v2/validator.hpp>
+#include <ndn-cxx/security/v2/certificate-storage.hpp>
+#include <ndn-cxx/util/io.hpp>
#include <boost/property_tree/ptree.hpp>
#include <memory>
@@ -50,11 +50,7 @@
PrefixUpdateProcessor(ndn::mgmt::Dispatcher& dispatcher,
ndn::Face& face,
NamePrefixList& namePrefixList,
- Lsdb& lsdb,
- const ndn::Name broadcastPrefix,
- ndn::KeyChain& keyChain,
- std::shared_ptr<ndn::CertificateCacheTtl> certificateCache,
- security::CertificateStore& certStore);
+ Lsdb& lsdb);
/*! \brief Load the validator's configuration from a section of a
* configuration file.
@@ -70,8 +66,7 @@
void
loadValidator(ConfigSection section, const std::string& filename);
-PUBLIC_WITH_TESTS_ELSE_PRIVATE:
- Validator&
+ ndn::security::ValidatorConfig&
getValidator()
{
return m_validator;
@@ -88,7 +83,7 @@
makeAuthorization();
private:
- Validator m_validator;
+ ndn::security::ValidatorConfig m_validator;
};
} // namespace update