http_rewrite using HTML parser

diff --git a/src/filter_http_rewrite.cpp b/src/filter_http_rewrite.cpp
index 9d672fb..fd1b887 100644 (file)
--- a/src/filter_http_rewrite.cpp
+++ b/src/filter_http_rewrite.cpp
@@ -62,6 +62,7 @@ namespace metaproxy_1 {
             std::string header;
             std::string attr;
             std::string tag;
+            bool reqline;
             RulePtr rule;
         };
 
@@ -78,7 +79,7 @@ namespace metaproxy_1 {
         };
         class HttpRewrite::Event : public HTMLParserEvent {
             void openTagStart(const char *name);
-            void anyTagEnd(const char *name);
+            void anyTagEnd(const char *name, int close_it);
             void attribute(const char *tagName, 
                            const char *name, 
                            const char *value,
@@ -88,8 +89,9 @@ namespace metaproxy_1 {
             const Phase *m_phase;
             WRBUF m_w;
             std::list<Within>::const_iterator enabled_within;
+            std::map<std::string, std::string> &m_vars;
         public:
-            Event(const Phase *p);
+            Event(const Phase *p, std::map<std::string, std::string> &vars);
             ~Event();
             const char *result();
         };
@@ -158,51 +160,54 @@ void yf::HttpRewrite::Phase::rewrite_reqline (mp::odr & o,
         path += hreq->path;
     }
 
-    std::list<Within>::const_iterator it = within_list.begin();
-    if (it != within_list.end())
-    {
-        RulePtr rule = it->rule;
 
-        yaz_log(YLOG_LOG, "Proxy request URL is %s", path.c_str());
-        std::string npath = rule->test_patterns(vars, path);
-        if (!npath.empty())
+    std::list<Within>::const_iterator it = within_list.begin();
+    for (; it != within_list.end(); it++)
+        if (it->reqline)
         {
-            yaz_log(YLOG_LOG, "Rewritten request URL is %s", npath.c_str());
-            hreq->path = odr_strdup(o, npath.c_str());
+            RulePtr rule = it->rule;
+            yaz_log(YLOG_LOG, "Proxy request URL is %s", path.c_str());
+            std::string npath = rule->test_patterns(vars, path);
+            if (!npath.empty())
+            {
+                yaz_log(YLOG_LOG, "Rewritten request URL is %s", npath.c_str());
+                hreq->path = odr_strdup(o, npath.c_str());
+            }
         }
-    }
 }
 
 void yf::HttpRewrite::Phase::rewrite_headers(mp::odr & o,
         Z_HTTP_Header *headers,
         std::map<std::string, std::string> & vars) const
 {
-    for (Z_HTTP_Header *header = headers;
-            header != 0;
-            header = header->next)
+    for (Z_HTTP_Header *header = headers; header; header = header->next)
     {
-        std::string sheader(header->name);
-        sheader += ": ";
-        sheader += header->value;
-        yaz_log(YLOG_LOG, "%s: %s", header->name, header->value);
-
         std::list<Within>::const_iterator it = within_list.begin();
-        if (it == within_list.end())
-            continue;
-        RulePtr rule = it->rule;
-
-        std::string out = rule->test_patterns(vars, sheader);
-        if (!out.empty())
+        for (; it != within_list.end(); it++)
         {
-            size_t pos = out.find(": ");
-            if (pos == std::string::npos)
+            if (it->header.length() > 0 &&
+                yaz_strcasecmp(it->header.c_str(), header->name) == 0)
             {
-                yaz_log(YLOG_LOG, "Header malformed during rewrite, ignoring");
-                continue;
+                std::string sheader(header->name);
+                sheader += ": ";
+                sheader += header->value;
+
+                RulePtr rule = it->rule;
+                std::string out = rule->test_patterns(vars, sheader);
+                if (!out.empty())
+                {
+                    size_t pos = out.find(": ");
+                    if (pos == std::string::npos)
+                    {
+                        yaz_log(YLOG_LOG, "Header malformed during rewrite, ignoring");
+                        continue;
+                    }
+                    header->name = odr_strdup(o, out.substr(0, pos).c_str());
+                    header->value = odr_strdup(o,
+                                               out.substr(pos + 2,
+                                                          std::string::npos).c_str());
+                }
             }
-            header->name = odr_strdup(o, out.substr(0, pos).c_str());
-            header->value = odr_strdup(o, out.substr(pos+2,
-                                                     std::string::npos).c_str());
         }
     }
 }
@@ -214,32 +219,25 @@ void yf::HttpRewrite::Phase::rewrite_body(mp::odr & o,
 {
     if (*content_buf)
     {
+        int i;
+        for (i = 0; i < *content_len; i++)
+            if ((*content_buf)[i] == 0)
+                return;  // binary content. skip
+
         HTMLParser parser;
-        Event ev(this);
+        Event ev(this, vars);
         std::string buf(*content_buf, *content_len);
 
         parser.parse(ev, buf.c_str());
-        std::cout << "RES\n" << ev.result() << std::endl;
-        std::cout << "-----" << std::endl;
-
-
-        std::list<Within>::const_iterator it = within_list.begin();
-        if (it != within_list.end())
-        {
-            RulePtr rule = it->rule;
-
-            std::string body(*content_buf);
-            std::string nbody = rule->test_patterns(vars, body);
-            if (!nbody.empty())
-            {
-                *content_buf = odr_strdup(o, nbody.c_str());
-                *content_len = nbody.size();
-            }
-        }
+        const char *res = ev.result();
+        *content_buf = odr_strdup(o, res);
+        *content_len = strlen(res);
     }
 }
 
-yf::HttpRewrite::Event::Event(const Phase *p) : m_phase(p)
+yf::HttpRewrite::Event::Event(const Phase *p,
+                              std::map<std::string, std::string> & vars
+    ) : m_phase(p), m_vars(vars)
 {
     m_w = wrbuf_alloc();
     enabled_within = m_phase->within_list.end();
@@ -274,16 +272,21 @@ void yf::HttpRewrite::Event::openTagStart(const char *name)
     wrbuf_puts(m_w, name);
 }
 
-void yf::HttpRewrite::Event::anyTagEnd(const char *name)
+void yf::HttpRewrite::Event::anyTagEnd(const char *name, int close_it)
 {
-    std::list<Within>::const_iterator it = enabled_within;
-    if (it != m_phase->within_list.end())
+    if (close_it)
     {
-        if (it->tag.compare(name) == 0)
+        std::list<Within>::const_iterator it = enabled_within;
+        if (it != m_phase->within_list.end())
         {
-            enabled_within = m_phase->within_list.end();
+            if (it->tag.compare(name) == 0)
+            {
+                enabled_within = m_phase->within_list.end();
+            }
         }
     }
+    if (close_it)
+        wrbuf_putc(m_w, '/');
     wrbuf_putc(m_w, '>');
 }
 
@@ -292,39 +295,40 @@ void yf::HttpRewrite::Event::attribute(const char *tagName,
                                          const char *value,
                                          int val_len)
 {
-    std::list<Within>::const_iterator it = enabled_within;
+    std::list<Within>::const_iterator it = m_phase->within_list.begin();
     bool subst = false;
 
-    if (it == m_phase->within_list.end())
+    for (; it != m_phase->within_list.end(); it++)
     {
-        // no active within tag.. see if a attr rule without tag applies
-        it = m_phase->within_list.begin();
-        for (; it != m_phase->within_list.end(); it++)
-        {
-            if (it->attr.length() > 0 && it->tag.length() == 0)
-                break;
-        }
-    }
-    if (it != m_phase->within_list.end())
-    {
-        std::vector<std::string> attr;
-        boost::split(attr, it->attr, boost::is_any_of(","));
-        size_t i;
-        for (i = 0; i < attr.size(); i++)
+        if (it->tag.length() == 0 || it->tag.compare(tagName) == 0)
         {
-            if (attr[i].compare("#text") && attr[i].compare(tagName) == 0)
+            std::vector<std::string> attr;
+            boost::split(attr, it->attr, boost::is_any_of(","));
+            size_t i;
+            for (i = 0; i < attr.size(); i++)
             {
-                subst = true;
+                if (attr[i].compare("#text") && attr[i].compare(name) == 0)
+                    subst = true;
             }
         }
+        if (subst)
+            break;
     }
 
     wrbuf_putc(m_w, ' ');
     wrbuf_puts(m_w, name);
-    wrbuf_puts(m_w, "\"");
-    wrbuf_write(m_w, value, val_len);
+    wrbuf_puts(m_w, "=\"");
+
+    std::string output;
     if (subst)
-        wrbuf_puts(m_w, " SUBST");
+    {
+        std::string input(value, val_len);
+        output = it->rule->test_patterns(m_vars, input);
+    }
+    if (output.empty())
+        wrbuf_write(m_w, value, val_len);
+    else
+        wrbuf_puts(m_w, output.c_str());
     wrbuf_puts(m_w, "\"");
 }
 
@@ -365,9 +369,16 @@ void yf::HttpRewrite::Event::text(const char *value, int len)
             }
         }
     }
