commit cd33902645ddeef5b0bc390856897a603da7e4e0
author Yingdi Yu <yuyingdi@gmail.com> Wed Nov 05 17:51:19 2014 -0800
committer Yingdi Yu <yuyingdi@gmail.com> Wed Nov 05 19:28:40 2014 -0800
tree e3bba5b2e3e077d01e550847a302a7870623e5b1
parent 906c2eab6dc58eeb86b85e635b47606edb684e9c

security: Introduce validator

Change-Id: I38dbed9f07abd779ed7666771759d546cbfb0d20

src/logic.cpp

diff --git a/src/logic.cpp b/src/logic.cpp
index f584da5..4c3fc55 100644
--- a/src/logic.cpp
+++ b/src/logic.cpp
@@ -49,6 +49,8 @@
 int Logic::m_instanceCounter = 0;
 #endif
 
+const ndn::Name Logic::DEFAULT_NAME;
+const ndn::shared_ptr<ndn::Validator> Logic::DEFAULT_VALIDATOR;
 const time::steady_clock::Duration Logic::DEFAULT_RESET_TIMER = time::seconds(0);
 const time::steady_clock::Duration Logic::DEFAULT_CANCEL_RESET_TIMER = time::milliseconds(500);
 const time::milliseconds Logic::DEFAULT_RESET_INTEREST_LIFETIME(1000);
@@ -62,6 +64,8 @@
              const Name& syncPrefix,
              const Name& userPrefix,
              const UpdateCallback& onUpdate,
+             const Name& signingId,
+             ndn::shared_ptr<ndn::Validator> validator,
              const time::steady_clock::Duration& resetTimer,
              const time::steady_clock::Duration& cancelResetTimer,
              const time::milliseconds& resetInterestLifetime,
@@ -84,6 +88,8 @@
   , m_resetInterestLifetime(resetInterestLifetime)
   , m_syncInterestLifetime(syncInterestLifetime)
   , m_syncReplyFreshness(syncReplyFreshness)
+  , m_signingId(signingId)
+  , m_validator(validator)
 {
 #ifdef _DEBUG
   m_instanceId = m_instanceCounter++;
@@ -250,8 +256,12 @@
 Logic::onSyncData(const Interest& interest, Data& data)
 {
   _LOG_DEBUG_ID(">> Logic::onSyncData");
-  // Place holder for validator.
-  onSyncDataValidated(data.shared_from_this());
+  if (static_cast<bool>(m_validator))
+    m_validator->validate(data,
+                          bind(&Logic::onSyncDataValidated, this, _1),
+                          bind(&Logic::onSyncDataValidationFailed, this, _1));
+  else
+    onSyncDataValidated(data.shared_from_this());
   _LOG_DEBUG_ID("<< Logic::onSyncData");
 }
 
@@ -544,7 +554,11 @@
   shared_ptr<Data> syncReply = make_shared<Data>(name);
   syncReply->setContent(state.wireEncode());
   syncReply->setFreshnessPeriod(m_syncReplyFreshness);
-  m_keyChain.sign(*syncReply);
+
+  if (m_signingId.empty())
+    m_keyChain.sign(*syncReply);
+  else
+    m_keyChain.signByIdentity(*syncReply, m_signingId);
 
   m_face.put(*syncReply);