namespace filter {
class HttpRewrite::Replace {
public:
- std::string regex;
+ bool start_anchor;
+ boost::regex re;
+ boost::smatch what;
std::string recipe;
std::map<int, std::string> group_index;
- const std::string search_replace(
- std::map<std::string, std::string> & vars,
- const std::string & txt) const;
std::string sub_vars(
const std::map<std::string, std::string> & vars) const;
- void parse_groups();
+ void parse_groups(std::string pattern);
};
class HttpRewrite::Rule {
std::list<Replace> replace_list;
const std::string test_patterns(
std::map<std::string, std::string> & vars,
- const std::string & txt) const;
+ const std::string & txt, bool anchor);
};
class HttpRewrite::Within {
public:
RulePtr rule;
};
+ class HttpRewrite::Content {
+ public:
+ std::string type;
+ boost::regex content_re;
+ std::list<Within> within_list;
+ void configure(const xmlNode *ptr,
+ std::map<std::string, RulePtr > &rules);
+ void quoted_literal(std::string &content,
+ std::map<std::string, std::string> &vars) const;
+ };
class HttpRewrite::Phase {
public:
Phase();
- std::list<Within> within_list;
int m_verbose;
+ std::list<Content> content_list;
void rewrite_reqline(mp::odr & o, Z_HTTP_Request *hreq,
std::map<std::string, std::string> & vars) const;
void rewrite_headers(mp::odr & o, Z_HTTP_Header *headers,
std::map<std::string, std::string> & vars) const;
void rewrite_body(mp::odr & o,
- char **content_buf, int *content_len,
- std::map<std::string, std::string> & vars) const;
+ const char *content_type,
+ char **content_buf, int *content_len,
+ std::map<std::string, std::string> & vars) const;
};
class HttpRewrite::Event : public HTMLParserEvent {
void openTagStart(const char *tag, int tag_len);
const char *sep);
void closeTag(const char *tag, int tag_len);
void text(const char *value, int len);
- const Phase *m_phase;
+ const Content *m_content;
WRBUF m_w;
std::stack<std::list<Within>::const_iterator> s_within;
std::map<std::string, std::string> &m_vars;
public:
- Event(const Phase *p, std::map<std::string, std::string> &vars);
+ Event(const Content *p, std::map<std::string, std::string> &vars);
~Event();
const char *result();
};
yaz_log(YLOG_LOG, ">> Request headers");
req_phase->rewrite_headers(o, hreq->headers, vars);
req_phase->rewrite_body(o,
- &hreq->content_buf, &hreq->content_len, vars);
+ z_HTTP_header_lookup(hreq->headers,
+ "Content-Type"),
+ &hreq->content_buf, &hreq->content_len,
+ vars);
package.request() = gdu;
}
package.move();
mp::odr o;
yaz_log(YLOG_LOG, "<< Respose headers");
res_phase->rewrite_headers(o, hres->headers, vars);
- res_phase->rewrite_body(o, &hres->content_buf,
- &hres->content_len, vars);
+ res_phase->rewrite_body(o,
+ z_HTTP_header_lookup(hres->headers,
+ "Content-Type"),
+ &hres->content_buf, &hres->content_len,
+ vars);
package.response() = gdu;
}
}
else
{
//TODO what about proto
+ const char *host = z_HTTP_header_lookup(hreq->headers, "Host");
+ if (!host)
+ return;
+
path += "http://";
- path += z_HTTP_header_lookup(hreq->headers, "Host");
+ path += host;
path += hreq->path;
}
+ std::list<Content>::const_iterator cit = content_list.begin();
+ for (; cit != content_list.end(); cit++)
+ if (cit->type == "headers")
+ break;
- std::list<Within>::const_iterator it = within_list.begin();
- for (; it != within_list.end(); it++)
+ if (cit == content_list.end())
+ return;
+
+ std::list<Within>::const_iterator it = cit->within_list.begin();
+ for (; it != cit->within_list.end(); it++)
if (it->reqline)
{
RulePtr rule = it->rule;
yaz_log(YLOG_LOG, "Proxy request URL is %s", path.c_str());
- std::string npath = rule->test_patterns(vars, path);
+ std::string npath = rule->test_patterns(vars, path, true);
if (!npath.empty())
{
yaz_log(YLOG_LOG, "Rewritten request URL is %s", npath.c_str());
Z_HTTP_Header *headers,
std::map<std::string, std::string> & vars) const
{
+ std::list<Content>::const_iterator cit = content_list.begin();
+ for (; cit != content_list.end(); cit++)
+ if (cit->type == "headers")
+ break;
+
+ if (cit == content_list.end())
+ return;
+
for (Z_HTTP_Header *header = headers; header; header = header->next)
{
- std::list<Within>::const_iterator it = within_list.begin();
- for (; it != within_list.end(); it++)
+ 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)
sheader += header->value;
RulePtr rule = it->rule;
- std::string out = rule->test_patterns(vars, sheader);
+ std::string out = rule->test_patterns(vars, sheader, true);
if (!out.empty())
{
size_t pos = out.find(": ");
}
}
-void yf::HttpRewrite::Phase::rewrite_body(mp::odr & o,
- char **content_buf,
- int *content_len,
- std::map<std::string, std::string> & vars) const
+void yf::HttpRewrite::Phase::rewrite_body(
+ mp::odr &o,
+ const char *content_type,
+ char **content_buf,
+ int *content_len,
+ std::map<std::string, std::string> & vars) const
{
+ std::list<Content>::const_iterator cit = content_list.begin();
+ for (; cit != content_list.end(); cit++)
+ {
+ yaz_log(YLOG_LOG, "rewrite_body: content_type=%s type=%s",
+ content_type, cit->type.c_str());
+ if (cit->type != "headers"
+ && regex_match(content_type, cit->content_re))
+ break;
+ }
+ if (cit == content_list.end())
+ return;
+
if (*content_buf)
{
int i;
if ((*content_buf)[i] == 0)
return; // binary content. skip
- HTMLParser parser;
- Event ev(this, vars);
+ if (cit->type == "html")
+ {
+ HTMLParser parser;
+ Event ev(&*cit, vars);
- parser.set_verbose(m_verbose);
+ parser.set_verbose(m_verbose);
- std::string buf(*content_buf, *content_len);
+ std::string buf(*content_buf, *content_len);
- parser.parse(ev, buf.c_str());
- const char *res = ev.result();
- *content_buf = odr_strdup(o, res);
- *content_len = strlen(res);
+ parser.parse(ev, buf.c_str());
+ const char *res = ev.result();
+ *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);
+ }
}
}
-yf::HttpRewrite::Event::Event(const Phase *p,
+yf::HttpRewrite::Event::Event(const Content *p,
std::map<std::string, std::string> & vars
- ) : m_phase(p), m_vars(vars)
+ ) : m_content(p), m_vars(vars)
{
m_w = wrbuf_alloc();
}
wrbuf_write(m_w, tag, tag_len);
std::string t(tag, tag_len);
- std::list<Within>::const_iterator it = m_phase->within_list.begin();
- for (; it != m_phase->within_list.end(); it++)
+ 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)
const char *value, int val_len,
const char *sep)
{
- std::list<Within>::const_iterator it = m_phase->within_list.begin();
+ std::list<Within>::const_iterator it = m_content->within_list.begin();
bool subst = false;
- for (; it != m_phase->within_list.end(); it++)
+ for (; it != m_content->within_list.end(); it++)
{
std::string t(tag, tag_len);
if (it->tag.length() == 0 ||
wrbuf_putc(m_w, ' ');
wrbuf_write(m_w, attr, attr_len);
- wrbuf_puts(m_w, "=");
- wrbuf_puts(m_w, sep);
-
- 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, true);
+ }
+ 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, sep);
}
void yf::HttpRewrite::Event::closeTag(const char *tag, int tag_len)
void yf::HttpRewrite::Event::text(const char *value, int len)
{
- std::list<Within>::const_iterator it = m_phase->within_list.end();
+ std::list<Within>::const_iterator it = m_content->within_list.end();
if (!s_within.empty())
it = s_within.top();
std::string output;
- if (it != m_phase->within_list.end())
+ if (it != m_content->within_list.end())
{
std::string input(value, len);
- output = it->rule->test_patterns(m_vars, input);
+ output = it->rule->test_patterns(m_vars, input, false);
}
if (output.empty())
wrbuf_write(m_w, value, len);
wrbuf_puts(m_w, output.c_str());
}
-
-/**
- * Tests pattern from the vector in order and executes recipe on
- the first match.
- */
const std::string yf::HttpRewrite::Rule::test_patterns(
std::map<std::string, std::string> & vars,
- const std::string & txt) const
-{
- std::list<Replace>::const_iterator it = replace_list.begin();
-
- for (; it != replace_list.end(); it++)
- {
- std::string out = it->search_replace(vars, txt);
- if (!out.empty()) return out;
- }
- return "";
-}
-
-const std::string yf::HttpRewrite::Replace::search_replace(
- std::map<std::string, std::string> & vars,
- const std::string & txt) const
+ const std::string & txt, bool anchor)
{
- //exec regex against value
- boost::regex re(regex);
- boost::smatch what;
+ bool first = anchor;
+ std::string out;
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
+ while (1)
{
+ std::list<Replace>::iterator bit = replace_list.end();
+ {
+ std::string::const_iterator best_pos = txt.end();
+ std::list<Replace>::iterator it = replace_list.begin();
+ for (; it != replace_list.end(); it++)
+ {
+ if (it->start_anchor && !first)
+ continue;
+ if (regex_search(start, end, it->what, it->re))
+ {
+ if (it->what[0].first < best_pos)
+ {
+ best_pos = it->what[0].first;
+ bit = it;
+ }
+ }
+ }
+ if (bit == replace_list.end())
+ break;
+ }
+ first = false;
size_t i;
- for (i = 1; i < what.size(); ++i)
+ for (i = 1; i < bit->what.size(); ++i)
{
//check if the group is named
- std::map<int, std::string>::const_iterator it
- = group_index.find(i);
- if (it != group_index.end())
+ std::map<int, std::string>::const_iterator git
+ = bit->group_index.find(i);
+ if (git != bit->group_index.end())
{ //it is
- vars[it->second] = what[i];
+ vars[git->second] = bit->what[i];
}
}
//prepare replacement string
- std::string rvalue = sub_vars(vars);
+ std::string rvalue = bit->sub_vars(vars);
yaz_log(YLOG_LOG, "! Rewritten '%s' to '%s'",
- what.str(0).c_str(), rvalue.c_str());
- out.append(start, what[0].first);
+ bit->what.str(0).c_str(), rvalue.c_str());
+ out.append(start, bit->what[0].first);
out.append(rvalue);
- start = what[0].second; //move search forward
+ start = bit->what[0].second; //move search forward
}
- //if we had a match cat the last part
if (start != txt.begin())
out.append(start, end);
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;
+ start_anchor = str[0] == '^';
yaz_log(YLOG_LOG, "Parsing groups from '%s'", str.c_str());
for (size_t i = 0; i < str.size(); ++i)
{
}
esc = false;
}
- regex = res;
+ re = res;
}
std::string yf::HttpRewrite::Replace::sub_vars(
{
}
+void yf::HttpRewrite::Content::quoted_literal(
+ std::string &content,
+ std::map<std::string, std::string> &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;
+ if (*cp == '\n')
+ break;
+ cp++;
+ }
+ if (!*cp)
+ break;
+ std::list<Within>::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<std::string, RulePtr > &rules)
+{
+ for (; ptr; ptr = ptr->next)
+ {
+ if (ptr->type != XML_ELEMENT_NODE)
+ continue;
+ if (!strcmp((const char *) ptr->name, "within"))
+ {
+ 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];
+ w.attr = values[1];
+ w.tag = values[2];
+ std::map<std::string,RulePtr>::const_iterator it =
+ rules.find(values[3]);
+ if (it == rules.end())
+ throw mp::filter::FilterException
+ ("Reference to non-existing rule '" + values[3] +
+ "' in http_rewrite filter");
+ w.rule = it->second;
+ w.reqline = values[4] == "1";
+ within_list.push_back(w);
+ }
+ }
+}
+
void yf::HttpRewrite::configure_phase(const xmlNode *ptr, Phase &phase)
{
static const char *names[2] = { "verbose", 0 };
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
+ " 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
}
rules[values[0]] = rule;
}
- else if (!strcmp((const char *) ptr->name, "within"))
+ else if (!strcmp((const char *) ptr->name, "content"))
{
- static const char *names[6] =
- { "header", "attr", "tag", "rule", "reqline", 0 };
- std::string values[5];
+ static const char *names[3] =
+ { "type", "mime", 0 };
+ std::string values[2];
mp::xml::parse_attr(ptr, names, values);
- Within w;
- w.header = values[0];
- w.attr = values[1];
- w.tag = values[2];
- std::map<std::string,RulePtr>::const_iterator it =
- rules.find(values[3]);
- if (it == rules.end())
- throw mp::filter::FilterException
- ("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);
+ if (values[0].empty())
+ {
+ throw mp::filter::FilterException
+ ("Missing attribute, type for for element "
+ + std::string((const char *) ptr->name)
+ + " in http_rewrite filter");
+ }
+ Content c;
+
+ c.type = values[0];
+ // if (!values[1].empty())
+ c.content_re = values[1];
+ c.configure(ptr->children, rules);
+ phase.content_list.push_back(c);
}
else
{
projects / metaproxy-moved-to-github.git / blobdiff