Fix multiple match aggregation

[metaproxy-moved-to-github.git] / src / filter_http_rewrite.cpp

diff --git a/src/filter_http_rewrite.cpp b/src/filter_http_rewrite.cpp
index 4baa28f..86667ca 100644 (file)
--- a/src/filter_http_rewrite.cpp
+++ b/src/filter_http_rewrite.cpp
@@ -48,7 +48,7 @@ yf::HttpRewrite::~HttpRewrite()
 
 void yf::HttpRewrite::process(mp::Package & package) const 
 {
-    std::cout << "HttpRewrite begins...." << std::endl;
+    yaz_log(YLOG_LOG, "HttpRewrite begins....");
     Z_GDU *gdu = package.request().get();
     //map of request/response vars
     std::map<std::string, std::string> vars;
@@ -58,9 +58,10 @@ void yf::HttpRewrite::process(mp::Package & package) const
         Z_HTTP_Request *hreq = gdu->u.HTTP_Request;
         mp::odr o;
         rewrite_reqline(o, hreq, vars);
-        std::cout << ">> Request headers" << std::endl;
-        rewrite_headers(o, hreq->headers, vars);
-        rewrite_body(o, &hreq->content_buf, &hreq->content_len, vars);
+        yaz_log(YLOG_LOG, ">> Request headers");
+        rewrite_headers(o, hreq->headers, vars, req_uri_pats, req_groups_bynum);
+        rewrite_body(o, &hreq->content_buf, &hreq->content_len, vars,
+                req_uri_pats, req_groups_bynum);
         package.request() = gdu;
     }
     package.move();
@@ -68,11 +69,12 @@ void yf::HttpRewrite::process(mp::Package & package) const
     if (gdu && gdu->which == Z_GDU_HTTP_Response)
     {
         Z_HTTP_Response *hres = gdu->u.HTTP_Response;
-        yaz_log(YLOG_DEBUG, "Response %d", hres->code);
+        yaz_log(YLOG_LOG, "Response code %d", hres->code);
         mp::odr o;
-        std::cout << "<< Respose headers" << std::endl;
-        rewrite_headers(o, hres->headers, vars);
-        rewrite_body(o, &hres->content_buf, &hres->content_len, vars);
+        yaz_log(YLOG_LOG, "<< Respose headers");
+        rewrite_headers(o, hres->headers, vars, res_uri_pats, res_groups_bynum);
+        rewrite_body(o, &hres->content_buf, &hres->content_len, vars,
+                res_uri_pats, res_groups_bynum);
         package.response() = gdu;
     }
 }
