fix: better comparision for two url paths

Author: sangjanai

engine/main.cc

@@ -325,7 +325,7 @@ void RunServer(std::optional<std::string> host, std::optional<int> port,
           auto handlers = drogon::app().getHandlersInfo();
           bool has_ep = [req, &handlers]() {
             for (auto const& h : handlers) {
-              if (req->path() == std::get<0>(h))
+              if (string_utils::AreUrlPathsEqual(req->path(), std::get<0>(h)))
                 return true;
             }
             return false;
@@ -340,9 +340,12 @@ void RunServer(std::optional<std::string> host, std::optional<int> port,
           std::string supported_methods = [req, &handlers]() {
             std::string methods;
             for (auto const& h : handlers) {
-              if (req->path() == std::get<0>(h)) {
-                methods += drogon::to_string_view(std::get<1>(h));
-                methods += ", ";
+              if (string_utils::AreUrlPathsEqual(req->path(), std::get<0>(h))) {
+                auto m = drogon::to_string_view(std::get<1>(h));
+                if (methods.find(m) == std::string::npos) {
+                  methods += drogon::to_string_view(std::get<1>(h));
+                  methods += ", ";
+                }
               }
             }
             if (methods.size() < 2)

engine/test/components/test_string_utils.cc

@@ -289,3 +289,50 @@ TEST_F(StringUtilsTestSuite, LargeInputPerformance) {
 }
 
 
+TEST_F(StringUtilsTestSuite, UrlPaths_SimilarStrings) {
+  std::string str1 = "/v1/threads/{1}/messages/{2}";
+  std::string str2 = "/v1/threads/xxx/messages/yyy";
+  EXPECT_TRUE( AreUrlPathsEqual(str1, str2));
+}
+
+TEST_F(StringUtilsTestSuite, UrlPaths_DifferentPaths) {
+  std::string str1 = "/v1/threads/{1}/messages/{2}";
+  std::string str2 = "/v1/threads/xxx/messages/yyy/extra";
+  EXPECT_FALSE(AreUrlPathsEqual(str1, str2));
+}
+
+TEST_F(StringUtilsTestSuite, UrlPaths_DifferentPlaceholderCounts) {
+  std::string str1 = "/v1/threads/{1}/messages/{2}";
+  std::string str2 = "/v1/threads/{1}/messages/{2}/{3}";
+  EXPECT_FALSE(AreUrlPathsEqual(str1, str2));
+}
+
+TEST_F(StringUtilsTestSuite, UrlPaths_NoPlaceholders) {
+  std::string str1 = "/v1/threads/1/messages/2";
+  std::string str2 = "/v1/threads/xxx/messages/yyy";
+  EXPECT_FALSE(AreUrlPathsEqual(str1, str2));
+}
+
+TEST_F(StringUtilsTestSuite, UrlPaths_EmptyStrings) {
+  std::string str1 = "";
+  std::string str2 = "";
+  EXPECT_TRUE(AreUrlPathsEqual(str1, str2));
+}
+
+TEST_F(StringUtilsTestSuite, UrlPaths_SinglePlaceholder) {
+  std::string str1 = "/v1/threads/{1}";
+  std::string str2 = "/v1/threads/xxx";
+  EXPECT_TRUE(AreUrlPathsEqual(str1, str2));
+}
+
+TEST_F(StringUtilsTestSuite, UrlPaths_MultiplePlaceholdersSameFormat) {
+  std::string str1 = "/v1/threads/{1}/messages/{2}/comments/{3}";
+  std::string str2 = "/v1/threads/xxx/messages/yyy/comments/zzz";
+  EXPECT_TRUE(AreUrlPathsEqual(str1, str2));
+}
+
+TEST_F(StringUtilsTestSuite, UrlPaths_NonPlaceholderDifferences) {
+  std::string str1 = "/v1/threads/{1}/messages/{2}";
+  std::string str2 = "/v2/threads/xxx/messages/yyy";
+  EXPECT_FALSE(AreUrlPathsEqual(str1, str2));
+}

engine/utils/string_utils.h

@@ -4,6 +4,7 @@
 #include <cctype>
 #include <chrono>
 #include <iomanip>
+#include <regex>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -200,4 +201,31 @@ inline std::string EscapeJson(const std::string& s) {
   }
   return o.str();
 }
+
+// Add a method to compares two url paths
+inline bool AreUrlPathsEqual(const std::string& path1,
+                             const std::string& path2) {
+  auto has_placeholder = [](const std::string& s) {
+    if (s.empty())
+      return false;
+    return s.find_first_of('{') < s.find_last_of('}');
+  };
+  std::vector<std::string> parts1 = SplitBy(path1, "/");
+  std::vector<std::string> parts2 = SplitBy(path2, "/");
+
+  // Check if both strings have the same number of parts
+  if (parts1.size() != parts2.size()) {
+    return false;
+  }
+
+  for (size_t i = 0; i < parts1.size(); ++i) {
+    if (has_placeholder(parts1[i]) || has_placeholder(parts2[i]))
+      continue;
+    if (parts1[i] != parts2[i]) {
+      return false;
+    }
+  }
+
+  return true;
+}
 }  // namespace string_utils