/* This file is part of Metaproxy.
- Copyright (C) 2005-2013 Index Data
+ Copyright (C) Index Data
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
std::string proxy_host;
std::string default_host;
int max_redirects;
+ bool x_forwarded_for;
+ bool bind_host;
Rep();
};
}
yf::HTTPClient::Rep::Rep()
{
- max_redirects = -0;
+ max_redirects = 0;
+ x_forwarded_for = false;
+ bind_host = false;
}
yf::HTTPClient::HTTPClient() : m_p(new Rep)
yaz_url_set_max_redirects(yaz_url, max_redirects);
+ if (x_forwarded_for)
+ {
+ std::string peer_name2 = package.origin().get_address();
+ const char *peer_name1 =
+ z_HTTP_header_lookup(hreq->headers, "X-Forwarded-For");
+ std::string pcomb;
+ if (peer_name1)
+ {
+ pcomb.append(peer_name1);
+ pcomb.append(", ");
+ }
+ pcomb.append(peer_name2);
+ z_HTTP_header_set(o, &hreq->headers, "X-Forwarded-For",
+ pcomb.c_str());
+ }
std::string uri;
if (hreq->path[0] == '/')
{
}
else
uri = hreq->path;
- Z_HTTP_Response *http_response = 0;
- if (uri.length())
- http_response =
- yaz_url_exec(yaz_url, uri.c_str(), hreq->method,
- hreq->headers, hreq->content_buf,
- hreq->content_len);
- if (http_response)
+
+ if (bind_host)
{
- res_gdu = o.create_HTTP_Response(package.session(), hreq, 200);
- z_HTTP_header_remove(&http_response->headers, "Transfer-Encoding");
- res_gdu->u.HTTP_Response = http_response;
+ std::string host = package.origin().get_bind_address();
+ uri.append(" ");
+ uri.append(host);
}
- else
+ if (!uri.length())
{
res_gdu = o.create_HTTP_Response_details(
package.session(),
- hreq, 502,
- yaz_url_get_error(yaz_url));
+ hreq, 404,
+ "http_client: no target URI specified");
+ }
+ else
+ {
+ Z_HTTP_Response * http_response =
+ yaz_url_exec(yaz_url, uri.c_str(), hreq->method,
+ hreq->headers, hreq->content_buf,
+ hreq->content_len);
+ if (http_response)
+ {
+ res_gdu = o.create_HTTP_Response(package.session(), hreq, 200);
+ z_HTTP_header_remove(&http_response->headers, "Transfer-Encoding");
+ res_gdu->u.HTTP_Response = http_response;
+ }
+ else
+ {
+ res_gdu = o.create_HTTP_Response_details(
+ package.session(),
+ hreq, 502, yaz_url_get_error(yaz_url));
+ }
}
package.response() = res_gdu;
yaz_url_destroy(yaz_url);
" in http_client filter");
}
}
+ else if (!strcmp((const char *) ptr->name, "x-forwarded-for"))
+ {
+ m_p->x_forwarded_for = mp::xml::get_bool(ptr, 0);
+ }
+ else if (!strcmp((const char *) ptr->name, "bind_host"))
+ {
+ m_p->bind_host = mp::xml::get_bool(ptr, 0);
+ }
else
{
throw mp::filter::FilterException