-/* $Id: yaz-proxy-config.cpp,v 1.23 2005-09-26 09:25:06 adam Exp $
- Copyright (c) 1998-2005, Index Data.
+/* $Id: yaz-proxy-config.cpp,v 1.30 2006-04-06 16:25:21 adam Exp $
+ Copyright (c) 1998-2006, Index Data.
-This file is part of the yaz-proxy.
+This file is part of the yazproxy.
YAZ proxy 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
xmlNodePtr m_proxyPtr;
void return_target_info(xmlNodePtr ptr, const char **url,
int *limit_bw, int *limit_pdu, int *limit_req,
- int *limit_search, int *limit_connect,
+ int *limit_search,
int *target_idletime, int *client_idletime,
int *keepalive_limit_bw, int *keepalive_limit_pdu,
int *pre_init, const char **cql2rpn,
const char **negotiation_charset,
const char **negotiation_lang,
- const char **target_charset);
+ const char **target_charset,
+ const char **default_client_query_charset);
void return_limit(xmlNodePtr ptr,
int *limit_bw, int *limit_pdu, int *limit_req,
- int *limit_search, int *limit_connect);
+ int *limit_search);
int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
char **addinfo);
xmlNodePtr find_target_node(const char *name, const char *db);
xmlNodePtr find_target_db(xmlNodePtr ptr, const char *db);
const char *get_text(xmlNodePtr ptr);
+ void get_period(xmlNodePtr ptr, int *period);
int check_type_1_attributes(ODR odr, xmlNodePtr ptr,
Z_AttributeList *attrs,
char **addinfo);
for (ptr = m_proxyPtr->children; ptr; ptr = ptr->next)
{
const char *fname;
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "module")
&& (fname = get_text(ptr)))
{
}
return 0;
}
+
+void Yaz_ProxyConfigP::get_period(xmlNodePtr ptr, int *period)
+{
+ struct _xmlAttr *attr;
+ *period = 60;
+ for (attr = ptr->properties; attr; attr = attr->next)
+ {
+ if (!strcmp((const char *) attr->name, "period") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ *period = atoi((const char *) attr->children->content);
+ }
+}
#endif
#if HAVE_XSLT
int *limit_bw,
int *limit_pdu,
int *limit_req,
- int *limit_search,
- int *limit_connect)
+ int *limit_search)
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "bandwidth"))
{
const char *t = get_text(ptr);
if (t)
*limit_bw = atoi(t);
}
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "retrieve"))
{
const char *t = get_text(ptr);
if (t)
*limit_req = atoi(t);
}
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "pdu"))
{
const char *t = get_text(ptr);
if (t)
*limit_search = atoi(t);
}
- if (ptr->type == XML_ELEMENT_NODE
- && !strcmp((const char *) ptr->name, "connect"))
- {
- const char *t = get_text(ptr);
- if (t)
- *limit_connect = atoi(t);
- }
}
}
#endif
int *limit_pdu,
int *limit_req,
int *limit_search,
- int *limit_connect,
int *target_idletime,
int *client_idletime,
int *keepalive_limit_bw,
const char **cql2rpn,
const char **negotiation_charset,
const char **negotiation_lang,
- const char **target_charset)
+ const char **target_charset,
+ const char **default_client_query_charset)
{
*pre_init = 0;
int no_url = 0;
ptr = ptr->children;
for (; ptr; ptr = ptr->next)
{
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "preinit"))
{
const char *v = get_text(ptr);
*pre_init = v ? atoi(v) : 1;
}
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "url"))
{
const char *t = get_text(ptr);
url[no_url] = 0;
}
}
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "keepalive"))
{
int dummy;
*keepalive_limit_bw = 500000;
*keepalive_limit_pdu = 1000;
return_limit(ptr, keepalive_limit_bw, keepalive_limit_pdu,
- &dummy, &dummy, &dummy);
+ &dummy, &dummy);
}
if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "limit"))
return_limit(ptr, limit_bw, limit_pdu, limit_req,
- limit_search, limit_connect);
+ limit_search);
if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "target-timeout"))
{
*target_idletime = 0;
}
}
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "client-timeout"))
{
const char *t = get_text(ptr);
*client_idletime = 0;
}
}
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "cql2rpn"))
{
const char *t = get_text(ptr);
if (t)
*cql2rpn = t;
}
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "target-charset"))
{
const char *t = get_text(ptr);
if (t && target_charset)
*target_charset = t;
}
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
+ && !strcmp((const char *) ptr->name, "default-client-charset"))
+ {
+ const char *t = get_text(ptr);
+ if (t && default_client_query_charset)
+ *default_client_query_charset = t;
+ }
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "negotiation-charset"))
{
const char *t = get_text(ptr);
if (t)
*negotiation_charset = t;
}
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "negotiation-lang"))
{
const char *t = get_text(ptr);
for (i = 0; i<attrs->num_attributes; i++)
{
Z_AttributeElement *el = attrs->attributes[i];
-
+
if (!el->attributeType)
continue;
int type = *el->attributeType;
int *value = 0;
-
+
if (el->which == Z_AttributeValue_numeric && el->value.numeric)
value = el->value.numeric;
-
+
xmlNodePtr ptr;
for(ptr = ptrl->children; ptr; ptr = ptr->next)
{
char addinfo_str[20];
if (!match_list(type, match_type))
continue;
-
+
*addinfo_str = '\0';
if (!strcmp(match_type, "*"))
sprintf (addinfo_str, "%d", type);
}
else
continue;
-
+
if (match_error)
{
if (*addinfo_str)
{
#if HAVE_XSLT
xmlNodePtr ptr;
-
+
ptr = m_cp->find_target_node(name, 0);
if (ptr)
{
// Check each name element
for (; ptr; ptr = ptr->next)
{
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "name"))
{
xmlNodePtr tptr = ptr->children;
{".jpg", "image/jpeg"},
{".png", "image/png"},
{".gif", "image/gif"},
+ {".css", "text/css"},
+ {".pdf", "application/pdf"},
{0, "text/plain"},
{0, 0},
};
xmlNodePtr ptr = m_cp->find_target_node(name, 0);
if (!ptr)
return ;
-
+
for (ptr = ptr->children; ptr; ptr = ptr->next)
if (ptr->type == XML_ELEMENT_NODE &&
!strcmp((const char *) ptr->name, "target-authentication"))
}
const char *t = m_cp->get_text(ptr);
if (!t || !strcmp(type, "none"))
+ {
req->idAuthentication = 0;
+ }
else if (!strcmp(type, "anonymous"))
{
req->idAuthentication =
*password = '\0';
*user = '\0';
sscanf(t, "%63[^:]:%63[^:]:%63s", user, group, password);
-
+
req->idAuthentication =
(Z_IdAuthentication *)
odr_malloc (odr, sizeof(*req->idAuthentication));
#if HAVE_XSLT
int syntax_has_matched = 0;
xmlNodePtr ptr;
-
+
ptr = m_cp->find_target_node(name, 0);
if (!ptr)
return 0;
{
if (attr->children
&& attr->children->type==XML_TEXT_NODE
- && attr->children->content
+ && attr->children->content
&& (!strcmp((const char *) attr->children->content, db)
|| !strcmp((const char *) attr->children->content,
"*")))
}
return ptr;
}
-
+
xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db)
{
xmlNodePtr ptr;
if (ptr->type == XML_ELEMENT_NODE &&
!strcmp((const char *) ptr->name, "target"))
{
- // default one ?
+ // default one ?
if (!name)
{
// <target default="1"> ?
{
if (attr->children
&& attr->children->type==XML_TEXT_NODE
- && attr->children->content
+ && attr->children->content
&& (!strcmp((const char *) attr->children->content,
name)
|| !strcmp((const char *) attr->children->content,
int *limit_pdu,
int *limit_req,
int *limit_search,
- int *limit_connect,
int *target_idletime,
int *client_idletime,
int *max_clients,
const char **authentication,
const char **negotiation_charset,
const char **negotiation_lang,
- const char **target_charset)
+ const char **target_charset,
+ const char **default_client_query_charset)
{
#if HAVE_XSLT
xmlNodePtr ptr;
m_cp->return_target_info(
ptr, url,
limit_bw, limit_pdu, limit_req,
- limit_search, limit_connect,
+ limit_search,
target_idletime, client_idletime,
keepalive_limit_bw, keepalive_limit_pdu,
pre_init, cql2rpn,
- negotiation_charset, negotiation_lang, target_charset);
+ negotiation_charset, negotiation_lang, target_charset,
+ default_client_query_charset);
return 1;
}
i++;
return 0;
}
+int Yaz_ProxyConfig::get_file_access_info(const char *path)
+{
+#if HAVE_XSLT
+ xmlNodePtr ptr;
+ if (!m_cp->m_proxyPtr)
+ return 0;
+ for (ptr = m_cp->m_proxyPtr->children; ptr; ptr = ptr->next)
+ {
+ if (ptr->type == XML_ELEMENT_NODE
+ && !strcmp((const char *) ptr->name, "docpath"))
+ {
+ const char *docpath = m_cp->get_text(ptr);
+ size_t docpath_len = strlen(docpath);
+ if (docpath_len < strlen(path) && path[docpath_len] == '/'
+ && !memcmp(docpath, path, docpath_len))
+ return 1;
+ }
+ }
+#endif
+ return 0;
+}
+
void Yaz_ProxyConfig::get_generic_info(int *log_mask,
- int *max_clients)
+ int *max_clients,
+ int *max_connect,
+ int *limit_connect,
+ int *period_connect)
{
+ *max_connect = 0;
+ *limit_connect = 0;
#if HAVE_XSLT
xmlNodePtr ptr;
if (!m_cp->m_proxyPtr)
return;
for (ptr = m_cp->m_proxyPtr->children; ptr; ptr = ptr->next)
{
- if (ptr->type == XML_ELEMENT_NODE
+ if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "log"))
{
const char *v = m_cp->get_text(ptr);
*log_mask |= PROXY_LOG_REQ_CLIENT;
if (m_cp->mycmp(v, "server-requests", len))
*log_mask |= PROXY_LOG_REQ_SERVER;
+ if (m_cp->mycmp(v, "client-ip", len))
+ *log_mask |= PROXY_LOG_IP_CLIENT;
if (isdigit(*v))
*log_mask |= atoi(v);
if (*cp == ',')
v = cp;
}
}
- if (ptr->type == XML_ELEMENT_NODE &&
+ else if (ptr->type == XML_ELEMENT_NODE &&
!strcmp((const char *) ptr->name, "max-clients"))
{
const char *t = m_cp->get_text(ptr);
*max_clients = 1;
}
}
+ else if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "period-connect"))
+ {
+ const char *t = m_cp->get_text(ptr);
+ if (t)
+ *period_connect = atoi(t);
+ }
+ else if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "max-connect"))
+ {
+ const char *t = m_cp->get_text(ptr);
+ if (t)
+ {
+ *max_connect = atoi(t);
+ }
+ }
+ else if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "limit-connect"))
+ {
+ const char *t = m_cp->get_text(ptr);
+ if (t)
+ {
+ *limit_connect = atoi(t);
+ }
+ }
+ else if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "target"))
+ ;
+ else if (ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "docpath"))
+ ;
+ else if (ptr->type == XML_ELEMENT_NODE)
+ {
+ yaz_log(YLOG_WARN, "0 Unknown element %s in yazproxy config",
+ ptr->name);
+ }
}
#endif
}
if (ptr->type == XML_ELEMENT_NODE &&
!strcmp((const char *) ptr->name, "database"))
break;
-
+
if (!ptr)
continue;
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
struct _xmlAttr *attr;
const char *name = 0;
-
+
for (attr = ptr_target->properties; attr; attr = attr->next)
if (!strcmp((const char *) attr->name, "name")
&& attr->children
&& attr->children->type==XML_TEXT_NODE
- && attr->children->content
+ && attr->children->content
&& attr->children->content[0])
{
name = (const char *)attr->children->content;
if (m_cp->get_explain_ptr(0 /* host */, db, &ptr_target, &ptr_explain))
{
xmlNodePtr ptr2 = xmlCopyNode(ptr_explain, 1);
-
+
xmlDocPtr doc = xmlNewDoc((const xmlChar *) "1.0");
-
+
xmlDocSetRootElement(doc, ptr2);
-
+
xmlChar *buf_out;
xmlDocDumpMemory(doc, &buf_out, len);
char *content = (char*) odr_malloc(odr, *len);
memcpy(content, buf_out, *len);
-
+
xmlFree(buf_out);
xmlFreeDoc(doc);
return content;
int *limit_pdu,
int *limit_req,
int *limit_search,
- int *limit_connect,
int *target_idletime,
int *client_idletime,
int *max_clients,
const char **cql2rpn,
const char **negotiation_charset,
const char **negotiation_lang,
- const char **target_charset)
+ const char **target_charset,
+ const char **default_client_query_charset)
{
#if HAVE_XSLT
xmlNodePtr ptr;
url[1] = 0;
}
m_cp->return_target_info(ptr, url, limit_bw, limit_pdu, limit_req,
- limit_search, limit_connect,
+ limit_search,
target_idletime, client_idletime,
keepalive_limit_bw, keepalive_limit_pdu,
pre_init, cql2rpn,
negotiation_charset, negotiation_lang,
- target_charset);
+ target_charset,
+ default_client_query_charset);
}
#else
*url = name;
projects / yazproxy-moved-to-github.git / blobdiff