X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_rewrite.cpp;h=7753f0e8bef60558e378e26441c6f7eea2a4eab4;hb=a258482a3b53b90b0932f4a789ba66e8e1576c05;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..7753f0e 100644 --- a/src/test_filter_rewrite.cpp +++ b/src/test_filter_rewrite.cpp @@ -21,13 +21,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include "filter_http_client.hpp" +#include "filter_http_rewrite.hpp" #include #include "router_chain.hpp" #include -#define BOOST_REGEX_MATCH_EXTRA - #include +#include + +#include #define BOOST_AUTO_TEST_MAIN #define BOOST_TEST_DYN_LINK @@ -37,97 +39,25 @@ 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) +struct TestConfig { + TestConfig() { - this->req_uri_pat = req_uri_pat; - this->resp_uri_pat = resp_uri_pat; - }; - -private: - std::map vars; - std::string req_uri_pat; - std::string resp_uri_pat; + std::cout << "global setup\n"; + yaz_log_init_level(YLOG_ALL); + } + ~TestConfig() + { + std::cout << "global teardown\n"; + } }; +BOOST_GLOBAL_FIXTURE( TestConfig ); BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) { try { - FilterHeaderRewrite fhr; + mp::filter::HttpRewrite fhr; } catch ( ... ) { BOOST_CHECK (false); @@ -140,8 +70,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( + "(?http\\:\\/\\/s?)(?[^\\/?#]+)\\/(?[^\\/]+)" + "\\/(?[^\\/]+)(?.*)", + "${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( + "(?http\\:\\/\\/s?)(?[^\\/?#]+)\\/(?[^ >]+)", + "THAT WAS MATCHED" + )); + + fhr.configure(vec_req, vec_res); + mp::filter::HTTPClient hc; router.append(fhr); @@ -152,7 +101,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 +117,77 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 ) BOOST_CHECK(hres); } - catch ( ... ) { + 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 = + "\n" + "\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + "\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); } }