From: Heikki Levanto <heikki@indexdata.dk>
Date: Wed, 29 May 2013 11:12:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into rewrite-filter
X-Git-Tag: v1.3.59~57^2~11
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=2c08da821832998446e5fe92acf4d1e87fe531d4;p=metaproxy-moved-to-github.git

Merge remote-tracking branch 'origin/master' into rewrite-filter

Conflicts:
	src/Makefile.am

Signed-off-by: Heikki Levanto <heikki@indexdata.dk>
---

2c08da821832998446e5fe92acf4d1e87fe531d4
diff --cc src/Makefile.am
index e5c40aa,f3b0500..42bb6b3
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -59,24 -57,27 +58,28 @@@ libmetaproxy_la_SOURCES = 
  	torus.cpp torus.hpp \
  	url_recipe.cpp \
  	util.cpp \
 +	html_parser.hpp html_parser.cpp \
- 	xmlutil.cpp 
+ 	router_chain.cpp \
+ 	xmlutil.cpp
  
+ libmetaproxy_la_LIBADD = $(YAZPPLALIB) \
+ 	$(BOOST_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB) \
+ 	$(BOOST_REGEX_LIB)
  
- libmetaproxy_la_LIBADD = $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) $(BOOST_REGEX_LIB)
+ metaproxy_LDADD = libmetaproxy.la $(YAZPPLALIB) \
+ 	$(BOOST_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB) \
+ 	$(BOOST_REGEX_LIB) $(USEMARCONLALIB)
  
- # Rules for lib
+ tstdl_LDADD = $(metaproxy_LDADD)
  
- LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) \
- 	$(BOOST_REGEX_LIB) $(USEMARCONLALIB)
+ LDADD = $(metaproxy_LDADD) $(BOOST_TEST_LIB)
+ AM_LDFLAGS = -export-dynamic
  
  bin_PROGRAMS = metaproxy
- noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
+ noinst_PROGRAMS = tstdl
  
- ex_filter_frontend_net_SOURCES = ex_filter_frontend_net.cpp
- ex_router_flexml_SOURCES =  ex_router_flexml.cpp
  tstdl_SOURCES = tstdl.cpp
- metaproxy_SOURCES = metaproxy_prog.cpp
+ metaproxy_SOURCES = metaproxy_prog.cpp $(filter_src)
  
  # Rules for dl programs
  pkglib_LTLIBRARIES = metaproxy_filter_dl.la
@@@ -122,52 -121,23 +125,26 @@@ test_session1_SOURCES=test_session1.cp
  test_session2_SOURCES=test_session2.cpp
  test_boost_threads_SOURCES=test_boost_threads.cpp
  test_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp
- test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp
- test_filter_factory_SOURCES = test_filter_factory.cpp
- test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp
- test_filter_log_SOURCES = test_filter_log.cpp
- test_filter_multi_SOURCES = test_filter_multi.cpp
- test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp
- test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp
- test_filter_backend_test_SOURCES = test_filter_backend_test.cpp
- test_filter_bounce_SOURCES = test_filter_bounce.cpp
- test_filter_record_transform_SOURCES = test_filter_record_transform.cpp
- test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp
- test_filter_virt_db_SOURCES = test_filter_virt_db.cpp
- test_filter_rewrite_SOURCES = test_filter_rewrite.cpp
+ test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp $(filter_src)
+ test_filter_factory_SOURCES = test_filter_factory.cpp $(filter_src)
+ test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp $(filter_src)
+ test_filter_log_SOURCES = test_filter_log.cpp $(filter_src)
+ test_filter_multi_SOURCES = test_filter_multi.cpp $(filter_src)
+ test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp $(filter_src)
+ test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp $(filter_src)
+ test_filter_backend_test_SOURCES = test_filter_backend_test.cpp $(filter_src)
+ test_filter_bounce_SOURCES = test_filter_bounce.cpp $(filter_src)
+ test_filter_record_transform_SOURCES = test_filter_record_transform.cpp \
+ 	$(filter_src)
+ test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp $(filter_src)
+ test_filter_virt_db_SOURCES = test_filter_virt_db.cpp $(filter_src)
  test_ses_map_SOURCES = test_ses_map.cpp
- test_router_flexml_SOURCES = test_router_flexml.cpp
- test_html_parser_SOURCES = test_html_parser.cpp
+ test_router_flexml_SOURCES = test_router_flexml.cpp $(filter_src)
  test_xmlutil_SOURCES = test_xmlutil.cpp
  
