X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_rewrite.cpp;h=67d77409996ea03cb34195b9df485b05990a1292;hb=67e481dac76e773799e3e18c87d29f0a210cbfb1;hp=be6a0718f89f0019b1b743fc736b9fb5cf15cb13;hpb=a627adf593e208501bb62986ae0d1a99a8f5fa4b;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_rewrite.cpp b/src/test_filter_rewrite.cpp
index be6a071..67d7740 100644
--- a/src/test_filter_rewrite.cpp
+++ b/src/test_filter_rewrite.cpp
@@ -21,13 +21,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdexcept>
 
 #include "filter_http_client.hpp"
+#include "filter_http_rewrite.hpp"
 #include <metaproxy/util.hpp>
 #include "router_chain.hpp"
 #include <metaproxy/package.hpp>
 
-#define BOOST_REGEX_MATCH_EXTRA
-
 #include <boost/regex.hpp>
+#include <boost/lexical_cast.hpp>
 
 #define BOOST_AUTO_TEST_MAIN
 #define BOOST_TEST_DYN_LINK
@@ -37,97 +37,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 using namespace boost::unit_test;
 namespace mp = metaproxy_1;
 
-class FilterHeaderRewrite: public mp::filter::Base {
-public:
-    void process(mp::Package & package) const {
-        Z_GDU *gdu = package.request().get();
-        //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);
-          }
-        }
-        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;
-          }
-        }
-
-    };
-    void configure(const xmlNode* ptr, bool test_only, const char *path) {};
-
-    void rewrite_req_header(Z_HTTP_Header *header) const
-    {
-        //exec regex against value
-        boost::regex e(req_uri_pat, boost::regex::perl);
-        boost::smatch what;
-        std::string hvalue(header->value);
-        if(boost::regex_match(hvalue, what, e, boost::match_extra))
-        {
-            unsigned i, j;
-            std::cout << "** Match found **\n   Sub-Expressions:\n";
-            for(i = 0; i < what.size(); ++i)
-                std::cout << "      $" << i << " = \"" << what[i] << "\"\n";
-            std::cout << "   Captures:\n";
-            for(i = 0; i < what.size(); ++i)
-            {
-                std::cout << "      $" << i << " = {";
-                for(j = 0; j < what.captures(i).size(); ++j)
-                {
-                    if(j)
-                        std::cout << ", ";
-                    else
-                        std::cout << " ";
-                    std::cout << "\"" << what.captures(i)[j] << "\"";
-                }
-                std::cout << " }\n";
-            }
-        }
-        else
-        {
-            std::cout << "** No Match found **\n";
-        }
-        //iteratate over named groups
-        //set the captured values in the map
-        //rewrite the header according to the hardcoded recipe
-    };
-    
-    void configure(const std::string & req_uri_pat, 
-            const std::string & resp_uri_pat) 
-    {
-       this->req_uri_pat = req_uri_pat;
-       this->resp_uri_pat = resp_uri_pat;
-    };
-
-private:
-    std::map<std::string, std::string> vars;
-    std::string req_uri_pat;
-    std::string resp_uri_pat;
-};
-
 
 BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
 {
     try
     {
-       FilterHeaderRewrite fhr;
+        mp::filter::HttpRewrite fhr;
     }
     catch ( ... ) {
         BOOST_CHECK (false);
@@ -140,8 +55,27 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 )
     {
         mp::RouterChain router;
 
-        FilterHeaderRewrite fhr;
-        fhr.configure(".*(localhost).*", ".*(localhost).*");
+        mp::filter::HttpRewrite fhr;
+        
+        mp::filter::HttpRewrite::spair_vec vec_req;
+        vec_req.push_back(std::make_pair(
+        "(?<proto>http\\:\\/\\/s?)(?<pxhost>[^\\/?#]+)\\/(?<pxpath>[^\\/]+)"
+        "\\/(?<host>[^\\/]+)(?<path>.*)",
+        "${proto}${host}${path}"
+        ));
+        vec_req.push_back(std::make_pair(
+        "(?:Host\\: )(.*)",
+        "Host: localhost"
+        ));
+
+        mp::filter::HttpRewrite::spair_vec vec_res;
+        vec_res.push_back(std::make_pair(
+        "(?<proto>http\\:\\/\\/s?)(?<host>[^\\/?#]+)\\/(?<path>[^ >]+)",
+        "http://${pxhost}/${pxpath}/${host}/${path}"
+        ));
+        
+        fhr.configure(vec_req, vec_res);
+
         mp::filter::HTTPClient hc;
         
         router.append(fhr);
@@ -152,7 +86,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;
 
@@ -168,7 +102,8 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 )
         BOOST_CHECK(hres);
 
     }
-    catch ( ... ) {
+    catch (std::exception & e) {
+        std::cout << e.what();
         BOOST_CHECK (false);
     }
 }