Fix forwarding with space in url by encoding (#2155)

drogonframework · Sep 13, 2024 · 93d8fb4 · 93d8fb4
1 parent 73406d1
commit 93d8fb4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/src/HttpAppFrameworkImpl.cc b/lib/src/HttpAppFrameworkImpl.cc
@@ -850,6 +850,7 @@ void HttpAppFrameworkImpl::forward(
     const std::string &hostString,
     double timeout)
 {
+    req->setPath(req->getOriginalPath());
     if (hostString.empty())
     {
         HttpInternalForwardHelper::forward(req, std::move(callback));

diff --git a/lib/src/HttpRequestImpl.h b/lib/src/HttpRequestImpl.h
@@ -209,7 +209,9 @@ class HttpRequestImpl : public HttpRequest
 
     const std::string &getOriginalPath() const override
     {
-        return originalPath_.empty() ? path_ : originalPath_;
+        return originalPath_.empty()
+                   ? (originalPath_ = drogon::utils::urlEncode(path_))
+                   : originalPath_;
     }
 
     void setQuery(const char *start, const char *end)
@@ -673,7 +675,7 @@ class HttpRequestImpl : public HttpRequest
     HttpMethod previousMethod_{Invalid};
     Version version_{Version::kUnknown};
     std::string path_;
-    std::string originalPath_;
+    mutable std::string originalPath_;
     bool pathEncode_{true};
     std::string_view matchedPathPattern_{""};
     std::string query_;