commit a9bda73593b4ed073df9d2c8f512222fbc1b19bb
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Sat May 20 22:58:55 2017 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon May 22 16:53:20 2017 -0700
tree 28dc3489f17ecb91ce8a56cd0d0c56f5eb67fe7b
parent 70fe25837375216fc26a097cad945f3cb29c8f3c

Fix failure status bug: when status is failure, request should be stopped

Change-Id: I699d9ae6bdc34ac67d9a8b3c69e9d789f9709c6d

src/ca-module.cpp

diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 6b93ee4..9df8384 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -192,12 +192,17 @@
     return;
   }
   JsonSection contentJson = challenge->handleChallengeRequest(request, certRequest);
-  try {
-    m_storage->updateRequest(certRequest);
+  if (certRequest.getStatus() == ChallengeModule::FAILURE) {
+    m_storage->deleteRequest(certRequest.getRequestId());
   }
-  catch (const std::exception& e) {
-    _LOG_TRACE("Cannot update request instance " << e.what());
-    return;
+  else {
+    try {
+      m_storage->updateRequest(certRequest);
+    }
+    catch (const std::exception& e) {
+      _LOG_TRACE("Cannot update request instance " << e.what());
+      return;
+    }
   }
 
   Data result;
@@ -233,14 +238,18 @@
     return;
   }
   JsonSection contentJson = challenge->handleChallengeRequest(request, certRequest);
-  try {
-    m_storage->updateRequest(certRequest);
+  if (certRequest.getStatus() == ChallengeModule::FAILURE) {
+    m_storage->deleteRequest(certRequest.getRequestId());
   }
-  catch (const std::exception& e) {
-    _LOG_TRACE("Cannot update request instance " << e.what());
-    return;
+  else {
+    try {
+      m_storage->updateRequest(certRequest);
+    }
+    catch (const std::exception& e) {
+      _LOG_TRACE("Cannot update request instance " << e.what());
+      return;
+    }
   }
-
   Data result;
   result.setName(request.getName());
   result.setContent(dataContentFromJson(contentJson));