X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=a175d1d42fcd1eb845ba0e7671d682bb2db80177;hb=dfc3beabad1354d86797de9de702116ae229ff94;hp=00daeef70446a71a820d3dd251a31821dec71054;hpb=a57254683d8adfdd6c3617cbcb06fc3b6138e602;p=yazpp-moved-to-github.git diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index 00daeef..a175d1d 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy.cpp,v 1.86 2004-01-09 18:11:15 adam Exp $ + * $Id: yaz-proxy.cpp,v 1.95 2004-01-30 12:02:21 adam Exp $ */ #include @@ -16,11 +16,6 @@ #include #include -#if HAVE_XSLT -#include -#include -#endif - static const char *apdu_name(Z_APDU *apdu) { switch (apdu->which) @@ -95,7 +90,8 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_optimize = xstrdup ("1"); strcpy(m_session_str, "0 "); m_session_no=0; - m_bytes_sent = m_bytes_recv = 0; + m_bytes_sent = 0; + m_bytes_recv = 0; m_bw_hold_PDU = 0; m_bw_max = 0; m_pdu_max = 0; @@ -106,11 +102,14 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, m_invalid_session = 0; m_config = 0; m_marcxml_flag = 0; - m_stylesheet_schema = 0; + m_stylesheet_xsp = 0; m_s2z_stylesheet = 0; + m_s2z_database = 0; m_schema = 0; m_initRequest_apdu = 0; m_initRequest_mem = 0; + m_initRequest_options = 0; + m_initRequest_version = 0; m_apdu_invalid_session = 0; m_mem_invalid_session = 0; m_s2z_odr_init = 0; @@ -136,7 +135,10 @@ Yaz_Proxy::~Yaz_Proxy() xfree (m_default_target); xfree (m_proxy_authentication); xfree (m_optimize); - xfree (m_stylesheet_schema); + + if (m_stylesheet_xsp) + xsltFreeStylesheet(m_stylesheet_xsp); + xfree (m_schema); if (m_s2z_odr_init) odr_destroy(m_s2z_odr_init); @@ -426,7 +428,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, { if (apdu->which != Z_APDU_initRequest) { - yaz_log (LOG_LOG, "no first INIT!"); + yaz_log (LOG_LOG, "%sno init request as first PDU", m_session_str); return 0; } Z_InitRequest *initRequest = apdu->u.initRequest; @@ -445,7 +447,6 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie, odr_strdup (odr_encode(), m_proxy_authentication); } } - // go through list of clients - and find the lowest/oldest one. Yaz_ProxyClient *c_min = 0; int min_seq = -1; @@ -581,43 +582,61 @@ void Yaz_Proxy::display_diagrecs(Z_DiagRec **pp, int num) } } -void Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p) +int Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p, Z_APDU *apdu) { - if (!m_stylesheet_schema) - return; - xmlDocPtr xslt_doc = xmlParseFile(m_stylesheet_schema); - xsltStylesheetPtr xsp; + if (!m_stylesheet_xsp || p->num_records <= 0) + return 0; /* no XSLT to be done ... */ - xsp = xsltParseStylesheetDoc(xslt_doc); + m_stylesheet_offset = 0; + m_stylesheet_nprl = p; + m_stylesheet_apdu = apdu; + timeout(0); + return 1; +} - int i; - for (i = 0; i < p->num_records; i++) +void Yaz_Proxy::convert_xsl_delay() +{ + Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset]; + if (npr->which == Z_NamePlusRecord_databaseRecord) { - Z_NamePlusRecord *npr = p->records[i]; - if (npr->which == Z_NamePlusRecord_databaseRecord) + Z_External *r = npr->u.databaseRecord; + if (r->which == Z_External_octet) { - Z_External *r = npr->u.databaseRecord; - if (r->which == Z_External_octet) + xmlDocPtr res, doc = xmlParseMemory( + (char*) r->u.octet_aligned->buf, + r->u.octet_aligned->len); + + yaz_log(LOG_LOG, "%sXSLT convert %d", + m_session_str, m_stylesheet_offset); + res = xsltApplyStylesheet(m_stylesheet_xsp, doc, 0); + if (res) { - xmlDocPtr res, doc = xmlParseMemory( - (char*) r->u.octet_aligned->buf, - r->u.octet_aligned->len); - - res = xsltApplyStylesheet(xsp, doc, 0); - xmlChar *out_buf; int out_len; - xmlDocDumpMemory (res, &out_buf, &out_len); - p->records[i]->u.databaseRecord = + 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); xmlFree(out_buf); - xmlFreeDoc(doc); xmlFreeDoc(res); } + xmlFreeDoc(doc); } } - xsltFreeStylesheet(xsp); + m_stylesheet_offset++; + if (m_stylesheet_offset == m_stylesheet_nprl->num_records) + { + m_stylesheet_nprl = 0; + if (m_stylesheet_xsp) + xsltFreeStylesheet(m_stylesheet_xsp); + m_stylesheet_xsp = 0; + timeout(m_client_idletime); + int r = send_PDU_convert(m_stylesheet_apdu); + } + else + timeout(0); } void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p) @@ -704,7 +723,11 @@ int Yaz_Proxy::send_http_response(int code) Z_HTTP_Response *hres = gdu->u.HTTP_Response; if (m_http_version) hres->version = odr_strdup(o, m_http_version); - m_http_keepalive = 0; + if (m_http_keepalive) + z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive"); + else + timeout(0); + if (m_log_mask & PROXY_LOG_REQ_CLIENT) { yaz_log (LOG_LOG, "%sSending %s to client", m_session_str, @@ -712,6 +735,8 @@ int Yaz_Proxy::send_http_response(int code) } int len; int r = send_GDU(gdu, &len); + m_bytes_sent += len; + m_bw_stat.add_bytes(len); logtime(); return r; } @@ -727,6 +752,8 @@ int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu) z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); if (m_http_keepalive) z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive"); + else + timeout(0); static Z_SOAP_Handler soap_handlers[2] = { #if HAVE_XSLT @@ -754,6 +781,8 @@ int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu) } int len; int r = send_GDU(gdu, &len); + m_bytes_sent += len; + m_bw_stat.add_bytes(len); logtime(); return r; } @@ -767,8 +796,7 @@ int Yaz_Proxy::send_to_srw_client_error(int srw_error, const char *add) srw_res->num_diagnostics = 1; srw_res->diagnostics = (Z_SRW_diagnostic *) odr_malloc(o, sizeof(*srw_res->diagnostics)); - srw_res->diagnostics[0].code = odr_intdup(o, srw_error); - srw_res->diagnostics[0].details = add ? odr_strdup(o, add) : 0; + yaz_mk_std_diagnostic(o, srw_res->diagnostics, srw_error, add); return send_srw_response(srw_pdu); } @@ -781,9 +809,9 @@ int Yaz_Proxy::z_to_srw_diag(ODR o, Z_SRW_searchRetrieveResponse *srw_res, srw_res->num_diagnostics = 1; srw_res->diagnostics = (Z_SRW_diagnostic *) odr_malloc(o, sizeof(*srw_res->diagnostics)); - srw_res->diagnostics[0].code = - odr_intdup(o, yaz_diag_bib1_to_srw(*ddf->condition)); - srw_res->diagnostics[0].details = ddf->u.v2Addinfo; + yaz_mk_std_diagnostic(o, srw_res->diagnostics, + yaz_diag_bib1_to_srw(*ddf->condition), + ddf->u.v2Addinfo); return 0; } @@ -849,28 +877,30 @@ int Yaz_Proxy::send_to_srw_client_ok(int hits, Z_Records *records, int start) int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics, int num_diagnostics) { - Z_SRW_PDU *res = yaz_srw_get(odr_encode(), Z_SRW_explain_response); - Z_SRW_explainResponse *er = res->u.explain_response; - Yaz_ProxyConfig *cfg = check_reconfigure(); if (cfg) { int len; char *b = cfg->get_explain(odr_encode(), 0 /* target */, - 0 /* db */, &len); + m_s2z_database, &len); if (b) { + Z_SRW_PDU *res = yaz_srw_get(odr_encode(), Z_SRW_explain_response); + Z_SRW_explainResponse *er = res->u.explain_response; + er->record.recordData_buf = b; er->record.recordData_len = len; er->record.recordPacking = m_s2z_packing; + + er->diagnostics = diagnostics; + er->num_diagnostics = num_diagnostics; + return send_srw_response(res); } } - er->diagnostics = diagnostics; - er->num_diagnostics = num_diagnostics; - return send_srw_response(res); + return send_http_response(404); } -int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) +int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu) { if (m_http_version) { @@ -899,7 +929,7 @@ int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) { send_to_srw_client_ok(0, res->records, 1); } - else if (m_s2z_present_apdu) + else if (m_s2z_present_apdu && m_s2z_hit_count > 0) { // adjust Z_PresentRequest *pr = m_s2z_present_apdu->u.presentRequest; @@ -915,6 +945,7 @@ int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) } else { + m_s2z_present_apdu = 0; send_to_srw_client_ok(m_s2z_hit_count, res->records, 1); } } @@ -930,10 +961,13 @@ int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) } else { + int len = 0; if (m_log_mask & PROXY_LOG_REQ_CLIENT) yaz_log (LOG_LOG, "%sSending %s to client", m_session_str, apdu_name(apdu)); - int r = send_Z_PDU(apdu, len); + int r = send_Z_PDU(apdu, &len); + m_bytes_sent += len; + m_bw_stat.add_bytes(len); logtime(); return r; } @@ -942,7 +976,6 @@ int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len) int Yaz_Proxy::send_to_client(Z_APDU *apdu) { - int len = 0; int kill_session = 0; if (apdu->which == Z_APDU_searchResponse) { @@ -963,7 +996,9 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) { if (m_marcxml_flag) convert_to_marcxml(p->u.databaseOrSurDiagnostics); - convert_xsl(p->u.databaseOrSurDiagnostics); + if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu)) + return 0; + } if (sr->resultCount) { @@ -999,32 +1034,50 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) { if (m_marcxml_flag) convert_to_marcxml(p->u.databaseOrSurDiagnostics); - convert_xsl(p->u.databaseOrSurDiagnostics); + if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu)) + return 0; } } - int r = send_PDU_convert(apdu, &len); + else if (apdu->which == Z_APDU_initResponse) + { + if (m_initRequest_options) + { + Z_Options *nopt = + (Odr_bitmask *)odr_malloc(odr_encode(), + sizeof(Odr_bitmask)); + ODR_MASK_ZERO(nopt); + + int i; + for (i = 0; i<24; i++) + if (ODR_MASK_GET(m_initRequest_options, i) && + ODR_MASK_GET(apdu->u.initResponse->options, i)) + ODR_MASK_SET(nopt, i); + apdu->u.initResponse->options = nopt; + } + if (m_initRequest_version) + { + Z_ProtocolVersion *nopt = + (Odr_bitmask *)odr_malloc(odr_encode(), + sizeof(Odr_bitmask)); + ODR_MASK_ZERO(nopt); + + int i; + for (i = 0; i<8; i++) + if (ODR_MASK_GET(m_initRequest_version, i) && + ODR_MASK_GET(apdu->u.initResponse->protocolVersion, i)) + ODR_MASK_SET(nopt, i); + apdu->u.initResponse->protocolVersion = nopt; + } + } + int r = send_PDU_convert(apdu); if (r) return r; - m_bytes_sent += len; - m_bw_stat.add_bytes(len); if (kill_session) { delete m_client; m_client = 0; m_parent->pre_init(); } - if (m_http_version) - { - if (!m_http_keepalive) - { -#if 1 - timeout(1); -#else - shutdown(); - return -1; -#endif - } - } return r; } @@ -1457,12 +1510,22 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) rc_temp.u.simple = sr->smallSetElementSetNames; rc = &rc_temp; } - + + char *stylesheet_name = 0; if (cfg) err = cfg->check_syntax(odr_encode(), m_default_target, sr->preferredRecordSyntax, rc, - &addinfo, &m_stylesheet_schema, &m_schema); + &addinfo, &stylesheet_name, &m_schema); + if (stylesheet_name) + { + if (m_stylesheet_xsp) + xsltFreeStylesheet(m_stylesheet_xsp); + m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*) + stylesheet_name); + m_stylesheet_offset = 0; + xfree(stylesheet_name); + } if (err == -1) { sr->preferredRecordSyntax = @@ -1490,11 +1553,21 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) char *addinfo = 0; Yaz_ProxyConfig *cfg = check_reconfigure(); + char *stylesheet_name = 0; if (cfg) err = cfg->check_syntax(odr_encode(), m_default_target, pr->preferredRecordSyntax, pr->recordComposition, - &addinfo, &m_stylesheet_schema, &m_schema); + &addinfo, &stylesheet_name, &m_schema); + if (stylesheet_name) + { + if (m_stylesheet_xsp) + xsltFreeStylesheet(m_stylesheet_xsp); + m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*) + stylesheet_name); + m_stylesheet_offset = 0; + xfree(stylesheet_name); + } if (err == -1) { pr->preferredRecordSyntax = @@ -1532,7 +1605,6 @@ Z_ElementSetNames *Yaz_Proxy::mk_esn_from_schema(ODR o, const char *schema) void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) { - if (m_s2z_odr_init) { odr_destroy(m_s2z_odr_init); @@ -1588,6 +1660,7 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) { Z_SRW_searchRetrieveRequest *srw_req = srw_pdu->u.request; + m_s2z_database = odr_strdup(m_s2z_odr_init, srw_req->database); // recordXPath unsupported. if (srw_req->recordXPath) { @@ -1736,12 +1809,12 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) z_presentRequest->preferredRecordSyntax = yaz_oidval_to_z3950oid(m_s2z_odr_search, CLASS_RECSYN, VAL_TEXT_XML); - z_presentRequest->recordComposition = - (Z_RecordComposition *) - odr_malloc(m_s2z_odr_search, - sizeof(Z_RecordComposition)); if (srw_req->recordSchema) { + z_presentRequest->recordComposition = + (Z_RecordComposition *) + odr_malloc(m_s2z_odr_search, + sizeof(Z_RecordComposition)); z_presentRequest->recordComposition->which = Z_RecordComp_simple; z_presentRequest->recordComposition->u.simple = @@ -1771,6 +1844,8 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) { Z_SRW_explainRequest *srw_req = srw_pdu->u.explain_request; + m_s2z_database = odr_strdup(m_s2z_odr_init, srw_req->database); + // save stylesheet if (srw_req->stylesheet) m_s2z_stylesheet = @@ -1804,6 +1879,9 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) } else if (srw_pdu->which == Z_SRW_scan_request) { + m_s2z_database = odr_strdup(m_s2z_odr_init, + srw_pdu->u.scan_request->database); + yaz_add_srw_diagnostic(odr_decode(), &diagnostic, &num_diagnostic, 4, "scan"); @@ -1819,13 +1897,15 @@ void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq) } else { + m_s2z_database = 0; + send_to_srw_client_error(4, 0); } } int len = 0; Z_GDU *p = z_get_HTTP_Response(odr_encode(), 400); + timeout(0); send_GDU(p, &len); - timeout(1); } void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) @@ -1865,6 +1945,29 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) nmem_destroy(m_initRequest_mem); m_initRequest_apdu = apdu; m_initRequest_mem = odr_extract_mem(odr_decode()); + + // 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); + + // 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) { @@ -1877,6 +1980,10 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu) 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; } @@ -2042,19 +2149,14 @@ void Yaz_ProxyClient::pre_init_client() Z_APDU *apdu = create_Z_PDU(Z_APDU_initRequest); Z_InitRequest *req = apdu->u.initRequest; - ODR_MASK_SET(req->options, Z_Options_search); - ODR_MASK_SET(req->options, Z_Options_present); - ODR_MASK_SET(req->options, Z_Options_namedResultSets); - ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl); - ODR_MASK_SET(req->options, Z_Options_scan); - ODR_MASK_SET(req->options, Z_Options_sort); - ODR_MASK_SET(req->options, Z_Options_extendedServices); - ODR_MASK_SET(req->options, Z_Options_delSet); - - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1); - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); - + int i; + for (i = 0; i<= 24; i++) + ODR_MASK_SET(req->options, i); + ODR_MASK_CLEAR(apdu->u.initRequest->options, + Z_Options_negotiationModel); + for (i = 0; i<= 10; i++) + ODR_MASK_SET(req->protocolVersion, i); + if (send_to_target(apdu) < 0) { delete this; @@ -2168,6 +2270,8 @@ void Yaz_Proxy::timeoutNotify() else if (apdu->which == Z_GDU_HTTP_Request) handle_incoming_HTTP(apdu->u.HTTP_Request); } + else if (m_stylesheet_nprl) + convert_xsl_delay(); else { inc_request_no(); @@ -2183,6 +2287,12 @@ void Yaz_Proxy::timeoutNotify() } } +void Yaz_Proxy::markInvalid() +{ + m_client = 0; + m_invalid_session = 1; +} + void Yaz_ProxyClient::timeoutNotify() { if (m_server) @@ -2192,6 +2302,14 @@ void Yaz_ProxyClient::timeoutNotify() get_hostname()); m_waiting = 1; m_root->pre_init(); + if (m_server && m_init_flag) + { + // target timed out in a session that was properly initialized + // server object stay alive but we mark it as invalid so it + // gets initialized again + m_server->markInvalid(); + m_server = 0; + } shutdown(); } @@ -2211,6 +2329,8 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable, m_waiting = 0; m_init_odr = odr_createmem (ODR_DECODE); m_initResponse = 0; + m_initResponse_options = 0; + m_initResponse_version = 0; m_resultSetStartPoint = 0; m_bytes_sent = m_bytes_recv = 0; m_pdu_recv = 0; @@ -2262,6 +2382,7 @@ int Yaz_Proxy::handle_init_response_for_invalid_session(Z_APDU *apdu) void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) { m_bytes_recv += len; + m_pdu_recv++; m_waiting = 0; if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER) @@ -2275,6 +2396,8 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) odr_reset (m_init_odr); nmem_transfer (m_init_odr->mem, nmem); m_initResponse = apdu; + m_initResponse_options = apdu->u.initResponse->options; + m_initResponse_version = apdu->u.initResponse->protocolVersion; Z_InitResponse *ir = apdu->u.initResponse; char *im0 = ir->implementationName;