namespace filter {
class HttpRewrite::Replace {
public:
+ bool start_anchor;
boost::regex re;
boost::smatch what;
std::string recipe;
std::list<Replace> replace_list;
const std::string test_patterns(
std::map<std::string, std::string> & vars,
- const std::string & txt);
+ const std::string & txt, bool anchor);
};
class HttpRewrite::Within {
public:
{
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());
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(": ");
if (subst)
{
std::string input(value, val_len);
- output = it->rule->test_patterns(m_vars, input);
+ output = it->rule->test_patterns(m_vars, input, true);
}
if (output.empty())
wrbuf_write(m_w, value, val_len);
if (it != m_phase->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);
const std::string yf::HttpRewrite::Rule::test_patterns(
std::map<std::string, std::string> & vars,
- const std::string & txt)
+ const std::string & txt, bool anchor)
{
+ bool first = anchor;
std::string out;
std::string::const_iterator start, end;
start = txt.begin();
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)
if (bit == replace_list.end())
break;
}
-
+ first = false;
size_t i;
for (i = 1; i < bit->what.size(); ++i)
{
bool esc = false;
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)
{