#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
using namespace boost::unit_test;
namespace mp = metaproxy_1;
-
-typedef std::pair<std::string, std::string> string_pair;
-typedef std::vector<string_pair> spair_vec;
-typedef spair_vec::iterator spv_iter;
-
-class FilterHeaderRewrite: public mp::filter::Base {
-public:
- void process(mp::Package & package) const {
- Z_GDU *gdu = package.request().get();
- //map of request/response vars
- std::map<std::string, std::string> vars;
- //we have an http req
- if (gdu && gdu->which == Z_GDU_HTTP_Request)
- {
- Z_HTTP_Request *hreq = gdu->u.HTTP_Request;
- mp::odr o;
- //rewrite the request line
- std::string path;
- if (strstr(hreq->path, "http://") == hreq->path)
- {
- std::cout << "Path in the method line is absolute, "
- "possibly a proxy request\n";
- path += hreq->path;
- }
- else
- {
- //TODO what about proto
- path += z_HTTP_header_lookup(hreq->headers, "Host");
- path += hreq->path;
- }
- std::cout << "Proxy request URL is " << path << std::endl;
- 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())
- hreq->path = odr_strdup(o, npath.c_str());
- std::cout << ">> Request headers" << std::endl;
- //iterate headers
- for (Z_HTTP_Header *header = hreq->headers;
- header != 0;
- header = header->next)
- {
- std::cout << header->name << ": " << header->value << std::endl;
- std::string out = test_patterns(vars,
- std::string(header->value),
- req_uri_pats, req_groups_bynum);
- if (!out.empty())
- header->value = odr_strdup(o, out.c_str());
- }
- package.request() = gdu;
- }
- package.move();
- gdu = package.response().get();
- if (gdu && gdu->which == Z_GDU_HTTP_Response)
- {
- Z_HTTP_Response *hr = gdu->u.HTTP_Response;
- std::cout << "Response " << hr->code;
- std::cout << "<< Respose headers" << std::endl;
- mp::odr o;
- //iterate headers
- for (Z_HTTP_Header *header = hr->headers;
- header != 0;
- header = header->next)
- {
- std::cout << header->name << ": " << header->value << std::endl;
- std::string out = test_patterns(vars,
- std::string(header->value),
- res_uri_pats, res_groups_bynum);
- if (!out.empty())
- header->value = odr_strdup(o, out.c_str());
- }
- package.response() = gdu;
- }
- };
-
- void configure(const xmlNode* ptr, bool test_only, const char *path) {};
-
- /**
- * Tests pattern from the vector in order and executes recipe on
- the first match.
- */
- const std::string test_patterns(
- std::map<std::string, std::string> & vars,
- const std::string & txt,
- const spair_vec & uri_pats,
- const std::vector<std::map<int, std::string> > & groups_bynum_vec)
- const
- {
- for (int i = 0; i < uri_pats.size(); i++)
- {
- std::string out = search_replace(vars, txt,
- uri_pats[i].first, uri_pats[i].second,
- groups_bynum_vec[i]);
- if (!out.empty()) return out;
- }
- return "";
- }
-
-
- const std::string search_replace(
- std::map<std::string, std::string> & vars,
- const std::string & txt,
- const std::string & uri_re,
- const std::string & uri_pat,
- const std::map<int, std::string> & groups_bynum) const
+/*
+ * The global testconfig is commented out, as it won't even compile
+ * on old Centos5 machines
+struct TestConfig {
+ TestConfig()
{
- //exec regex against value
- boost::regex re(uri_re);
- boost::smatch what;
- std::string::const_iterator start, end;
- start = txt.begin();
- end = txt.end();
- std::string out;
- while (regex_search(start, end, what, re)) //find next full match
- {
- unsigned i;
- for (i = 1; i < what.size(); ++i)
- {
- //check if the group is named
- std::map<int, std::string>::const_iterator it
- = groups_bynum.find(i);
- if (it != groups_bynum.end())
- { //it is
- std::string name = it->second;
- if (!what[i].str().empty())
- vars[name] = what[i];
- }
-
- }
- //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;
- start = what[0].second; //move search forward
- }
- return out;
+ std::cout << "global setup\n";
+ yaz_log_init_level(YLOG_ALL);
}
-
- static void parse_groups(
- const spair_vec & uri_pats,
- std::vector<std::map<int, std::string> > & groups_bynum_vec)
+ ~TestConfig()
{
- for (int h = 0; h < uri_pats.size(); h++)
- {
- int gnum = 0;
- bool esc = false;
- //regex is first, subpat is second
- std::string str = uri_pats[h].first;
- //for each pair we have an indexing map
- std::map<int, std::string> groups_bynum;
- for (int i = 0; i < str.size(); ++i)
- {
- if (!esc && str[i] == '\\')
- {
- esc = true;
- continue;
- }
- if (!esc && str[i] == '(') //group starts
- {
- gnum++;
- if (i+1 < str.size() && str[i+1] == '?') //group with attrs
- {
- i++;
- if (i+1 < str.size() && str[i+1] == ':') //non-capturing
- {
- if (gnum > 0) gnum--;
- i++;
- continue;
- }
- if (i+1 < str.size() && str[i+1] == 'P') //optional, python
- i++;
- if (i+1 < str.size() && str[i+1] == '<') //named
- {
- i++;
- std::string gname;
- bool term = false;
- while (++i < str.size())
- {
- if (str[i] == '>') { term = true; break; }
- if (!isalnum(str[i]))
- throw mp::filter::FilterException
- ("Only alphanumeric chars allowed, found "
- " in '"
- + str
- + "' at "
- + boost::lexical_cast<std::string>(i));
- gname += str[i];
- }
- if (!term)
- throw mp::filter::FilterException
- ("Unterminated group name '" + gname
- + " in '" + str +"'");
- groups_bynum[gnum] = gname;
- std::cout << "Found named group '" << gname
- << "' at $" << gnum << std::endl;
- }
- }
- }
- esc = false;
- }
- groups_bynum_vec.push_back(groups_bynum);
- }
- }
-
- static std::string sub_vars (const std::string & in,
- const std::map<std::string, std::string> & vars)
- {
- std::string out;
- bool esc = false;
- for (int i = 0; i < in.size(); ++i)
- {
- if (!esc && in[i] == '\\')
- {
- esc = true;
- continue;
- }
- if (!esc && in[i] == '$') //var
- {
- if (i+1 < in.size() && in[i+1] == '{') //ref prefix
- {
- ++i;
- std::string name;
- bool term = false;
- while (++i < in.size())
- {
- if (in[i] == '}') { term = true; break; }
- name += in[i];
- }
- if (!term) throw mp::filter::FilterException
- ("Unterminated var ref in '"+in+"' at "
- + boost::lexical_cast<std::string>(i));
- std::map<std::string, std::string>::const_iterator it
- = vars.find(name);
- if (it != vars.end())
- {
- out += it->second;
- }
- }
- else
- {
- throw mp::filter::FilterException
- ("Malformed or trimmed var ref in '"
- +in+"' at "+boost::lexical_cast<std::string>(i));
- }
- continue;
- }
- //passthru
- out += in[i];
- esc = false;
- }
- return out;
+ std::cout << "global teardown\n";
}
-
- void configure(
- const spair_vec req_uri_pats,
- const spair_vec res_uri_pats)
- {
- //TODO should we really copy them out?
- this->req_uri_pats = req_uri_pats;
- this->res_uri_pats = res_uri_pats;
- //pick up names
- parse_groups(req_uri_pats, req_groups_bynum);
- parse_groups(res_uri_pats, res_groups_bynum);
- };
-
-private:
- std::map<std::string, std::string> vars;
- spair_vec req_uri_pats;
- spair_vec res_uri_pats;
- std::vector<std::map<int, std::string> > req_groups_bynum;
- std::vector<std::map<int, std::string> > res_groups_bynum;
-
};
+BOOST_GLOBAL_FIXTURE( TestConfig );
+*/
BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
{
try
{
- FilterHeaderRewrite fhr;
- }
- catch ( ... ) {
- BOOST_CHECK (false);
- }
-}
-
-BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 )
-{
- try
- {
+ std::cout << "Running non-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"
+ " <rule name=\"null\"/>\n"
+ " <rule name=\"url\">\n"
+ " <rewrite from='"
+ "(?<proto>https?://)(?<pxhost>[^ /?#]+)/(?<pxpath>[^ /]+)"
+ "/(?<host>[^ /]+)(?<path>[^ ]*)'\n"
+ " to='${proto}${host}${path}' />\n"
+ " <rewrite from='(?:Host: )(.*)'\n"
+ " to='Host: ${host}' />\n"
+ " </rule>\n"
+ " <within header=\"link\" rule=\"null\"/>\n"
+ " <within reqline=\"1\" rule=\"url\"/>\n"
+ " </request>\n"
+ " <response>\n"
+ " <rule name=\"null\"/>\n"
+ " <rule name=\"url\">\n"
+ " <rewrite from='"
+ "(?<proto>https?://)(?<host>[^/?# "'>]+)/(?<path>[^ "'>]+)'\n"
+ " to='${proto}${pxhost}/${pxpath}/${host}/${path}' />\n"
+ " </rule>\n"
+ " <within header=\"link\" rule=\"url\"/>\n"
+ " <within tag=\"script\" attr=\"src,#text\" rule=\"url\"/>\n"
+ " <within tag=\"style\" rule=\"url\"/>\n"
+ " <within attr=\"href,src\" rule=\"url\"/>\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);
- FilterHeaderRewrite fhr;
-
- spair_vec vec_req;
- vec_req.push_back(std::make_pair(
- "(?<proto>http\\:\\/\\/s?)(?<pxhost>[^\\/?#]+)\\/(?<pxpath>[^\\/]+)"
- "\\/(?<target>.+)",
- "${proto}${target}"
- ));
- vec_req.push_back(std::make_pair(
- "proxyhost",
- "localhost"
- ));
-
- spair_vec vec_res;
-
- fhr.configure(vec_req, vec_res);
-
- mp::filter::HTTPClient hc;
-
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);
+ 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: 522\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 = 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;
+ 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((size_t) resp_result_len, strlen(resp_expected));
+
+ std::cout << "Rewritten result:\n" << std::endl;
+ fflush(stdout);
+ fwrite(resp_result, 1, resp_result_len, stdout);
+ fflush(stdout);
+ std::cout << "\nRewritten 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);
}
}
+
/*
* Local variables:
* c-basic-offset: 4