@@ -84,26 +86,31 @@ void yf::HttpRewrite::rewrite_reqline (mp::odr & o, Z_HTTP_Request *hreq,
     std::string path;
     if (strstr(hreq->path, "http://") == hreq->path)
     {
-        std::cout << "Path in the method line is absolute, " 
-            "possibly a proxy request\n";
+        yaz_log(YLOG_LOG, "Path in the method line is absolute, " 
+            "possibly a proxy request");
         path += hreq->path;
     }
     else
     {
         //TODO what about proto
+        path += "http://";
         path += z_HTTP_header_lookup(hreq->headers, "Host");
         path += hreq->path; 
     }
-    std::cout << "Proxy request URL is " << path << std::endl;
+    yaz_log(YLOG_LOG, "Proxy request URL is %s", path.c_str());
     std::string npath = 
         test_patterns(vars, path, req_uri_pats, req_groups_bynum);
-    std::cout << "Resp request URL is " << npath << std::endl;
     if (!npath.empty())
+    {
+        yaz_log(YLOG_LOG, "Rewritten request URL is %s", npath.c_str());
         hreq->path = odr_strdup(o, npath.c_str());
+    }
 }
 
 void yf::HttpRewrite::rewrite_headers (mp::odr & o, Z_HTTP_Header *headers,
-        std::map<std::string, std::string> & vars) const 
+        std::map<std::string, std::string> & vars, 
+        const spair_vec & uri_pats,
+        const std::vector<std::map<int, std::string> > & groups_bynum) const 
 {
     for (Z_HTTP_Header *header = headers;
             header != 0; 
@@ -112,16 +119,14 @@ void yf::HttpRewrite::rewrite_headers (mp::odr & o, Z_HTTP_Header *headers,
         std::string sheader(header->name);
         sheader += ": ";
         sheader += header->value;
-        std::cout << header->name << ": " << header->value << std::endl;
-        std::string out = test_patterns(vars, 
-                sheader, 
-                req_uri_pats, req_groups_bynum);
+        yaz_log(YLOG_LOG, "%s: %s", header->name, header->value);
+        std::string out = test_patterns(vars, sheader, uri_pats, groups_bynum);
         if (!out.empty()) 
         {
             size_t pos = out.find(": ");
             if (pos == std::string::npos)
             {
-                std::cout << "Header malformed during rewrite, ignoring";
+                yaz_log(YLOG_LOG, "Header malformed during rewrite, ignoring");
                 continue;
             }
             header->name = odr_strdup(o, out.substr(0, pos).c_str());
@@ -132,13 +137,15 @@ void yf::HttpRewrite::rewrite_headers (mp::odr & o, Z_HTTP_Header *headers,
 }
 
 void yf::HttpRewrite::rewrite_body (mp::odr & o, char **content_buf, int *content_len,
-        std::map<std::string, std::string> & vars) const 
+        std::map<std::string, std::string> & vars,
+        const spair_vec & uri_pats,
+        const std::vector<std::map<int, std::string> > & groups_bynum) const 
 {
     if (*content_buf)
     {
         std::string body(*content_buf);
         std::string nbody = 
-            test_patterns(vars, body, req_uri_pats, req_groups_bynum);
+            test_patterns(vars, body, uri_pats, groups_bynum);
         if (!nbody.empty())
         {
             *content_buf = odr_strdup(o, nbody.c_str());
@@ -201,13 +208,14 @@ const std::string yf::HttpRewrite::search_replace(
         }
         //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;
+        yaz_log(YLOG_LOG, "! Rewritten '%s' to '%s'", 
+                what.str(0).c_str(), rvalue.c_str());
+        out += std::string(start, what[0].first) + rvalue;
         start = what[0].second; //move search forward
     }
+    //if we had a match cat the last part
+    if (start != txt.begin())
+        out += std::string(start, end);
     return out;
 }
 
@@ -266,8 +274,8 @@ void yf::HttpRewrite::parse_groups(
                                 ("Unterminated group name '" + gname 
                                  + " in '" + str +"'");
                         groups_bynum[gnum] = gname;
-                        std::cout << "Found named group '" << gname 
-                            << "' at $" << gnum << std::endl;
+                        yaz_log(YLOG_LOG, "Found named group '%s' at $%d",
+                                gname.c_str(), gnum);
                     }
                 }
             }
@@ -361,7 +369,8 @@ static void configure_rules(const xmlNode *ptr, yf::HttpRewrite::spair_vec & des
                          + std::string((const char *) attr->name)
                          + " in rewrite section of http_rewrite");
             }
-            std::cout << "Found rewrite rule from=" << from << " to " << to << std::endl;
+            yaz_log(YLOG_LOG, "Found rewrite rule from '%s' to '%s'", 
+                    from.c_str(), to.c_str());
             if (!from.empty())
                 dest.push_back(std::make_pair(from, to));
         }
@@ -386,7 +395,6 @@ void yf::HttpRewrite::configure(const xmlNode * ptr, bool test_only,
             continue;
         else if (!strcmp((const char *) ptr->name, "request"))
         {
-            std::cout << "Found request rule" << std::endl;
             configure_rules(ptr, req_uri_pats);
         }
         else if (!strcmp((const char *) ptr->name, "response"))