- TESTLDADD = $(LDADD) $(BOOST_TEST_LIB)
- 
- test_package1_LDADD = $(TESTLDADD)
- test_pipe_LDADD = $(TESTLDADD)
- test_filter1_LDADD = $(TESTLDADD)
- test_filter2_LDADD = $(TESTLDADD)
- test_session1_LDADD = $(TESTLDADD)
- test_session2_LDADD = $(TESTLDADD)
- test_boost_threads_LDADD = $(TESTLDADD)
- test_filter_auth_simple_LDADD = $(TESTLDADD)
- test_filter_factory_LDADD = $(TESTLDADD)
- test_filter_frontend_net_LDADD = $(TESTLDADD)
- test_filter_log_LDADD = $(TESTLDADD)
- test_filter_multi_LDADD = $(TESTLDADD)
- test_filter_query_rewrite_LDADD = $(TESTLDADD)
- test_filter_z3950_client_LDADD = $(TESTLDADD)
- test_filter_backend_test_LDADD = $(TESTLDADD)
- test_filter_bounce_LDADD = $(TESTLDADD)
- test_filter_record_transform_LDADD = $(TESTLDADD)
- test_filter_sru_to_z3950_LDADD = $(TESTLDADD)
- test_filter_virt_db_LDADD = $(TESTLDADD)
- test_filter_rewrite_LDADD = $(TESTLDADD)
- test_router_flexml_LDADD = $(TESTLDADD)
- test_ses_map_LDADD = $(TESTLDADD)
- test_thread_pool_observer_LDADD = $(TESTLDADD)
- test_html_parser_LDADD = $(TESTLDADD)
- test_xmlutil_LDADD = $(TESTLDADD)
++test_html_parser_SOURCES = test_html_parser.cpp $(filter_src)
++test_filter_rewrite_SOURCES = test_filter_rewrite.cpp $(filter_src)
 +
  # doxygen target
  dox:
  	(cd $(top_srcdir) ; make dox) 
diff --cc src/test_filter_rewrite.cpp
index 430e784,0000000..d266274
mode 100644,000000..100644
--- a/src/test_filter_rewrite.cpp
+++ b/src/test_filter_rewrite.cpp
@@@ -1,346 -1,0 +1,346 @@@
 +/* This file is part of Metaproxy.
 +   Copyright (C) 2005-2013 Index Data
 +
 +Metaproxy is free software; you can redistribute it and/or modify it under
 +the terms of the GNU General Public License as published by the Free
 +Software Foundation; either version 2, or (at your option) any later
 +version.
 +
 +Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
 +WARRANTY; without even the implied warranty of MERCHANTABILITY or
 +FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 +for more details.
 +
 +You should have received a copy of the GNU General Public License
 +along with this program; if not, write to the Free Software
 +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 +*/
 +
 +#include "config.hpp"
 +#include <iostream>
 +#include <stdexcept>
 +
 +#include "filter_http_client.hpp"
 +#include "filter_http_rewrite.hpp"
 +#include <metaproxy/util.hpp>
