commit 693c12724b58c009db8cb8c477ca2451a665ec43
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Sat May 20 22:58:55 2017 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Sun Jun 04 22:55:07 2017 -0700
tree 8562020af667f298c3a37178ab4a9243c005dedd
parent 7ed6204f927d5a26c1c12010028c755cbd8edb24

Fix the logic in handle new: add cert request check and interest check

Change-Id: I1c60251f6192a14a57eee8398237c6c1e94e633e

src/ca-module.cpp

diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 15f28e0..94fb2bc 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -85,7 +85,7 @@
       m_registeredPrefixIds.push_back(prefixId);
     }
     catch (const std::exception& e) {
-      _LOG_TRACE("Error: " << e.what());
+      _LOG_ERROR(e.what());
     }
   }
 }
@@ -137,9 +137,19 @@
     clientCert.wireDecode(request.getName().at(caItem.m_caName.size() + 2).blockFromValue());
   }
   catch (const std::exception& e) {
-    _LOG_TRACE("Unrecognized certificate request " << e.what());
+    _LOG_ERROR("Unrecognized certificate request " << e.what());
     return;
   }
+
+  if (!security::verifySignature(clientCert, clientCert)) {
+    _LOG_TRACE("Cert request with bad signature.");
+    return;
+  }
+  if (!security::verifySignature(request, clientCert)) {
+    _LOG_TRACE("Interest with bad signature.");
+    return;
+  }
+
   std::string requestId = std::to_string(random::generateWord64());
   CertificateRequest certRequest(caItem.m_caName, requestId, clientCert);
   certRequest.setStatus(ChallengeModule::WAIT_SELECTION);
@@ -174,7 +184,7 @@
   }
 
   if (!security::verifySignature(request, certRequest.getCert())) {
-    _LOG_TRACE("Error: Interest with bad signature.");
+    _LOG_TRACE("Interest with bad signature.");
     return;
   }
 
@@ -183,7 +193,7 @@
     challengeType = readString(request.getName().at(caItem.m_caName.size() + 3));
   }
   catch (const std::exception& e) {
-    _LOG_TRACE(e.what());
+    _LOG_ERROR(e.what());
     return;
   }
   _LOG_TRACE("SELECT request choosing challenge " << challengeType);
@@ -228,7 +238,7 @@
   }
 
   if (!security::verifySignature(request, certRequest.getCert())) {
-    _LOG_TRACE("Error: Interest with bad signature.");
+    _LOG_TRACE("Interest with bad signature.");
     return;
   }
 
@@ -276,7 +286,7 @@
   }
 
   if (!security::verifySignature(request, certRequest.getCert())) {
-    _LOG_TRACE("Error: Interest with bad signature.");
+    _LOG_TRACE("Interest with bad signature.");
     return;
   }
 
@@ -308,7 +318,7 @@
     signedCert = m_storage->getCertificate(requestId);
   }
   catch (const std::exception& e) {
-    _LOG_TRACE("Error: " << e.what());
+    _LOG_ERROR(e.what());
     return;
   }
 
@@ -327,6 +337,7 @@
   security::v2::Certificate newCert;
   newCert.setName(certName);
   newCert.setContent(certRequest.getCert().getContent());
+  _LOG_TRACE("cert request content " << certRequest.getCert());
   SignatureInfo signatureInfo;
   security::ValidityPeriod period(time::system_clock::now(),
                                   time::system_clock::now() + caItem.m_validityPeriod);
@@ -336,13 +347,14 @@
   newCert.setFreshnessPeriod(caItem.m_freshnessPeriod);
 
   m_keyChain.sign(newCert, signingInfo);
+  _LOG_TRACE("new cert got signed" << newCert);
   try {
     m_storage->addCertificate(certRequest.getRequestId(), newCert);
     m_storage->deleteRequest(certRequest.getRequestId());
     _LOG_TRACE("New Certificate Issued " << certName);
   }
   catch (const std::exception& e) {
-    _LOG_TRACE("Error: Cannot add issued cert and remove the request " << e.what());
+    _LOG_ERROR("Cannot add issued cert and remove the request " << e.what());
     return;
   }
 }
@@ -357,7 +369,7 @@
     certRequest = m_storage->getRequest(requestId);
   }
   catch (const std::exception& e) {
-    _LOG_TRACE("Error: " << e.what());
+    _LOG_ERROR(e.what());
   }
   return certRequest;
 }
@@ -365,7 +377,7 @@
 void
 CaModule::onRegisterFailed(const std::string& reason)
 {
-  _LOG_TRACE("Error: failed to register prefix in local hub's daemon, REASON: " << reason);
+  _LOG_ERROR("Failed to register prefix in local hub's daemon, REASON: " << reason);
 }
 
 Block
@@ -384,7 +396,7 @@
     jsonString = encoding::readString(name.at(pos));
   }
   catch (const std::exception& e) {
-    _LOG_TRACE(e.what());
+    _LOG_ERROR(e.what());
     return JsonSection();
   }
   std::istringstream ss(jsonString);