/* 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
void proxy(mp::Package &package);
std::string proxy_host;
std::string default_host;
+ int max_redirects;
+ bool x_forwarded_for;
+ Rep();
};
}
}
+yf::HTTPClient::Rep::Rep()
+{
+ max_redirects = 0;
+ x_forwarded_for = false;
+}
+
yf::HTTPClient::HTTPClient() : m_p(new Rep)
{
}
Z_GDU *res_gdu = 0;
mp::odr o;
yaz_url_t yaz_url = yaz_url_create();
- std::string uri;
+ const char *http_proxy =
+ z_HTTP_header_remove(&hreq->headers, "X-Metaproxy-Proxy");
- if (proxy_host.length())
- yaz_url_set_proxy(yaz_url, proxy_host.c_str());
+ if (!http_proxy)
+ http_proxy = proxy_host.c_str();
+ if (*http_proxy)
+ yaz_url_set_proxy(yaz_url, http_proxy);
+
+ 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] == '/')
{
if (default_host.length())
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(package.session(), hreq, 404);
+ 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);
{
m_p->proxy_host = mp::xml::get_text(ptr);
}
+ else if (!strcmp((const char *) ptr->name, "max-redirects"))
+ {
+ m_p->max_redirects = mp::xml::get_int(ptr, 0);
+ }
else if (!strcmp((const char *) ptr->name, "default-host"))
{
m_p->default_host = mp::xml::get_text(ptr);
" 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
{
throw mp::filter::FilterException