From 24c59a891cc78bd319b5db6c5ade450585e37ed1 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 4 Jul 2013 16:16:54 +0200 Subject: [PATCH] http_rewrite: quoted literals --- src/filter_http_rewrite.cpp | 56 ++++++++++++++++ src/test_filter_rewrite.cpp | 153 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 209 insertions(+) diff --git a/src/filter_http_rewrite.cpp b/src/filter_http_rewrite.cpp index ddcac86..5e3cfab 100644 --- a/src/filter_http_rewrite.cpp +++ b/src/filter_http_rewrite.cpp @@ -73,6 +73,8 @@ namespace metaproxy_1 { std::list within_list; void configure(const xmlNode *ptr, std::map &rules); + void quoted_literal(std::string &content, + std::map &vars) const; }; class HttpRewrite::Phase { public: @@ -288,6 +290,13 @@ void yf::HttpRewrite::Phase::rewrite_body( *content_buf = odr_strdup(o, res); *content_len = strlen(res); } + if (cit->type == "quoted-literal") + { + std::string content(*content_buf, *content_len); + cit->quoted_literal(content, vars); + *content_buf = odr_strdup(o, content.c_str()); + *content_len = strlen(*content_buf); + } } } @@ -608,6 +617,53 @@ yf::HttpRewrite::Phase::Phase() : m_verbose(0) { } +void yf::HttpRewrite::Content::quoted_literal( + std::string &content, + std::map &vars) const +{ + std::string res; + const char *cp = content.c_str(); + const char *cp0 = cp; + while (*cp) + { + if (*cp == '"' || *cp == '\'') + { + int m = *cp; + cp++; + res.append(cp0, cp - cp0); + cp0 = cp; + while (*cp) + { + if (cp[-1] != '\\' && *cp == m) + break; + cp++; + } + if (!*cp) + break; + std::list::const_iterator it = within_list.begin(); + std::string s(cp0, cp - cp0); + if (it != within_list.end()) + { + RulePtr rule = it->rule; + std::string r; + r = rule->test_patterns(vars, s, true); + if (!r.empty()) + s = r; + } + cp0 = cp; + res.append(s); + } + else if (*cp == '/' && cp[1] == '/') + { + while (cp[1] && cp[1] != '\n') + cp++; + } + cp++; + } + res.append(cp0, cp - cp0); + content = res; +} + void yf::HttpRewrite::Content::configure( const xmlNode *ptr, std::map &rules) { diff --git a/src/test_filter_rewrite.cpp b/src/test_filter_rewrite.cpp index a048c74..6a81559 100644 --- a/src/test_filter_rewrite.cpp +++ b/src/test_filter_rewrite.cpp @@ -222,6 +222,159 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) } +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 = + "\n" + "\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \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); + 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: 140\r\n" + "Content-Type: application/javascript\r\n" + "Link: ; rel=absolute\r\n" + "Link: ; rel=relative\r\n" + "\r\n" + "// \"\n" + "my.location = 'http://targetsite/images/bg.png';\n" + "my.other = \"http://targetsite/images/fg.png\";\n" + "my.thrd = \"other\";\n" + "// http://targetsite/images/bg.png\n"; + + const char *resp_expected = + "HTTP/1.1 200 OK\r\n" + "Content-Length: 194\r\n" + "Content-Type: application/javascript\r\n" + "Link: ; rel=absolute\r\n" + "Link: ; rel=relative\r\n" + "\r\n" + "// \"\n" + "my.location = 'http://proxyhost/proxypath/targetsite/images/bg.png';\n" + "my.other = \"http://proxyhost/proxypath/targetsite/images/fg.png\";\n" + "my.thrd = \"other\";\n" + "// http://targetsite/images/bg.png\n"; + + Z_GDU *gdu_res; + mp::odr dec(ODR_DECODE); + mp::odr enc(ODR_ENCODE); + odr_setbuf(dec, (char *) resp_buf, strlen(resp_buf), 0); + int 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); + + z_GDU(enc, &gdu_res_rew, 0, 0); + char *resp_result; + int resp_result_len; + resp_result = odr_getbuf(enc, &resp_result_len, 0); + + int equal = ((size_t) resp_result_len == strlen(resp_expected)) + && !memcmp(resp_result, resp_expected, resp_result_len); + BOOST_CHECK(equal); + + if (!equal) + { + //compare buffers + std::cout << "Expected result:\n" << resp_expected << "\n"; + std::cout << "Got result:\n" << "\n"; + fflush(stdout); + fwrite(resp_result, 1, resp_result_len, stdout); + fflush(stdout); + std::cout << "\nGot result buf len: " << resp_result_len + << "\n"; + } + } + } + catch (std::exception & e) { + std::cout << e.what(); + std::cout << std::endl; + BOOST_CHECK (false); + } +} + /* * Local variables: * c-basic-offset: 4 -- 1.7.10.4