-    wrbuf_write(m_w, value, len);
+    std::string output;
     if (subst)
-        wrbuf_puts(m_w, "<!-- SUBST -->");
+    {
+        std::string input(value, len);
+        output = it->rule->test_patterns(m_vars, input);
+    }
+    if (output.empty())
+        wrbuf_write(m_w, value, len);
+    else
+        wrbuf_puts(m_w, output.c_str());
 }
 
 
@@ -590,14 +601,13 @@ void yf::HttpRewrite::configure_phase(const xmlNode *ptr, Phase &phase)
                          + std::string((const char *) p->name)
                          + " in http_rewrite filter");
             }
-            if (!rule->replace_list.empty())
-                rules[values[0]] = rule;
+            rules[values[0]] = rule;
         }
         else if (!strcmp((const char *) ptr->name, "within"))
         {
-            static const char *names[5] =
-                { "header", "attr", "tag", "rule", 0 };
-            std::string values[4];
+            static const char *names[6] =
+                { "header", "attr", "tag", "rule", "reqline", 0 };
+            std::string values[5];
             mp::xml::parse_attr(ptr, names, values);
             Within w;
             w.header = values[0];
@@ -610,6 +620,7 @@ void yf::HttpRewrite::configure_phase(const xmlNode *ptr, Phase &phase)
                     ("Reference to non-existing rule '" + values[3] +
                      "' in http_rewrite filter");
             w.rule = it->second;
+            w.reqline = values[4] == "1";
             phase.within_list.push_back(w);
         }
         else

