commit d574102016b41802c32a61c4255a88584705c2c6
author Patrick Venture <venture@google.com> Mon Jun 17 09:08:35 2019 -0700
committer Patrick Venture <venture@google.com> Mon Jun 17 10:05:45 2019 -0700
tree 379e7c27f4e99dc0f227ac2cf75a1ecd55f28373
parent 7a5dcd8c213972b5abc6e05c663d37cf004bda7f

bmc: abort from verificationStarted

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I649ad1779075ef07908740a1430ca285f856512c

firmware_handler.cpp

diff --git a/firmware_handler.cpp b/firmware_handler.cpp
index 865c045..03342aa 100644
--- a/firmware_handler.cpp
+++ b/firmware_handler.cpp
@@ -655,10 +655,12 @@
              */
             break;
         case UpdateState::verificationStarted:
-            /* TODO: If they close this blob before verification finishes,
-             * that's an abort.
+            /* Abort without checking to see if it happened to finish. Require
+             * the caller to stat() deliberately.
              */
-            return false;
+            abortVerification();
+            abortProcess();
+            break;
         case UpdateState::verificationCompleted:
             if (lastVerificationStatus == ActionStatus::success)
             {
@@ -723,6 +725,24 @@
     return {};
 }
 
+void FirmwareBlobHandler::abortProcess()
+{
+    /* Closing of open files is handled from close() -- Reaching here from
+     * delete may never be supported.
+     */
+    removeBlobId(verifyBlobId);
+    removeBlobId(updateBlobId);
+    removeBlobId(activeImageBlobId);
+    removeBlobId(activeHashBlobId);
+
+    state = UpdateState::notYetStarted;
+}
+
+void FirmwareBlobHandler::abortVerification()
+{
+    verification->abort();
+}
+
 bool FirmwareBlobHandler::triggerVerification()
 {
     bool result = verification->trigger();

firmware_handler.hpp

diff --git a/firmware_handler.hpp b/firmware_handler.hpp
index 1f7032b..8883176 100644
--- a/firmware_handler.hpp
+++ b/firmware_handler.hpp
@@ -156,6 +156,9 @@
     bool stat(uint16_t session, blobs::BlobMeta* meta) override;
     bool expire(uint16_t session) override;
 
+    void abortProcess();
+
+    void abortVerification();
     bool triggerVerification();
     bool triggerUpdate();
 

test/firmware_state_verificationstarted_unittest.cpp

diff --git a/test/firmware_state_verificationstarted_unittest.cpp b/test/firmware_state_verificationstarted_unittest.cpp
index 03ceb99..ba76503 100644
--- a/test/firmware_state_verificationstarted_unittest.cpp
+++ b/test/firmware_state_verificationstarted_unittest.cpp
@@ -263,8 +263,22 @@
 /*
  * close(session) - close while state if verificationStarted without calling
  * stat first will abort.
- * TODO: implement this test when we implement abort.
  */
+TEST_F(FirmwareHandlerVerificationStartedTest,
+       CloseOnVerifyDuringVerificationAbortsProcess)
+{
+    getToVerificationStarted(staticLayoutBlobId);
+    EXPECT_CALL(*verifyMockPtr, abort()).Times(1);
+
+    EXPECT_TRUE(handler->close(session));
+
+    std::vector<std::string> expectedBlobs = {staticLayoutBlobId, hashBlobId};
+
+    EXPECT_THAT(handler->getBlobIds(),
+                UnorderedElementsAreArray(expectedBlobs));
+
+    expectedState(FirmwareBlobHandler::UpdateState::notYetStarted);
+}
 
 } // namespace
 } // namespace ipmi_flash