commit a1fc62305e703423f8c6494ee1f31c7a0a592fff
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Thu Jun 13 14:56:59 2019 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Thu Jun 13 15:25:47 2019 -0700
tree e3e193ff4e8a08306d6515319635972ab0efa7e8
parent 5f749a25c6374e6f8977d6e6e4c095338155e6ba

CA config and Client config: update format and semantics of probe

Refs: https://github.com/named-data/ndncert/wiki/NDNCERT-CA-Configuration

Change-Id: Ia0a8def6aea8565533a0f5364c44768d3849f18f

src/ca-module.cpp

diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 1794528..74985aa 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -195,18 +195,24 @@
   if (probeTokenStr != "") {
     try {
       std::stringstream ss(probeTokenStr);
-      probeToken = io::load<security::v2::Certificate>(ss);
+      probeToken = io::load<Data>(ss);
     }
     catch (const std::exception& e) {
       _LOG_ERROR("Unrecognized probe token " << e.what());
       return;
     }
   }
-  if (probeToken != nullptr) {
+  if (probeToken == nullptr && m_config.m_probe != "") {
+    // the CA requires PROBE before NEW
+    _LOG_ERROR("CA requires PROBE but no PROBE token is found in NEW Interest.");
+    return;
+  }
+  else if (probeToken != nullptr) {
+    // check whether the carried probe token is a PROBE Data packet
     Name prefix = m_config.m_caName;
     prefix.append("CA").append("_PROBE");
     if (!prefix.isPrefixOf(probeToken->getName())) {
-      // the carried probe token is not a Probe Data packet
+      _LOG_ERROR("Carried PROBE token is not a valid PROBE Data packet.");
       return;
     }
   }
@@ -231,7 +237,7 @@
     const auto& key = pib.getIdentity(m_config.m_caName).getDefaultKey();
     const auto& caCert = key.getDefaultCertificate();
     if (!security::verifySignature(*probeToken, caCert)) {
-      _LOG_TRACE("Token with bad signature.");
+      _LOG_TRACE("PROBE Token with bad signature.");
       return;
     }
   }