- #include "router_chain.hpp"
++#include <metaproxy/router_chain.hpp>
 +#include <metaproxy/package.hpp>
 +
 +#include <boost/regex.hpp>
 +#include <boost/lexical_cast.hpp>
 +
 +#include <yaz/log.h>
 +
 +#define BOOST_AUTO_TEST_MAIN
 +#define BOOST_TEST_DYN_LINK
 +
 +#include <boost/test/auto_unit_test.hpp>
 +
 +using namespace boost::unit_test;
 +namespace mp = metaproxy_1;
 +
 +struct TestConfig {
 +    TestConfig()   
 +    {
 +        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
 +    {
 +        std::cout << "Running non-xml config test case" << std::endl;
 +        mp::RouterChain router;
 +        mp::filter::HttpRewrite fhr;
 +        
 +        //configure the filter
 +        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: ${host}"
 +        ));
 +
 +        mp::filter::HttpRewrite::spair_vec vec_res;
 +        vec_res.push_back(std::make_pair(
 +        "(?<proto>http\\:\\/\\/s?)(?<host>[^\\/?# \"'>]+)\\/(?<path>[^ \"'>]+)",
 +        "${proto}${pxhost}/${pxpath}/${host}/${path}"
 +        ));
 +        
 +        fhr.configure(vec_req, vec_res);
 +        
 +        router.append(fhr);
 +
 +        // create an http request
 +        mp::Package pack;
 +
 +        mp::odr odr;
 +        Z_GDU *gdu_req = z_get_HTTP_Request_uri(odr, 
 +        "http://proxyhost/proxypath/targetsite/page1.html", 0, 1);
 +
 +        pack.request() = gdu_req;
 +
 +        //create the http response
 +
 +        const char *resp_buf =
 +            "HTTP/1.1 200 OK\r\n"
 +            "Content-Length: 441\r\n"
 +            "Content-Type: text/html\r\n"
 +            "Link: <http://targetsite/file.xml>; rel=absolute\r\n"
 +            "Link: </dir/file.xml>; rel=relative\r\n"
 +            "\r\n"
 +            "<html><head><title>Hello proxy!</title>"
 +            "<style>"
 +            "body {"
 +            "  background-image:url('http://targetsite/images/bg.png');"
 +            "}"
 +            "</style>"
 +            "</head>"
 +            "<script>var jslink=\"http://targetsite/webservice.xml\";</script>"
 +            "<body>"
 +            "<p>Welcome to our website. It doesn't make it easy to get pro"
 +            "xified"
 +            "<a href=\"http://targetsite/page2.html\">"
 +            "  An absolute link</a>"
 +            "<a target=_blank href='http://targetsite/page3.html\">"
 +            "  Another abs link</a>"
 +            "<a href=\"/docs/page4.html\" />"
 +            "</body></html>";
 +
 +        const char *resp_expected =
 +            "HTTP/1.1 200 OK\r\n"
 +            "Content-Length: 521\r\n"
 +            "Content-Type: text/html\r\n"
 +            "Link: <http://proxyhost/proxypath/targetsite/file.xml>; rel=absolute\r\n"
 +            "Link: </dir/file.xml>; rel=relative\r\n"
 +            "\r\n"
 +            "<html><head><title>Hello proxy!</title>"
 +            "<style>"
 +            "body {"
 +            "  background-image:url('http://proxyhost/proxypath/targetsite/images/bg.png');"
 +            "}"
 +            "</style>"
 +            "</head>"
 +            "<script>var jslink=\"http://proxyhost/proxypath/targetsite/webservice.xml\";</script>"
 +            "<body>"
 +            "<p>Welcome to our website. It doesn't make it easy to get pro"
 +            "xified"
 +            "<a href=\"http://proxyhost/proxypath/targetsite/page2.html\">"
 +            "  An absolute link</a>"
 +            "<a target=_blank href='http://proxyhost/proxypath/targetsite/page3.html\">"
 +            "  Another abs link</a>"
 +            "<a href=\"/docs/page4.html\" />"
 +            "</body></html>";
 +
 +        int r;
 +        Z_GDU *gdu_res;
 +        ODR dec = odr_createmem(ODR_DECODE);
 +        odr_setbuf(dec, (char *) resp_buf, strlen(resp_buf), 0);
 +        r = z_GDU(dec, &gdu_res, 0, 0);
 +
 +        BOOST_CHECK(r);
 +        if (r)
 +        {
 +            BOOST_CHECK_EQUAL(gdu_res->which, Z_GDU_HTTP_Response);
 +        }
 +
 +        pack.response() = gdu_res;
 +
 +        //feed to the router
 +        pack.router(router).move();
 +
 +        //analyze the response
 +        Z_GDU *gdu_res_rew = pack.response().get();
 +        BOOST_CHECK(gdu_res_rew);
 +        BOOST_CHECK_EQUAL(gdu_res_rew->which, Z_GDU_HTTP_Response);
 +        
 +        Z_HTTP_Response *hres = gdu_res_rew->u.HTTP_Response;
 +        BOOST_CHECK(hres);
 +
 +        //compare buffers
 +        std::cout << "Expected result:\n" << resp_expected << std::endl;
 +
 +        ODR enc = odr_createmem(ODR_ENCODE);
 +        z_GDU(enc, &gdu_res_rew, 0, 0);
 +        char *resp_result;
 +        int resp_result_len;
 +        resp_result = odr_getbuf(enc, &resp_result_len, 0);
 +        
 +        BOOST_CHECK(resp_result);
 +        BOOST_CHECK_EQUAL(resp_result_len, strlen(resp_expected));
 +
 +        std::cout << "Rewriten result:\n" << resp_result << std::endl;
 +        std::cout << "Rewriten result buf len: " << resp_result_len 
 +            << std::endl;
 +
 +        BOOST_CHECK(memcmp(resp_result, resp_expected, resp_result_len) == 0);
 +
 +        odr_destroy(dec);
 +        odr_destroy(enc);
 +    }
 +    catch (std::exception & e) {
 +        std::cout << e.what();
 +        std::cout << std::endl;
 +        BOOST_CHECK (false);
 +    }
 +}
 +
 +/*
 +BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 )
 +{
 +    try
 +    {
 +        std::cout << "Running xml config test case" << std::endl;
 +        mp::RouterChain router;
 +        mp::filter::HttpRewrite fhr;
 +
 +        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>https?://)(?&lt;pxhost>[^ /?#]+)/(?&lt;pxpath>[^ /]+)"
 +    "/(?&lt;host>[^ /]+)(?&lt;path>[^ ]*)'\n"
 +            "            to='${proto}${host}${path}' />\n"
 +            "   <rewrite from='(?:Host: )(.*)'\n"
 +            "            to='Host: ${host}' />\n" 
 +            " </request>\n"
 +            " <response>\n"
 +            "   <rewrite from='"
 +    "(?&lt;proto>https?://)(?&lt;host>[^/?# &quot;&apos;>]+)/(?&lt;path>[^  &quot;&apos;>]+)'\n"
 +            "            to='${proto}${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);
 +        fhr.configure(root_element, true, "");
 +        xmlFreeDoc(doc);
 +        
 +        router.append(fhr);
 +
 +        // create an http request
 +        mp::Package pack;
 +
 +        mp::odr odr;
 +        Z_GDU *gdu_req = z_get_HTTP_Request_uri(odr, 
 +        "http://proxyhost/proxypath/targetsite/page1.html", 0, 1);
 +
 +        pack.request() = gdu_req;
 +
 +        //create the http response
 +
 +        const char *resp_buf =
 +            "HTTP/1.1 200 OK\r\n"
 +            "Content-Length: 50\r\n"
 +            "Content-Type: text/html\r\n"
 +            "Link: <http://targetsite/file.xml>; rel=absolute\r\n"
 +            "Link: </dir/file.xml>; rel=relative\r\n"
 +            "\r\n"
 +            "<html><head><title>Hello proxy!</title>"
 +            "<style>"
 +            "body {"
 +            "  background-image:url('http://targetsite/images/bg.png');"
 +            "}"
 +            "</style>"
 +            "</head>"
 +            "<script>var jslink=\"http://targetsite/webservice.xml\";</script>"
 +            "<body>"
 +            "<p>Welcome to our website. It doesn't make it easy to get pro"
 +            "xified"
 +            "<a href=\"http://targetsite/page2.html\">"
 +            "  An absolute link</a>"
 +            "<a target=_blank href='http://targetsite/page3.html\">"
 +            "  Another abs link</a>"
 +            "<a href=\"/docs/page4.html\" />"
 +            "</body></html>";
 +
 +        const char *resp_buf_rew =
 +            "HTTP/1.1 200 OK\r\n"
 +            "Content-Length: 50\r\n"
 +            "Content-Type: text/html\r\n"
 +            "Link: <http://proxyhost/proxypath/targetsite/file.xml>; rel=absolute\r\n"
 +            "Link: </dir/file.xml>; rel=relative\r\n"
 +            "\r\n"
 +            "<html><head><title>Hello proxy!</title>"
 +            "<style>"
 +            "body {"
 +            "  background-image:url('http://proxyhost/proxypath/targetsite/images/bg.png');"
 +            "}"
 +            "</style>"
 +            "</head>"
 +            "<script>var jslink=\"http://proxyhost/proxypath/targetsite/webservice.xml\";</script>"
 +            "<body>"
 +            "<p>Welcome to our website. It doesn't make it easy to get pro"
 +            "xified"
 +            "<a href=\"http://proxyhost/proxypath/targetsite/page.html\">"
 +            "  An absolute link</a>"
 +            "<a target=_blank href='http://proxyhost/proxypath/targetsite/anotherpage.html\">"
 +            "  Another abs link</a>"
 +            "<a href=\"/docs/page2.html\" />"
 +            "</body></html>";
 +
 +        int r;
 +        Z_GDU *gdu_res;
 +        ODR odr2 = odr_createmem(ODR_DECODE);
 +        odr_setbuf(odr2, (char *) resp_buf, strlen(resp_buf), 0);
 +        r = z_GDU(odr2, &gdu_res, 0, 0);
 +
 +        BOOST_CHECK(r == 0);
 +        if (r)
 +        {
 +            BOOST_CHECK_EQUAL(gdu_res->which, Z_GDU_HTTP_Response);
 +        }
 +
 +        pack.response() = gdu_res;
 +
 +        //feed to the router
 +        pack.router(router).move();
 +
 +        //analyze the response
 +        Z_GDU *gdu_res_rew = pack.response().get();
 +        BOOST_CHECK(gdu_res_rew);
 +        BOOST_CHECK_EQUAL(gdu_res_rew->which, Z_GDU_HTTP_Response);
 +        
 +        Z_HTTP_Response *hres = gdu_res_rew->u.HTTP_Response;
 +        BOOST_CHECK(hres);
 +
 +        //how to compare the buffers:
 +
 +        odr_destroy(odr2);
 +    }
 +    catch (std::exception & e) {
 +        std::cout << e.what();
 +        std::cout << std::endl;
 +        BOOST_CHECK (false);
 +    }
 +}
 +*/
 +
 +/*
 + * Local variables:
 + * c-basic-offset: 4
 + * c-file-style: "Stroustrup"
 + * indent-tabs-mode: nil
 + * End:
 + * vim: shiftwidth=4 tabstop=8 expandtab
 + */
 +