diff --git a/src/html_parser.cpp b/src/html_parser.cpp
index 8d91a2c..49ef670 100644 (file)
--- a/src/html_parser.cpp
+++ b/src/html_parser.cpp
@@ -130,7 +130,7 @@ static int tagAttrs (mp::HTMLParserEvent & event,
     const char *attr_value;
     int val_len;
     i = skipSpace (cp);
-    while (cp[i] && cp[i] != '>')
+    while (cp[i] && cp[i] != '>' && cp[i] != '/')
     {
         int nor = skipAttribute (cp+i, attr_name, &attr_value, &val_len);
         i += nor;
@@ -176,11 +176,16 @@ static int tagStart (mp::HTMLParserEvent & event,
 static int tagEnd (mp::HTMLParserEvent & event, const char *tagName, const char *cp)
 {
     int i = 0;
+    int close_it = 0;
     while (cp[i] && cp[i] != '>')
+    {
+        if (cp[i] == '/')
+            close_it = 1;
         i++;
+    }
     if (cp[i] == '>')
     {
-        event.anyTagEnd(tagName);
+        event.anyTagEnd(tagName, close_it);
         i++;
     }
     return i;

diff --git a/src/html_parser.hpp b/src/html_parser.hpp
index ad46061..2193a0f 100644 (file)
--- a/src/html_parser.hpp
+++ b/src/html_parser.hpp
@@ -25,7 +25,7 @@ namespace metaproxy_1 {
         class HTMLParserEvent {
         public:
             virtual void openTagStart(const char *name) = 0;
-            virtual void anyTagEnd(const char *name) = 0;
+            virtual void anyTagEnd(const char *name, int close_it) = 0;
             virtual void attribute(const char *tagName, 
                     const char *name, 
                     const char *value,

diff --git a/src/test_filter_rewrite.cpp b/src/test_filter_rewrite.cpp
index b16768f..65cb4c0 100644 (file)
--- a/src/test_filter_rewrite.cpp
+++ b/src/test_filter_rewrite.cpp
@@ -42,14 +42,14 @@ namespace mp = metaproxy_1;
  * The global testconfig is commented out, as it won't even compile
  * on old Centos5 machines
 struct TestConfig {
-    TestConfig()   
+    TestConfig()
     {
-        std::cout << "global setup\n"; 
+        std::cout << "global setup\n";
         yaz_log_init_level(YLOG_ALL);
     }
-    ~TestConfig() 
-    { 
-        std::cout << "global teardown\n"; 
+    ~TestConfig()
+    {
+        std::cout << "global teardown\n";
     }
 };
 
@@ -63,12 +63,13 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
         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='"
     "(?&lt;proto>https?://)(?&lt;pxhost>[^ /?#]+)/(?&lt;pxpath>[^ /]+)"
@@ -77,16 +78,20 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
             "     <rewrite from='(?:Host: )(.*)'\n"
             "            to='Host: ${host}' />\n"
             "   </rule>\n"
-            "   <within rule=\"url\"/>\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='"
     "(?&lt;proto>https?://)(?&lt;host>[^/?# &quot;&apos;>]+)/(?&lt;path>[^  &quot;&apos;>]+)'\n"
-            "            to='${proto}${pxhost}/${pxpath}/${host}/${path}' />\n" 
+            "            to='${proto}${pxhost}/${pxpath}/${host}/${path}' />\n"
             "  </rule>\n"
-            "  <within rule=\"url\"/>\n"
-            "  <within tag=\"html\" rule=\"url\"/>\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"
         ;
@@ -99,14 +104,14 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
         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, 
+        Z_GDU *gdu_req = z_get_HTTP_Request_uri(odr,
         "http://proxyhost/proxypath/targetsite/page1.html", 0, 1);
 
         pack.request() = gdu_req;
@@ -133,14 +138,14 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
             "xified"
             "<a href=\"http://targetsite/page2.html\">"
             "  An absolute link</a>"
-            "<a target=_blank href='http://targetsite/page3.html\">"
+            "<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-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"
@@ -158,9 +163,9 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
             "xified"
             "<a href=\"http://proxyhost/proxypath/targetsite/page2.html\">"
             "  An absolute link</a>"
-            "<a target=_blank href='http://proxyhost/proxypath/targetsite/page3.html\">"
+            "<a target=\"_blank\" href=\"http://proxyhost/proxypath/targetsite/page3.html\">"
             "  Another abs link</a>"
-            "<a href=\"/docs/page4.html\" />"
+            "<a href=\"/docs/page4.html\"/>"
             "</body></html>";
 
         int r;
@@ -184,7 +189,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
         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);
 
@@ -196,13 +201,15 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
         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);
-        std::cout << "\nRewritten result buf len: " << resp_result_len 
+        fflush(stdout);
+        std::cout << "\nRewritten result buf len: " << resp_result_len
             << std::endl;
 
         BOOST_CHECK(memcmp(resp_result, resp_expected, resp_result_len) == 0);

diff --git a/src/test_html_parser.cpp b/src/test_html_parser.cpp
index aa818f9..f0ab641 100644 (file)
--- a/src/test_html_parser.cpp
+++ b/src/test_html_parser.cpp
@@ -54,8 +54,10 @@ class MyEvent : public mp::HTMLParserEvent {
             out += "\"";
         }
 
-        void anyTagEnd(const char *name)
+        void anyTagEnd(const char *name, int close_it)
         {
+            if (close_it)
+                out += "/";
             out += ">";
         }
         
@@ -79,12 +81,15 @@ BOOST_AUTO_TEST_CASE( test_html_parser_1 )
         mp::HTMLParser hp;
         const char* html = 
             "<html><body><a t1=v1 t2='v2' t3=\"v3\">some text</a>"
-            "<hr><table ></table  ></body></html";
+            "<hr><table ></table  ><a href=\"x\"/></body></html>";
         const char* expected = 
             "<html><body><a t1=\"v1\" t2=\"v2\" t3=\"v3\">some text</a>"
-            "<hr><table></table></body></html";
+            "<hr><table></table><a href=\"x\"/></body></html>";
         MyEvent e;
         hp.parse(e, html);
+
+        std::cout << expected << std::endl;
+        std::cout << e.out << std::endl;
         BOOST_CHECK_EQUAL(std::string(expected), e.out);
     }
     catch (std::exception & e)