Only remember match if not empty
[metaproxy-moved-to-github.git] / src / test_filter_rewrite.cpp
index 40ab6ba..f2962e1 100644 (file)
@@ -25,9 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "router_chain.hpp"
 #include <metaproxy/package.hpp>
 
-#define BOOST_REGEX_MATCH_EXTRA
-
-#include <boost/xpressive/xpressive.hpp>
+#include <boost/regex.hpp>
 #include <boost/lexical_cast.hpp>
 
 #define BOOST_AUTO_TEST_MAIN
@@ -36,53 +34,93 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
-using namespace boost::xpressive;
 namespace mp = metaproxy_1;
 
 class FilterHeaderRewrite: public mp::filter::Base {
 public:
     void process(mp::Package & package) const {
         Z_GDU *gdu = package.request().get();
+        //map of request/response vars
+        std::map<std::string, std::string> vars;
         //we have an http req
         if (gdu && gdu->which == Z_GDU_HTTP_Request)
         {
-          std::cout << "Request headers" << std::endl;
-          Z_HTTP_Request *hreq = gdu->u.HTTP_Request;
-          //dump req headers
-          for (Z_HTTP_Header *header = hreq->headers;
-              header != 0; 
-              header = header->next) 
-          {
-            std::cout << header->name << ": " << header->value << std::endl;
-            rewrite_req_header(header);
-          }
+            Z_HTTP_Request *hreq = gdu->u.HTTP_Request;
+            mp::odr o;
+            //rewrite the request line
+            std::string path;
+            if (strstr(hreq->path, "http://") == hreq->path)
+            {
+                std::cout << "Path in the method line is absolute, " 
+                    "possibly a proxy request\n";
+                path += hreq->path;
+            }
+            else
+            {
+               path += z_HTTP_header_lookup(hreq->headers, "Host");
+               path += hreq->path; 
+            }
+            std::cout << "Proxy request URL is " << path << std::endl;
+            std::string npath = 
+                search_replace(vars, path, req_uri_rx, req_uri_pat);
+            std::cout << "Resp request URL is " << npath << std::endl;
+            if (!npath.empty())
+                hreq->path = odr_strdup(o, npath.c_str());
+            std::cout << ">> Request headers" << std::endl;
+            //iterate headers
+            for (Z_HTTP_Header *header = hreq->headers;
+                    header != 0; 
+                    header = header->next) 
+            {
+                std::cout << header->name << ": " << header->value << std::endl;
+                std::string out = search_replace(vars, 
+                        std::string(header->value), 
+                        req_uri_rx, req_uri_pat);
+                if (!out.empty())
+                    header->value = odr_strdup(o, out.c_str());
+            }
+            package.request() = gdu;
         }
         package.move();
         gdu = package.response().get();
         if (gdu && gdu->which == Z_GDU_HTTP_Response)
         {
-          std::cout << "Respose headers" << std::endl;
-          Z_HTTP_Response *hr = gdu->u.HTTP_Response;
-          //dump resp headers
-          for (Z_HTTP_Header *header = hr->headers;
-              header != 0; 
-              header = header->next) 
-          {
-            std::cout << header->name << ": " << header->value << std::endl;
-          }
+            Z_HTTP_Response *hr = gdu->u.HTTP_Response;
+            std::cout << "Response " << hr->code;
+            std::cout << "<< Respose headers" << std::endl;
+            mp::odr o;
+            //iterate headers
+            for (Z_HTTP_Header *header = hr->headers;
+                    header != 0; 
+                    header = header->next) 
+            {
+                std::cout << header->name << ": " << header->value << std::endl;
+                std::string out = search_replace(vars, 
+                        std::string(header->value), 
+                        resp_uri_rx, resp_uri_pat);
+                if (!out.empty())
+                    header->value = odr_strdup(o, out.c_str());
+            }
+            package.response() = gdu;
         }
-
     };
+
     void configure(const xmlNode* ptr, bool test_only, const char *path) {};
 
-    void rewrite_req_header(Z_HTTP_Header *header) const
+    const std::string search_replace(
+            std::map<std::string, std::string> & vars,
+            const std::string txt,
+            const std::string & uri_re,
+            const std::string & uri_pat) const
     {
         //exec regex against value
-        sregex re = sregex::compile(req_uri_rx);
-        smatch what;
-        std::string hvalue(header->value);
-        std::map<std::string, std::string> vars;
-        if (regex_match(hvalue, what, re))
+        boost::regex re(uri_re);
+        boost::smatch what;
+        std::string::const_iterator start, end;
+        start = txt.begin();
+        end = txt.end();
+        std::string out;
+        while (regex_search(start, end, what, re)) //find next full match
         {
             unsigned i;
             for (i = 1; i < what.size(); ++i)
@@ -93,17 +131,21 @@ public:
                 if (it != groups_by_num.end()) 
                 {   //it is
                     std::string name = it->second;
-                    vars[name] = what[i];
+                    if (!what[i].str().empty())
+                        vars[name] = what[i];
                 }
+
             }
-            //rewrite the header according to the recipe
-            std::string rvalue = sub_vars(req_uri_pat, vars);
-            std::cout << "Rewritten '"+hvalue+"' to '"+rvalue+"'\n";
-        }
-        else
-        {
-            std::cout << "No match found in '" + hvalue + "'\n";
+            //prepare replacement string
+            std::string rvalue = sub_vars(uri_pat, vars);
+            //rewrite value
+            std::string rhvalue = what.prefix().str() 
+                + rvalue + what.suffix().str();
+            std::cout << "! Rewritten '"+what.str(0)+"' to '"+rvalue+"'\n";
+            out += rhvalue;
+            start = what[0].second; //move search forward
         }
+        return out;
     };
 
     static void parse_groups(const std::string & str,
@@ -125,6 +167,12 @@ public:
                if (i+1 < str.size() && str[i+1] == '?') //group with attrs 
                {
                    i++;
+                   if (i+1 < str.size() && str[i+1] == ':') //non-capturing
+                   {
+                       if (gnum > 0) gnum--;
+                       i++;
+                       continue;
+                   }
                    if (i+1 < str.size() && str[i+1] == 'P') //optional, python
                        i++;
                    if (i+1 < str.size() && str[i+1] == '<') //named
@@ -189,7 +237,9 @@ public:
                     std::map<std::string, std::string>::const_iterator it
                         = vars.find(name);
                     if (it != vars.end())
+                    {
                         out += it->second;
+                    }
                 }
                 else
                 {
@@ -251,10 +301,13 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 )
 
         FilterHeaderRewrite fhr;
         fhr.configure(
-                ".*?(?P<host>[^:]+):(?P<port>\\d+).*",
-                "http://${host}:${port}/somepath",
-                ".*(localhost).*",
-                "http:://g");
+    "((?<proto>http\\:\\/\\/s?)(?<pxhost>[^\\/?#]+)\\/(?<pxpath>[^\\/]+)"
+    "(?<target>.+))|(proxyhost)",
+                "${proto}${target}${whatever}",
+                //rewrite connection close
+                "close",
+                "open for ${host}");
+
         mp::filter::HTTPClient hc;
         
         router.append(fhr);
@@ -265,7 +318,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 )
 
         mp::odr odr;
         Z_GDU *gdu_req = z_get_HTTP_Request_uri(odr, 
-            "http://localhost:80/~jakub/targetsite.php", 0, 1);
+        "http://proxyhost/proxypath/localhost:80/~jakub/targetsite.php", 0, 1);
 
         pack.request() = gdu_req;