X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=c1cc98f352336ee75690f46e97890877b8ebde48;hb=eb2b00deb4ecc5a3fbfbef11f57790c1659ab3e2;hp=6170a1e28238907fab97554e70a33cbe64eaf6e1;hpb=2c1361022c99ef0dccedad47cfe6e6bbd0a0a5ee;p=yazproxy-moved-to-github.git diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index 6170a1e..c1cc98f 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -1,4 +1,4 @@ -/* $Id: yaz-proxy.cpp,v 1.19 2005-02-07 13:29:38 adam Exp $ +/* $Id: yaz-proxy.cpp,v 1.29 2005-06-02 06:40:46 adam Exp $ Copyright (c) 1998-2005, Index Data. This file is part of the yaz-proxy. @@ -38,6 +38,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include +#include #include #include @@ -49,6 +50,48 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "proxyp.h" #include #include +#include +#include "msg-thread.h" + +using namespace yazpp_1; + +class Auth_Msg : public IMsg_Thread { +public: + int m_ret; + void destroy(); + IMsg_Thread *handle(); + void result(); + Yaz_Proxy *m_proxy; + Z_APDU *m_apdu; +}; + +IMsg_Thread *Auth_Msg::handle() +{ + yaz_log(YLOG_LOG, "Auth_Msg:handle begin"); + m_ret = m_proxy->handle_authentication(m_apdu); + yaz_log(YLOG_LOG, "Auth_Msg:handle end"); + return this; +} + +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); + shutdown(); + } + else + handle_incoming_Z_PDU_2(apdu); +} + +void Auth_Msg::result() +{ + yaz_log(YLOG_LOG, "Auth_Msg:result"); + m_proxy->result_authentication(m_apdu, m_ret); + delete this; +} static const char *apdu_name(Z_APDU *apdu) { @@ -103,10 +146,13 @@ static const char *gdu_name(Z_GDU *gdu) } Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, - Yaz_Proxy *parent) : + IYazSocketObservable *the_socket_observable, + Yaz_Proxy *parent) + : Yaz_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; @@ -115,7 +161,9 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_keepalive_limit_pdu = 1000; m_proxyTarget = 0; m_default_target = 0; - m_proxy_authentication = 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); @@ -123,7 +171,7 @@ 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; @@ -137,7 +185,7 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_referenceId = 0; m_referenceId_mem = nmem_create(); m_config = 0; - m_marcxml_flag = 0; + m_marcxml_mode = none; m_stylesheet_xsp = 0; m_stylesheet_nprl = 0; m_s2z_stylesheet = 0; @@ -152,6 +200,11 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, 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; @@ -176,6 +229,7 @@ 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; } Yaz_Proxy::~Yaz_Proxy() @@ -188,7 +242,9 @@ Yaz_Proxy::~Yaz_Proxy() xfree(m_proxyTarget); xfree(m_default_target); - xfree(m_proxy_authentication); + xfree(m_proxy_negotiation_charset); + xfree(m_proxy_negotiation_lang); + delete m_charset_converter; xfree(m_optimize); #if HAVE_XSLT @@ -209,9 +265,16 @@ 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; } +void Yaz_Proxy::set_debug_mode(int mode) +{ + m_debug_mode = mode; +} + int Yaz_Proxy::set_config(const char *config) { delete m_config; @@ -232,12 +295,18 @@ void Yaz_Proxy::set_default_target(const char *target) m_default_target = (char *) xstrdup (target); } -void Yaz_Proxy::set_proxy_authentication (const char *auth) +void Yaz_Proxy::set_proxy_negotiation (const char *charset, const char *lang) { - xfree (m_proxy_authentication); - m_proxy_authentication = 0; - if (auth) - m_proxy_authentication = (char *) xstrdup (auth); + 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() @@ -273,7 +342,8 @@ IYaz_PDU_Observer *Yaz_Proxy::sessionNotify(IYaz_PDU_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); @@ -286,11 +356,16 @@ 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_authentication(m_proxy_authentication); sprintf(new_proxy->m_session_str, "%ld:%d ", (long) time(0), m_session_no); m_session_no++; yaz_log (YLOG_LOG, "%sNew session %s", new_proxy->m_session_str, the_PDU_Observable->getpeername()); + 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; } @@ -310,7 +385,6 @@ char *Yaz_Proxy::get_cookie(Z_OtherInformation **otherInfo) return oi->information.characterInfo; return 0; } - char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo) { int oid[OID_SIZE]; @@ -325,7 +399,6 @@ char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo) return oi->information.characterInfo; return 0; } - const char *Yaz_Proxy::load_balance(const char **url) { int zurl_in_use[MAX_ZURL_PLEX]; @@ -369,12 +442,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; } @@ -391,18 +458,21 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, Yaz_ProxyConfig *cfg = check_reconfigure(); if (proxy_host) { -#if 0 -/* only to be enabled for debugging... */ - if (!strcmp(proxy_host, "stop")) - exit(0); -#endif + if (parent && parent->m_debug_mode) + { + // only to be enabled for debugging... + if (!strcmp(proxy_host, "stop")) + exit(0); + } xfree(m_default_target); m_default_target = xstrdup(proxy_host); } 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; + const char *query_charset = 0; url[0] = m_default_target; url[1] = 0; if (cfg) @@ -416,7 +486,9 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, &m_keepalive_limit_pdu, &pre_init, &cql2rpn_fname, - &authentication); + &negotiation_charset, + &negotiation_lang, + &query_charset); } if (client_idletime != -1) { @@ -425,8 +497,12 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, } 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); + } + m_charset_converter->set_target_query_charset(query_charset); if (!url[0]) { yaz_log(YLOG_LOG, "%sNo default target", m_session_str); @@ -484,11 +560,14 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, } } } - else if (!c && apdu->which == Z_APDU_initRequest - && apdu->u.initRequest->idAuthentication == 0) + else if (!c && + apdu->which == Z_APDU_initRequest && + apdu->u.initRequest->idAuthentication == 0 && + !ODR_MASK_GET(apdu->u.initRequest->options, Z_Options_negotiationModel)) { // 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); @@ -527,23 +606,9 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, } Z_InitRequest *initRequest = apdu->u.initRequest; - if (!initRequest->idAuthentication) - { - if (m_proxy_authentication) - { - initRequest->idAuthentication = - (Z_IdAuthentication *) - odr_malloc (odr_encode(), - sizeof(*initRequest->idAuthentication)); - initRequest->idAuthentication->which = - Z_IdAuthentication_open; - initRequest->idAuthentication->u.open = - odr_strdup (odr_encode(), m_proxy_authentication); - } - } - else + if (initRequest->idAuthentication) { - // the client use authentication. We set the keepalive PDU + // the client uses authentication. We set the keepalive PDU // to 0 so we don't cache it in releaseClient m_keepalive_limit_pdu = 0; } @@ -811,6 +876,7 @@ void Yaz_Proxy::convert_to_frontend_type(Z_NamePlusRecordList *p) continue; } #endif +/* HAVE_USEMARCON */ npr->u.databaseRecord = z_ext_record(odr_encode(), m_frontend_type, @@ -822,11 +888,78 @@ 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) { int i; - if (!backend_charset) backend_charset = "MARC-8"; yaz_iconv_t cd = yaz_iconv_open("UTF-8", backend_charset); @@ -839,7 +972,18 @@ void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p, if (npr->which == Z_NamePlusRecord_databaseRecord) { Z_External *r = npr->u.databaseRecord; - if (r->which == Z_External_octet) + if (r->which == Z_External_OPAC) + { + WRBUF w = wrbuf_alloc(); + + yaz_display_OPAC(w, r->u.opac, 0); + npr->u.databaseRecord = z_ext_record( + odr_encode(), VAL_TEXT_XML, + wrbuf_buf(w), wrbuf_len(w) + ); + wrbuf_free(w, 1); + } + else if (r->which == Z_External_octet) { int rlen; char *result; @@ -847,9 +991,8 @@ void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p, r->u.octet_aligned->len, &result, &rlen)) { - npr->u.databaseRecord = z_ext_record(odr_encode(), - VAL_TEXT_XML, - result, rlen); + npr->u.databaseRecord = + z_ext_record(odr_encode(), VAL_TEXT_XML, result, rlen); } } } @@ -1168,9 +1311,12 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) #endif ) convert_to_frontend_type(p->u.databaseOrSurDiagnostics); - if (m_marcxml_flag) + 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; @@ -1213,15 +1359,22 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) #endif ) convert_to_frontend_type(p->u.databaseOrSurDiagnostics); - if (m_marcxml_flag) + 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; } } 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 = @@ -1263,6 +1416,7 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) m_initRequest_maximumRecordSize : m_client->m_initResponse_maximumRecordSize); } + int r = send_PDU_convert(apdu); if (r) return r; @@ -1597,6 +1751,180 @@ 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 no 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 (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) + { + Z_InitResponse *initResponse = apdu->u.initResponse; + Z_OtherInformation **otherInfo; + + 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. + 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) + { + 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, @@ -1666,6 +1994,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) @@ -1695,9 +2041,47 @@ Z_APDU *Yaz_Proxy::handle_query_validation(Z_APDU *apdu) return apdu; } +int Yaz_Proxy::handle_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->client_authentication(m_default_target, 0, 0, 0); + } + else if (req->idAuthentication->which == Z_IdAuthentication_idPass) + { + ret = cfg->client_authentication(m_default_target, + req->idAuthentication->u.idPass->userId, + req->idAuthentication->u.idPass->groupId, + req->idAuthentication->u.idPass->password); + } + 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->client_authentication(m_default_target, user, 0, pass); + } + else + ret = cfg->client_authentication(m_default_target, 0, 0, 0); + + cfg->target_authentication(m_default_target, odr_encode(), req); + + return ret; +} + Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) { - m_marcxml_flag = 0; + m_marcxml_mode = none; if (apdu->which == Z_APDU_searchRequest) { Z_SearchRequest *sr = apdu->u.searchRequest; @@ -1750,6 +2134,7 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) { sr->smallSetElementSetNames = 0; sr->mediumSetElementSetNames = 0; + m_marcxml_mode = marcxml; if (m_backend_type) { @@ -1761,7 +2146,6 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) sr->preferredRecordSyntax = yaz_oidval_to_z3950oid(odr_encode(), CLASS_RECSYN, VAL_USMARC); - m_marcxml_flag = 1; } else if (err) { @@ -1826,6 +2210,7 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) if (err == -1) { pr->recordComposition = 0; + m_marcxml_mode = marcxml; if (m_backend_type) { @@ -1837,7 +2222,6 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) pr->preferredRecordSyntax = yaz_oidval_to_z3950oid(odr_encode(), CLASS_RECSYN, VAL_USMARC); - m_marcxml_flag = 1; } else if (err) { @@ -1895,7 +2279,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] != '/') @@ -1929,7 +2312,7 @@ int Yaz_Proxy::file_access(Z_HTTP_Request *hreq) 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); @@ -2271,6 +2654,123 @@ 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; + + // 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; + + Auth_Msg *m = new Auth_Msg; + m->m_apdu = apdu; + m->m_proxy = this; + m_my_thread->put(m); +} + void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) { Z_ReferenceId **refid = get_referenceIdP(apdu); @@ -2311,83 +2811,19 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) return; } } + 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 init options for the response.. - m_initRequest_options = apdu->u.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); - 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); + handle_init(apdu); + else + handle_incoming_Z_PDU_2(apdu); +} - 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; - } +void Yaz_Proxy::handle_incoming_Z_PDU_2(Z_APDU *apdu) +{ handle_max_record_retrieve(apdu); - + if (apdu) apdu = handle_syntax_validation(apdu); @@ -2395,18 +2831,27 @@ 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 // though we didn't use it return; } + // Add otherInformation entry in APDU if + // 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; @@ -2587,6 +3032,8 @@ void Yaz_Proxy::pre_init() 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(); @@ -2605,7 +3052,10 @@ void Yaz_Proxy::pre_init() &keepalive_limit_pdu, &pre_init, &cql2rpn, - &authentication) ; i++) + &authentication, + &negotiation_charset, + &negotiation_lang, + 0) ; i++) { if (pre_init) {