-/* $Id: yaz-proxy.cpp,v 1.7 2004-10-18 22:10:57 adam Exp $
- Copyright (c) 1998-2004, Index Data.
+/* $Id: yaz-proxy.cpp,v 1.20 2005-02-10 08:09:42 oleg Exp $
+ Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
*/
#ifdef WIN32
-#else
-#include <unistd.h>
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
#endif
-#if HAVE_GETTIMEOFDAY
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
#include <assert.h>
#include <time.h>
-#include <sys/types.h>
#include <fcntl.h>
#include <yaz/srw.h>
#include <yaz/yaz-iconv.h>
#include <yaz/log.h>
#include <yaz/diagbib1.h>
-#include <yazproxy/proxy.h>
+#include "proxyp.h"
#include <yaz/pquery.h>
#include <yaz/otherinfo.h>
+#include <yaz/charneg.h>
-#if HAVE_XSLT
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxslt/xsltutils.h>
-#include <libxslt/transform.h>
-#endif
static const char *apdu_name(Z_APDU *apdu)
{
}
return "Unknown request/response";
}
-
Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
Yaz_Proxy *parent) :
Yaz_Z_Assoc(the_PDU_Observable), m_bw_stat(60), m_pdu_stat(60)
m_proxyTarget = 0;
m_default_target = 0;
m_proxy_authentication = 0;
+ m_proxy_negotiation_charset = 0;
+ m_proxy_negotiation_lang = 0;
m_max_clients = 150;
m_log_mask = 0;
m_seed = time(0);
m_initRequest_maximumRecordSize = 0;
m_initRequest_options = 0;
m_initRequest_version = 0;
+ m_initRequest_oi_negotiation_charsets = 0;
+ m_initRequest_oi_negotiation_num_charsets = 0;
+ m_initRequest_oi_negotiation_langs = 0;
+ m_initRequest_oi_negotiation_num_langs = 0;
+ m_initRequest_oi_negotiation_selected = 0;
m_apdu_invalid_session = 0;
m_mem_invalid_session = 0;
m_s2z_odr_init = 0;
#else
m_time_tv = 0;
#endif
+ m_usemarcon_ini_stage1 = 0;
+ m_usemarcon_ini_stage2 = 0;
+ m_usemarcon = new Yaz_usemarcon();
if (!m_parent)
low_socket_open();
}
Yaz_Proxy::~Yaz_Proxy()
{
- yaz_log(LOG_LOG, "%sClosed %d/%d sent/recv bytes total", m_session_str,
+ yaz_log(YLOG_LOG, "%sClosed %d/%d sent/recv bytes total", m_session_str,
m_bytes_sent, m_bytes_recv);
nmem_destroy(m_initRequest_mem);
nmem_destroy(m_mem_invalid_session);
xfree(m_proxyTarget);
xfree(m_default_target);
xfree(m_proxy_authentication);
+ xfree(m_proxy_negotiation_charset);
+ xfree(m_proxy_negotiation_lang);
xfree(m_optimize);
#if HAVE_XSLT
xfree (m_schema);
xfree (m_backend_type);
xfree (m_backend_charset);
+ xfree (m_usemarcon_ini_stage1);
+ xfree (m_usemarcon_ini_stage2);
+ delete m_usemarcon;
if (m_s2z_odr_init)
odr_destroy(m_s2z_odr_init);
if (m_s2z_odr_search)
if (auth)
m_proxy_authentication = (char *) xstrdup (auth);
}
-
+void Yaz_Proxy::set_proxy_negotiation (const char *charset, const char *lang)
+{
+ yaz_log(YLOG_LOG, "%sSet the proxy negotiation: charset to '%s',
+ language to '%s'", m_session_str, (charset)?charset:"none",
+ (lang)?lang:"none");
+ xfree (m_proxy_negotiation_charset);
+ xfree (m_proxy_negotiation_lang);
+ m_proxy_negotiation_charset = m_proxy_negotiation_lang = 0;
+ if (charset)
+ m_proxy_negotiation_charset = (char *) xstrdup (charset);
+ if (lang)
+ m_proxy_negotiation_lang = (char *) xstrdup (lang);
+}
Yaz_ProxyConfig *Yaz_Proxy::check_reconfigure()
{
if (m_parent)
Yaz_ProxyConfig *cfg = m_config;
if (m_reconfig_flag)
{
- yaz_log(LOG_LOG, "reconfigure");
+ yaz_log(YLOG_LOG, "reconfigure");
yaz_log_reopen();
if (m_config_fname && cfg)
{
- yaz_log(LOG_LOG, "reconfigure config %s", m_config_fname);
+ yaz_log(YLOG_LOG, "reconfigure config %s", m_config_fname);
int r = cfg->read_xml(m_config_fname);
if (r)
- yaz_log(LOG_WARN, "reconfigure failed");
+ yaz_log(YLOG_WARN, "reconfigure failed");
else
{
m_log_mask = 0;
}
}
else
- yaz_log(LOG_LOG, "reconfigure");
+ yaz_log(YLOG_LOG, "reconfigure");
m_reconfig_flag = 0;
}
return cfg;
else
new_proxy->set_APDU_yazlog(0);
new_proxy->set_proxy_authentication(m_proxy_authentication);
+ new_proxy->set_proxy_negotiation(m_proxy_negotiation_charset,
+ m_proxy_negotiation_lang);
sprintf(new_proxy->m_session_str, "%ld:%d ", (long) time(0), m_session_no);
m_session_no++;
- yaz_log (LOG_LOG, "%sNew session %s", new_proxy->m_session_str,
+ yaz_log (YLOG_LOG, "%sNew session %s", new_proxy->m_session_str,
the_PDU_Observable->getpeername());
return new_proxy;
}
return oi->information.characterInfo;
return 0;
}
-
char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo)
{
int oid[OID_SIZE];
return oi->information.characterInfo;
return 0;
}
-
const char *Yaz_Proxy::load_balance(const char **url)
{
int zurl_in_use[MAX_ZURL_PLEX];
const char *ret_spare = 0;
for (i = 0; url[i]; i++)
{
- yaz_log(LOG_DEBUG, "%szurl=%s use=%d spare=%d",
+ yaz_log(YLOG_DEBUG, "%szurl=%s use=%d spare=%d",
m_session_str, url[i], zurl_in_use[i], zurl_in_spare[i]);
if (min_use > zurl_in_use[i])
{
proxy_host = m_default_target;
int client_idletime = -1;
const char *cql2rpn_fname = 0;
+ const char *authentication = 0;
+ const char *negotiation_charset = 0;
+ const char *negotiation_lang = 0;
url[0] = m_default_target;
url[1] = 0;
if (cfg)
&m_keepalive_limit_bw,
&m_keepalive_limit_pdu,
&pre_init,
- &cql2rpn_fname);
+ &cql2rpn_fname,
+ &authentication,
+ &negotiation_charset,
+ &negotiation_lang);
}
if (client_idletime != -1)
{
}
if (cql2rpn_fname)
m_cql2rpn.set_pqf_file(cql2rpn_fname);
+ if (authentication)
+ set_proxy_authentication(authentication);
+ if (negotiation_charset || negotiation_lang)
+ set_proxy_negotiation(negotiation_charset,
+ negotiation_lang);
if (!url[0])
{
- yaz_log(LOG_LOG, "%sNo default target", m_session_str);
+ yaz_log(YLOG_LOG, "%sNo default target", m_session_str);
return 0;
}
// we don't handle multiplexing for cookie session, so we just
// we have an initRequest we can safely do re-open
if (c->m_waiting && apdu->which == Z_APDU_initRequest)
{
- yaz_log (LOG_LOG, "%s REOPEN target=%s", m_session_str,
+ yaz_log (YLOG_LOG, "%s REOPEN target=%s", m_session_str,
c->get_hostname());
c->close();
c->m_init_flag = 0;
c->m_server->m_client = 0;
c->m_server = this;
(parent->m_seqno)++;
- yaz_log (LOG_DEBUG, "get_client 1 %p %p", this, c);
+ yaz_log (YLOG_DEBUG, "get_client 1 %p %p", this, c);
return c;
}
}
}
- else if (!c)
+ else if (!c &&
+ apdu->which == Z_APDU_initRequest &&
+ apdu->u.initRequest->idAuthentication == 0 &&
+ !ODR_MASK_GET(apdu->u.initRequest->options, Z_Options_negotiationModel))
{
- // don't have a client session yet. Search in session w/o cookie
+ // anonymous sessions without cookie.
+ // if authentication is set it is NOT anonymous se we can't share them.
+ // If charset and lang negotiation is use it is NOT anonymous session too.
for (c = parent->m_clientPool; c; c = c->m_next)
{
- assert (c->m_prev);
- assert (*c->m_prev == c);
+ assert(c->m_prev);
+ assert(*c->m_prev == c);
if (c->m_server == 0 && c->m_cookie == 0 &&
- c->m_waiting == 0 &&
+ c->m_waiting == 0 &&
!strcmp(m_proxyTarget, c->get_hostname()))
{
// found it in cache
- yaz_log (LOG_LOG, "%sREUSE %d %s",
+ yaz_log (YLOG_LOG, "%sREUSE %d %s",
m_session_str, parent->m_seqno, c->get_hostname());
c->m_seqno = parent->m_seqno;
{
if (apdu->which != Z_APDU_initRequest)
{
- yaz_log (LOG_LOG, "%sno init request as first PDU", m_session_str);
+ yaz_log (YLOG_LOG, "%sno init request as first PDU", m_session_str);
return 0;
}
Z_InitRequest *initRequest = apdu->u.initRequest;
odr_strdup (odr_encode(), m_proxy_authentication);
}
}
+ else
+ {
+ // the client use authentication. We set the keepalive PDU
+ // to 0 so we don't cache it in releaseClient
+ m_keepalive_limit_pdu = 0;
+ }
// go through list of clients - and find the lowest/oldest one.
Yaz_ProxyClient *c_min = 0;
int min_seq = -1;
int no_of_clients = 0;
if (parent->m_clientPool)
- yaz_log (LOG_DEBUG, "Existing sessions");
+ yaz_log (YLOG_DEBUG, "Existing sessions");
for (c = parent->m_clientPool; c; c = c->m_next)
{
- yaz_log (LOG_DEBUG, " Session %-3d wait=%d %s cookie=%s", c->m_seqno,
+ yaz_log (YLOG_DEBUG, " Session %-3d wait=%d %s cookie=%s", c->m_seqno,
c->m_waiting, c->get_hostname(),
c->m_cookie ? c->m_cookie : "");
no_of_clients++;
c = c_min;
if (c->m_waiting || strcmp(m_proxyTarget, c->get_hostname()))
{
- yaz_log (LOG_LOG, "%sMAXCLIENTS %d Destroy %d",
+ yaz_log (YLOG_LOG, "%sMAXCLIENTS %d Destroy %d",
m_session_str, parent->m_max_clients, c->m_seqno);
if (c->m_server && c->m_server != this)
delete c->m_server;
}
else
{
- yaz_log (LOG_LOG, "%sMAXCLIENTS %d Reuse %d %d %s",
+ yaz_log (YLOG_LOG, "%sMAXCLIENTS %d Reuse %d %d %s",
m_session_str, parent->m_max_clients,
c->m_seqno, parent->m_seqno, c->get_hostname());
xfree (c->m_cookie);
}
else
{
- yaz_log (LOG_LOG, "%sNEW %d %s",
+ yaz_log (YLOG_LOG, "%sNEW %d %s",
m_session_str, parent->m_seqno, m_proxyTarget);
c = new Yaz_ProxyClient(m_PDU_Observable->clone(), parent);
c->m_next = parent->m_clientPool;
else
c->set_APDU_yazlog(0);
}
- yaz_log (LOG_DEBUG, "get_client 3 %p %p", this, c);
+ yaz_log (YLOG_DEBUG, "get_client 3 %p %p", this, c);
return c;
}
-
void Yaz_Proxy::display_diagrecs(Z_DiagRec **pp, int num)
{
int i;
Z_DiagRec *p = pp[i];
if (p->which != Z_DiagRec_defaultFormat)
{
- yaz_log(LOG_LOG, "%sError no diagnostics", m_session_str);
+ yaz_log(YLOG_LOG, "%sError no diagnostics", m_session_str);
return;
}
else
r = p->u.defaultFormat;
if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1)
- yaz_log(LOG_LOG, "%sError unknown diagnostic set", m_session_str);
+ yaz_log(YLOG_LOG, "%sError unknown diagnostic set", m_session_str);
switch (r->which)
{
case Z_DefaultDiagFormat_v2Addinfo:
- yaz_log(LOG_LOG, "%sError %d %s:%s",
+ yaz_log(YLOG_LOG, "%sError %d %s:%s",
m_session_str,
*r->condition, diagbib1_str(*r->condition),
r->u.v2Addinfo);
break;
case Z_DefaultDiagFormat_v3Addinfo:
- yaz_log(LOG_LOG, "%sError %d %s:%s",
+ yaz_log(YLOG_LOG, "%sError %d %s:%s",
m_session_str,
*r->condition, diagbib1_str(*r->condition),
r->u.v3Addinfo);
void Yaz_Proxy::convert_xsl_delay()
{
- Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset];
#if HAVE_XSLT
+ Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset];
if (npr->which == Z_NamePlusRecord_databaseRecord)
{
Z_External *r = npr->u.databaseRecord;
r->u.octet_aligned->len);
- yaz_log(LOG_LOG, "%sXSLT convert %d",
+ yaz_log(YLOG_LOG, "%sXSLT convert %d",
m_session_str, m_stylesheet_offset);
res = xsltApplyStylesheet((xsltStylesheetPtr) m_stylesheet_xsp,
doc, 0);
Z_External *r = npr->u.databaseRecord;
if (r->which == Z_External_octet)
{
+#if HAVE_USEMARCON
+ if (m_usemarcon_ini_stage1 && *m_usemarcon_ini_stage1)
+ {
+ if (!m_usemarcon->m_stage1)
+ {
+ m_usemarcon->m_stage1 = new CDetails();
+ }
+ m_usemarcon->m_stage1->SetIniFileName(m_usemarcon_ini_stage1);
+ m_usemarcon->m_stage1->SetMarcRecord((char*) r->u.octet_aligned->buf, r->u.octet_aligned->len);
+ int res = m_usemarcon->m_stage1->Start();
+ if (res == 0)
+ {
+ char *converted;
+ int convlen;
+ m_usemarcon->m_stage1->GetMarcRecord(converted, convlen);
+ if (m_usemarcon_ini_stage2 && *m_usemarcon_ini_stage2)
+ {
+ if (!m_usemarcon->m_stage2)
+ {
+ m_usemarcon->m_stage2 = new CDetails();
+ }
+ m_usemarcon->m_stage2->SetIniFileName(m_usemarcon_ini_stage2);
+ m_usemarcon->m_stage2->SetMarcRecord(converted, convlen);
+ res = m_usemarcon->m_stage2->Start();
+ if (res == 0)
+ {
+ free(converted);
+ m_usemarcon->m_stage2->GetMarcRecord(converted, convlen);
+ }
+ else
+ {
+ yaz_log(YLOG_LOG, "%sUSEMARCON stage 2 error %d", m_session_str, res);
+ }
+ }
+ npr->u.databaseRecord =
+ z_ext_record(odr_encode(),
+ m_frontend_type,
+ converted,
+ strlen(converted));
+ free(converted);
+ }
+ else
+ {
+ yaz_log(YLOG_LOG, "%sUSEMARCON stage 1 error %d", m_session_str, res);
+ }
+ continue;
+ }
+#endif
npr->u.databaseRecord =
z_ext_record(odr_encode(),
m_frontend_type,
const char *backend_charset)
{
int i;
-
if (!backend_charset)
backend_charset = "MARC-8";
- yaz_iconv_t cd = yaz_iconv_open("UTF-8", "MARC-8");
+ yaz_iconv_t cd = yaz_iconv_open("UTF-8", backend_charset);
yaz_marc_t mt = yaz_marc_create();
yaz_marc_xml(mt, YAZ_MARC_MARCXML);
yaz_marc_iconv(mt, cd);
long diff = (tv1.tv_sec - tv->tv_sec)*1000000 +
(tv1.tv_usec - tv->tv_usec);
if (diff >= 0)
- yaz_log(LOG_LOG, "%sElapsed %ld.%03ld", m_session_str,
+ yaz_log(YLOG_LOG, "%sElapsed %ld.%03ld", m_session_str,
diff/1000000, (diff/1000)%1000);
}
tv->tv_sec = 0;
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
{
- yaz_log (LOG_LOG, "%sSending %s to client", m_session_str,
+ yaz_log (YLOG_LOG, "%sSending %s to client", m_session_str,
gdu_name(gdu));
}
int len;
soap_handlers, 0, m_s2z_stylesheet);
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
{
- yaz_log (LOG_LOG, "%sSending %s to client", m_session_str,
+ yaz_log (YLOG_LOG, "%sSending %s to client", m_session_str,
gdu_name(gdu));
}
int len;
{
int len = 0;
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
- yaz_log (LOG_LOG, "%sSending %s to client", m_session_str,
+ yaz_log (YLOG_LOG, "%sSending %s to client", m_session_str,
apdu_name(apdu));
int r = send_Z_PDU(apdu, &len);
m_bytes_sent += len;
{
if (p && p->which == Z_Records_DBOSD)
{
- if (m_backend_type)
+ if (m_backend_type
+#if HAVE_USEMARCON
+ || m_usemarcon_ini_stage1 || m_usemarcon_ini_stage2
+#endif
+ )
convert_to_frontend_type(p->u.databaseOrSurDiagnostics);
if (m_marcxml_flag)
convert_to_marcxml(p->u.databaseOrSurDiagnostics,
}
if (sr->resultCount)
{
- yaz_log(LOG_LOG, "%s%d hits", m_session_str,
+ yaz_log(YLOG_LOG, "%s%d hits", m_session_str,
*sr->resultCount);
if (*sr->resultCount < 0)
{
}
if (p && p->which == Z_Records_DBOSD)
{
- if (m_backend_type)
+ if (m_backend_type
+#if HAVE_USEMARCON
+ || m_usemarcon_ini_stage1 || m_usemarcon_ini_stage2
+#endif
+ )
convert_to_frontend_type(p->u.databaseOrSurDiagnostics);
if (m_marcxml_flag)
convert_to_marcxml(p->u.databaseOrSurDiagnostics,
}
else if (apdu->which == Z_APDU_initResponse)
{
+ //Get and check negotiation record
+ //from init response.
+ handle_charset_lang_negotiation(apdu);
+
if (m_initRequest_options)
{
Z_Options *nopt =
m_initRequest_maximumRecordSize :
m_client->m_initResponse_maximumRecordSize);
}
+
int r = send_PDU_convert(apdu);
if (r)
return r;
const char *apdu_name_tmp = apdu_name(apdu);
int r = send_Z_PDU(apdu, &len);
if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER)
- yaz_log (LOG_LOG, "%sSending %s to %s %d bytes",
+ yaz_log (YLOG_LOG, "%sSending %s to %s %d bytes",
get_session_str(),
apdu_name_tmp, get_hostname(), len);
m_bytes_sent += len;
int toget = *pr->numberOfRecordsRequested;
int start = *pr->resultSetStartPoint;
- yaz_log(LOG_LOG, "%sPresent %s %d+%d", m_session_str,
+ yaz_log(YLOG_LOG, "%sPresent %s %d+%d", m_session_str,
pr->resultSetId, start, toget);
if (*m_parent->m_optimize == '0')
}
Z_NamePlusRecordList *npr;
#if 0
- yaz_log(LOG_LOG, "%sCache lookup %d+%d syntax=%s",
+ yaz_log(YLOG_LOG, "%sCache lookup %d+%d syntax=%s",
m_session_str, start, toget, yaz_z3950oid_to_str(
pr->preferredRecordSyntax, &oclass));
#endif
pr->preferredRecordSyntax,
pr->recordComposition))
{
- yaz_log (LOG_LOG, "%sReturned cached records for present request",
+ yaz_log (YLOG_LOG, "%sReturned cached records for present request",
m_session_str);
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse);
new_apdu->u.presentResponse->referenceId = pr->referenceId;
char query_str[120];
this_query->print(query_str, sizeof(query_str)-1);
- yaz_log(LOG_LOG, "%sSearch %s", m_session_str, query_str);
+ yaz_log(YLOG_LOG, "%sSearch %s", m_session_str, query_str);
if (*m_parent->m_optimize != '0' &&
m_client->m_last_ok && m_client->m_last_query &&
if (m_client->m_cache.lookup (odr_encode(), &npr, 1, toget,
sr->preferredRecordSyntax, comp))
{
- yaz_log (LOG_LOG, "%sReturned cached records for medium set",
+ yaz_log (YLOG_LOG, "%sReturned cached records for medium set",
m_session_str);
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
new_apdu->u.searchResponse->referenceId = sr->referenceId;
{
// medium Set
// send present request (medium size)
- yaz_log (LOG_LOG, "%sOptimizing search for medium set",
+ yaz_log (YLOG_LOG, "%sOptimizing search for medium set",
m_session_str);
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
m_client->m_last_resultCount <= 0)
{
// large set. Return pseudo-search response immediately
- yaz_log (LOG_LOG, "%sOptimizing search for large set",
+ yaz_log (YLOG_LOG, "%sOptimizing search for large set",
m_session_str);
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
new_apdu->u.searchResponse->referenceId = sr->referenceId;
if (m_client->m_cache.lookup (odr_encode(), &npr, 1, toget,
sr->preferredRecordSyntax, comp))
{
- yaz_log (LOG_LOG, "%sReturned cached records for small set",
+ yaz_log (YLOG_LOG, "%sReturned cached records for small set",
m_session_str);
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
new_apdu->u.searchResponse->referenceId = sr->referenceId;
}
else
{
- yaz_log (LOG_LOG, "%sOptimizing search for small set",
+ yaz_log (YLOG_LOG, "%sOptimizing search for small set",
m_session_str);
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
Z_PresentRequest *pr = new_apdu->u.presentRequest;
m_bytes_recv += len;
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
- yaz_log (LOG_LOG, "%sReceiving %s from client %d bytes",
+ yaz_log (YLOG_LOG, "%sReceiving %s from client %d bytes",
m_session_str, gdu_name(apdu), len);
if (m_bw_hold_PDU) // double incoming PDU. shutdown now.
reduce = (reduce > nreduce) ? reduce : nreduce;
}
}
+ m_http_version = 0;
if (reduce)
{
- yaz_log(LOG_LOG, "%sdelay=%d bw=%d pdu=%d limit-bw=%d limit-pdu=%d",
+ yaz_log(YLOG_LOG, "%sdelay=%d bw=%d pdu=%d limit-bw=%d limit-pdu=%d",
m_session_str, reduce, bw_total, pdu_total,
m_bw_max, m_pdu_max);
}
}
}
+void Yaz_Proxy::handle_charset_lang_negotiation(Z_APDU *apdu)
+{
+ if (apdu->which == Z_APDU_initRequest)
+ {
+ if (m_initRequest_options &&
+ !ODR_MASK_GET(m_initRequest_options, Z_Options_negotiationModel) &&
+ (m_proxy_negotiation_charset || m_proxy_negotiation_lang))
+ {
+ // There is not negotiation proposal from
+ // client's side. OK. The proxy negotiation
+ // in use, only.
+ Z_InitRequest *initRequest = apdu->u.initRequest;
+ Z_OtherInformation **otherInfo;
+ Z_OtherInformationUnit *oi;
+ get_otherInfoAPDU(apdu, &otherInfo);
+ oi = update_otherInformation(otherInfo, 1, NULL, 0, 0);
+ if (oi)
+ {
+ ODR_MASK_SET(initRequest->options,
+ Z_Options_negotiationModel);
+ oi->which = Z_OtherInfo_externallyDefinedInfo;
+ oi->information.externallyDefinedInfo =
+ yaz_set_proposal_charneg(odr_encode(),
+ (const char**)&m_proxy_negotiation_charset,
+ m_proxy_negotiation_charset ? 1:0,
+ (const char**)&m_proxy_negotiation_lang,
+ m_proxy_negotiation_lang ? 1:0,
+ 1);
+ }
+ }
+ }
+ else if (apdu->which == Z_APDU_initResponse)
+ {
+ Z_InitResponse *initResponse = apdu->u.initResponse;
+ Z_OtherInformation **otherInfo;
+ Z_OtherInformationUnit *oi;
+
+ if (ODR_MASK_GET(initResponse->options, Z_Options_negotiationModel))
+ {
+ char *charset = 0;
+ char *lang = 0;
+ int selected = 0;
+
+ get_otherInfoAPDU(apdu, &otherInfo);
+
+ if (!otherInfo && !(*otherInfo))
+ return;
+
+ Z_CharSetandLanguageNegotiation *charneg =
+ yaz_get_charneg_record(*otherInfo);
+
+ if (!charneg)
+ return;
+
+ yaz_get_response_charneg(m_referenceId_mem, charneg,
+ &charset, &lang, &selected);
+
+ yaz_log(YLOG_LOG, "%sAccepted charset - '%s' and lang - '%s'",
+ m_session_str, (charset)?charset:"none", (lang)?lang:"none");
+
+ if (m_initRequest_options &&
+ ODR_MASK_GET(m_initRequest_options, Z_Options_negotiationModel))
+ {
+ yaz_log(YLOG_LOG, "%sClient's negotiation record in use",
+ m_session_str);
+ }
+ else if (m_proxy_negotiation_charset || m_proxy_negotiation_lang)
+ {
+ // negotiation-charset, negotiation-lang
+ // elements of config file in use.
+
+ yaz_log(YLOG_LOG, "%sProxy's negotiation record in use",
+ m_session_str);
+ // clear negotiation option.
+ ODR_MASK_CLEAR(initResponse->options, Z_Options_negotiationModel);
+
+ // Delete negotiation (charneg-3) entry.
+ Z_OtherInformation *p = *otherInfo;
+ for (int i=0; i<p->num_elements; i++)
+ {
+ if (p->list[i]->which == Z_OtherInfo_externallyDefinedInfo)
+ {
+ Z_External *pext =
+ p->list[i]->information.externallyDefinedInfo;
+ struct oident *e = oid_getentbyoid(pext->direct_reference);
+
+ if (e && e->value == VAL_CHARNEG3 && e->oclass == CLASS_NEGOT &&
+ pext->which == Z_External_charSetandLanguageNegotiation)
+ {
+ (p->num_elements)--;
+ if(p->num_elements == 0)
+ {
+ *otherInfo = 0;
+ }
+ else
+ {
+ for (int j=i; j<p->num_elements;j++)
+ p->list[j] = p->list[j+1];
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
Z_Records *Yaz_Proxy::create_nonSurrogateDiagnostics(ODR odr,
int error,
const char *addinfo)
Z_SearchRequest *sr = apdu->u.searchRequest;
char *addinfo = 0;
- yaz_log(LOG_LOG, "%sCQL: %s", m_session_str,
+ yaz_log(YLOG_LOG, "%sCQL: %s", m_session_str,
sr->query->u.type_104->u.cql);
int r = m_cql2rpn.query_transform(sr->query->u.type_104->u.cql,
&rpnquery, odr_encode(),
&addinfo);
if (r == -3)
- yaz_log(LOG_LOG, "%sNo CQL to RPN table", m_session_str);
+ yaz_log(YLOG_LOG, "%sNo CQL to RPN table", m_session_str);
else if (r)
{
- yaz_log(LOG_LOG, "%sCQL Conversion error %d", m_session_str, r);
+ yaz_log(YLOG_LOG, "%sCQL Conversion error %d", m_session_str, r);
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
new_apdu->u.searchResponse->referenceId = sr->referenceId;
m_default_target,
sr->preferredRecordSyntax, rc,
&addinfo, &stylesheet_name, &m_schema,
- &m_backend_type, &m_backend_charset);
+ &m_backend_type, &m_backend_charset,
+ &m_usemarcon_ini_stage1,
+ &m_usemarcon_ini_stage2);
if (stylesheet_name)
{
m_parent->low_socket_close();
pr->preferredRecordSyntax,
pr->recordComposition,
&addinfo, &stylesheet_name, &m_schema,
- &m_backend_type, &m_backend_charset);
+ &m_backend_type, &m_backend_charset,
+ &m_usemarcon_ini_stage1,
+ &m_usemarcon_ini_stage2
+ );
if (stylesheet_name)
{
m_parent->low_socket_close();
m_default_target = xstrdup(t);
}
}
+
+int Yaz_Proxy::file_access(Z_HTTP_Request *hreq)
+{
+ struct stat sbuf;
+ yaz_log(YLOG_LOG, "file_access");
+ if (strcmp(hreq->method, "GET"))
+ return 0;
+ if (hreq->path[0] != '/')
+ {
+ yaz_log(YLOG_WARN, "Bad path: %s", hreq->path);
+ return 0;
+ }
+ const char *cp = hreq->path;
+ while (*cp)
+ {
+ if (*cp == '/' && strchr("/.", cp[1]))
+ {
+ yaz_log(YLOG_WARN, "Bad path: %s", hreq->path);
+ return 0;
+ }
+ cp++;
+ }
+ const char *fname = hreq->path+1;
+ if (stat(fname, &sbuf))
+ {
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "%s: stat failed", fname);
+ return 0;
+ }
+ if ((sbuf.st_mode & S_IFMT) != S_IFREG)
+ {
+ yaz_log(YLOG_WARN, "%s: not a regular file", fname);
+ return 0;
+ }
+ if (sbuf.st_size > (off_t) 1000000)
+ {
+ yaz_log(YLOG_WARN, "%s: too large for transfer", fname);
+ return 0;
+ }
+
+ ODR o = odr_encode();
+ Yaz_ProxyConfig *cfg = check_reconfigure();
+ const char *ctype = cfg->check_mime_type(fname);
+ Z_GDU *gdu = z_get_HTTP_Response(o, 200);
+ Z_HTTP_Response *hres = gdu->u.HTTP_Response;
+ if (m_http_version)
+ hres->version = odr_strdup(o, m_http_version);
+ z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype);
+ if (m_http_keepalive)
+ z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive");
+ else
+ timeout(0);
+
+ hres->content_len = sbuf.st_size;
+ hres->content_buf = (char*) odr_malloc(o, hres->content_len);
+ FILE *f = fopen(fname, "rb");
+ if (f)
+ {
+ fread(hres->content_buf, 1, hres->content_len, f);
+ fclose(f);
+ }
+ else
+ {
+ return 0;
+ }
+ if (m_log_mask & PROXY_LOG_REQ_CLIENT)
+ {
+ yaz_log (YLOG_LOG, "%sSending file %s to client", m_session_str,
+ fname);
+ }
+ int len;
+ send_GDU(gdu, &len);
+ return 1;
+}
void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq)
{
char *charset = 0;
Z_SRW_diagnostic *diagnostic = 0;
int num_diagnostic = 0;
- if (yaz_srw_decode(hreq, &srw_pdu, &soap_package, odr_decode(),
- &charset) == 0
- || yaz_sru_decode(hreq, &srw_pdu, &soap_package, odr_decode(),
- &charset, &diagnostic, &num_diagnostic) == 0)
+
+ if (file_access(hreq))
+ {
+ return;
+ }
+ else if (yaz_srw_decode(hreq, &srw_pdu, &soap_package, odr_decode(),
+ &charset) == 0
+ || yaz_sru_decode(hreq, &srw_pdu, &soap_package, odr_decode(),
+ &charset, &diagnostic, &num_diagnostic) == 0)
{
m_s2z_odr_init = odr_createmem(ODR_ENCODE);
m_s2z_odr_search = odr_createmem(ODR_ENCODE);
const char *pqf_msg;
size_t off;
int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
- yaz_log(LOG_LOG, "%*s^\n", off+4, "");
- yaz_log(LOG_LOG, "Bad PQF: %s (code %d)\n", pqf_msg, code);
+ yaz_log(YLOG_LOG, "%*s^\n", off+4, "");
+ yaz_log(YLOG_LOG, "Bad PQF: %s (code %d)\n", pqf_msg, code);
send_to_srw_client_error(10, 0);
return;
{
Z_SRW_explainRequest *srw_req = srw_pdu->u.explain_request;
+ const char *backend_db = srw_req->database;
+ srw_get_client(srw_req->database, &backend_db);
+
m_s2z_database = odr_strdup(m_s2z_odr_init, srw_req->database);
// save stylesheet
send_to_srw_client_error(4, 0);
}
}
- int len = 0;
- Z_GDU *p = z_get_HTTP_Response(odr_encode(), 400);
- timeout(0);
- send_GDU(p, &len);
+ send_http_response(400);
}
void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
m_client = get_client(apdu, get_cookie(oi), get_proxy(oi));
if (!m_client)
{
- delete this;
- return;
+ if (m_http_version)
+ {
+ send_http_response(404);
+ return;
+ }
+ else
+ {
+ delete this;
+ return;
+ }
}
+
m_client->m_server = this;
if (apdu->which == Z_APDU_initRequest)
{
if (apdu->u.initRequest->implementationId)
- yaz_log(LOG_LOG, "%simplementationId: %s",
+ yaz_log(YLOG_LOG, "%simplementationId: %s",
m_session_str, apdu->u.initRequest->implementationId);
if (apdu->u.initRequest->implementationName)
- yaz_log(LOG_LOG, "%simplementationName: %s",
+ yaz_log(YLOG_LOG, "%simplementationName: %s",
m_session_str, apdu->u.initRequest->implementationName);
if (apdu->u.initRequest->implementationVersion)
- yaz_log(LOG_LOG, "%simplementationVersion: %s",
+ yaz_log(YLOG_LOG, "%simplementationVersion: %s",
m_session_str, apdu->u.initRequest->implementationVersion);
if (m_initRequest_apdu == 0)
{
if (m_initRequest_mem)
nmem_destroy(m_initRequest_mem);
+
m_initRequest_apdu = apdu;
m_initRequest_mem = odr_extract_mem(odr_decode());
m_initRequest_maximumRecordSize = *apdu->u.initRequest->
maximumRecordSize;
*apdu->u.initRequest->maximumRecordSize = 1024*1024;
-
+
+ // Save proposal charsets and langs.
+ if (ODR_MASK_GET(apdu->u.initRequest->options,
+ Z_Options_negotiationModel))
+ {
+ Z_CharSetandLanguageNegotiation *charSetandLangRecord =
+ yaz_get_charneg_record(*oi);
+
+ yaz_get_proposal_charneg(m_referenceId_mem,
+ charSetandLangRecord,
+ &m_initRequest_oi_negotiation_charsets,
+ &m_initRequest_oi_negotiation_num_charsets,
+ &m_initRequest_oi_negotiation_langs,
+ &m_initRequest_oi_negotiation_num_langs,
+ &m_initRequest_oi_negotiation_selected);
+
+ for (int i=0; i<m_initRequest_oi_negotiation_num_charsets; i++)
+ {
+ yaz_log(YLOG_LOG, "%scharacters set proposal: %s",
+ m_session_str,(m_initRequest_oi_negotiation_charsets[i])?
+ m_initRequest_oi_negotiation_charsets[i]:"none");
+ }
+ for (int i=0; i<m_initRequest_oi_negotiation_num_langs; i++)
+ {
+ yaz_log(YLOG_LOG, "%slanguages proposal: %s",
+ m_session_str, (m_initRequest_oi_negotiation_langs[i])?
+ m_initRequest_oi_negotiation_langs[i]:"none");
+ }
+ yaz_log(YLOG_LOG, "%sselected proposal: %d (boolean)",
+ m_session_str, m_initRequest_oi_negotiation_selected);
+ }
// save init options for the response..
m_initRequest_options = apdu->u.initRequest->options;
int i;
for (i = 0; i<= 24; i++)
ODR_MASK_SET(apdu->u.initRequest->options, i);
+ // check negotiation option
+ if (!ODR_MASK_GET(m_initRequest_options,
+ Z_Options_negotiationModel))
+ {
+ ODR_MASK_CLEAR(apdu->u.initRequest->options,
+ Z_Options_negotiationModel);
+ }
ODR_MASK_CLEAR(apdu->u.initRequest->options,
- Z_Options_negotiationModel);
- ODR_MASK_CLEAR(apdu->u.initRequest->options,
- Z_Options_concurrentOperations);
-
+ Z_Options_concurrentOperations);
// make new version
m_initRequest_version = apdu->u.initRequest->protocolVersion;
apdu->u.initRequest->protocolVersion =
// though we didn't use it
return;
}
+ // Add otherInformation entry in APDU if
+ // negotiatoin in use.
+ if (apdu)
+ handle_charset_lang_negotiation(apdu);
- // delete other info part from PDU before sending to target
+ // delete other info construct completely if 0 elements
get_otherInfoAPDU(apdu, &oi);
- if (oi)
+ if (oi && *oi && (*oi)->num_elements == 0)
*oi = 0;
if (apdu->which == Z_APDU_presentRequest &&
m_client->m_bytes_recv+m_client->m_bytes_sent < m_keepalive_limit_bw &&
m_client->m_waiting == 0)
{
- yaz_log(LOG_LOG, "%sShutdown (client to proxy) keepalive %s",
+ yaz_log(YLOG_LOG, "%sShutdown (client to proxy) keepalive %s",
m_session_str,
m_client->get_hostname());
- yaz_log(LOG_LOG, "%sbw=%d pdu=%d limit-bw=%d limit-pdu=%d",
+ yaz_log(YLOG_LOG, "%sbw=%d pdu=%d limit-bw=%d limit-pdu=%d",
m_session_str, m_client->m_pdu_recv,
m_client->m_bytes_sent + m_client->m_bytes_recv,
m_keepalive_limit_bw, m_keepalive_limit_pdu);
assert (m_client->m_waiting != 2);
// Tell client (if any) that no server connection is there..
m_client->m_server = 0;
- m_invalid_session = 0;
m_client = 0;
}
else if (m_client)
{
- yaz_log (LOG_LOG, "%sShutdown (client to proxy) close %s",
+ yaz_log (YLOG_LOG, "%sShutdown (client to proxy) close %s",
m_session_str,
m_client->get_hostname());
assert (m_client->m_waiting != 2);
}
else if (!m_parent)
{
- yaz_log (LOG_LOG, "%sshutdown (client to proxy) bad state",
+ yaz_log (YLOG_LOG, "%sshutdown (client to proxy) bad state",
m_session_str);
assert (m_parent);
}
else
{
- yaz_log (LOG_LOG, "%sShutdown (client to proxy)",
+ yaz_log (YLOG_LOG, "%sShutdown (client to proxy)",
m_session_str);
}
if (m_parent)
void Yaz_ProxyClient::shutdown()
{
- yaz_log (LOG_LOG, "%sShutdown (proxy to target) %s", get_session_str(),
+ yaz_log (YLOG_LOG, "%sShutdown (proxy to target) %s", get_session_str(),
get_hostname());
delete m_server;
delete this;
void Yaz_Proxy::failNotify()
{
inc_request_no();
- yaz_log (LOG_LOG, "%sConnection closed by client",
+ yaz_log (YLOG_LOG, "%sConnection closed by client",
get_session_str());
shutdown();
}
{
if (m_server)
m_server->inc_request_no();
- yaz_log (LOG_LOG, "%sConnection closed by target %s",
+ yaz_log (YLOG_LOG, "%sConnection closed by target %s",
get_session_str(), get_hostname());
shutdown();
}
{
const char *s = get_session_str();
const char *h = get_hostname();
- yaz_log (LOG_LOG, "%sConnection accepted by %s timeout=%d", s, h,
+ yaz_log (YLOG_LOG, "%sConnection accepted by %s timeout=%d", s, h,
m_target_idletime);
timeout(m_target_idletime);
if (!m_server)
int keepalive_limit_bw, keepalive_limit_pdu;
int pre_init;
const char *cql2rpn = 0;
+ const char *authentication = 0;
+ const char *negotiation_charset = 0;
+ const char *negotiation_lang = 0;
Yaz_ProxyConfig *cfg = check_reconfigure();
&keepalive_limit_bw,
&keepalive_limit_pdu,
&pre_init,
- &cql2rpn) ; i++)
+ &cql2rpn,
+ &authentication,
+ &negotiation_charset,
+ &negotiation_lang) ; i++)
{
if (pre_init)
{
other++;
}
}
- yaz_log(LOG_LOG, "%spre-init %s %s use=%d other=%d spare=%d "
+ yaz_log(YLOG_LOG, "%spre-init %s %s use=%d other=%d spare=%d "
"sparew=%d preinit=%d",m_session_str,
name, zurl_in_use[j], in_use, other,
spare, spare_waiting, pre_init);
{
inc_request_no();
- yaz_log (LOG_LOG, "%sTimeout (client to proxy)", m_session_str);
+ yaz_log (YLOG_LOG, "%sTimeout (client to proxy)", m_session_str);
shutdown();
}
}
if (m_server)
m_server->inc_request_no();
- yaz_log (LOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(),
+ yaz_log (YLOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(),
get_hostname());
m_waiting = 1;
m_root->pre_init();
m_pdu_recv++;
m_waiting = 0;
if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER)
- yaz_log (LOG_LOG, "%sReceiving %s from %s %d bytes", get_session_str(),
+ yaz_log (YLOG_LOG, "%sReceiving %s from %s %d bytes", get_session_str(),
apdu_name(apdu), get_hostname(), len);
if (apdu->which == Z_APDU_initResponse)
{
int r = Yaz_Z_Assoc::server(addr);
if (!r)
{
- yaz_log(LOG_LOG, "%sStarted proxy "
+ yaz_log(YLOG_LOG, "%sStarted proxy "
#ifdef VERSION
VERSION
#endif