X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_http_rewrite.cpp;h=d4fdbcb0319b1893349e1dde14f878146e46793d;hb=da6bac74235b917ec0ea5afc39ee6b4c35d57b45;hp=90e3152b0362195a0b221c37a60bd10ae16c8650;hpb=41ddc790e888e2b0cfe5da66a34e26e737e20b54;p=metaproxy-moved-to-github.git diff --git a/src/filter_http_rewrite.cpp b/src/filter_http_rewrite.cpp index 90e3152..d4fdbcb 100644 --- a/src/filter_http_rewrite.cpp +++ b/src/filter_http_rewrite.cpp @@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include +#include #include #include #include @@ -39,15 +40,15 @@ namespace metaproxy_1 { namespace filter { class HttpRewrite::Replace { public: - std::string regex; + boost::regex re; std::string recipe; std::map group_index; const std::string search_replace( std::map & vars, const std::string & txt) const; - std::string sub_vars ( + std::string sub_vars( const std::map & vars) const; - void parse_groups(); + void parse_groups(std::string pattern); }; class HttpRewrite::Rule { @@ -84,12 +85,13 @@ namespace metaproxy_1 { void anyTagEnd(const char *tag, int tag_len, int close_it); void attribute(const char *tag, int tag_len, const char *attr, int attr_len, - const char *value, int val_len); + const char *value, int val_len, + const char *sep); void closeTag(const char *tag, int tag_len); void text(const char *value, int len); const Phase *m_phase; WRBUF m_w; - std::list::const_iterator enabled_within; + std::stack::const_iterator> s_within; std::map &m_vars; public: Event(const Phase *p, std::map &vars); @@ -244,7 +246,6 @@ yf::HttpRewrite::Event::Event(const Phase *p, ) : m_phase(p), m_vars(vars) { m_w = wrbuf_alloc(); - enabled_within = m_phase->within_list.end(); } yf::HttpRewrite::Event::~Event() @@ -259,33 +260,29 @@ const char *yf::HttpRewrite::Event::result() void yf::HttpRewrite::Event::openTagStart(const char *tag, int tag_len) { - // check if there is - if (enabled_within == m_phase->within_list.end()) + wrbuf_putc(m_w, '<'); + wrbuf_write(m_w, tag, tag_len); + + std::string t(tag, tag_len); + std::list::const_iterator it = m_phase->within_list.begin(); + for (; it != m_phase->within_list.end(); it++) { - std::string t(tag, tag_len); - std::list::const_iterator it = - m_phase->within_list.begin(); - for (; it != m_phase->within_list.end(); it++) + if (it->tag.length() > 0 && yaz_strcasecmp(it->tag.c_str(), + t.c_str()) == 0) { - if (it->tag.length() > 0 && yaz_strcasecmp(it->tag.c_str(), - t.c_str()) == 0) + std::vector attr; + boost::split(attr, it->attr, boost::is_any_of(",")); + size_t i; + for (i = 0; i < attr.size(); i++) { - std::vector 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") == 0) { - if (attr[i].compare("#text") == 0) - { - enabled_within = it; - break; - } + s_within.push(it); + return; } } } } - wrbuf_putc(m_w, '<'); - wrbuf_write(m_w, tag, tag_len); } void yf::HttpRewrite::Event::anyTagEnd(const char *tag, int tag_len, @@ -293,14 +290,12 @@ void yf::HttpRewrite::Event::anyTagEnd(const char *tag, int tag_len, { if (close_it) { - std::list::const_iterator it = enabled_within; - if (it != m_phase->within_list.end()) + if (!s_within.empty()) { + std::list::const_iterator it = s_within.top(); std::string t(tag, tag_len); if (yaz_strcasecmp(it->tag.c_str(), t.c_str()) == 0) - { - enabled_within = m_phase->within_list.end(); - } + s_within.pop(); } } if (close_it) @@ -310,7 +305,8 @@ void yf::HttpRewrite::Event::anyTagEnd(const char *tag, int tag_len, void yf::HttpRewrite::Event::attribute(const char *tag, int tag_len, const char *attr, int attr_len, - const char *value, int val_len) + const char *value, int val_len, + const char *sep) { std::list::const_iterator it = m_phase->within_list.begin(); bool subst = false; @@ -338,31 +334,33 @@ void yf::HttpRewrite::Event::attribute(const char *tag, int tag_len, wrbuf_putc(m_w, ' '); wrbuf_write(m_w, attr, attr_len); - wrbuf_puts(m_w, "=\""); - - std::string output; - if (subst) + if (value) { - std::string input(value, val_len); - output = it->rule->test_patterns(m_vars, input); + wrbuf_puts(m_w, "="); + wrbuf_puts(m_w, sep); + + std::string output; + if (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, sep); } - if (output.empty()) - wrbuf_write(m_w, value, val_len); - else - wrbuf_puts(m_w, output.c_str()); - wrbuf_puts(m_w, "\""); } void yf::HttpRewrite::Event::closeTag(const char *tag, int tag_len) { - std::list::const_iterator it = enabled_within; - if (it != m_phase->within_list.end()) + if (!s_within.empty()) { + std::list::const_iterator it = s_within.top(); std::string t(tag, tag_len); if (yaz_strcasecmp(it->tag.c_str(), t.c_str()) == 0) - { - enabled_within = m_phase->within_list.end(); - } + s_within.pop(); } wrbuf_puts(m_w, "::const_iterator it = enabled_within; - bool subst = false; - - if (it != m_phase->within_list.end()) - { - subst = true; - if (it->attr.length() > 0) - { - subst = false; - std::vector 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") == 0) - { - subst = true; - } - } - } - } + std::list::const_iterator it = m_phase->within_list.end(); + if (!s_within.empty()) + it = s_within.top(); std::string output; - if (subst) + if (it != m_phase->within_list.end()) { std::string input(value, len); output = it->rule->test_patterns(m_vars, input); @@ -403,7 +383,6 @@ void yf::HttpRewrite::Event::text(const char *value, int len) wrbuf_puts(m_w, output.c_str()); } - /** * Tests pattern from the vector in order and executes recipe on the first match. @@ -426,8 +405,6 @@ const std::string yf::HttpRewrite::Replace::search_replace( std::map & vars, const std::string & txt) const { - //exec regex against value - boost::regex re(regex); boost::smatch what; std::string::const_iterator start, end; start = txt.begin(); @@ -443,8 +420,7 @@ const std::string yf::HttpRewrite::Replace::search_replace( = group_index.find(i); if (it != group_index.end()) { //it is - if (!what[i].str().empty()) - vars[it->second] = what[i]; + vars[it->second] = what[i]; } } @@ -462,11 +438,11 @@ const std::string yf::HttpRewrite::Replace::search_replace( return out; } -void yf::HttpRewrite::Replace::parse_groups() +void yf::HttpRewrite::Replace::parse_groups(std::string pattern) { int gnum = 0; bool esc = false; - const std::string & str = regex; + const std::string &str = pattern; std::string res; yaz_log(YLOG_LOG, "Parsing groups from '%s'", str.c_str()); for (size_t i = 0; i < str.size(); ++i) @@ -522,11 +498,11 @@ void yf::HttpRewrite::Replace::parse_groups() } esc = false; } - regex = res; + re = res; } -std::string yf::HttpRewrite::Replace::sub_vars ( - const std::map & vars) const +std::string yf::HttpRewrite::Replace::sub_vars( + const std::map & vars) const { std::string out; bool esc = false; @@ -608,11 +584,12 @@ void yf::HttpRewrite::configure_phase(const xmlNode *ptr, Phase &phase) if (!strcmp((const char *) p->name, "rewrite")) { Replace replace; + std::string from; const struct _xmlAttr *attr; for (attr = p->properties; attr; attr = attr->next) { if (!strcmp((const char *) attr->name, "from")) - replace.regex = mp::xml::get_text(attr->children); + from = mp::xml::get_text(attr->children); else if (!strcmp((const char *) attr->name, "to")) replace.recipe = mp::xml::get_text(attr->children); else @@ -622,10 +599,12 @@ void yf::HttpRewrite::configure_phase(const xmlNode *ptr, Phase &phase) + " in rewrite section of http_rewrite"); } yaz_log(YLOG_LOG, "Found rewrite rule from '%s' to '%s'", - replace.regex.c_str(), replace.recipe.c_str()); - replace.parse_groups(); - if (!replace.regex.empty()) + from.c_str(), replace.recipe.c_str()); + if (!from.empty()) + { + replace.parse_groups(from); rule->replace_list.push_back(replace); + } } else throw mp::filter::FilterException