-/* $Id: yaz-proxy.cpp,v 1.57 2006-04-13 00:43:56 adam Exp $
- Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+ Copyright (C) 1998-2009 Index Data
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
for more details.
You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
#ifdef WIN32
#define HAVE_SYS_STAT_H 1
#include <yaz/pquery.h>
#include <yaz/otherinfo.h>
#include <yaz/charneg.h>
+#include <yaz/oid_db.h>
#include "msg-thread.h"
+#if YAZ_VERSIONL >= 0x03001D
+#define YAZ_HAS_MK_SURROGATE 1
+#else
+#define YAZ_HAS_MK_SURROGATE 0
+#endif
+
using namespace yazpp_1;
#ifdef WIN32
#define strncasecmp _strnicmp
#endif
-#define USE_AUTH_MSG 1
-
-#if USE_AUTH_MSG
class YAZ_EXPORT Auth_Msg : public IMsg_Thread {
public:
int m_ret;
void Auth_Msg::result()
{
- if (m_proxy->dec_ref(false))
+ if (m_proxy->dec_ref())
{
yaz_log(YLOG_LOG, "Auth_Msg::proxy deleted meanwhile");
}
delete this;
}
-#endif
-
void Yaz_Proxy::result_authentication(Z_APDU *apdu, int ret)
{
if (apdu == 0 || ret == 0)
Z_APDU *apdu_reject = zget_APDU(odr_encode(), Z_APDU_initResponse);
*apdu_reject->u.initResponse->result = 0;
send_to_client(apdu_reject);
- dec_ref(false);
+ dec_ref();
}
else
{
m_seed = time(0);
m_client_idletime = 600;
m_target_idletime = 600;
- m_optimize = xstrdup ("1");
+ m_max_sockets = 1024;
+ m_optimize = xstrdup("1");
strcpy(m_session_str, "0 ");
m_session_no = 0;
m_bytes_sent = 0;
m_schema = 0;
m_backend_type = 0;
m_backend_charset = 0;
- m_frontend_type = 0;
+ m_frontend_type[0] = -1;
m_initRequest_apdu = 0;
m_initRequest_mem = 0;
m_initRequest_preferredMessageSize = 0;
m_ref_count = 1;
m_main_ptr_dec = false;
m_peername = 0;
+ m_num_msg_threads = 0;
}
void Yaz_Proxy::inc_ref()
delete m_charset_converter;
xfree(m_optimize);
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
#endif
- xfree (m_time_tv);
-
- xfree (m_peername);
- xfree (m_schema);
- xfree (m_backend_type);
- xfree (m_backend_charset);
- xfree (m_usemarcon_ini_stage1);
- xfree (m_usemarcon_ini_stage2);
+ xfree(m_time_tv);
+
+ xfree(m_peername);
+ 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);
{
int period = 60;
m_config->get_generic_info(&m_log_mask, &m_max_clients,
- &m_max_connect, &m_limit_connect, &period);
+ &m_max_connect, &m_limit_connect, &period,
+ &m_num_msg_threads);
m_connect.set_period(period);
}
return r;
void Yaz_Proxy::set_default_target(const char *target)
{
- xfree (m_default_target);
+ xfree(m_default_target);
m_default_target = 0;
if (target)
- m_default_target = (char *) xstrdup (target);
+ m_default_target = (char *) xstrdup(target);
}
-void Yaz_Proxy::set_proxy_negotiation (const char *charset, const char *lang,
+void Yaz_Proxy::set_proxy_negotiation(const char *charset, const char *lang,
const char *default_charset)
{
yaz_log(YLOG_DEBUG, "%sSet the proxy negotiation: charset to '%s', "
charset?charset:"none",
default_charset?default_charset:"none",
lang?lang:"none");
- xfree (m_proxy_negotiation_charset);
- xfree (m_proxy_negotiation_lang);
+ 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);
+ m_proxy_negotiation_charset = (char *) xstrdup(charset);
if (lang)
- m_proxy_negotiation_lang = (char *) xstrdup (lang);
+ m_proxy_negotiation_lang = (char *) xstrdup(lang);
if (default_charset)
m_proxy_negotiation_default_charset =
- (char *) xstrdup (default_charset);
+ (char *) xstrdup(default_charset);
}
Yaz_ProxyConfig *Yaz_Proxy::check_reconfigure()
if (m_reconfig_flag)
{
yaz_log(YLOG_LOG, "reconfigure");
- yaz_log_reopen();
if (m_config_fname && cfg)
{
yaz_log(YLOG_LOG, "reconfigure config %s", m_config_fname);
int period = 60;
cfg->get_generic_info(&m_log_mask, &m_max_clients,
&m_max_connect, &m_limit_connect,
- &period);
+ &period, &m_num_msg_threads);
m_connect.set_period(period);
}
}
char session_str[200];
const char *peername = the_PDU_Observable->getpeername();
+ if (!peername)
+ peername = "nullpeer";
+
if (m_log_mask & PROXY_LOG_IP_CLIENT)
sprintf(session_str, "%ld:%d %.80s %d ",
(long) time(0), m_session_no, peername, 0);
else
sprintf(session_str, "%ld:%d %d ",
(long) time(0), m_session_no, 0);
+ m_session_no++;
- yaz_log (YLOG_LOG, "%sNew session %s", session_str, peername);
+ yaz_log(YLOG_LOG, "%sNew session %s", session_str, peername);
Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable,
m_socket_observable, this);
new_proxy->set_default_target(m_default_target);
new_proxy->m_max_clients = m_max_clients;
new_proxy->m_log_mask = m_log_mask;
+ new_proxy->m_session_no = m_session_no;
+ new_proxy->m_num_msg_threads = m_num_msg_threads;
+#if 0
+ // in case we want to watch a particular client..
if (!strcmp(peername, "tcp:163.121.19.82")) // NIS GROUP
new_proxy->m_log_mask = 255;
+#endif
new_proxy->set_APDU_log(get_APDU_log());
if (new_proxy->m_log_mask & PROXY_LOG_APDU_CLIENT)
new_proxy->set_proxy_negotiation(m_proxy_negotiation_charset,
m_proxy_negotiation_lang, m_proxy_negotiation_default_charset);
// create thread object the first time we get an incoming connection
- if (!m_my_thread)
- m_my_thread = new Msg_Thread(m_socket_observable, 1);
+ if (!m_my_thread && m_num_msg_threads > 0)
+ {
+ yaz_log(YLOG_LOG, "%sStarting message thread management. number=%d",
+ session_str, m_num_msg_threads);
+ m_my_thread = new Msg_Thread(m_socket_observable, m_num_msg_threads);
+ }
new_proxy->m_my_thread = m_my_thread;
return new_proxy;
}
char *Yaz_Proxy::get_cookie(Z_OtherInformation **otherInfo)
{
- int oid[OID_SIZE];
- Z_OtherInformationUnit *oi;
- struct oident ent;
- ent.proto = PROTO_Z3950;
- ent.oclass = CLASS_USERINFO;
- ent.value = (oid_value) VAL_COOKIE;
- assert (oid_ent_to_oid (&ent, oid));
-
- if (oid_ent_to_oid (&ent, oid) &&
- (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) &&
- oi->which == Z_OtherInfo_characterInfo)
+ Z_OtherInformationUnit *oi =
+ update_otherInformation(otherInfo, 0, yaz_oid_userinfo_cookie, 1, 1);
+
+ if (oi && oi->which == Z_OtherInfo_characterInfo)
return oi->information.characterInfo;
return 0;
}
+
char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo)
{
- int oid[OID_SIZE];
- Z_OtherInformationUnit *oi;
- struct oident ent;
- ent.proto = PROTO_Z3950;
- ent.oclass = CLASS_USERINFO;
- ent.value = (oid_value) VAL_PROXY;
- if (oid_ent_to_oid (&ent, oid) &&
- (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) &&
- oi->which == Z_OtherInfo_characterInfo)
+ Z_OtherInformationUnit *oi =
+ update_otherInformation(otherInfo, 0, yaz_oid_userinfo_proxy, 1, 1);
+
+ if (oi && oi->which == Z_OtherInfo_characterInfo)
return oi->information.characterInfo;
return 0;
}
return ret_min;
}
+int Yaz_Proxy::get_number_of_connections()
+{
+ int no_connections = 0;
+ Yaz_ProxyClient *c;
+
+ for (c = m_parent->m_clientPool; c; c = c->m_next)
+ {
+ assert(c->m_prev);
+ assert(*c->m_prev == c);
+ if (!strcmp(m_proxyTarget, c->get_hostname()))
+ {
+ no_connections++;
+ }
+ }
+ yaz_log(YLOG_LOG, "%sExisting %s connections: %d", m_session_str, m_proxyTarget,
+ no_connections);
+ return no_connections;
+}
+
Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
- const char *proxy_host)
+ const char *proxy_host, int *http_code)
{
- assert (m_parent);
+ assert(m_parent);
Yaz_Proxy *parent = m_parent;
Yaz_ProxyClient *c = m_client;
&m_pdu_max, &m_max_record_retrieve,
&m_search_max,
&m_target_idletime, &client_idletime,
+ &m_max_sockets,
&parent->m_max_clients,
&m_keepalive_limit_bw,
&m_keepalive_limit_pdu,
m_client_idletime = client_idletime;
timeout(m_client_idletime);
}
+
+ // get those FILE descriptors available
+ m_parent->low_socket_close();
if (cql2rpn_fname)
m_cql2rpn.set_pqf_file(cql2rpn_fname);
+ // reserve them again
+ m_parent->low_socket_open();
+
if (negotiation_charset || negotiation_lang || default_client_query_charset)
{
set_proxy_negotiation(negotiation_charset,
{ // search in sessions with a cookie
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_cookie && !strcmp(cookie,c->m_cookie) &&
!strcmp(m_proxyTarget, c->get_hostname()))
{
// we have an initRequest we can safely do re-open
if (c->m_waiting && apdu->which == Z_APDU_initRequest)
{
- yaz_log (YLOG_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 (YLOG_DEBUG, "get_client 1 %p %p", this, c);
+ yaz_log(YLOG_DEBUG, "get_client 1 %p %p", this, c);
return c;
}
}
{
assert(c->m_prev);
assert(*c->m_prev == c);
- if (c->m_server == 0 && c->m_cookie == 0 && c->m_waiting == 0
+ if (c->m_server == 0 && c->m_cookie == 0 && c->m_waiting == 0
&& c->compare_idAuthentication(apdu)
&& c->compare_charset(apdu)
&& !strcmp(m_proxyTarget, c->get_hostname()))
{
// found it in cache
- yaz_log (YLOG_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 (YLOG_LOG, "%sno init request as first PDU", m_session_str);
+ yaz_log(YLOG_LOG, "%sno init request as first PDU", m_session_str);
+ *http_code = 500;
+ return 0;
+ }
+
+ int no_in_use = get_number_of_connections();
+ if (no_in_use >= m_max_sockets)
+ {
+ yaz_log(YLOG_LOG, "%smax sockets reached %d", m_session_str,
+ m_max_sockets);
+ *http_code = 500;
return 0;
}
// go through list of clients - and find the lowest/oldest one.
int min_seq = -1;
int no_of_clients = 0;
if (parent->m_clientPool)
- yaz_log (YLOG_DEBUG, "Existing sessions");
+ yaz_log(YLOG_DEBUG, "Existing sessions");
for (c = parent->m_clientPool; c; c = c->m_next)
{
- yaz_log (YLOG_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 (YLOG_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)
- c->m_server->dec_ref(true);
+ c->m_server->dec_ref();
}
else
{
- yaz_log (YLOG_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);
+ xfree(c->m_cookie);
c->m_cookie = 0;
if (cookie)
c->m_cookie = xstrdup(cookie);
if (c->m_server && c->m_server != this)
{
c->m_server->m_client = 0;
- c->m_server->dec_ref(true);
+ c->m_server->dec_ref();
}
(parent->m_seqno)++;
c->m_target_idletime = m_target_idletime;
}
else
{
- yaz_log (YLOG_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;
c->m_prev = &parent->m_clientPool;
}
- xfree (c->m_cookie);
+ xfree(c->m_cookie);
c->m_cookie = 0;
if (cookie)
c->m_cookie = xstrdup(cookie);
c->set_idAuthentication(apdu);
}
- yaz_log (YLOG_DEBUG, "get_client 3 %p %p", this, c);
+ yaz_log(YLOG_DEBUG, "get_client 3 %p %p", this, c);
return c;
}
int i;
for (i = 0; i<num; i++)
{
- oident *ent;
Z_DefaultDiagFormat *r;
Z_DiagRec *p = pp[i];
if (p->which != Z_DiagRec_defaultFormat)
}
else
r = p->u.defaultFormat;
- if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
- ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1)
- yaz_log(YLOG_LOG, "%sError unknown diagnostic set", m_session_str);
switch (r->which)
{
case Z_DefaultDiagFormat_v2Addinfo:
- yaz_log(YLOG_LOG, "%sError %d %s:%s",
+ yaz_log(YLOG_LOG, "%sError " ODR_INT_PRINTF " %s:%s",
m_session_str,
*r->condition, diagbib1_str(*r->condition),
r->u.v2Addinfo);
break;
case Z_DefaultDiagFormat_v3Addinfo:
- yaz_log(YLOG_LOG, "%sError %d %s:%s",
+ yaz_log(YLOG_LOG, "%sError " ODR_INT_PRINTF " %s:%s",
m_session_str,
*r->condition, diagbib1_str(*r->condition),
r->u.v3Addinfo);
void Yaz_Proxy::convert_xsl_delay()
{
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset];
if (npr->which == Z_NamePlusRecord_databaseRecord)
{
{
xmlChar *out_buf;
int out_len;
- xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);
-
+ xmlDocDumpFormatMemory(res, &out_buf, &out_len, 1);
m_stylesheet_nprl->records[m_stylesheet_offset]->
u.databaseRecord =
- z_ext_record(odr_encode(), VAL_TEXT_XML,
- (char*) out_buf, out_len);
+ z_ext_record_oid(odr_encode(), yaz_oid_recsyn_xml,
+ (char*) out_buf, out_len);
xmlFree(out_buf);
xmlFreeDoc(res);
}
{
m_timeout_mode = timeout_normal;
m_stylesheet_nprl = 0;
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
#endif
void Yaz_Proxy::convert_to_frontend_type(Z_NamePlusRecordList *p)
{
- if (m_frontend_type != VAL_NONE)
+ if (m_frontend_type[0] != -1)
{
int i;
for (i = 0; i < p->num_records; i++)
Z_External *r = npr->u.databaseRecord;
if (r->which == Z_External_octet)
{
-#if HAVE_USEMARCON
+#if !HAVE_USEMARCON
if (m_usemarcon_ini_stage1 && *m_usemarcon_ini_stage1)
+ yaz_log(YLOG_LOG, "%sError: USEMARCON requested but not available",
+ m_session_str);
+#endif
+#if HAVE_USEMARCON
+ yaz_log(YLOG_DEBUG, "%sUSEMARCON stage1=%s stage2=%s",
+ m_session_str,
+ m_usemarcon_ini_stage1 ? m_usemarcon_ini_stage1 : "(none)",
+ m_usemarcon_ini_stage2 ? m_usemarcon_ini_stage2 : "(none)");
+ char *converted;
+ int convlen;
+ if (m_usemarcon->convert(m_usemarcon_ini_stage1, m_usemarcon_ini_stage2,
+ (char*) r->u.octet_aligned->buf, r->u.octet_aligned->len,
+ &converted, &convlen))
{
- 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(),
+ npr->u.databaseRecord =
+ z_ext_record_oid(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;
+ free(converted);
}
+ else
#endif
/* HAVE_USEMARCON */
npr->u.databaseRecord =
- z_ext_record(odr_encode(),
- m_frontend_type,
- (char*) r->u.octet_aligned->buf,
- r->u.octet_aligned->len);
+ z_ext_record_oid(odr_encode(),
+ m_frontend_type,
+ (char*) r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
}
}
}
if (npr->which == Z_NamePlusRecord_databaseRecord)
{
Z_External *r = npr->u.databaseRecord;
- oident *ent = oid_getentbyoid(r->direct_reference);
- if (!ent || ent->value == VAL_NONE)
+ const Odr_oid *oid = r->direct_reference;
+ if (!oid)
continue;
- if (ent->value == VAL_SUTRS)
+ if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
{
WRBUF w = wrbuf_alloc();
wrbuf_iconv_write(w, cd, (char*) r->u.octet_aligned->buf,
r->u.octet_aligned->len);
npr->u.databaseRecord =
- z_ext_record(odr_encode(), ent->value, wrbuf_buf(w),
- wrbuf_len(w));
- wrbuf_free(w, 1);
+ z_ext_record_oid(odr_encode(), oid, wrbuf_buf(w),
+ wrbuf_len(w));
+ wrbuf_destroy(w);
}
- else if (ent->value == VAL_TEXT_XML)
+ else if (!oid_oidcmp(oid, yaz_oid_recsyn_xml))
{
;
}
else if (r->which == Z_External_octet)
{
- int rlen;
- char *result;
+ size_t rlen;
+ const char *result;
if (yaz_marc_decode_buf(mt,
(char*) r->u.octet_aligned->buf,
r->u.octet_aligned->len,
&result, &rlen))
{
npr->u.databaseRecord =
- z_ext_record(odr_encode(), ent->value, result, rlen);
+ z_ext_record_oid(odr_encode(), oid, result, rlen);
yaz_log(YLOG_LOG, "%sRecoding MARC record",
m_session_str);
}
WRBUF w = wrbuf_alloc();
yaz_opac_decode_wrbuf(mt, r->u.opac, w);
- npr->u.databaseRecord = z_ext_record(
- odr_encode(), VAL_TEXT_XML,
- wrbuf_buf(w), wrbuf_len(w)
- );
- wrbuf_free(w, 1);
+ npr->u.databaseRecord = z_ext_record_oid(
+ odr_encode(), yaz_oid_recsyn_xml,
+ wrbuf_buf(w), wrbuf_len(w));
+ wrbuf_destroy(w);
}
else if (r->which == Z_External_octet)
{
- int rlen;
- char *result;
+ size_t rlen;
+ const char *result;
if (yaz_marc_decode_buf(mt, (char*) r->u.octet_aligned->buf,
r->u.octet_aligned->len,
&result, &rlen))
{
npr->u.databaseRecord =
- z_ext_record(odr_encode(), VAL_TEXT_XML, result, rlen);
+ z_ext_record_oid(odr_encode(), yaz_oid_recsyn_xml,
+ result, rlen);
}
}
}
z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive");
else
timeout(0);
+ if (code == 401)
+ z_HTTP_header_add(o, &hres->headers, "WWW-Authenticate",
+ "Basic realm=\"YAZ Proxy\"");
+
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
{
z_HTTP_header_add(o, &hres->headers, "WWW-Authenticate", "Basic realm=\"YAZ Proxy\"");
static Z_SOAP_Handler soap_handlers[2] = {
-#if HAVE_XSLT
- {"http://www.loc.gov/zing/srw/", 0,
+#if YAZ_HAVE_XSLT
+ { (char*) "http://www.loc.gov/zing/srw/", 0,
(Z_SOAP_fun) yaz_srw_codec},
#endif
{0, 0, 0}
soap_handlers, 0, m_s2z_stylesheet);
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
{
- yaz_log (YLOG_LOG, "%sSending %s to client", m_session_str,
- gdu_name(gdu));
+ yaz_log(YLOG_LOG, "%sSending %s to client", m_session_str,
+ gdu_name(gdu));
}
int len;
int r = send_GDU(gdu, &len);
return 0;
}
+#if YAZ_HAS_MK_SURROGATE
+#else
+static void yazproxy_mk_sru_surrogate(ODR o, Z_SRW_record *record, int pos,
+ int code, const char *details)
+{
+ const char *message = yaz_diag_srw_str(code);
+ int len = 200;
+ if (message)
+ len += strlen(message);
+ if (details)
+ len += strlen(details);
+
+ record->recordData_buf = (char *) odr_malloc(o, len);
+
+ sprintf(record->recordData_buf, "<diagnostic "
+ "xmlns=\"http://www.loc.gov/zing/srw/diagnostic/\">\n"
+ " <uri>info:srw/diagnostic/1/%d</uri>\n", code);
+ if (details)
+ sprintf(record->recordData_buf + strlen(record->recordData_buf),
+ " <details>%s</details>\n", details);
+ if (message)
+ sprintf(record->recordData_buf + strlen(record->recordData_buf),
+ " <message>%s</message>\n", message);
+ sprintf(record->recordData_buf + strlen(record->recordData_buf),
+ "</diagnostic>\n");
+ record->recordData_len = strlen(record->recordData_buf);
+ record->recordPosition = odr_intdup(o, pos);
+ record->recordSchema = odr_strdup(o, "info:srw/schema/1/diagnostics-v1.1");
+}
+#endif
+
int Yaz_Proxy::send_to_srw_client_ok(int hits, Z_Records *records, int start)
{
ODR o = odr_encode();
Z_NamePlusRecord *npr = records->u.databaseOrSurDiagnostics->records[i];
if (npr->which != Z_NamePlusRecord_databaseRecord)
{
- srw_res->records[i].recordSchema = "diagnostic";
- srw_res->records[i].recordPacking = m_s2z_packing;
- srw_res->records[i].recordData_buf = "67";
- srw_res->records[i].recordData_len = 2;
- srw_res->records[i].recordPosition = odr_intdup(o, i+start);
+#if YAZ_HAS_MK_SURROGATE
+ yaz_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#else
+ yazproxy_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#endif
continue;
}
Z_External *r = npr->u.databaseRecord;
- oident *ent = oid_getentbyoid(r->direct_reference);
- if (r->which == Z_External_octet && ent->value == VAL_TEXT_XML)
+
+ if (r->which == Z_External_octet
+ && !oid_oidcmp(r->direct_reference, yaz_oid_recsyn_xml))
{
srw_res->records[i].recordSchema = m_schema;
srw_res->records[i].recordPacking = m_s2z_packing;
}
else
{
- srw_res->records[i].recordSchema = "diagnostic";
- srw_res->records[i].recordPacking = m_s2z_packing;
- srw_res->records[i].recordData_buf = "67";
- srw_res->records[i].recordData_len = 2;
- srw_res->records[i].recordPosition = odr_intdup(o, i+start);
+#if YAZ_HAS_MK_SURROGATE
+ yaz_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#else
+ yazproxy_mk_sru_surrogate(
+ o, srw_res->records + i, i+start,
+ YAZ_SRW_RECORD_NOT_AVAILABLE_IN_THIS_SCHEMA, 0);
+#endif
}
}
}
int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics,
int num_diagnostics)
{
+ int http_status = 404;
Yaz_ProxyConfig *cfg = check_reconfigure();
if (cfg)
{
int len;
char *b = cfg->get_explain_doc(odr_encode(), 0 /* target */,
- m_s2z_database, &len);
+ m_s2z_database, &len, &http_status);
if (b)
{
Z_SRW_PDU *res = yaz_srw_get(odr_encode(), Z_SRW_explain_response);
er->record.recordData_buf = b;
er->record.recordData_len = len;
er->record.recordPacking = m_s2z_packing;
- er->record.recordSchema = "http://explain.z3950.org/dtd/2.0/";
+ er->record.recordSchema = odr_strdup(odr_encode(),
+ "http://explain.z3950.org/dtd/2.0/");
er->diagnostics = diagnostics;
er->num_diagnostics = num_diagnostics;
return send_srw_response(res);
}
}
- return send_http_response(404);
+ return send_http_response(http_status);
}
int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu)
{
int len = 0;
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
- yaz_log (YLOG_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 (sr->resultCount)
{
- yaz_log(YLOG_LOG, "%s%d hits", m_session_str,
+ yaz_log(YLOG_LOG, "%s" ODR_INT_PRINTF " hits", m_session_str,
*sr->resultCount);
if (*sr->resultCount < 0)
{
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 (YLOG_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;
{
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse);
new_apdu->u.presentResponse->records =
- create_nonSurrogateDiagnostics(odr_encode(), 30,
- pr->resultSetId);
+ create_nonSurrogateDiagnostics(
+ odr_encode(),
+ YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+ pr->resultSetId);
+ send_to_client(new_apdu);
+ return 0;
+ }
+ if (start < 1 || toget < 0)
+ {
+ Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse);
+ new_apdu->u.presentResponse->records =
+ create_nonSurrogateDiagnostics(
+ odr_encode(),
+ YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE,
+ 0);
send_to_client(new_apdu);
return 0;
}
{
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse);
new_apdu->u.presentResponse->records =
- create_nonSurrogateDiagnostics(odr_encode(), 13, 0);
+ create_nonSurrogateDiagnostics(
+ odr_encode(),
+ YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE,
+ 0);
send_to_client(new_apdu);
return 0;
}
pr->preferredRecordSyntax,
pr->recordComposition))
{
- yaz_log (YLOG_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;
this_query->set_Z_Query(sr->query);
- char query_str[120];
+ // Check for non-negative piggyback params.
+ if (*sr->smallSetUpperBound < 0
+ || *sr->largeSetLowerBound < 0
+ || *sr->mediumSetPresentNumber < 0)
+ {
+ Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
+ // Not a present request.. But can't find better diagnostic
+ new_apdu->u.searchResponse->records =
+ create_nonSurrogateDiagnostics(
+ odr_encode(),
+ YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, 0);
+ send_to_client(new_apdu);
+ return 0;
+ }
+
+ char query_str[4096];
this_query->print(query_str, sizeof(query_str)-1);
yaz_log(YLOG_LOG, "%sSearch %s", m_session_str, query_str);
if (toget > m_client->m_last_resultCount)
toget = m_client->m_last_resultCount;
-
+
if (sr->mediumSetElementSetNames)
{
comp = (Z_RecordComposition *)
if (m_client->m_cache.lookup (odr_encode(), &npr, 1, toget,
sr->preferredRecordSyntax, comp))
{
- yaz_log (YLOG_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 (YLOG_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 (YLOG_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 (YLOG_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 (YLOG_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_client->m_cache.clear();
m_client->m_resultSetStartPoint = 0;
- xfree (m_client->m_last_resultSetId);
- m_client->m_last_resultSetId = xstrdup (sr->resultSetName);
+ xfree(m_client->m_last_resultSetId);
+ m_client->m_last_resultSetId = xstrdup(sr->resultSetName);
m_client->m_last_databases.set(sr->num_databaseNames,
(const char **) sr->databaseNames);
m_bytes_recv += len;
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
- yaz_log (YLOG_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 0
+ // try to make a _bad_ attribute set ID .. Don't enable this in prod.
+ if (apdu->which == Z_GDU_Z3950
+ && apdu->u.z3950->which == Z_APDU_searchRequest)
+ {
+ Z_SearchRequest *req = apdu->u.z3950->u.searchRequest;
+ if (req->query && req->query->which == Z_Query_type_1)
+ {
+ Z_RPNQuery *rpnquery = req->query->u.type_1;
+ if (rpnquery->attributeSetId)
+ {
+ rpnquery->attributeSetId[0] = -2;
+ rpnquery->attributeSetId[1] = -1;
+ yaz_log(YLOG_WARN, "%sBAD FIXUP TEST", m_session_str);
+ }
+ }
+ }
+#endif
+
#if HAVE_GETTIMEOFDAY
gettimeofday((struct timeval *) m_time_tv, 0);
#endif
m_pdu_stat.add_bytes(1);
GDU *gdu = new GDU(apdu);
- m_in_queue.enqueue(gdu);
+ if (gdu->get() == 0)
+ {
+ delete gdu;
+ yaz_log(YLOG_LOG, "%sUnable to encode package", m_session_str);
+ m_in_queue.clear();
+ dec_ref();
+ return;
+ }
+ m_in_queue.enqueue(gdu);
recv_GDU_more(false);
}
while (m_timeout_mode == timeout_normal && (g = m_in_queue.dequeue()))
{
m_timeout_mode = timeout_busy;
+ inc_ref();
recv_GDU_reduce(g);
+ if (dec_ref())
+ break;
}
}
{
Z_Records *rec = (Z_Records *)
odr_malloc (odr, sizeof(*rec));
- int *err = (int *)
+ Odr_int *err = (Odr_int *)
odr_malloc (odr, sizeof(*err));
Z_DiagRec *drec = (Z_DiagRec *)
odr_malloc (odr, sizeof(*drec));
*err = error;
rec->which = Z_Records_NSD;
rec->u.nonSurrogateDiagnostic = dr;
- dr->diagnosticSetId =
- yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+ dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1);
dr->condition = err;
dr->which = Z_DefaultDiagFormat_v2Addinfo;
dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
return ret;
}
+int Yaz_Proxy::handle_global_authentication(Z_APDU *apdu)
+{
+ if (apdu->which != Z_APDU_initRequest)
+ return 1; // pass if no init request
+ Z_InitRequest *req = apdu->u.initRequest;
+
+ Yaz_ProxyConfig *cfg = check_reconfigure();
+ if (!cfg)
+ return 1; // pass if no config
+
+ int ret;
+ if (req->idAuthentication == 0)
+ {
+ ret = cfg->global_client_authentication(0, 0, 0,
+ m_peername);
+ }
+ else if (req->idAuthentication->which == Z_IdAuthentication_idPass)
+ {
+ ret = cfg->global_client_authentication(
+ req->idAuthentication->u.idPass->userId,
+ req->idAuthentication->u.idPass->groupId,
+ req->idAuthentication->u.idPass->password,
+ m_peername);
+ }
+ else if (req->idAuthentication->which == Z_IdAuthentication_open)
+ {
+ char user[64], pass[64];
+ *user = '\0';
+ *pass = '\0';
+ sscanf(req->idAuthentication->u.open, "%63[^/]/%63s", user, pass);
+ ret = cfg->global_client_authentication(user, 0, pass,
+ m_peername);
+ }
+ else
+ ret = cfg->global_client_authentication(0, 0, 0, m_peername);
+ return ret;
+}
+
Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
{
m_marcxml_mode = none;
}
if (sr->preferredRecordSyntax)
- {
- struct oident *ent;
- ent = oid_getentbyoid(sr->preferredRecordSyntax);
- m_frontend_type = ent->value;
- }
+ oid_oidcpy(m_frontend_type, sr->preferredRecordSyntax);
else
- m_frontend_type = VAL_NONE;
+ m_frontend_type[0] = -1;
char *stylesheet_name = 0;
if (cfg)
{
m_parent->low_socket_close();
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*)
sr->smallSetElementSetNames = 0;
sr->mediumSetElementSetNames = 0;
m_marcxml_mode = marcxml;
- if (m_backend_type)
- {
-
- sr->preferredRecordSyntax =
- yaz_str_to_z3950oid(odr_encode(), CLASS_RECSYN,
- m_backend_type);
- }
- else
- sr->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(odr_encode(), CLASS_RECSYN,
- VAL_USMARC);
+ sr->preferredRecordSyntax =
+ yaz_string_to_oid_odr(
+ yaz_oid_std(), CLASS_RECSYN,
+ m_backend_type ? m_backend_type : "usmarc",
+ odr_encode());
}
else if (err)
{
else if (m_backend_type)
{
sr->preferredRecordSyntax =
- yaz_str_to_z3950oid(odr_encode(), CLASS_RECSYN, m_backend_type);
+ yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN,
+ m_backend_type, odr_encode());
}
}
else if (apdu->which == Z_APDU_presentRequest)
Yaz_ProxyConfig *cfg = check_reconfigure();
if (pr->preferredRecordSyntax)
- {
- struct oident *ent;
- ent = oid_getentbyoid(pr->preferredRecordSyntax);
- m_frontend_type = ent->value;
- }
+ oid_oidcpy(m_frontend_type, pr->preferredRecordSyntax);
else
- m_frontend_type = VAL_NONE;
+ m_frontend_type[0] = -1;
char *stylesheet_name = 0;
if (cfg)
{
m_parent->low_socket_close();
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*)
{
pr->recordComposition = 0;
m_marcxml_mode = marcxml;
- if (m_backend_type)
- {
- pr->preferredRecordSyntax =
- yaz_str_to_z3950oid(odr_encode(), CLASS_RECSYN,
- m_backend_type);
- }
- else
- pr->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(odr_encode(), CLASS_RECSYN,
- VAL_USMARC);
+ pr->preferredRecordSyntax =
+ yaz_string_to_oid_odr(
+ yaz_oid_std(), CLASS_RECSYN,
+ m_backend_type ? m_backend_type : "usmarc",
+ odr_encode());
}
else if (err)
{
else if (m_backend_type)
{
pr->preferredRecordSyntax =
- yaz_str_to_z3950oid(odr_encode(), CLASS_RECSYN, m_backend_type);
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, m_backend_type,
+ odr_encode());
}
}
return apdu;
}
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
{
- yaz_log (YLOG_LOG, "%sSending file %s to client", m_session_str,
+ yaz_log(YLOG_LOG, "%sSending file %s to client", m_session_str,
fname);
}
int len;
m_s2z_present_apdu = 0;
m_s2z_stylesheet = 0;
-
+
Z_IdAuthentication *auth = NULL;
- if (*authorization_str)
+ if (srw_pdu->username && !srw_pdu->password)
+ {
+ yaz_log(YLOG_LOG, "username: %s\n", srw_pdu->username);
+ auth = (Z_IdAuthentication *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdAuthentication));
+ auth->which = Z_IdAuthentication_open;
+ auth->u.open = odr_strdup(m_s2z_odr_init, srw_pdu->username);
+ }
+ else if (srw_pdu->username && srw_pdu->password)
{
+ yaz_log(YLOG_LOG, "username/password: %s/%s\n",
+ srw_pdu->username, srw_pdu->password);
auth = (Z_IdAuthentication *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdAuthentication));
auth->which = Z_IdAuthentication_idPass;
auth->u.idPass = (Z_IdPass *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdPass));
auth->u.idPass->groupId = NULL;
- char *p = strchr(authorization_str, ':');
- if (p)
+ auth->u.idPass->password = odr_strdup(m_s2z_odr_init, srw_pdu->password);
+ auth->u.idPass->userId = odr_strdup(m_s2z_odr_init, srw_pdu->username);
+ }
+ else
+ {
+ if (*authorization_str)
{
- *p = '\0';
- p++;
- auth->u.idPass->password = odr_strdup(m_s2z_odr_init, p);
+ yaz_log(YLOG_LOG, "authorization_str present: %s\n", authorization_str);
+ auth = (Z_IdAuthentication *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdAuthentication));
+ auth->which = Z_IdAuthentication_idPass;
+ auth->u.idPass = (Z_IdPass *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdPass));
+ auth->u.idPass->groupId = NULL;
+ char *p = strchr(authorization_str, ':');
+ if (p)
+ {
+ *p = '\0';
+ p++;
+ auth->u.idPass->password = odr_strdup(m_s2z_odr_init, p);
+ }
+ auth->u.idPass->userId = odr_strdup(m_s2z_odr_init, authorization_str);
}
- auth->u.idPass->userId = odr_strdup(m_s2z_odr_init, authorization_str);
- }
-
+ }
+
if (srw_pdu->which == Z_SRW_searchRetrieve_request)
{
*z_searchRequest->largeSetLowerBound = 2000000000; // 2e9
z_searchRequest->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(m_s2z_odr_search, CLASS_RECSYN,
- VAL_TEXT_XML);
+ odr_oiddup(m_s2z_odr_search, yaz_oid_recsyn_xml);
+
if (srw_req->recordSchema)
{
z_searchRequest->smallSetElementSetNames =
m_s2z_present_apdu->u.presentRequest;
*z_presentRequest->resultSetStartPoint = start;
*z_presentRequest->numberOfRecordsRequested = max;
+
z_presentRequest->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(m_s2z_odr_search, CLASS_RECSYN,
- VAL_TEXT_XML);
+ odr_oiddup(m_s2z_odr_search, yaz_oid_recsyn_xml);
if (srw_req->recordSchema)
{
z_presentRequest->recordComposition =
Z_APDU *apdu2 = m_client->m_initResponse;
apdu2->u.initResponse->otherInfo = 0;
if (m_client->m_cookie && *m_client->m_cookie)
- set_otherInformationString(apdu2, VAL_COOKIE, 1,
- m_client->m_cookie);
+ set_otherInformationString(apdu2, yaz_oid_userinfo_cookie,
+ 1, m_client->m_cookie);
apdu2->u.initResponse->referenceId =
apdu->u.initRequest->referenceId;
apdu2->u.initResponse->options = m_client->m_initResponse_options;
handle_charset_lang_negotiation(apdu2);
+ if (m_timeout_mode == timeout_busy)
+ m_timeout_mode = timeout_normal;
send_to_client(apdu2);
- m_timeout_mode = timeout_normal;
return;
}
}
m_client->m_init_flag = 1;
-#if USE_AUTH_MSG
- Auth_Msg *m = new Auth_Msg;
- m->m_proxy = this;
- z_APDU(odr_encode(), &apdu, 0, "encode");
- char *apdu_buf = odr_getbuf(odr_encode(), &m->m_apdu_len, 0);
- m->m_apdu_buf = (char*) nmem_malloc(m->m_nmem, m->m_apdu_len);
- memcpy(m->m_apdu_buf, apdu_buf, m->m_apdu_len);
- odr_reset(odr_encode());
-
- inc_ref();
- m_my_thread->put(m);
-#else
- int ret = handle_authentication(apdu);
- result_authentication(apdu, ret);
-#endif
+ if (m_num_msg_threads && m_my_thread)
+ {
+ Auth_Msg *m = new Auth_Msg;
+ m->m_proxy = this;
+ z_APDU(odr_encode(), &apdu, 0, "encode");
+ char *apdu_buf = odr_getbuf(odr_encode(), &m->m_apdu_len, 0);
+ m->m_apdu_buf = (char*) nmem_malloc(m->m_nmem, m->m_apdu_len);
+ memcpy(m->m_apdu_buf, apdu_buf, m->m_apdu_len);
+ odr_reset(odr_encode());
+
+ inc_ref();
+ m_my_thread->put(m);
+ }
+ else
+ {
+ int ret = handle_authentication(apdu);
+ result_authentication(apdu, ret);
+ }
}
void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
if (apdu->which == Z_APDU_searchRequest)
m_search_stat.add_bytes(1);
+ // Handle global authentication
+ if (!handle_global_authentication(apdu))
+ {
+ if (m_http_version)
+ { // HTTP. Send unauthorized
+ send_http_response(401);
+ return;
+ }
+ else
+ {
+ // Z39.50 just shutdown
+ timeout(0);
+ return;
+ }
+ return;
+ }
+
// Determine our client.
Z_OtherInformation **oi;
get_otherInfoAPDU(apdu, &oi);
- m_client = get_client(apdu, get_cookie(oi), get_proxy(oi));
+ int http_code = 404;
+ m_client = get_client(apdu, get_cookie(oi), get_proxy(oi), &http_code);
if (!m_client)
{
if (m_http_version)
{ // HTTP. Send not found
- send_http_response(404);
+ send_http_response(http_code);
return;
}
else
}
else if (m_client)
{
- yaz_log (YLOG_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 (YLOG_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 (YLOG_LOG, "%sShutdown (client to proxy)",
+ yaz_log(YLOG_LOG, "%sShutdown (client to proxy)",
m_session_str);
}
if (m_parent)
m_parent->pre_init();
}
-bool Yaz_Proxy::dec_ref(bool main_ptr)
+bool Yaz_Proxy::dec_ref()
{
- assert(m_ref_count > 0);
- if (main_ptr)
- {
- if (m_main_ptr_dec)
- return false;
- m_main_ptr_dec = true;
- }
-
m_http_keepalive = 0;
--m_ref_count;
void Yaz_ProxyClient::shutdown()
{
- yaz_log (YLOG_LOG, "%sShutdown (proxy to target) %s", get_session_str(),
+ yaz_log(YLOG_LOG, "%sShutdown (proxy to target) %s", get_session_str(),
get_hostname());
if (m_server)
{
- m_waiting = 1; // ensure it's released from Proxy in releaseClient
- m_server->dec_ref(true);
+ m_waiting = 1; // ensure it's released from Yaz_Proxy::releaseClient
+ m_server->dec_ref();
}
else
delete this;
void Yaz_Proxy::failNotify()
{
inc_request_no();
- yaz_log (YLOG_LOG, "%sConnection closed by client",
- get_session_str());
- dec_ref(true);
+ yaz_log(YLOG_LOG, "%sConnection closed by client", get_session_str());
+ dec_ref();
}
void Yaz_Proxy::send_response_fail_client(const char *addr)
send_srw_explain_response(diagnostic, num_diagnostic);
}
}
+
void Yaz_ProxyClient::failNotify()
{
if (m_server)
m_server->inc_request_no();
- yaz_log (YLOG_LOG, "%sConnection closed by target %s",
+ yaz_log(YLOG_LOG, "%sConnection closed by target %s",
get_session_str(), get_hostname());
if (m_server)
{
const char *s = get_session_str();
const char *h = get_hostname();
- yaz_log (YLOG_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)
odr_destroy(m_init_odr);
odr_destroy(m_idAuthentication_odr);
delete m_last_query;
- xfree (m_last_resultSetId);
- xfree (m_cookie);
+ xfree(m_last_resultSetId);
+ xfree(m_cookie);
}
void Yaz_ProxyClient::pre_init_client()
const char *zurl_in_use[MAX_ZURL_PLEX];
int limit_bw, limit_pdu, limit_req, limit_search;
int target_idletime, client_idletime;
+ int max_sockets;
int max_clients;
int keepalive_limit_bw, keepalive_limit_pdu;
int pre_init;
&limit_bw, &limit_pdu, &limit_req,
&limit_search,
&target_idletime, &client_idletime,
+ &max_sockets,
&max_clients,
&keepalive_limit_bw,
&keepalive_limit_pdu,
"sparew=%d preinit=%d",m_session_str,
name, zurl_in_use[j], in_use, other,
spare, spare_waiting, pre_init);
- if (spare + spare_waiting < pre_init)
+ if (spare + spare_waiting < pre_init
+ && in_use + spare + spare_waiting + other < max_sockets)
{
c = new Yaz_ProxyClient(m_PDU_Observable->clone(), this);
c->m_next = m_clientPool;
case timeout_busy:
inc_request_no();
m_in_queue.clear();
- yaz_log (YLOG_LOG, "%sTimeout (client to proxy)", m_session_str);
- dec_ref(true);
+ yaz_log(YLOG_LOG, "%sTimeout (client to proxy)", m_session_str);
+ dec_ref();
break;
case timeout_reduce:
timeout(m_client_idletime);
if (m_server)
m_server->inc_request_no();
- yaz_log (YLOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(),
+ yaz_log(YLOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(),
get_hostname());
if (m_server)
{
if (!strcmp (name, "optimize")) {
if (value) {
- xfree (m_optimize);
- m_optimize = xstrdup (value);
+ xfree(m_optimize);
+ m_optimize = xstrdup(value);
}
return m_optimize;
}
m_pdu_recv++;
m_waiting = 0;
if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER)
- yaz_log (YLOG_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)
{
*imv1 = '\0';
if (imv0)
strcat(imv1, imv0);
+#ifdef VERSION
strcat(imv1, "/" VERSION);
+#endif
ir->implementationVersion = imv1;
// apply YAZ Proxy implementation name
}
}
if (m_cookie)
- set_otherInformationString (apdu, VAL_COOKIE, 1, m_cookie);
+ set_otherInformationString(apdu, yaz_oid_userinfo_cookie, 1, m_cookie);
Yaz_Proxy *server = m_server; // save it. send_to_client may destroy us
char ch = (char) (ch_ptr - base64_chars);
switch (index)
{
- case 1:
- buf[buf_pos] = ch << 2;
- break;
- case 2:
- buf[buf_pos++] += (ch & 0x30) >> 4;
- buf[buf_pos] = (ch & 0x0f) << 4;
- break;
- case 3:
- buf[buf_pos++] += (ch & 0x3c) >> 2;
- buf[buf_pos] = (ch & 0x03) << 6;
- break;
- case 4:
- buf[buf_pos++] += ch;
+ case 1:
+ buf[buf_pos] = ch << 2;
+ break;
+ case 2:
+ buf[buf_pos++] += (ch & 0x30) >> 4;
+ buf[buf_pos] = (ch & 0x0f) << 4;
+ break;
+ case 3:
+ buf[buf_pos++] += (ch & 0x3c) >> 2;
+ buf[buf_pos] = (ch & 0x03) << 6;
+ break;
+ case 4:
+ buf[buf_pos++] += ch;
}
if (index < 4)
index++;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yazproxy-moved-to-github.git / blobdiff