refactor: throw exceptions if errors are detected, instead of just logging them.

Author: JoshuaSBrown

common/source/CipherEngine.cpp

@@ -42,7 +42,15 @@ namespace SDMS{
         std::fill_n(output.get(), paddedLength + SDMS::CipherEngine::NULL_TERMINATOR_SIZE, 0);  // manually zero-initialize
         const int outputLength = EVP_EncodeBlock(reinterpret_cast<unsigned char*>(output.get()), input, length);
         if (paddedLength != outputLength)
-        {  DL_ERROR(log_context, "Output Length (" << outputLength <<") and Predicted Padded Length ("<< paddedLength <<" ) of encoded bytes not equal!"); }
+        {
+          std::ostringstream oss;
+          oss << "Output Length (" << outputLength
+              << ") and Predicted Padded Length (" << paddedLength
+              << ") of encoded bytes not equal!";
+
+          DL_ERROR(log_context, oss.str());
+          EXCEPT_PARAM(1, oss.str());
+        }
         return output;
     }
 
@@ -54,8 +62,15 @@ namespace SDMS{
         auto output = std::make_unique<unsigned char[]>(paddedLength+SDMS::CipherEngine::NULL_TERMINATOR_SIZE);
         std::fill_n(output.get(), paddedLength+SDMS::CipherEngine::NULL_TERMINATOR_SIZE, 0);
         const int outputLength = EVP_DecodeBlock(output.get(), reinterpret_cast<const unsigned char*>(input), length);
-        if (paddedLength != outputLength)
-        { DL_ERROR(log_context, "Output Length (" << outputLength <<") and Predicted Padded Length ("<< paddedLength <<" ) of decoded bytes not equal!"); }
+        if (paddedLength != outputLength) {
+          std::ostringstream oss;
+          oss << "Output Length (" << outputLength
+              << ") and Predicted Padded Length (" << paddedLength
+              << ") of decoded bytes not equal!";
+
+          DL_ERROR(log_context, oss.str());
+          EXCEPT_PARAM(1, oss.str());
+        }
         return output;
     }
     void CipherEngine::generateIV(unsigned char *iv)
@@ -107,7 +122,7 @@ bool CipherEngine::tokenNeedsUpdate(const Value::Object &obj)
     CipherEngine::CipherBytes CipherEngine::encryptAlgorithm(unsigned char *iv, const std::string& msg, LogContext log_context)
     {
         if (msg.length() > MAX_MSG_LENGTH) {
-            throw TraceException(__FILE__, __LINE__, 0, std::string("Message too long for encryption"));
+            EXCEPT_PARAM(0, std::string("Message too long for encryption"));
         }
         EVP_CIPHER_CTX *ctx = nullptr;
         CipherBytes bytes_result = {};

common/tests/unit/CMakeLists.txt

@@ -21,11 +21,13 @@ foreach(PROG
   add_executable(unit_${PROG} ${${PROG}_SOURCES})
   if(BUILD_SHARED_LIBS)
     target_link_libraries(unit_${PROG} PRIVATE ${DATAFED_BOOST_LIBRARIES}
-      common libzmq protobuf::libprotobuf Threads::Threads)
+      common libzmq protobuf::libprotobuf Threads::Threads
+      "${OPENSSL_SSL_LIBRARY}" "${OPENSSL_CRYPTO_LIBRARY}" )
     target_compile_definitions(unit_${PROG} PRIVATE BOOST_TEST_DYN_LINK)
   else()
     target_link_libraries(unit_${PROG} PRIVATE ${DATAFED_BOOST_LIBRARIES}
-      common libzmq-static protobuf::libprotobuf Threads::Threads)
+      common libzmq-static protobuf::libprotobuf Threads::Threads
+      "${OPENSSL_SSL_LIBRARY}" "${OPENSSL_CRYPTO_LIBRARY}" )
   endif()
   # Only want this if using shared boost libraries
   if ( ENABLE_UNIT_TESTS )

common/tests/unit/test_CipherEngine.cpp

@@ -41,8 +41,31 @@ BOOST_AUTO_TEST_CASE(testing_KeyGeneration)
             finalArray[lv] = keyArray[lv];
     }
     BOOST_CHECK(sizeof(finalArray)==SDMS::CipherEngine::KEY_LENGTH);
+
+    // Assert that the generated key is not all zeros
+    bool all_zeros = true;
+    for (int i = 0; i < SDMS::CipherEngine::KEY_LENGTH; ++i) {
+        if (token_key[i] != 0) {
+            all_zeros = false;
+            break;
+        }
+    }
+    BOOST_CHECK(!all_zeros);
+    // Generate a second key and check that it is different from the first
+    unsigned char second_key[SDMS::CipherEngine::KEY_LENGTH];
+    CipherEngine::generateEncryptionKey(second_key);
+    bool keys_are_different = false;
+    for (int i = 0; i < SDMS::CipherEngine::KEY_LENGTH; ++i) {
+        if (token_key[i] != second_key[i]) {
+            keys_are_different = true;
+            break;
+        }
+    }
+    BOOST_CHECK(keys_are_different);
 }
 
+
+
 BOOST_AUTO_TEST_CASE(test_EncryptionDecryption)
 {
     LogContext log_context;