#include "comm/Connection.h"
#include "fde.h"
#include "fqdncache.h"
+#include "format/Format.h"
#include "globals.h"
#include "HttpRequest.h"
#include "mgr/Registration.h"
#include "redirect.h"
#include "rfc1738.h"
+#include "SBuf.h"
#include "SquidConfig.h"
#include "Store.h"
#if USE_AUTH
/// url maximum lengh + extra informations passed to redirector
#define MAX_REDIRECTOR_REQUEST_STRLEN (MAX_URL + 1024)
-typedef struct {
+class RedirectStateData
+{
+public:
+ explicit RedirectStateData(const char *url);
+ ~RedirectStateData();
+
void *data;
- char *orig_url;
+ SBuf orig_url;
Ip::Address client_addr;
const char *client_ident;
const char *method_s;
HLPCB *handler;
-} redirectStateData;
+
+private:
+ CBDATA_CLASS2(RedirectStateData);
+};
static HLPCB redirectHandleReply;
static HLPCB storeIdHandleReply;
-static void redirectStateFree(redirectStateData * r);
static helper *redirectors = NULL;
static helper *storeIds = NULL;
static OBJH redirectStats;
static OBJH storeIdStats;
static int redirectorBypassed = 0;
static int storeIdBypassed = 0;
-CBDATA_TYPE(redirectStateData);
+static Format::Format *redirectorExtrasFmt = NULL;
+static Format::Format *storeIdExtrasFmt = NULL;
+
+CBDATA_CLASS_INIT(RedirectStateData);
+
+RedirectStateData::RedirectStateData(const char *url) :
+ data(NULL),
+ orig_url(url),
+ client_addr(),
+ client_ident(NULL),
+ method_s(NULL),
+ handler(NULL)
+{
+}
+
+RedirectStateData::~RedirectStateData()
+{
+}
static void
redirectHandleReply(void *data, const HelperReply &reply)
{
- redirectStateData *r = static_cast<redirectStateData *>(data);
+ RedirectStateData *r = static_cast<RedirectStateData *>(data);
debugs(61, 5, HERE << "reply=" << reply);
// XXX: This function is now kept only to check for and display the garbage use-case
const Http::StatusCode status = static_cast<Http::StatusCode>(atoi(result));
HelperReply newReply;
- newReply.result = reply.result;
- newReply.notes = reply.notes;
+ // BACKWARD COMPATIBILITY 2012-06-15:
+ // We got HelperReply::Unknown reply result but new
+ // RedirectStateData handlers require HelperReply::Okay,
+ // else will drop the helper reply
+ newReply.result = HelperReply::Okay;
+ newReply.notes.append(&reply.notes);
if (status == Http::scMovedPermanently
|| status == Http::scMovedTemporarily
if (cbdataReferenceValidDone(r->data, &cbdata))
r->handler(cbdata, newReply);
- redirectStateFree(r);
+ delete r;
return;
}
}
if (cbdataReferenceValidDone(r->data, &cbdata))
r->handler(cbdata, reply);
- redirectStateFree(r);
+ delete r;
}
static void
storeIdHandleReply(void *data, const HelperReply &reply)
{
- redirectStateData *r = static_cast<redirectStateData *>(data);
+ RedirectStateData *r = static_cast<RedirectStateData *>(data);
debugs(61, 5,"StoreId helper: reply=" << reply);
// XXX: This function is now kept only to check for and display the garbage use-case
if (cbdataReferenceValidDone(r->data, &cbdata))
r->handler(cbdata, reply);
- redirectStateFree(r);
-}
-
-static void
-redirectStateFree(redirectStateData * r)
-{
- safe_free(r->orig_url);
- cbdataFree(r);
+ delete r;
}
static void
}
static void
-constructHelperQuery(const char *name, helper *hlp, HLPCB *replyHandler, ClientHttpRequest * http, HLPCB *handler, void *data)
+constructHelperQuery(const char *name, helper *hlp, HLPCB *replyHandler, ClientHttpRequest * http, HLPCB *handler, void *data, Format::Format *requestExtrasFmt)
{
ConnStateData * conn = http->getConn();
const char *fqdn;
char buf[MAX_REDIRECTOR_REQUEST_STRLEN];
int sz;
Http::StatusCode status;
- char claddr[MAX_IPSTRLEN];
- char myaddr[MAX_IPSTRLEN];
/** TODO: create a standalone method to initialize
- * the cbdata\redirectStateData for all the helpers.
+ * the RedirectStateData for all the helpers.
*/
- redirectStateData *r = cbdataAlloc(redirectStateData);
- r->orig_url = xstrdup(http->uri);
+ RedirectStateData *r = new RedirectStateData(http->uri);
if (conn != NULL)
r->client_addr = conn->log_addr;
else
- r->client_addr.SetNoAddr();
+ r->client_addr.setNoAddr();
r->client_ident = NULL;
#if USE_AUTH
if (http->request->auth_user_request != NULL) {
}
#endif
- // HttpRequest initializes with null_string. So we must check both defined() and size()
- if (!r->client_ident && http->request->extacl_user.defined() && http->request->extacl_user.size()) {
+ if (!r->client_ident && http->request->extacl_user.size() > 0) {
r->client_ident = http->request->extacl_user.termedBuf();
debugs(61, 5, HERE << "acl-user=" << (r->client_ident?r->client_ident:"NULL"));
}
if ((fqdn = fqdncache_gethostbyaddr(r->client_addr, 0)) == NULL)
fqdn = dash_str;
- sz = snprintf(buf, MAX_REDIRECTOR_REQUEST_STRLEN, "%s %s/%s %s %s myip=%s myport=%d\n",
- r->orig_url,
- r->client_addr.NtoA(claddr,MAX_IPSTRLEN),
- fqdn,
- r->client_ident[0] ? rfc1738_escape(r->client_ident) : dash_str,
- r->method_s,
- http->request->my_addr.NtoA(myaddr,MAX_IPSTRLEN),
- http->request->my_addr.GetPort());
+ static MemBuf requestExtras;
+ requestExtras.reset();
+ if (requestExtrasFmt)
+ requestExtrasFmt->assemble(requestExtras, http->al, 0);
+
+ sz = snprintf(buf, MAX_REDIRECTOR_REQUEST_STRLEN, "%s%s%s\n",
+ r->orig_url.c_str(),
+ requestExtras.hasContent() ? " " : "",
+ requestExtras.hasContent() ? requestExtras.content() : "");
if ((sz<=0) || (sz>=MAX_REDIRECTOR_REQUEST_STRLEN)) {
if (sz<=0) {
clientReplyContext *repContext = dynamic_cast<clientReplyContext *>(node->data.getRaw());
assert (repContext);
Ip::Address tmpnoaddr;
- tmpnoaddr.SetNoAddr();
+ tmpnoaddr.setNoAddr();
repContext->setReplyToError(ERR_GATEWAY_FAILURE, status,
http->request->method, NULL,
http->getConn() != NULL && http->getConn()->clientConnection != NULL ?
http->request,
NULL,
#if USE_AUTH
- http->getConn() != NULL && http->getConn()->auth_user_request != NULL ?
- http->getConn()->auth_user_request : http->request->auth_user_request);
+ http->getConn() != NULL && http->getConn()->getAuth() != NULL ?
+ http->getConn()->getAuth() : http->request->auth_user_request);
#else
NULL);
#endif
return;
}
- constructHelperQuery("redirector", redirectors, redirectHandleReply, http, handler, data);
+ constructHelperQuery("redirector", redirectors, redirectHandleReply, http, handler, data, redirectorExtrasFmt);
}
/**
return;
}
- constructHelperQuery("storeId helper", storeIds, storeIdHandleReply, http, handler, data);
-}
-
-static void
-redirectRegisterWithCacheManager(void)
-{
- Mgr::RegisterAction("redirector", "URL Redirector Stats", redirectStats, 0, 1);
- Mgr::RegisterAction("store_id", "StoreId helper Stats", storeIdStats, 0, 1); /* registering the new StoreID statistics in Mgr*/
+ constructHelperQuery("storeId helper", storeIds, storeIdHandleReply, http, handler, data, storeIdExtrasFmt);
}
void
redirectInit(void)
{
- static int init = 0;
-
- redirectRegisterWithCacheManager();
+ static bool init = false;
- /** FIXME: Temporary unified helpers startup
- * When and if needed for more helpers a separated startup
- * method will be added for each of them.
- */
- if (!Config.Program.redirect && !Config.Program.store_id)
- return;
+ if (!init) {
+ Mgr::RegisterAction("redirector", "URL Redirector Stats", redirectStats, 0, 1);
+ Mgr::RegisterAction("store_id", "StoreId helper Stats", storeIdStats, 0, 1);
+ }
if (Config.Program.redirect) {
helperOpenServers(storeIds);
}
- if (!init) {
- init = 1;
- CBDATA_INIT_TYPE(redirectStateData);
+ if (Config.redirector_extras) {
+ redirectorExtrasFmt = new ::Format::Format("url_rewrite_extras");
+ (void)redirectorExtrasFmt->parse(Config.redirector_extras);
}
+
+ if (Config.storeId_extras) {
+ storeIdExtrasFmt = new ::Format::Format("store_id_extras");
+ (void)storeIdExtrasFmt->parse(Config.storeId_extras);
+ }
+
+ init = true;
}
void
delete storeIds;
storeIds = NULL;
+ delete redirectorExtrasFmt;
+ redirectorExtrasFmt = NULL;
+
+ delete storeIdExtrasFmt;
+ storeIdExtrasFmt = NULL;
}
projects / thirdparty / squid.git / blobdiff