X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_http_rewrite.cpp;h=cb005e9f67fca0b6dbca616c79bd5e17b9c4f438;hb=55e06106b63485b77b5b3c114c39b79e4f23168a;hp=80a876a86620e3a88f6ad9d4dffdd2fd75c0f103;hpb=fafb98623457b4b29bbe3a32af19e901d92106dc;p=metaproxy-moved-to-github.git

diff --git a/src/filter_http_rewrite.cpp b/src/filter_http_rewrite.cpp
index 80a876a..cb005e9 100644
--- a/src/filter_http_rewrite.cpp
+++ b/src/filter_http_rewrite.cpp
@@ -59,9 +59,9 @@ namespace metaproxy_1 {
         };
         class HttpRewrite::Within {
         public:
-            std::string header;
-            std::string attr;
-            std::string tag;
+            boost::regex header;
+            boost::regex attr;
+            boost::regex tag;
             std::string type;
             bool reqline;
             RulePtr rule;
@@ -226,8 +226,8 @@ void yf::HttpRewrite::Phase::rewrite_headers(mp::odr & o,
         std::list<Within>::const_iterator it = cit->within_list.begin();
         for (; it != cit->within_list.end(); it++)
         {
-            if (it->header.length() > 0 &&
-                yaz_strcasecmp(it->header.c_str(), header->name) == 0)
+            if (!it->header.empty() &&
+                regex_match(header->name, it->header))
             {
                 std::string sheader(header->name);
                 sheader += ": ";
@@ -309,19 +309,12 @@ void yf::HttpRewrite::Event::openTagStart(const char *tag, int tag_len)
     std::list<Within>::const_iterator it = m_content->within_list.begin();
     for (; it != m_content->within_list.end(); it++)
     {
-        if (it->tag.length() > 0 && yaz_strcasecmp(it->tag.c_str(),
-                                                   t.c_str()) == 0)
+        if (!it->tag.empty() && regex_match(t, it->tag))
         {
-            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->attr.empty() && regex_match("#text", it->attr))
             {
-                if (attr[i].compare("#text") == 0)
-                {
-                    s_within.push(it);
-                    return;
-                }
+                s_within.push(it);
+                return;
             }
         }
     }
@@ -336,7 +329,7 @@ void yf::HttpRewrite::Event::anyTagEnd(const char *tag, int tag_len,
         {
             std::list<Within>::const_iterator it = s_within.top();
             std::string t(tag, tag_len);
-            if (yaz_strcasecmp(it->tag.c_str(), t.c_str()) == 0)
+            if (regex_match(t, it->tag))
                 s_within.pop();
         }
     }
@@ -356,19 +349,11 @@ void yf::HttpRewrite::Event::attribute(const char *tag, int tag_len,
     for (; it != m_content->within_list.end(); it++)
     {
         std::string t(tag, tag_len);
-        if (it->tag.length() == 0 ||
-            yaz_strcasecmp(it->tag.c_str(), t.c_str()) == 0)
+        if (it->tag.empty() || regex_match(t, it->tag))
         {
             std::string a(attr, attr_len);
-            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 (attr[i].compare("#text") &&
-                    yaz_strcasecmp(attr[i].c_str(), a.c_str()) == 0)
-                    subst = true;
-            }
+            if (!it->attr.empty() && regex_match(a, it->attr))
+                subst = true;
         }
         if (subst)
             break;
@@ -400,7 +385,7 @@ void yf::HttpRewrite::Event::closeTag(const char *tag, int tag_len)
     {
         std::list<Within>::const_iterator it = s_within.top();
         std::string t(tag, tag_len);
-        if (yaz_strcasecmp(it->tag.c_str(), t.c_str()) == 0)
+        if (regex_match(t, it->tag))
             s_within.pop();
     }
     wrbuf_puts(m_w, "</");
@@ -425,7 +410,8 @@ void yf::HttpRewrite::Event::text(const char *value, int len)
 static bool embed_quoted_literal(
     std::string &content,
     std::map<std::string, std::string> &vars,
-    mp::filter::HttpRewrite::RulePtr ruleptr)
+    mp::filter::HttpRewrite::RulePtr ruleptr,
+    bool html_context)
 {
     bool replace = false;
     std::string res;
@@ -433,7 +419,28 @@ static bool embed_quoted_literal(
     const char *cp0 = cp;
     while (*cp)
     {
-        if (*cp == '"' || *cp == '\'')
+        if (html_context && !strncmp(cp, "&quot;", 6))
+        {
+            cp += 6;
+            res.append(cp0, cp - cp0);
+            cp0 = cp;
+            while (*cp)
+            {
+                if (!strncmp(cp, "&quot;", 6))
+                    break;
+                if (*cp == '\n')
+                    break;
+                cp++;
+            }
+            if (!*cp)
+                break;
+            std::string s(cp0, cp - cp0);
+            if (ruleptr->test_patterns(vars, s, true))
+                replace = true;
+            cp0 = cp;
+            res.append(s);
+        }
+        else if (*cp == '"' || *cp == '\'')
         {
             int m = *cp;
             cp++;
@@ -473,7 +480,7 @@ bool yf::HttpRewrite::Within::exec(
 {
     if (type == "quoted-literal")
     {
-        return embed_quoted_literal(txt, vars, rule);
+        return embed_quoted_literal(txt, vars, rule, true);
     }
     else
     {
@@ -685,7 +692,7 @@ void yf::HttpRewrite::Content::quoted_literal(
 {
     std::list<Within>::const_iterator it = within_list.begin();
     if (it != within_list.end())
-        embed_quoted_literal(content, vars, it->rule);
+        embed_quoted_literal(content, vars, it->rule, false);
 }
 
 void yf::HttpRewrite::Content::configure(
@@ -702,9 +709,12 @@ void yf::HttpRewrite::Content::configure(
             std::string values[6];
             mp::xml::parse_attr(ptr, names, values);
             Within w;
-            w.header = values[0];
-            w.attr = values[1];
-            w.tag = values[2];
+            if (values[0].length() > 0)
+                w.header.assign(values[0], boost::regex_constants::icase);
+            if (values[1].length() > 0)
+                w.attr.assign(values[1], boost::regex_constants::icase);
+            if (values[2].length() > 0)
+                w.tag.assign(values[2], boost::regex_constants::icase);
             std::map<std::string,RulePtr>::const_iterator it =
                 rules.find(values[3]);
             if (it == rules.end())
@@ -800,8 +810,8 @@ void yf::HttpRewrite::configure_phase(const xmlNode *ptr, Phase &phase)
             Content c;
 
             c.type = values[0];
-            // if (!values[1].empty())
-                c.content_re = values[1];
+            if (!values[1].empty())
+                c.content_re.assign(values[1], boost::regex::icase);
             c.configure(ptr->children, rules);
             phase.content_list.push_back(c);
         }