hrw: Supports indexed query parameters as conds

Author: zwoop

plugins/header_rewrite/conditions.cc

@@ -30,6 +30,8 @@
 #include <array>
 #include <atomic>
 
+#include "swoc/TextView.h"
+
 #include "ts/ts.h"
 
 #include "conditions.h"
@@ -280,7 +282,26 @@ ConditionUrl::set_qualifier(const std::string &q)
   Condition::set_qualifier(q);
 
   Dbg(pi_dbg_ctl, "\tParsing %%{URL:%s}", q.c_str());
-  _url_qual = parse_url_qualifier(q);
+
+  std::string::size_type pos = q.find(':');
+
+  if (pos != std::string::npos) {
+    std::string qual_part = q.substr(0, pos);
+    std::string sub_qual  = q.substr(pos + 1);
+
+    _url_qual = parse_url_qualifier(qual_part);
+
+    if (_url_qual == URL_QUAL_QUERY) {
+      if (!sub_qual.empty()) {
+        _query_param = sub_qual;
+        Dbg(pi_dbg_ctl, "\tQuery parameter sub-key: %s", _query_param.c_str());
+      }
+    } else {
+      TSError("[%s] Sub-qualifier not supported for URL component: %s", PLUGIN_NAME, qual_part.c_str());
+    }
+  } else {
+    _url_qual = parse_url_qualifier(q);
+  }
 }
 
 void
@@ -347,8 +368,15 @@ ConditionUrl::append_value(std::string &s, const Resources &res)
     break;
   case URL_QUAL_QUERY:
     q_str = TSUrlHttpQueryGet(bufp, url, &i);
-    s.append(q_str, i);
-    Dbg(pi_dbg_ctl, "   Query parameters to match is: %.*s", i, q_str);
+    if (_query_param.empty()) {
+      s.append(q_str, i);
+      Dbg(pi_dbg_ctl, "   Query parameters to match is: %.*s", i, q_str);
+    } else {
+      swoc::TextView value = res.get_query_param(_query_param, q_str, i);
+
+      s.append(value.data(), value.size());
+      Dbg(pi_dbg_ctl, "   Query parameter %s value is: %.*s", _query_param.c_str(), static_cast<int>(value.size()), value.data());
+    }
     break;
   case URL_QUAL_SCHEME:
     q_str = TSUrlSchemeGet(bufp, url, &i);

plugins/header_rewrite/conditions.h

@@ -300,6 +300,7 @@ class ConditionUrl : public Condition
 private:
   UrlQualifiers _url_qual = URL_QUAL_NONE;
   UrlType       _type;
+  std::string   _query_param; // Optional: specific query parameter name for QUERY sub-key
 };
 
 // DBM lookups

plugins/header_rewrite/operators.cc

@@ -324,6 +324,7 @@ OperatorSetDestination::exec(const Resources &res) const
 
         const_cast<Resources &>(res).changed_url = true;
         TSUrlHttpQuerySet(bufp, url_m_loc, value.c_str(), value.size());
+        res.reset_query_cache();
         Dbg(pi_dbg_ctl, "OperatorSetDestination::exec() invoked with QUERY: %s", value.c_str());
       }
       break;
@@ -348,6 +349,7 @@ OperatorSetDestination::exec(const Resources &res) const
         if (TSUrlCreate(bufp, &new_url_loc) == TS_SUCCESS && TSUrlParse(bufp, new_url_loc, &start, end) == TS_PARSE_DONE &&
             TSHttpHdrUrlSet(bufp, res.hdr_loc, new_url_loc) == TS_SUCCESS) {
           const_cast<Resources &>(res).changed_url = true;
+          res.reset_query_cache();
           Dbg(pi_dbg_ctl, "Set destination URL to %s", value.c_str());
         } else {
           Dbg(pi_dbg_ctl, "Failed to set URL %s", value.c_str());
@@ -461,6 +463,7 @@ OperatorRMDestination::exec(const Resources &res) const
       }
       const_cast<Resources &>(res).changed_url = true;
       TSUrlHttpQuerySet(bufp, url_m_loc, value.c_str(), value.size());
+      res.reset_query_cache();
       break;
     case URL_QUAL_PORT:
       const_cast<Resources &>(res).changed_url = true;

plugins/header_rewrite/resources.cc

@@ -181,3 +181,32 @@ Resources::destroy()
 
   _ready = false;
 }
+
+swoc::TextView
+Resources::get_query_param(const std::string &name, const char *query_str, int query_len) const
+{
+  if (!_extended_info.query_parsed) {
+    if (query_str && query_len > 0) {
+      swoc::TextView query_view(query_str, query_len);
+
+      while (!query_view.empty()) {
+        swoc::TextView param       = query_view.take_prefix_at('&');
+        swoc::TextView param_name  = param.take_prefix_at('=');
+        swoc::TextView param_value = param;
+
+        if (!param_name.empty()) {
+          _extended_info.query_params[param_name] = param_value;
+        }
+      }
+    }
+    _extended_info.query_parsed = true;
+  }
+
+  auto it = _extended_info.query_params.find(swoc::TextView(name));
+
+  if (it != _extended_info.query_params.end()) {
+    return it->second;
+  }
+
+  return swoc::TextView();
+}

plugins/header_rewrite/resources.h

@@ -22,6 +22,9 @@
 #pragma once
 
 #include <string>
+#include <unordered_map>
+
+#include "swoc/TextView.h"
 
 #include "regex_helper.h"
 #include "ts/ts.h"
@@ -96,6 +99,16 @@ class Resources
     return _extended_info.matches;
   }
 
+  // Get a query parameter value by name, with caching
+  swoc::TextView get_query_param(const std::string &name, const char *query_str, int query_len) const;
+
+  void
+  reset_query_cache() const
+  {
+    _extended_info.query_params.clear();
+    _extended_info.query_parsed = false;
+  }
+
   TSCont              contp          = nullptr;
   TSRemapRequestInfo *_rri           = nullptr;
   TSMBuffer           bufp           = nullptr;
@@ -114,8 +127,10 @@ class Resources
   TSHttpStatus resp_status = TS_HTTP_STATUS_NONE;
 
   struct LifetimeExtension {
-    std::string  subject_storage;
-    RegexMatches matches;
+    std::string                                        subject_storage;
+    RegexMatches                                       matches;
+    std::unordered_map<swoc::TextView, swoc::TextView> query_params;
+    bool                                               query_parsed = false;
   };
   bool                      changed_url = false;
   mutable LifetimeExtension _extended_info;