Method mapping: Added support to map HTTP methods

nawaz1991 · Jul 6, 2024 · 0dd4b9b · 0dd4b9b
1 parent 6e3d1e7
commit 0dd4b9b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/include/oas_validator_imp.hpp b/include/oas_validator_imp.hpp
@@ -15,7 +15,8 @@
 class OASValidatorImp
 {
 public:
-    explicit OASValidatorImp(const std::string& oas_specs, bool head_mapped_get = false);
+    explicit OASValidatorImp(const std::string& oas_specs,
+                             const std::unordered_map<std::string, std::unordered_set<std::string>>& method_map = {});
     ValidationError ValidateRoute(const std::string& method, const std::string& http_path, std::string& error_msg);
     ValidationError ValidateBody(const std::string& method, const std::string& http_path, const std::string& json_body,
                                  std::string& error_msg);
@@ -45,17 +46,17 @@ class OASValidatorImp
         PathTrie path_trie{};
     };
 
-    bool head_mapped_get_;
+    const std::unordered_map<std::string, std::unordered_set<std::string>> method_map_;
     std::array<PerMethod, static_cast<size_t>(HttpMethod::COUNT)> oas_validators_{};
     MethodValidator method_validator_{};
 
-    ValidationError GetValidators(const std::string& method, const std::string& http_path, ValidatorsStore*& validators,
-                                  std::string& error_msg, std::unordered_map<size_t, ParamRange>* param_idxs = nullptr,
-                                  std::string* query = nullptr);
     ValidationError GetValidators(const std::string& method, const std::string& mapped_method,
                                   const std::string& http_path, ValidatorsStore*& validators, std::string& error_msg,
                                   std::unordered_map<size_t, ParamRange>* param_idxs = nullptr,
                                   std::string* query = nullptr);
+    ValidationError GetValidators(const std::string& method, const std::string& http_path, ValidatorsStore*& validators,
+                                  std::string& error_msg, std::unordered_map<size_t, ParamRange>* param_idxs = nullptr,
+                                  std::string* query = nullptr);
     static std::vector<std::string> Split(const std::string& str);
     static rapidjson::Value* ResolvePath(rapidjson::Document& doc, const std::string& path);
     static void ParseSpecs(const std::string& oas_specs, rapidjson::Document& doc);

diff --git a/src/oas_validator_imp.cpp b/src/oas_validator_imp.cpp
@@ -9,8 +9,9 @@
 #include <rapidjson/istreamwrapper.h>
 #include <sstream>
 
-OASValidatorImp::OASValidatorImp(const std::string& oas_specs, bool head_mapped_get)
-    : head_mapped_get_(head_mapped_get)
+OASValidatorImp::OASValidatorImp(const std::string& oas_specs,
+                                 const std::unordered_map<std::string, std::unordered_set<std::string>>& method_map)
+    : method_map_(method_map)
 {
     rapidjson::Document doc;
     ParseSpecs(oas_specs, doc);
@@ -177,9 +178,18 @@ ValidationError OASValidatorImp::GetValidators(const std::string& method, const
     CHECK_ERROR(err_code)
 
     err_code = GetValidators(method, method, http_path, validators, error_msg, param_idxs, query);
-
-    if (head_mapped_get_ && ValidationError::INVALID_ROUTE == err_code && (method == "head" || method == "HEAD")) {
-        return GetValidators(method, "get", http_path, validators, error_msg, param_idxs, query);
+    if (ValidationError::INVALID_ROUTE == err_code) {
+        try {
+            auto mapped_methods = method_map_.at(method);
+            for (const auto& mapped_method : mapped_methods) {
+                err_code = GetValidators(method, mapped_method, http_path, validators, error_msg, param_idxs, query);
+                if (ValidationError::NONE == err_code) {
+                    return err_code;
+                }
+            }
+        } catch (const std::out_of_range&) {
+            return err_code;
+        }
     }
 
     return err_code;