normalize search query in help page

KNiranjani · Oct 23, 2018 · d63cc46 · d63cc46
1 parent 8c86ec5
commit d63cc46
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/cpp/session/modules/SessionHelp.cpp b/src/cpp/session/modules/SessionHelp.cpp
@@ -122,6 +122,21 @@ bool isLocalURL(const std::string& url,
  return false;
 }
 
+std::string normalizeHttpdSearchContent(const std::string& content)
+{
+ return boost::regex_replace(
+ content,
+ boost::regex("(The search string was <b>\")(.*)(\"</b>)"),
+ [](const boost::smatch& m)
+ {
+ std::string query = m[2];
+ if (query.find('<') != std::string::npos)
+ query = string_utils::htmlEscape(query);
+
+ return m[1] + string_utils::htmlEscape(m[2]) + m[3];
+ });
+}
+
 template <typename F>
 bool isHttpdErrorPayload(SEXP payloadSEXP, F accessor)
 {
@@ -411,6 +426,10 @@ void handleHttpdResult(SEXP httpdSEXP,
  content = r::sexp::asString(STRING_ELT(payloadSEXP, 0));
  else if (TYPEOF(payloadSEXP) == VECSXP)
  content = r::sexp::asString(VECTOR_ELT(payloadSEXP, 0));
+
+ // normalize search result output
+ if (boost::algorithm::iends_with(request.path(), "/search"))
+ content = normalizeHttpdSearchContent(content);
 
  // check for special file returns
  std::string fileName ;