Add XML config test

diff --git a/src/filter_http_rewrite.cpp b/src/filter_http_rewrite.cpp
index e64fb36..29ce8b0 100644 (file)
--- a/src/filter_http_rewrite.cpp
+++ b/src/filter_http_rewrite.cpp
@@ -360,13 +360,14 @@ 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;
             if (!from.empty())
                 dest.push_back(std::make_pair(from, to));
         }
         else
         {
             throw mp::filter::FilterException
-                ("Bad element "
+                ("Bad element o"
                  + std::string((const char *) ptr->name)
                  + " in http_rewrite1 filter");
         }
@@ -384,11 +385,12 @@ void yf::HttpRewrite::configure(const xmlNode * ptr, bool test_only,
             continue;
         else if (!strcmp((const char *) ptr->name, "request"))
         {
-            configure_rules(ptr->children, req_uri_pats);
+            std::cout << "Found request rule" << std::endl;
+            configure_rules(ptr, req_uri_pats);
         }
         else if (!strcmp((const char *) ptr->name, "response"))
         {
-            configure_rules(ptr->children, res_uri_pats);
+            configure_rules(ptr, res_uri_pats);
         }
         else
         {
@@ -398,6 +400,7 @@ void yf::HttpRewrite::configure(const xmlNode * ptr, bool test_only,
                  + " in http_rewrite1 filter");
         }
     }
+    configure(req_uri_pats, res_uri_pats);
 }
 
 static mp::filter::Base* filter_creator()

diff --git a/src/test_filter_rewrite.cpp b/src/test_filter_rewrite.cpp
index 67d7740..29bc5ca 100644 (file)
--- a/src/test_filter_rewrite.cpp
+++ b/src/test_filter_rewrite.cpp
@@ -104,6 +104,75 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 )
     }
     catch (std::exception & e) {
         std::cout << e.what();
+        std::cout << std::endl;
+        BOOST_CHECK (false);
+    }
+}
+
+BOOST_AUTO_TEST_CASE( test_filter_rewrite_3 )
+{
+    try
+    {
+        std::string xmlconf =
+            "<?xml version='1.0'?>\n"
+            "<filter xmlns='http://indexdata.com/metaproxy'\n"
+            "        id='rewrite1' type='http_rewrite'>\n"
+            " <request>\n"
+            "   <rewrite from='"
+    "(?&lt;proto>http\\:\\/\\/s?)(?&lt;pxhost>[^\\/?#]+)\\/(?&lt;pxpath>[^\\/]+)"
+    "\\/(?&lt;host>[^\\/]+)(?&lt;path>.*)'\n"
+            "            to='${proto}${host}${path}' />\n"
+            "   <rewrite from='(?:Host\\: )(.*)'\n"
+            "            to='Host: localhost' />\n" 
+            " </request>\n"
+            " <response>\n"
+            "   <rewrite from='"
+    "(?&lt;proto>http\\:\\/\\/s?)(?&lt;host>[^\\/?#]+)\\/(?&lt;path>[^ >]+)'\n"
+            "            to='http://${pxhost}/${pxpath}/${host}/${path}' />\n" 
+            " </response>\n"
+            "</filter>\n"
+            ;
+
+        std::cout << xmlconf;
+
+        // reading and parsing XML conf
+        xmlDocPtr doc = xmlParseMemory(xmlconf.c_str(), xmlconf.size());
+        BOOST_CHECK(doc);
+        xmlNode *root_element = xmlDocGetRootElement(doc);
+        mp::filter::HttpRewrite fhr; 
+        fhr.configure(root_element, true, "");
+        xmlFreeDoc(doc);
+
+        mp::filter::HTTPClient hc;
+        
+        mp::RouterChain router;
+        router.append(fhr);
+        router.append(hc);
+
+        // create an http request
+        mp::Package pack;
+
+        mp::odr odr;
+        Z_GDU *gdu_req = z_get_HTTP_Request_uri(odr, 
+        "http://proxyhost/proxypath/localhost:80/~jakub/targetsite.php", 0, 1);
+
+        pack.request() = gdu_req;
+
+        //feed to the router
+        pack.router(router).move();
+
+        //analyze the response
+        Z_GDU *gdu_res = pack.response().get();
+        BOOST_CHECK(gdu_res);
+        BOOST_CHECK_EQUAL(gdu_res->which, Z_GDU_HTTP_Response);
+        
+        Z_HTTP_Response *hres = gdu_res->u.HTTP_Response;
+        BOOST_CHECK(hres);
+
+    }
+    catch (std::exception & e) {
+        std::cout << e.what();
+        std::cout << std::endl;
         BOOST_CHECK (false);
     }
 }