Merge branch 'fix/json-body-check'

VROOM-Project · Jul 10, 2024 · bc29414 · bc29414
2 parents fb74026 + f251a6f
commit bc29414
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,10 @@
 
 - Wrong compiler used for clang-based OSRM builds (#1098)
 
+#### Routing
+
+- ORS error handling (#1083)
+
 ## [v1.14.0] - 2024-01-16
 
 ### Added

diff --git a/src/routing/http_wrapper.cpp b/src/routing/http_wrapper.cpp
@@ -141,11 +141,10 @@ std::string HttpWrapper::run_query(const std::string& query) const {
 
 void HttpWrapper::parse_response(rapidjson::Document& json_result,
                                  const std::string& json_content) {
-#ifdef NDEBUG
   json_result.Parse(json_content.c_str());
-#else
-  assert(!json_result.Parse(json_content.c_str()).HasParseError());
-#endif
+  if (json_result.HasParseError()) {
+    throw RoutingException("Failed to parse routing response.");
+  }
 }
 
 Matrices HttpWrapper::get_matrices(const std::vector<Location>& locs) const {

diff --git a/src/routing/ors_wrapper.cpp b/src/routing/ors_wrapper.cpp
@@ -64,8 +64,23 @@ void OrsWrapper::check_response(const rapidjson::Document& json_result,
                                 const std::vector<Location>&,
                                 const std::string&) const {
   if (json_result.HasMember("error")) {
-    throw RoutingException(
-      std::string(json_result["error"]["message"].GetString()));
+    if (json_result["error"].IsObject() &&
+        json_result["error"].HasMember("message") &&
+        json_result["error"]["message"].IsString()) {
+      // Normal ORS error syntax.
+      throw RoutingException(
+        std::string(json_result["error"]["message"].GetString()));
+    }
+
+    if (json_result["error"].IsString()) {
+      // Web framework error uses another convention, see #1083.
+      auto error = std::string(json_result["error"].GetString());
+
+      if (json_result.HasMember("path") && json_result["path"].IsString()) {
+        error += " " + std::string(json_result["path"].GetString());
+      }
+      throw RoutingException(error);
+    }
   }
 }