Correctly url encode querystring

Fix tests with querystring needed url encoding (pattern=jazz&books.query.title=Ray%20Charles)
kiwix · May 31, 2022 · 3ffe4b3 · 3ffe4b3
1 parent 587afc8
commit 3ffe4b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
@@ -221,7 +221,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
     auto bookName = request.get_argument("content");
     try {
       const auto bookIds = Library::BookIdSet{mp_nameMapper->getIdForName(bookName)};
-      const auto queryString = request.get_query([&](const std::string& key){return key == "content";});
+      const auto queryString = request.get_query([&](const std::string& key){return key == "content";}, true);
       return {queryString, bookIds};
     } catch (const std::out_of_range&) {
       throw Error(noSuchBookErrorMsg(bookName));
@@ -239,7 +239,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
     }
     const auto bookIds = Library::BookIdSet(id_vec.begin(), id_vec.end());
     checkBookNumber(bookIds, m_multizimSearchLimit);
-    const auto queryString = request.get_query([&](const std::string& key){return key == prefix+"id";});
+    const auto queryString = request.get_query([&](const std::string& key){return key == prefix+"id";}, true);
     return {queryString, bookIds};
   } catch(const std::out_of_range&) {}
 
@@ -258,7 +258,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
       }
     }
     checkBookNumber(bookIds, m_multizimSearchLimit);
-    const auto queryString = request.get_query([&](const std::string& key){return key == prefix+"name";});
+    const auto queryString = request.get_query([&](const std::string& key){return key == prefix+"name";}, true);
     return {queryString, bookIds};
   } catch(const std::out_of_range&) {}
 
@@ -270,7 +270,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
   }
   const auto bookIds = Library::BookIdSet(id_vec.begin(), id_vec.end());
   checkBookNumber(bookIds, m_multizimSearchLimit);
-  const auto queryString = request.get_query([&](const std::string& key){return startsWith(key, prefix+"filter.");});
+  const auto queryString = request.get_query([&](const std::string& key){return startsWith(key, prefix+"filter.");}, true);
   return {queryString, bookIds};
 }
 

diff --git a/src/server/request_context.h b/src/server/request_context.h
@@ -92,20 +92,21 @@ class RequestContext {
     std::string get_url_part(int part) const;
     std::string get_full_url() const;
 
-    std::string get_query() const {
-      return get_query([](const std::string& key) {return true;});
+    std::string get_query(bool mustEncode = false) const {
+      return get_query([](const std::string& key) {return true;}, mustEncode);
     }
 
     template<class F>
-    std::string get_query(F filter) const {
+    std::string get_query(F filter, bool mustEncode) const {
       std::string q;
       const char* sep = "";
+      auto encode = [=](const std::string& value) { return mustEncode?urlEncode(value, true):value; };
       for ( const auto& a : arguments ) {
         if (!filter(a.first)) {
           continue;
         }
         for (const auto& v: a.second) {
-          q += sep + a.first + '=' + v;
+          q += sep + encode(a.first) + '=' + encode(v);
           sep = "&";
         }
       }