Refactored sha1 & md5 utils to share implementation and reduce code duplication.

Author: eduar-hte

src/Makefile.am

@@ -248,11 +248,9 @@ UTILS = \
 	utils/geo_lookup.cc \
 	utils/https_client.cc \
 	utils/ip_tree.cc \
-	utils/md5.cc \
 	utils/msc_tree.cc \
 	utils/random.cc \
 	utils/regex.cc \
-	utils/sha1.cc \
 	utils/system.cc \
 	utils/shared_files.cc
 

src/utils/md5.cc

@@ -13,29 +13,20 @@
  *
  */
 
-#include <string>
-
-#include "modsecurity/actions/action.h"
-#include "src/actions/transformations/transformation.h"
-
 #ifndef SRC_UTILS_MD5_H_
 #define SRC_UTILS_MD5_H_
 
-#include <cstring>
-#include <iostream>
+#include "src/utils/sha1.h"
+#include "mbedtls/md5.h"
+#include <string>
 
-namespace modsecurity {
-namespace Utils {
+namespace modsecurity::Utils {
 
-class Md5 {
- public:
-    Md5() { }
 
-    static std::string hexdigest(const std::string& input);
-    static std::string digest(const std::string& input);
+class Md5 : public DigestImpl<mbedtls_md5, 16> {
 };
 
-}  // namespace Utils
-}  // namespace modsecurity
+
+}  // namespace modsecurity::Utils
 
 #endif  // SRC_UTILS_MD5_H_

src/utils/md5.h

@@ -13,26 +13,63 @@
  *
  */
 
-
 #ifndef SRC_UTILS_SHA1_H_
 #define SRC_UTILS_SHA1_H_
 
-#include <algorithm>
-#include <iostream>
 #include <string>
+#include <cassert>
+
+#include "src/utils/string.h"
+#include "mbedtls/sha1.h"
+
+namespace modsecurity::Utils {
+
 
-namespace modsecurity {
-namespace Utils {
+using DigestOp = int (*)(const unsigned char *, size_t, unsigned char []);
 
-class Sha1 {
+
+template<DigestOp digestOp, int DigestSize>
+class DigestImpl {
  public:
-    Sha1() { }
 
-    static std::string hexdigest(const std::string& input);
-    static std::string digest(const std::string& input);
+    static std::string digest(const std::string& input) {
+        return digestHelper(input, [](const auto digest) { 
+            return std::string(digest);
+        });
+    }
+
+    static void digestReplace(std::string& value) {
+        digestHelper(value, [&value](const auto digest) mutable { 
+            value = digest;
+        });
+    }
+
+    static std::string hexdigest(const std::string &input) {
+        return digestHelper(input, [](const auto digest) { 
+            return utils::string::string_to_hex(digest);
+        });
+    }
+
+private:
+
+    template<typename ConvertOp>
+    static auto digestHelper(const std::string &input,
+        ConvertOp convertOp) -> auto {
+        char digest[DigestSize];
+
+        auto ret = digestOp(reinterpret_cast<const unsigned char *>(input.c_str()),
+                 input.size(), reinterpret_cast<unsigned char *>(digest));
+        assert(ret == 0);
+
+        return convertOp(std::string_view(digest, DigestSize));
+    }
 };
 
-}  // namespace Utils
-}  // namespace modsecurity
+
+class Sha1 : public DigestImpl<mbedtls_sha1, 20> {
+};
+
+
+}  // namespace modsecurity::Utils
 
 #endif  // SRC_UTILS_SHA1_H_