X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=d4693c613acd5e745ef4c60336b43bb7091b6ff0;hb=850cba55769a7ed94d4da0e7c05b823e54ce3cc3;hp=2d418a101e440d892b61ad21f99ba987b4cffde3;hpb=e88de60f087ada19ac4cc76e6b00b3b518984346;p=yazproxy-moved-to-github.git diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index 2d418a1..d4693c6 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -1,4 +1,4 @@ -/* $Id: yaz-proxy.cpp,v 1.24 2005-02-22 10:08:20 adam Exp $ +/* $Id: yaz-proxy.cpp,v 1.33 2005-06-21 18:46:04 adam Exp $ Copyright (c) 1998-2005, Index Data. This file is part of the yaz-proxy. @@ -51,7 +51,87 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include +#include "msg-thread.h" +using namespace yazpp_1; + +#define USE_AUTH_MSG 1 + +#if USE_AUTH_MSG +class Auth_Msg : public IMsg_Thread { +public: + int m_ret; + IMsg_Thread *handle(); + void result(); + Yaz_Proxy *m_proxy; + NMEM m_nmem; + char *m_apdu_buf; + int m_apdu_len; + Auth_Msg(); + virtual ~Auth_Msg(); +}; + +Auth_Msg::Auth_Msg() +{ + m_nmem = nmem_create(); +} + +Auth_Msg::~Auth_Msg() +{ + nmem_destroy(m_nmem); +} + +IMsg_Thread *Auth_Msg::handle() +{ + yaz_log(YLOG_LOG, "Auth_Msg:handle begin"); + ODR decode = odr_createmem(ODR_DECODE); + Z_APDU *apdu; + + odr_setbuf(decode, m_apdu_buf, m_apdu_len, 0); + int r = z_APDU(decode, &apdu, 0, 0); + if (!r) + { + yaz_log(YLOG_WARN, "decode failed in Auth_Msg::handle"); + } + else + { + m_ret = m_proxy->handle_authentication(apdu); + } + yaz_log(YLOG_LOG, "Auth_Msg:handle end"); + odr_destroy(decode); + return this; +} + +void Auth_Msg::result() +{ + yaz_log(YLOG_LOG, "Auth_Msg:result proxy ok buf=%p len=%d", + m_apdu_buf, m_apdu_len); + odr_reset(m_proxy->odr_decode()); + odr_setbuf(m_proxy->odr_decode(), m_apdu_buf, m_apdu_len, 0); + Z_APDU *apdu = 0; + int r = z_APDU(m_proxy->odr_decode(), &apdu, 0, 0); + if (r) + yaz_log(YLOG_LOG, "Auth_Msg::result z_APDU OK"); + else + yaz_log(YLOG_LOG, "Auth_Msg::result z_APDU failed"); + m_proxy->result_authentication(apdu, m_ret); + delete this; +} + +#endif + +void Yaz_Proxy::result_authentication(Z_APDU *apdu, int ret) +{ + if (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(); + } + else + handle_incoming_Z_PDU_2(apdu); +} static const char *apdu_name(Z_APDU *apdu) { @@ -104,11 +184,15 @@ static const char *gdu_name(Z_GDU *gdu) } 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) + +Yaz_Proxy::Yaz_Proxy(IPDU_Observable *the_PDU_Observable, + ISocketObservable *the_socket_observable, + Yaz_Proxy *parent) + : + Z_Assoc(the_PDU_Observable), m_bw_stat(60), m_pdu_stat(60) { m_PDU_Observable = the_PDU_Observable; + m_socket_observable = the_socket_observable; m_client = 0; m_parent = parent; m_clientPool = 0; @@ -119,6 +203,7 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_default_target = 0; m_proxy_negotiation_charset = 0; m_proxy_negotiation_lang = 0; + m_charset_converter = new Yaz_CharsetConverter; m_max_clients = 150; m_log_mask = 0; m_seed = time(0); @@ -126,23 +211,26 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_target_idletime = 600; m_optimize = xstrdup ("1"); strcpy(m_session_str, "0 "); - m_session_no=0; + m_session_no = 0; m_bytes_sent = 0; m_bytes_recv = 0; m_bw_hold_PDU = 0; m_bw_max = 0; m_pdu_max = 0; + m_timeout_mode = timeout_normal; + m_timeout_gdu = 0; m_max_record_retrieve = 0; m_reconfig_flag = 0; m_config_fname = 0; m_request_no = 0; - m_invalid_session = 0; + m_flag_invalid_session = 0; m_referenceId = 0; m_referenceId_mem = nmem_create(); m_config = 0; m_marcxml_mode = none; m_stylesheet_xsp = 0; m_stylesheet_nprl = 0; + m_stylesheet_apdu = 0; m_s2z_stylesheet = 0; m_s2z_database = 0; m_schema = 0; @@ -184,6 +272,14 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_usemarcon = new Yaz_usemarcon(); if (!m_parent) low_socket_open(); + m_my_thread = 0; + m_ref_count = 1; + m_peername = 0; +} + +void Yaz_Proxy::inc_ref() +{ +// m_ref_count++; } Yaz_Proxy::~Yaz_Proxy() @@ -198,6 +294,7 @@ Yaz_Proxy::~Yaz_Proxy() xfree(m_default_target); xfree(m_proxy_negotiation_charset); xfree(m_proxy_negotiation_lang); + delete m_charset_converter; xfree(m_optimize); #if HAVE_XSLT @@ -206,6 +303,7 @@ Yaz_Proxy::~Yaz_Proxy() #endif xfree (m_time_tv); + xfree (m_peername); xfree (m_schema); xfree (m_backend_type); xfree (m_backend_charset); @@ -218,6 +316,8 @@ Yaz_Proxy::~Yaz_Proxy() odr_destroy(m_s2z_odr_search); if (!m_parent) low_socket_close(); + if (!m_parent) + delete m_my_thread; delete m_config; } @@ -289,11 +389,12 @@ Yaz_ProxyConfig *Yaz_Proxy::check_reconfigure() return cfg; } -IYaz_PDU_Observer *Yaz_Proxy::sessionNotify(IYaz_PDU_Observable - *the_PDU_Observable, int fd) +IPDU_Observer *Yaz_Proxy::sessionNotify(IPDU_Observable + *the_PDU_Observable, int fd) { check_reconfigure(); - Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable, this); + Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable, + m_socket_observable, this); new_proxy->m_config = 0; new_proxy->m_config_fname = 0; new_proxy->timeout(m_client_idletime); @@ -306,12 +407,17 @@ IYaz_PDU_Observer *Yaz_Proxy::sessionNotify(IYaz_PDU_Observable new_proxy->set_APDU_yazlog(1); else new_proxy->set_APDU_yazlog(0); - 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++; + new_proxy->m_peername = xstrdup(the_PDU_Observable->getpeername()); yaz_log (YLOG_LOG, "%sNew session %s", new_proxy->m_session_str, - the_PDU_Observable->getpeername()); + new_proxy->m_peername); + new_proxy->set_proxy_negotiation(m_proxy_negotiation_charset, + m_proxy_negotiation_lang); + // create thread object the first time we get an incoming connection + if (!m_my_thread) + m_my_thread = new Msg_Thread(m_socket_observable); + new_proxy->m_my_thread = m_my_thread; return new_proxy; } @@ -388,12 +494,6 @@ const char *Yaz_Proxy::load_balance(const char **url) max_spare = zurl_in_spare[i]; } } - // use the one with minimum connections if spare is > 3 - if (spare_for_min > 3) - return ret_min; - // use one with most spares (if any) - if (max_spare > 0) - return ret_spare; return ret_min; } @@ -424,6 +524,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, const char *cql2rpn_fname = 0; const char *negotiation_charset = 0; const char *negotiation_lang = 0; + const char *query_charset = 0; url[0] = m_default_target; url[1] = 0; if (cfg) @@ -438,7 +539,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, &pre_init, &cql2rpn_fname, &negotiation_charset, - &negotiation_lang); + &negotiation_lang, + &query_charset); } if (client_idletime != -1) { @@ -449,10 +551,10 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, m_cql2rpn.set_pqf_file(cql2rpn_fname); if (negotiation_charset || negotiation_lang) { - yaz_log(YLOG_LOG, "set_proxy_negotiation..."); set_proxy_negotiation(negotiation_charset, negotiation_lang); } + m_charset_converter->set_target_query_charset(query_charset); if (!url[0]) { yaz_log(YLOG_LOG, "%sNo default target", m_session_str); @@ -660,6 +762,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, 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; @@ -704,6 +807,8 @@ int Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p, Z_APDU *apdu) m_stylesheet_offset = 0; m_stylesheet_nprl = p; m_stylesheet_apdu = apdu; + m_timeout_mode = timeout_xsl; + timeout(0); return 1; } @@ -751,6 +856,7 @@ void Yaz_Proxy::convert_xsl_delay() m_stylesheet_offset++; if (m_stylesheet_offset == m_stylesheet_nprl->num_records) { + m_timeout_mode = timeout_normal; m_stylesheet_nprl = 0; #if HAVE_XSLT if (m_stylesheet_xsp) @@ -837,6 +943,74 @@ void Yaz_Proxy::convert_to_frontend_type(Z_NamePlusRecordList *p) } } +void Yaz_Proxy::convert_records_charset(Z_NamePlusRecordList *p, + const char *backend_charset) +{ + yaz_log(YLOG_LOG, "%sconvert_to_marc", m_session_str); + int sel = m_charset_converter->get_client_charset_selected(); + const char *client_record_charset = + m_charset_converter->get_client_query_charset(); + if (sel && backend_charset && client_record_charset && + strcmp(backend_charset, client_record_charset)) + { + int i; + yaz_iconv_t cd = yaz_iconv_open(client_record_charset, + backend_charset); + yaz_marc_t mt = yaz_marc_create(); + yaz_marc_xml(mt, YAZ_MARC_ISO2709); + yaz_marc_iconv(mt, cd); + for (i = 0; i < p->num_records; i++) + { + Z_NamePlusRecord *npr = p->records[i]; + 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) + continue; + + if (ent->value == VAL_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); + } + else if (ent->value == VAL_TEXT_XML) + { + ; + } + else if (r->which == Z_External_octet) + { + int rlen; + 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); + yaz_log(YLOG_LOG, "%sRecoding MARC record", + m_session_str); + } + } + } + } + if (cd) + yaz_iconv_close(cd); + yaz_marc_destroy(mt); + } + else + { + yaz_log(YLOG_LOG, "%sSkipping marc convert", m_session_str); + } +} + void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p, const char *backend_charset) { @@ -1195,6 +1369,9 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) if (m_marcxml_mode == marcxml) convert_to_marcxml(p->u.databaseOrSurDiagnostics, m_backend_charset); + else + convert_records_charset(p->u.databaseOrSurDiagnostics, + m_backend_charset); if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu)) return 0; @@ -1205,7 +1382,7 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) *sr->resultCount); if (*sr->resultCount < 0) { - m_invalid_session = 1; + m_flag_invalid_session = 1; kill_session = 1; *sr->searchStatus = 0; @@ -1240,6 +1417,9 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) if (m_marcxml_mode == marcxml) convert_to_marcxml(p->u.databaseOrSurDiagnostics, m_backend_charset); + else + convert_records_charset(p->u.databaseOrSurDiagnostics, + m_backend_charset); if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu)) return 0; } @@ -1567,21 +1747,37 @@ void Yaz_Proxy::recv_GDU(Z_GDU *apdu, int len) if (m_log_mask & PROXY_LOG_REQ_CLIENT) 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. - shutdown(); - - m_bw_stat.add_bytes(len); - m_pdu_stat.add_bytes(1); - + #if HAVE_GETTIMEOFDAY gettimeofday((struct timeval *) m_time_tv, 0); #endif + m_bw_stat.add_bytes(len); + m_pdu_stat.add_bytes(1); + + GDU *gdu = new GDU(apdu); + int qsize = m_in_queue.size(); + if (m_timeout_mode != timeout_normal) + { + yaz_log(YLOG_LOG, "%sAdded gdu in queue of size %d", m_session_str, + qsize); + m_in_queue.enqueue(gdu); + } + else + { + recv_GDU_reduce(gdu); + recv_GDU_more(); + } +} +void Yaz_Proxy::recv_GDU_reduce(GDU *gdu) +{ int bw_total = m_bw_stat.get_total(); int pdu_total = m_pdu_stat.get_total(); - int reduce = 0; + + assert(m_timeout_mode == timeout_normal); + assert(m_timeout_gdu == 0); + if (m_bw_max) { if (bw_total > m_bw_max) @@ -1598,16 +1794,36 @@ void Yaz_Proxy::recv_GDU(Z_GDU *apdu, int len) } } m_http_version = 0; + if (reduce) { 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); - m_bw_hold_PDU = apdu; // save PDU and signal "on hold" + m_timeout_mode = timeout_reduce; + m_timeout_gdu = gdu; + // m_bw_hold_PDU = apdu; // save PDU and signal "on hold" timeout(reduce); // call us reduce seconds later } - else if (apdu->which == Z_GDU_Z3950) + else + recv_GDU_normal(gdu); +} + +void Yaz_Proxy::recv_GDU_more() +{ + GDU *g; + while (m_timeout_mode == timeout_normal && (g = m_in_queue.dequeue())) + recv_GDU_reduce(g); +} + +void Yaz_Proxy::recv_GDU_normal(GDU *gdu) +{ + Z_GDU *apdu = gdu->get(); + gdu->extract_odr_to(odr_decode()); + delete gdu; + + if (apdu->which == Z_GDU_Z3950) handle_incoming_Z_PDU(apdu->u.z3950); else if (apdu->which == Z_GDU_HTTP_Request) handle_incoming_HTTP(apdu->u.HTTP_Request); @@ -1626,15 +1842,18 @@ void Yaz_Proxy::handle_max_record_retrieve(Z_APDU *apdu) } } } + void Yaz_Proxy::handle_charset_lang_negotiation(Z_APDU *apdu) { if (apdu->which == Z_APDU_initRequest) { + yaz_log(YLOG_LOG, "%shandle_charset_lang_negotiation", + m_session_str); 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 + // There is no negotiation proposal from // client's side. OK. The proxy negotiation // in use, only. Z_InitRequest *initRequest = apdu->u.initRequest; @@ -1656,6 +1875,66 @@ void Yaz_Proxy::handle_charset_lang_negotiation(Z_APDU *apdu) 1); } } + else if (m_initRequest_options && + ODR_MASK_GET(m_initRequest_options, + Z_Options_negotiationModel) && + m_charset_converter->get_target_query_charset()) + { + yaz_log(YLOG_LOG, "%sManaged charset negotiation: charset=%s", + m_session_str, + m_charset_converter->get_target_query_charset()); + Z_InitRequest *initRequest = apdu->u.initRequest; + Z_CharSetandLanguageNegotiation *negotiation = + yaz_get_charneg_record (initRequest->otherInfo); + if (negotiation && + negotiation->which == Z_CharSetandLanguageNegotiation_proposal) + { + NMEM nmem = nmem_create(); + char **charsets = 0; + int num_charsets = 0; + char **langs = 0; + int num_langs = 0; + int selected = 0; + yaz_get_proposal_charneg (nmem, negotiation, + &charsets, &num_charsets, + &langs, &num_langs, &selected); + int i; + for (i = 0; iget_target_query_charset(); + // sweep through charsets and pick the first supported + // conversion + for (i = 0; iset_client_query_charset(c_charset); + m_charset_converter->set_client_charset_selected(selected); + } + nmem_destroy(nmem); + ODR_MASK_CLEAR(m_initRequest_options, + Z_Options_negotiationModel); + yaz_del_charneg_record(&initRequest->otherInfo); + } + else + { + yaz_log(YLOG_WARN, "%sUnable to decode charset package", + m_session_str); + } + } } else if (apdu->which == Z_APDU_initResponse) { @@ -1703,35 +1982,42 @@ void Yaz_Proxy::handle_charset_lang_negotiation(Z_APDU *apdu) ODR_MASK_CLEAR(initResponse->options, Z_Options_negotiationModel); // Delete negotiation (charneg-3) entry. - Z_OtherInformation *p = *otherInfo; - for (int i=0; inum_elements; i++) + yaz_del_charneg_record(otherInfo); + } + } + else + { + if (m_proxy_negotiation_charset || m_proxy_negotiation_lang) + { + yaz_log(YLOG_LOG, "%sTarget did not honor negotiation", + m_session_str); + } + else if (m_charset_converter->get_client_query_charset()) + { + Z_OtherInformation **otherInfo; + Z_OtherInformationUnit *oi; + get_otherInfoAPDU(apdu, &otherInfo); + oi = update_otherInformation(otherInfo, 1, NULL, 0, 0); + if (oi) { - 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; jnum_elements;j++) - p->list[j] = p->list[j+1]; - } - } - } - } + ODR_MASK_SET(initResponse->options, + Z_Options_negotiationModel); + ODR_MASK_SET(m_initRequest_options, + Z_Options_negotiationModel); + + oi->which = Z_OtherInfo_externallyDefinedInfo; + oi->information.externallyDefinedInfo = + yaz_set_response_charneg( + odr_encode(), + m_charset_converter->get_client_query_charset(), + 0 /* no lang */, + m_charset_converter->get_client_charset_selected()); + } } } } } + Z_Records *Yaz_Proxy::create_nonSurrogateDiagnostics(ODR odr, int error, const char *addinfo) @@ -1800,6 +2086,24 @@ Z_APDU *Yaz_Proxy::handle_query_transformation(Z_APDU *apdu) return apdu; } +Z_APDU *Yaz_Proxy::handle_target_charset_conversion(Z_APDU *apdu) +{ + if (apdu->which == Z_APDU_searchRequest && + apdu->u.searchRequest->query) + { + if (apdu->u.searchRequest->query->which == Z_Query_type_1 + || apdu->u.searchRequest->query->which == Z_Query_type_101) + { + if (m_http_version) + m_charset_converter->set_client_query_charset("UTF-8"); + Z_RPNQuery *rpnquery = apdu->u.searchRequest->query->u.type_1; + m_charset_converter->convert_type_1(rpnquery, odr_encode()); + } + } + return apdu; +} + + Z_APDU *Yaz_Proxy::handle_query_validation(Z_APDU *apdu) { if (apdu->which == Z_APDU_searchRequest) @@ -1842,14 +2146,17 @@ int Yaz_Proxy::handle_authentication(Z_APDU *apdu) int ret; if (req->idAuthentication == 0) { - ret = cfg->client_authentication(m_default_target, 0, 0, 0); + ret = cfg->client_authentication(m_default_target, 0, 0, 0, + m_peername); } else if (req->idAuthentication->which == Z_IdAuthentication_idPass) { - ret = cfg->client_authentication(m_default_target, + ret = cfg->client_authentication( + m_default_target, req->idAuthentication->u.idPass->userId, req->idAuthentication->u.idPass->groupId, - req->idAuthentication->u.idPass->password); + req->idAuthentication->u.idPass->password, + m_peername); } else if (req->idAuthentication->which == Z_IdAuthentication_open) { @@ -1857,10 +2164,12 @@ int Yaz_Proxy::handle_authentication(Z_APDU *apdu) *user = '\0'; *pass = '\0'; sscanf(req->idAuthentication->u.open, "%63[^/]/%63s", user, pass); - ret = cfg->client_authentication(m_default_target, user, 0, pass); + ret = cfg->client_authentication(m_default_target, user, 0, pass, + m_peername); } else - ret = cfg->client_authentication(m_default_target, 0, 0, 0); + ret = cfg->client_authentication(m_default_target, 0, 0, 0, + m_peername); cfg->target_authentication(m_default_target, odr_encode(), req); @@ -2067,7 +2376,6 @@ void Yaz_Proxy::srw_get_client(const char *db, const char **backend_db) 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] != '/') @@ -2443,6 +2751,136 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) send_http_response(400); } +void Yaz_Proxy::handle_init(Z_APDU *apdu) +{ + Z_OtherInformation **oi; + get_otherInfoAPDU(apdu, &oi); + + if (apdu->u.initRequest->implementationId) + yaz_log(YLOG_LOG, "%simplementationId: %s", + m_session_str, apdu->u.initRequest->implementationId); + if (apdu->u.initRequest->implementationName) + yaz_log(YLOG_LOG, "%simplementationName: %s", + m_session_str, apdu->u.initRequest->implementationName); + if (apdu->u.initRequest->implementationVersion) + 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_preferredMessageSize = *apdu->u.initRequest-> + preferredMessageSize; + *apdu->u.initRequest->preferredMessageSize = 1024*1024; + m_initRequest_maximumRecordSize = *apdu->u.initRequest-> + maximumRecordSize; + *apdu->u.initRequest->maximumRecordSize = 1024*1024; + + Z_CharSetandLanguageNegotiation *charSetandLangRecord = + yaz_get_charneg_record(*oi); + + // Save proposal charsets and langs. + if (ODR_MASK_GET(apdu->u.initRequest->options, + Z_Options_negotiationModel) + && charSetandLangRecord) + { + + 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; iu.initRequest->options; + + apdu->u.initRequest->options = + (Odr_bitmask *)nmem_malloc(m_initRequest_mem, + sizeof(Odr_bitmask)); + ODR_MASK_ZERO(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_concurrentOperations); + // make new version + m_initRequest_version = apdu->u.initRequest->protocolVersion; + apdu->u.initRequest->protocolVersion = + (Odr_bitmask *)nmem_malloc(m_initRequest_mem, + sizeof(Odr_bitmask)); + ODR_MASK_ZERO(apdu->u.initRequest->protocolVersion); + + for (i = 0; i<= 8; i++) + ODR_MASK_SET(apdu->u.initRequest->protocolVersion, i); + } + if (m_client->m_init_flag) + { + if (handle_init_response_for_invalid_session(apdu)) + return; + if (m_client->m_initResponse) + { + 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); + apdu2->u.initResponse->referenceId = + apdu->u.initRequest->referenceId; + apdu2->u.initResponse->options = m_client->m_initResponse_options; + apdu2->u.initResponse->protocolVersion = + m_client->m_initResponse_version; + + send_to_client(apdu2); + 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 +} + void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) { Z_ReferenceId **refid = get_referenceIdP(apdu); @@ -2459,11 +2897,12 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) else m_referenceId = 0; - if (!m_client && m_invalid_session) + if (!m_client && m_flag_invalid_session) { - m_apdu_invalid_session = apdu; + // Got request for a session that is invalid.. + m_apdu_invalid_session = apdu; // save package m_mem_invalid_session = odr_extract_mem(odr_decode()); - apdu = m_initRequest_apdu; + apdu = m_initRequest_apdu; // but throw an init to the target } // Determine our client. @@ -2487,126 +2926,15 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) m_client->m_server = this; if (apdu->which == Z_APDU_initRequest) - { - if (apdu->u.initRequest->implementationId) - yaz_log(YLOG_LOG, "%simplementationId: %s", - m_session_str, apdu->u.initRequest->implementationId); - if (apdu->u.initRequest->implementationName) - yaz_log(YLOG_LOG, "%simplementationName: %s", - m_session_str, apdu->u.initRequest->implementationName); - if (apdu->u.initRequest->implementationVersion) - 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_preferredMessageSize = *apdu->u.initRequest-> - preferredMessageSize; - *apdu->u.initRequest->preferredMessageSize = 1024*1024; - 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; iu.initRequest->options; - - apdu->u.initRequest->options = - (Odr_bitmask *)nmem_malloc(m_initRequest_mem, - sizeof(Odr_bitmask)); - ODR_MASK_ZERO(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_concurrentOperations); - // make new version - m_initRequest_version = apdu->u.initRequest->protocolVersion; - apdu->u.initRequest->protocolVersion = - (Odr_bitmask *)nmem_malloc(m_initRequest_mem, - sizeof(Odr_bitmask)); - ODR_MASK_ZERO(apdu->u.initRequest->protocolVersion); - - for (i = 0; i<= 8; i++) - ODR_MASK_SET(apdu->u.initRequest->protocolVersion, i); - } - if (m_client->m_init_flag) - { - if (handle_init_response_for_invalid_session(apdu)) - return; - if (m_client->m_initResponse) - { - 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); - apdu2->u.initResponse->referenceId = - apdu->u.initRequest->referenceId; - apdu2->u.initResponse->options = m_client->m_initResponse_options; - apdu2->u.initResponse->protocolVersion = - m_client->m_initResponse_version; - - send_to_client(apdu2); - return; - } - } - m_client->m_init_flag = 1; - } - - if (!handle_authentication(apdu)) - { - Z_APDU *apdu_reject = zget_APDU(odr_encode(), Z_APDU_initResponse); - *apdu_reject->u.initResponse->result = 0; - send_to_client(apdu_reject); - - shutdown(); - return; - } + handle_init(apdu); + else + handle_incoming_Z_PDU_2(apdu); +} +void Yaz_Proxy::handle_incoming_Z_PDU_2(Z_APDU *apdu) +{ handle_max_record_retrieve(apdu); - + if (apdu) apdu = handle_syntax_validation(apdu); @@ -2614,10 +2942,14 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) apdu = handle_query_transformation(apdu); if (apdu) + apdu = handle_target_charset_conversion(apdu); + + if (apdu) apdu = handle_query_validation(apdu); if (apdu) apdu = result_set_optimize(apdu); + if (!apdu) { m_client->timeout(m_target_idletime); // mark it active even @@ -2625,11 +2957,12 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) return; } // Add otherInformation entry in APDU if - // negotiatoin in use. + // negotiation is in use. if (apdu) handle_charset_lang_negotiation(apdu); // delete other info construct completely if 0 elements + Z_OtherInformation **oi; get_otherInfoAPDU(apdu, &oi); if (oi && *oi && (*oi)->num_elements == 0) *oi = 0; @@ -2661,7 +2994,7 @@ void Yaz_Proxy::releaseClient() { xfree(m_proxyTarget); m_proxyTarget = 0; - m_invalid_session = 0; + m_flag_invalid_session = 0; // only keep if keep_alive flag is set... if (m_client && m_client->m_pdu_recv < m_keepalive_limit_pdu && @@ -2704,10 +3037,17 @@ void Yaz_Proxy::releaseClient() m_parent->pre_init(); } -void Yaz_Proxy::shutdown() +bool Yaz_Proxy::dec_ref() { - releaseClient(); - delete this; + --m_ref_count; + assert(m_ref_count >= 0); + bool last = (m_ref_count == 0); + if (m_ref_count == 0) + { + releaseClient(); + delete this; + } + return last; } const char *Yaz_ProxyClient::get_session_str() @@ -2730,7 +3070,7 @@ void Yaz_Proxy::failNotify() inc_request_no(); yaz_log (YLOG_LOG, "%sConnection closed by client", get_session_str()); - shutdown(); + dec_ref(); } void Yaz_ProxyClient::failNotify() @@ -2753,8 +3093,8 @@ void Yaz_ProxyClient::connectNotify() pre_init_client(); } -IYaz_PDU_Observer *Yaz_ProxyClient::sessionNotify(IYaz_PDU_Observable - *the_PDU_Observable, int fd) +IPDU_Observer *Yaz_ProxyClient::sessionNotify(IPDU_Observable + *the_PDU_Observable, int fd) { return new Yaz_ProxyClient(the_PDU_Observable, 0); } @@ -2832,7 +3172,8 @@ void Yaz_Proxy::pre_init() &cql2rpn, &authentication, &negotiation_charset, - &negotiation_lang) ; i++) + &negotiation_lang, + 0) ; i++) { if (pre_init) { @@ -2900,25 +3241,26 @@ void Yaz_Proxy::timeoutNotify() { if (m_parent) { - if (m_bw_hold_PDU) - { - timeout(m_client_idletime); - Z_GDU *apdu = m_bw_hold_PDU; - m_bw_hold_PDU = 0; - - if (apdu->which == Z_GDU_Z3950) - handle_incoming_Z_PDU(apdu->u.z3950); - else if (apdu->which == Z_GDU_HTTP_Request) - handle_incoming_HTTP(apdu->u.HTTP_Request); - } - else if (m_stylesheet_nprl) - convert_xsl_delay(); - else + GDU *gdu; + switch(m_timeout_mode) { + case timeout_normal: inc_request_no(); - + m_in_queue.clear(); yaz_log (YLOG_LOG, "%sTimeout (client to proxy)", m_session_str); - shutdown(); + dec_ref(); + break; + case timeout_reduce: + timeout(m_client_idletime); + m_timeout_mode = timeout_normal; + gdu = m_timeout_gdu; + m_timeout_gdu = 0; + recv_GDU_normal(gdu); + break; + case timeout_xsl: + assert(m_stylesheet_nprl); + convert_xsl_delay(); + recv_GDU_more(); } } else @@ -2931,7 +3273,7 @@ void Yaz_Proxy::timeoutNotify() void Yaz_Proxy::markInvalid() { m_client = 0; - m_invalid_session = 1; + m_flag_invalid_session = 1; } void Yaz_ProxyClient::timeoutNotify() @@ -2954,9 +3296,9 @@ void Yaz_ProxyClient::timeoutNotify() shutdown(); } -Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable, +Yaz_ProxyClient::Yaz_ProxyClient(IPDU_Observable *the_PDU_Observable, Yaz_Proxy *parent) : - Yaz_Z_Assoc (the_PDU_Observable) + Z_Assoc (the_PDU_Observable) { m_cookie = 0; m_next = 0; @@ -3012,9 +3354,9 @@ void Yaz_ProxyClient::recv_GDU(Z_GDU *apdu, int len) int Yaz_Proxy::handle_init_response_for_invalid_session(Z_APDU *apdu) { - if (!m_invalid_session) + if (!m_flag_invalid_session) return 0; - m_invalid_session = 0; + m_flag_invalid_session = 0; handle_incoming_Z_PDU(m_apdu_invalid_session); assert (m_mem_invalid_session); nmem_destroy(m_mem_invalid_session); @@ -3108,14 +3450,16 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) } if (m_cookie) set_otherInformationString (apdu, VAL_COOKIE, 1, m_cookie); - if (m_server) - { - m_server->send_to_client(apdu); - } + + Yaz_Proxy *server = m_server; // save it. send_to_client may destroy us + + if (server) + server->send_to_client(apdu); if (apdu->which == Z_APDU_close) - { shutdown(); - } + else if (server) + server->recv_GDU_more(); + } void Yaz_Proxy::low_socket_close() @@ -3141,7 +3485,7 @@ void Yaz_Proxy::low_socket_open() int Yaz_Proxy::server(const char *addr) { - int r = Yaz_Z_Assoc::server(addr); + int r = Z_Assoc::server(addr); if (!r) { yaz_log(YLOG_LOG, "%sStarted proxy "