void yf::HttpRewrite::process(mp::Package & package) const
{
- yaz_log(YLOG_DEBUG, "HttpRewrite begins....");
+ yaz_log(YLOG_LOG, "HttpRewrite begins....");
Z_GDU *gdu = package.request().get();
//map of request/response vars
std::map<std::string, std::string> vars;
Z_HTTP_Request *hreq = gdu->u.HTTP_Request;
mp::odr o;
rewrite_reqline(o, hreq, vars);
- yaz_log(YLOG_DEBUG, ">> Request headers");
- rewrite_headers(o, hreq->headers, vars);
- rewrite_body(o, &hreq->content_buf, &hreq->content_len, vars);
+ yaz_log(YLOG_LOG, ">> Request headers");
+ rewrite_headers(o, hreq->headers, vars, req_uri_pats, req_groups_bynum);
+ rewrite_body(o, &hreq->content_buf, &hreq->content_len, vars,
+ req_uri_pats, req_groups_bynum);
package.request() = gdu;
}
package.move();
if (gdu && gdu->which == Z_GDU_HTTP_Response)
{
Z_HTTP_Response *hres = gdu->u.HTTP_Response;
- yaz_log(YLOG_DEBUG, "Response code %d", hres->code);
+ yaz_log(YLOG_LOG, "Response code %d", hres->code);
mp::odr o;
- yaz_log(YLOG_DEBUG, "<< Respose headers");
- rewrite_headers(o, hres->headers, vars);
- rewrite_body(o, &hres->content_buf, &hres->content_len, vars);
+ yaz_log(YLOG_LOG, "<< Respose headers");
+ rewrite_headers(o, hres->headers, vars, res_uri_pats, res_groups_bynum);
+ rewrite_body(o, &hres->content_buf, &hres->content_len, vars,
+ res_uri_pats, res_groups_bynum);
package.response() = gdu;
}
}
std::string path;
if (strstr(hreq->path, "http://") == hreq->path)
{
- yaz_log(YLOG_DEBUG, "Path in the method line is absolute, "
+ yaz_log(YLOG_LOG, "Path in the method line is absolute, "
"possibly a proxy request");
path += hreq->path;
}
else
{
//TODO what about proto
+ path += "http://";
path += z_HTTP_header_lookup(hreq->headers, "Host");
path += hreq->path;
}
- yaz_log(YLOG_DEBUG, "Proxy request URL is %s", path.c_str());
+ yaz_log(YLOG_LOG, "Proxy request URL is %s", path.c_str());
std::string npath =
test_patterns(vars, path, req_uri_pats, req_groups_bynum);
if (!npath.empty())
{
- yaz_log(YLOG_DEBUG, "Rewritten request URL is %s", npath.c_str());
+ yaz_log(YLOG_LOG, "Rewritten request URL is %s", npath.c_str());
hreq->path = odr_strdup(o, npath.c_str());
}
}
void yf::HttpRewrite::rewrite_headers (mp::odr & o, Z_HTTP_Header *headers,
- std::map<std::string, std::string> & vars) const
+ std::map<std::string, std::string> & vars,
+ const spair_vec & uri_pats,
+ const std::vector<std::map<int, std::string> > & groups_bynum) const
{
for (Z_HTTP_Header *header = headers;
header != 0;
std::string sheader(header->name);
sheader += ": ";
sheader += header->value;
- yaz_log(YLOG_DEBUG, "%s: %s", header->name, header->value);
- std::string out = test_patterns(vars,
- sheader,
- req_uri_pats, req_groups_bynum);
+ yaz_log(YLOG_LOG, "%s: %s", header->name, header->value);
+ std::string out = test_patterns(vars, sheader, uri_pats, groups_bynum);
if (!out.empty())
{
size_t pos = out.find(": ");
if (pos == std::string::npos)
{
- yaz_log(YLOG_DEBUG, "Header malformed during rewrite, ignoring");
+ yaz_log(YLOG_LOG, "Header malformed during rewrite, ignoring");
continue;
}
header->name = odr_strdup(o, out.substr(0, pos).c_str());
}
void yf::HttpRewrite::rewrite_body (mp::odr & o, char **content_buf, int *content_len,
- std::map<std::string, std::string> & vars) const
+ std::map<std::string, std::string> & vars,
+ const spair_vec & uri_pats,
+ const std::vector<std::map<int, std::string> > & groups_bynum) const
{
if (*content_buf)
{
std::string body(*content_buf);
std::string nbody =
- test_patterns(vars, body, req_uri_pats, req_groups_bynum);
+ test_patterns(vars, body, uri_pats, groups_bynum);
if (!nbody.empty())
{
*content_buf = odr_strdup(o, nbody.c_str());
= groups_bynum.find(i);
if (it != groups_bynum.end())
{ //it is
- std::string name = it->second;
if (!what[i].str().empty())
- vars[name] = what[i];
+ vars[it->second] = what[i];
}
}
//prepare replacement string
std::string rvalue = sub_vars(uri_pat, vars);
- //rewrite value
- std::string rhvalue = what.prefix().str()
- + rvalue + what.suffix().str();
- yaz_log(YLOG_DEBUG, "! Rewritten '%s' to '%s'",
+ yaz_log(YLOG_LOG, "! Rewritten '%s' to '%s'",
what.str(0).c_str(), rvalue.c_str());
- out += rhvalue;
+ out.append(start, what[0].first);
+ out.append(rvalue);
start = 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;
}
("Unterminated group name '" + gname
+ " in '" + str +"'");
groups_bynum[gnum] = gname;
- yaz_log(YLOG_DEBUG, "Found named group '%s' at $%d",
+ yaz_log(YLOG_LOG, "Found named group '%s' at $%d",
gname.c_str(), gnum);
}
}
+ std::string((const char *) attr->name)
+ " in rewrite section of http_rewrite");
}
- yaz_log(YLOG_DEBUG, "Found rewrite rule from '%s' to '%s'",
+ yaz_log(YLOG_LOG, "Found rewrite rule from '%s' to '%s'",
from.c_str(), to.c_str());
if (!from.empty())
dest.push_back(std::make_pair(from, to));