/* This file is part of Metaproxy.
- Copyright (C) 2005-2012 Index Data
+ Copyright (C) 2005-2013 Index Data
Metaproxy 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
class Zoom::Searchable : boost::noncopyable {
public:
std::string authentication;
+ std::string authenticationMode;
std::string cfAuth;
std::string cfProxy;
std::string cfSubDB;
std::string urlRecipe;
std::string contentConnector;
std::string sortStrategy;
+ std::string extraArgs;
+ std::string rpn2cql_fname;
bool use_turbomarc;
bool piggyback;
CCL_bibset ccl_bibset;
bool enable_cproxy;
bool enable_explain;
xmlDoc *explain_doc;
+ std::string m_proxy;
+ cql_transform_t cqlt;
public:
Backend();
~Backend();
Impl *m_p;
bool m_is_virtual;
bool m_in_use;
+ std::string session_realm;
yazpp_1::GDU m_init_gdu;
BackendPtr m_backend;
void handle_package(mp::Package &package);
void handle_search(mp::Package &package);
+ void auth(mp::Package &package, Z_InitRequest *req,
+ int *error, char **addinfo, ODR odr);
+
BackendPtr explain_search(mp::Package &package,
std::string &database,
int *error,
char **addinfo,
mp::odr &odr,
+ std::string torus_url,
std::string &torus_db,
std::string &realm);
void handle_present(mp::Package &package);
int *error,
char **addinfo,
mp::odr &odr,
- int *proxy_step,
- std::string &proxy);
+ int *proxy_step);
bool create_content_session(mp::Package &package,
BackendPtr b,
std::string authentication,
std::string proxy,
std::string realm);
-
+
void prepare_elements(BackendPtr b,
Odr_oid *preferredRecordSyntax,
const char *element_set_name,
ODR odr, BackendPtr b,
Odr_oid *preferredRecordSyntax,
const char *element_set_name);
-
+ bool retry(mp::Package &package,
+ mp::odr &odr,
+ BackendPtr b,
+ int &error, char **addinfo,
+ int &proxy_step, int &same_retries,
+ int &proxy_retries);
void log_diagnostic(mp::Package &package,
int error, const char *addinfo);
public:
private:
void configure_local_records(const xmlNode * ptr, bool test_only);
bool check_proxy(const char *proxy);
+
+
+
FrontendPtr get_frontend(mp::Package &package);
void release_frontend(mp::Package &package);
SearchablePtr parse_torus_record(const xmlNode *ptr);
struct cql_node *convert_cql_fields(struct cql_node *cn, ODR odr);
- std::map<mp::Session, FrontendPtr> m_clients;
+ std::map<mp::Session, FrontendPtr> m_clients;
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
std::string torus_searchable_url;
std::string torus_content_url;
+ std::string torus_auth_url;
std::string default_realm;
std::map<std::string,std::string> fieldmap;
std::string xsldir;
CCL_bibset bibset;
std::string element_transform;
std::string element_raw;
+ std::string element_passthru;
std::string proxy;
xsltStylesheetPtr explain_xsp;
xsltStylesheetPtr record_xsp;
return ptr;
}
else // else: we don't want to find nested nodes
- {
+ {
xmlNode *ret_node = xml_node_search(ptr->children, num, m);
if (ret_node)
return ret_node;
}
// define Pimpl wrapper forwarding to Impl
-
+
yf::Zoom::Zoom() : m_p(new Impl)
{
}
enable_cproxy = true;
enable_explain = false;
explain_doc = 0;
+ cqlt = 0;
}
yf::Zoom::Backend::~Backend()
xsltFreeStylesheet(xsp);
if (explain_doc)
xmlFreeDoc(explain_doc);
+ cql_transform_close(cqlt);
ZOOM_connection_destroy(m_connection);
ZOOM_resultset_destroy(m_resultset);
}
{
if (!dset)
dset = "Unknown";
-
+
if (!strcmp(dset, "info:srw/diagnostic/1"))
*error = yaz_diag_srw_to_bib1(error0);
else if (!strcmp(dset, "Bib-1"))
*error = error0;
else if (!strcmp(dset, "ZOOM"))
{
- *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+ *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
if (error0 == ZOOM_ERROR_INIT)
*error = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR;
else if (error0 == ZOOM_ERROR_DECODE)
}
else
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
-
+
*addinfo = (char *) odr_malloc(
odr, 30 + strlen(dset) + strlen(msg) +
(zoom_addinfo ? strlen(zoom_addinfo) : 0));
int *error, char **addinfo,
ODR odr)
{
+ size_t h = zurl.find_first_of('#');
+ if (h != std::string::npos)
+ zurl.erase(h);
ZOOM_connection_connect(m_connection, zurl.length() ? zurl.c_str() : 0, 0);
get_zoom_error(error, addinfo, odr);
+
}
void yf::Zoom::Backend::search(ZOOM_query q, Odr_int *hits,
ccl_qual_rm(&ccl_bibset);
}
-yf::Zoom::Frontend::Frontend(Impl *impl) :
+yf::Zoom::Frontend::Frontend(Impl *impl) :
m_p(impl), m_is_virtual(false), m_in_use(true)
{
}
boost::mutex::scoped_lock lock(m_mutex);
std::map<mp::Session,yf::Zoom::FrontendPtr>::iterator it;
-
+
while(true)
{
it = m_clients.find(package.session());
if (it == m_clients.end())
break;
-
+
if (!it->second->m_in_use)
{
it->second->m_in_use = true;
{
boost::mutex::scoped_lock lock(m_mutex);
std::map<mp::Session,yf::Zoom::FrontendPtr>::iterator it;
-
+
it = m_clients.find(package.session());
if (it != m_clients.end())
{
}
yf::Zoom::Impl::Impl() :
- apdu_log(false), element_transform("pz2") , element_raw("raw"),
+ apdu_log(false), element_transform("pz2") , element_raw("raw") ,
+ element_passthru("F"),
zoom_timeout("40"), proxy_timeout(1)
{
bibset = ccl_qual_mk();
yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr)
{
Zoom::SearchablePtr s(new Searchable(bibset));
-
+
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
if (ptr->type != XML_ELEMENT_NODE)
s->authentication = mp::xml::get_text(ptr);
}
else if (!strcmp((const char *) ptr->name,
+ "authenticationMode"))
+ {
+ s->authenticationMode = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name,
"cfAuth"))
{
s->cfAuth = mp::xml::get_text(ptr);
- }
+ }
else if (!strcmp((const char *) ptr->name,
"cfProxy"))
{
s->cfProxy = mp::xml::get_text(ptr);
- }
+ }
else if (!strcmp((const char *) ptr->name,
"cfSubDB"))
{
s->cfSubDB = mp::xml::get_text(ptr);
- }
+ }
else if (!strcmp((const char *) ptr->name,
"contentConnector"))
{
s->contentConnector = mp::xml::get_text(ptr);
- }
+ }
else if (!strcmp((const char *) ptr->name, "udb"))
{
s->udb = mp::xml::get_text(ptr);
{
s->sortStrategy = mp::xml::get_text(ptr);
}
+ else if (!strcmp((const char *) ptr->name,
+ "extraArgs"))
+ {
+ s->extraArgs = mp::xml::get_text(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name, "rpn2cql"))
+ s->rpn2cql_fname = mp::xml::get_text(ptr);
}
return s;
}
{
while (ptr && ptr->type != XML_ELEMENT_NODE)
ptr = ptr->next;
-
+
if (ptr)
{
if (!strcmp((const char *) ptr->name, "records"))
else
{
throw mp::filter::FilterException
- ("Bad element "
+ ("Bad element "
+ std::string((const char *) ptr->name)
+ " in zoom filter inside element "
"<torus><records>");
else
{
throw mp::filter::FilterException
- ("Bad element "
+ ("Bad element "
+ std::string((const char *) ptr->name)
+ " in zoom filter inside element <torus>");
}
torus_searchable_url = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "content_url"))
torus_content_url = mp::xml::get_text(attr->children);
+ else if (!strcmp((const char *) attr->name, "auth_url"))
+ torus_auth_url = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "realm"))
default_realm = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "xsldir"))
element_transform = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "element_raw"))
element_raw = mp::xml::get_text(attr->children);
+ else if (!strcmp((const char *) attr->name, "element_passthru"))
+ element_passthru = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "proxy"))
proxy = mp::xml::get_text(attr->children);
else if (!strcmp((const char *) attr->name, "explain_xsl"))
{
yaz_log(YLOG_WARN,
"contentProxy's server attribute is deprecated");
- yaz_log(YLOG_LOG,
+ yaz_log(YLOG_LOG,
"Specify config_file instead. For example:");
- yaz_log(YLOG_LOG,
+ yaz_log(YLOG_LOG,
" content_file=\"/etc/cf-proxy/cproxy.cfg\"");
content_proxy_server = mp::xml::get_text(attr->children);
}
}
}
else if (!strcmp((const char *) ptr->name, "log"))
- {
+ {
const struct _xmlAttr *attr;
for (attr = ptr->properties; attr; attr = attr->next)
{
else
{
throw mp::filter::FilterException
- ("Bad element "
+ ("Bad element "
+ std::string((const char *) ptr->name)
+ " in zoom filter");
}
if (explain_xslt_fname.length())
{
const char *path = 0;
-
+
if (xsldir.length())
path = xsldir.c_str();
else
path = file_path.c_str();
-
+
char fullpath[1024];
char *cp = yaz_filepath_resolve(explain_xslt_fname.c_str(),
path, 0, fullpath);
xmlFreeDoc(xsp_doc);
throw mp::filter::FilterException
("Cannot parse XSLT " + explain_xslt_fname);
-
+
}
}
if (record_xslt_fname.length())
{
const char *path = 0;
-
+
if (xsldir.length())
path = xsldir.c_str();
else
path = file_path.c_str();
-
+
char fullpath[1024];
char *cp = yaz_filepath_resolve(record_xslt_fname.c_str(),
path, 0, fullpath);
xmlFreeDoc(xsp_doc);
throw mp::filter::FilterException
("Cannot parse XSLT " + record_xslt_fname);
-
+
}
}
}
proxyhostname = m_p->content_proxy_server;
legacy_format = true;
}
-
+
if (m_p->content_tmp_file.length())
tmp_file = m_p->content_tmp_file;
while (*cp == ' ')
cp++;
if (!strcmp(buf, "proxyhostname"))
- proxyhostname = cp;
+ proxyhostname = cp;
if (!strcmp(buf, "sessiondir") && *cp)
{
if (cp[strlen(cp)-1] == '/')
"unable to open content config %s",
m_p->content_config_file.c_str());
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- *addinfo = (char *) odr_malloc(odr, 60 + tmp_file.length());
- sprintf(*addinfo, "unable to open content config %s",
+ *addinfo = (char *) odr_malloc(odr, 70 + tmp_file.length());
+ sprintf(*addinfo, "zoom: unable to open content config %s",
m_p->content_config_file.c_str());
return false;
}
package.log("zoom", YLOG_WARN, "bad tmp_file %s", tmp_file.c_str());
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
*addinfo = (char *) odr_malloc(odr, 60 + tmp_file.length());
- sprintf(*addinfo, "bad format of content tmp_file: %s",
+ sprintf(*addinfo, "zoom: bad format of content tmp_file: %s",
tmp_file.c_str());
xfree(fname);
return false;
{
package.log("zoom", YLOG_WARN|YLOG_ERRNO, "create %s", fname);
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- *addinfo = (char *) odr_malloc(odr, 40 + strlen(fname));
- sprintf(*addinfo, "Could not create %s", fname);
+ *addinfo = (char *) odr_malloc(odr, 50 + strlen(fname));
+ sprintf(*addinfo, "zoom: could not create %s", fname);
xfree(fname);
return false;
}
yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
mp::Package &package,
std::string &database, int *error, char **addinfo, mp::odr &odr,
- int *proxy_step, std::string &proxy)
+ int *proxy_step)
{
- proxy.clear();
+ bool connection_reuse = false;
+ std::string proxy;
+
std::list<BackendPtr>::const_iterator map_it;
- if (m_backend && !m_backend->enable_explain &&
+ if (m_backend && !m_backend->enable_explain &&
m_backend->m_frontend_database == database)
{
- m_backend->connect("", error, addinfo, odr);
- return m_backend;
+ connection_reuse = true;
+ proxy = m_backend->m_proxy;
}
std::string input_args;
std::string authentication;
std::string content_authentication;
std::string content_proxy;
- std::string realm = m_p->default_realm;
+ std::string realm = session_realm;
+ if (realm.length() == 0)
+ realm = m_p->default_realm;
const char *param_user = 0;
const char *param_password = 0;
odr_malloc(odr, (10 + no_parms) * sizeof(*out_names));
const char **out_values = (const char **)
odr_malloc(odr, (10 + no_parms) * sizeof(*out_values));
-
+
// may be changed if it's a content connection
std::string torus_url = m_p->torus_searchable_url;
int i;
char **dstr;
int dnum = 0;
nmem_strsplit(((ODR) odr)->mem, ",", value, &dstr, &dnum);
- if (*proxy_step >= dnum)
- *proxy_step = 0;
+ if (connection_reuse)
+ {
+ // find the step after our current proxy
+ int i;
+ for (i = 0; i < dnum; i++)
+ if (!strcmp(proxy.c_str(), dstr[i]))
+ break;
+ if (i >= dnum - 1)
+ *proxy_step = 0;
+ else
+ *proxy_step = i + 1;
+ }
else
{
- proxy = dstr[*proxy_step];
-
- (*proxy_step)++;
- if (*proxy_step == dnum)
+ // step is known.. Guess our proxy from it
+ if (*proxy_step >= dnum)
*proxy_step = 0;
+ else
+ {
+ proxy = dstr[*proxy_step];
+
+ (*proxy_step)++;
+ if (*proxy_step == dnum)
+ *proxy_step = 0;
+ }
}
}
else if (!strcmp(name, "cproxysession"))
out_values[no_out_args++] = value;
torus_url = m_p->torus_content_url;
}
- else if (!strcmp(name, "realm"))
+ else if (!strcmp(name, "realm") && session_realm.length() == 0)
realm = value;
+ else if (!strcmp(name, "torus_url") && session_realm.length() == 0)
+ torus_url = value;
else if (name[0] == 'x' && name[1] == '-')
{
out_names[no_out_args] = name;
BackendPtr notfound;
char *msg = (char*) odr_malloc(odr, strlen(name) + 30);
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- sprintf(msg, "Bad database argument: %s", name);
+ sprintf(msg, "zoom: bad database argument: %s", name);
*addinfo = msg;
return notfound;
}
}
+ if (proxy.length())
+ package.log("zoom", YLOG_LOG, "proxy: %s", proxy.c_str());
+
+ if (connection_reuse)
+ {
+ m_backend->connect("", error, addinfo, odr);
+ return m_backend;
+ }
+
if (param_user)
{
authentication = std::string(param_user);
}
if (torus_db.compare("IR-Explain---1") == 0)
- return explain_search(package, database, error, addinfo, odr, torus_db,
- realm);
-
+ return explain_search(package, database, error, addinfo, odr, torus_url,
+ torus_db, realm);
+
SearchablePtr sptr;
std::map<std::string,SearchablePtr>::iterator it;
realm, m_p->proxy);
if (!doc)
{
- *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
- *addinfo = odr_strdup(odr, torus_db.c_str());
+ *error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ *addinfo = odr_strdup(odr, "Torus server unavailable or "
+ "incorrectly configured");
BackendPtr b;
return b;
}
const xmlNode *ptr = xmlDocGetRootElement(doc);
- if (ptr)
- { // presumably ptr is a records element node
- // parse first record in document
- for (ptr = ptr->children; ptr; ptr = ptr->next)
+ if (ptr && ptr->type == XML_ELEMENT_NODE)
+ {
+ if (!strcmp((const char *) ptr->name, "record"))
+ {
+ sptr = m_p->parse_torus_record(ptr);
+ }
+ else if (!strcmp((const char *) ptr->name, "records"))
{
- if (ptr->type == XML_ELEMENT_NODE
- && !strcmp((const char *) ptr->name, "record"))
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
{
- if (sptr)
+ if (ptr->type == XML_ELEMENT_NODE
+ && !strcmp((const char *) ptr->name, "record"))
{
- *error = YAZ_BIB1_UNSPECIFIED_ERROR;
- *addinfo = (char*) odr_malloc(odr, 40 + database.length()),
- sprintf(*addinfo, "multiple records for udb=%s",
- database.c_str());
- xmlFreeDoc(doc);
- BackendPtr b;
- return b;
+ if (sptr)
+ {
+ *error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ *addinfo = (char*)
+ odr_malloc(odr, 40 + torus_db.length());
+ sprintf(*addinfo, "multiple records for udb=%s",
+ database.c_str());
+ xmlFreeDoc(doc);
+ BackendPtr b;
+ return b;
+ }
+ sptr = m_p->parse_torus_record(ptr);
}
- sptr = m_p->parse_torus_record(ptr);
}
}
+ else
+ {
+ *error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ *addinfo = (char*) odr_malloc(
+ odr, 40 + strlen((const char *) ptr->name));
+ sprintf(*addinfo, "bad root element for torus: %s", ptr->name);
+ xmlFreeDoc(doc);
+ BackendPtr b;
+ return b;
+ }
}
xmlFreeDoc(doc);
}
BackendPtr b;
return b;
}
-
+
xsltStylesheetPtr xsp = 0;
if (sptr->transform_xsl_content.length())
{
if (!xsp_doc)
{
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- *addinfo = (char *) odr_malloc(odr, 40);
- sprintf(*addinfo, "xmlParseMemory failed");
+ *addinfo = odr_strdup(odr, "zoom: xmlParseMemory failed "
+ "for literalTransform XSL");
BackendPtr b;
return b;
}
if (!xsp)
{
*error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
- *addinfo = odr_strdup(odr, "xsltParseStylesheetDoc failed");
+ *addinfo =
+ odr_strdup(odr,"zoom: xsltParseStylesheetDoc failed "
+ "for literalTransform XSL");
BackendPtr b;
xmlFreeDoc(xsp_doc);
return b;
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
*addinfo = (char *)
odr_malloc(odr, 40 + sptr->transform_xsl_fname.length());
- sprintf(*addinfo, "File could not be read: %s",
+ sprintf(*addinfo, "zoom: could not open file %s",
sptr->transform_xsl_fname.c_str());
BackendPtr b;
return b;
if (!xsp_doc)
{
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- *addinfo = (char *) odr_malloc(odr, 40 + fname.length());
- sprintf(*addinfo, "xmlParseFile failed. File: %s", fname.c_str());
+ *addinfo = (char *) odr_malloc(odr, 50 + fname.length());
+ sprintf(*addinfo, "zoom: xmlParseFile failed for file %s",
+ fname.c_str());
BackendPtr b;
return b;
}
xsp = xsltParseStylesheetDoc(xsp_doc);
if (!xsp)
{
- *error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
- *addinfo = odr_strdup(odr, "xsltParseStylesheetDoc failed");
+ *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+ *addinfo = (char *) odr_malloc(odr, 50 + fname.length());
+ sprintf(*addinfo, "zoom: xsltParseStylesheetDoc failed "
+ "for file %s", fname.c_str());
BackendPtr b;
xmlFreeDoc(xsp_doc);
return b;
}
}
+ cql_transform_t cqlt = 0;
+ if (sptr->rpn2cql_fname.length())
+ {
+ char fullpath[1024];
+ char *cp = yaz_filepath_resolve(sptr->rpn2cql_fname.c_str(),
+ m_p->file_path.c_str(), 0, fullpath);
+ if (cp)
+ cqlt = cql_transform_open_fname(fullpath);
+ }
+ else
+ cqlt = cql_transform_create();
+
+ if (!cqlt)
+ {
+ *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+ *addinfo = odr_strdup(odr, "zoom: missing/invalid cql2rpn file");
+ BackendPtr b;
+ xsltFreeStylesheet(xsp);
+ return b;
+ }
+
m_backend.reset();
BackendPtr b(new Backend);
+ b->cqlt = cqlt;
b->sptr = sptr;
b->xsp = xsp;
b->m_frontend_database = database;
if (sptr->query_encoding.length())
b->set_option("rpnCharset", sptr->query_encoding);
+ std::string extraArgs = sptr->extraArgs;
+
b->set_option("timeout", m_p->zoom_timeout.c_str());
-
- if (m_p->apdu_log)
+
+ if (m_p->apdu_log)
b->set_option("apdulog", "1");
if (sptr->piggyback && sptr->sru.length())
if (proxy.length() == 0)
proxy = sptr->cfProxy;
-
+ b->m_proxy = proxy;
+
if (sptr->cfAuth.length())
{
// A CF target
out_names[no_out_args] = "user";
out_values[no_out_args++] =
odr_strdup(odr, authentication.c_str());
- }
+ }
}
if (proxy.length())
{
}
else
{
- size_t found = authentication.find('/');
-
- if (sptr->sru.length() && found != std::string::npos)
- {
- b->set_option("user", authentication.substr(0, found));
- b->set_option("password", authentication.substr(found+1));
- }
+ if (sptr->sru.length() == 0)
+ b->set_option("user", authentication); /* Z39.50 */
else
- b->set_option("user", authentication);
+ {
+ std::string user;
+ std::string password;
+ std::string authtype = sptr->authenticationMode;
+
+ {
+ const char *cstr = authentication.c_str();
+ const char *cp1 = strchr(cstr, '/');
+ if (cp1)
+ {
+ password.assign(cp1 + 1);
+ user.assign(cstr, cp1 - cstr);
+ }
+ else
+ user.assign(cstr);
+ }
+ if (authtype.compare("url") == 0)
+ {
+ /* SRU URL encoding of auth stuff */
+ ODR o = odr_createmem(ODR_ENCODE);
+ char *path = 0;
+ const char *names[3];
+ const char *values[3];
+
+ names[0] = "x-username";
+ values[0] = user.c_str();
+ names[1] = "x-password";
+ values[1] = password.c_str();
+ names[2] = 0;
+ values[2] = 0;
+
+ yaz_array_to_uri(&path, o, (char **) names, (char **) values);
+ if (extraArgs.length())
+ extraArgs.append("&");
+ extraArgs.append(path);
+ odr_destroy(o);
+ }
+ else
+ {
+ b->set_option("user", user);
+ if (password.length())
+ b->set_option("password", password);
+ }
+ }
if (proxy.length())
b->set_option("proxy", proxy);
}
- if (proxy.length())
- package.log("zoom", YLOG_LOG, "proxy: %s", proxy.c_str());
-
- std::string url;
+ if (extraArgs.length())
+ b->set_option("extraArgs", extraArgs);
+
+ std::string url(sptr->target);
if (sptr->sru.length())
{
- url = "http://" + sptr->target;
b->set_option("sru", sptr->sru);
-
+ if (url.find("://") == std::string::npos)
+ url = "http://" + url;
if (sptr->sru_version.length())
b->set_option("sru_version", sptr->sru_version);
}
- else
- {
- url = sptr->target;
- }
if (no_out_args)
{
char *x_args = 0;
out_names[no_out_args] = 0; // terminate list
-
+
yaz_array_to_uri(&x_args, odr, (char **) out_names,
(char **) out_values);
url += "," + std::string(x_args);
{
char oid_name_str[OID_STR_MAX];
const char *syntax_name = 0;
-
+
if (preferredRecordSyntax &&
!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml))
{
enable_pz2_retrieval = true;
enable_pz2_transform = true;
}
- else if (element_set_name &&
+ else if (element_set_name &&
!strcmp(element_set_name, m_p->element_raw.c_str()))
{
enable_pz2_retrieval = true;
enable_record_transform = true;
}
}
-
+
if (enable_pz2_retrieval)
{
std::string configured_request_syntax = b->sptr->request_syntax;
if (configured_request_syntax.length())
{
syntax_name = configured_request_syntax.c_str();
- const Odr_oid *syntax_oid =
+ const Odr_oid *syntax_oid =
yaz_string_to_oid(yaz_oid_std(), CLASS_RECSYN, syntax_name);
if (!oid_oidcmp(syntax_oid, yaz_oid_recsyn_usmarc)
|| !oid_oidcmp(syntax_oid, yaz_oid_recsyn_opac))
if (enable_pz2_retrieval)
{
- element_set_name = 0;
- if (b->sptr->element_set.length())
- element_set_name = b->sptr->element_set.c_str();
+ if (element_set_name && !strcmp(element_set_name,
+ m_p->element_passthru.c_str()))
+ ;
+ else
+ {
+ element_set_name = 0;
+ if (b->sptr->element_set.length())
+ element_set_name = b->sptr->element_set.c_str();
+ }
}
b->set_option("elementSetName", element_set_name);
}
Z_Records *yf::Zoom::Frontend::get_explain_records(
- Package &package,
+ mp::Package &package,
Odr_int start,
Odr_int number_to_present,
int *error,
number_to_present = 10000;
xmlNode *ptr = xmlDocGetRootElement(b->explain_doc);
-
+
Z_NamePlusRecordList *npl = (Z_NamePlusRecordList *)
odr_malloc(odr, sizeof(*npl));
npl->records = (Z_NamePlusRecord **)
odr_malloc(odr, number_to_present * sizeof(*npl->records));
-
+
for (i = 0; i < number_to_present; i++)
{
int num = 0;
}
-Z_Records *yf::Zoom::Frontend::get_records(Package &package,
+Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
Odr_int start,
Odr_int number_to_present,
int *error,
if (start < 0 || number_to_present <=0)
return records;
-
+
if (number_to_present > 10000)
number_to_present = 10000;
const char *xsl_parms[3];
mp::wrbuf cproxy_host;
-
+
if (b->enable_cproxy && b->cproxy_host.length())
{
wrbuf_puts(cproxy_host, "\"");
int sur_error = ZOOM_record_error(recs[i], 0 /* msg */,
&addinfo, 0 /* diagset */);
-
+
if (sur_error)
{
log_diagnostic(package, sur_error, addinfo);
odr, odr_database, error, addinfo);
}
else
- {
+ {
// first stage XSLT - per target
xsltStylesheetPtr xsp = b->xsp;
xmlDoc *rec_res = xsltApplyStylesheet(xsp, rec_doc,
// insert generated-url
if (rec_res)
{
- std::string res =
+ std::string res =
mp::xml::url_recipe_handle(rec_res,
b->sptr->urlRecipe);
if (res.length())
xmlNode *ptr = xmlDocGetRootElement(rec_res);
while (ptr && ptr->type != XML_ELEMENT_NODE)
ptr = ptr->next;
- xmlNode *c =
+ xmlNode *c =
xmlNewChild(ptr, 0, BAD_CAST "metadata", 0);
xmlNewProp(c, BAD_CAST "type", BAD_CAST
"generated-url");
{
if (!rec_buf)
npr = zget_surrogateDiagRec(
- odr, odr_database,
+ odr, odr_database,
YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
rec_type_str);
else
else
{
npr = zget_surrogateDiagRec(
- odr, odr_database,
+ odr, odr_database,
YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS,
"ZOOM_record, type ext");
}
int *error,
char **addinfo,
mp::odr &odr,
+ std::string torus_url,
std::string &torus_db,
std::string &realm)
{
b->m_frontend_database = database;
b->enable_explain = true;
-
+
Z_GDU *gdu = package.request().get();
Z_APDU *apdu_req = gdu->u.z3950;
Z_SearchRequest *sr = apdu_req->u.searchRequest;
else if (query->which == Z_Query_type_104 &&
query->u.type_104->which == Z_External_CQL)
{
- std::string torus_url = m_p->torus_searchable_url;
std::string torus_query(query->u.type_104->u.cql);
xmlDoc *doc = mp::get_searchable(package, torus_url, "",
torus_query,
if (!doc)
{
*error = YAZ_BIB1_UNSPECIFIED_ERROR;
- *addinfo = odr_strdup(odr, "IR-Explain---1 problem. "
- "Could not obtain Torus records for Explain");
+ *addinfo = odr_strdup(odr, "Torus server unavailable or "
+ "incorrectly configured");
}
else
{
xmlNode *ptr = xmlDocGetRootElement(doc);
int hits = 0;
-
+
xml_node_search(ptr, &hits, 0);
Z_APDU *apdu_res = odr.create_searchResponse(apdu_req, 0, 0);
yaz_poll_add(pfd.input_mask, yaz_poll_except);
if (cs->io_pending && CS_WANT_WRITE)
yaz_poll_add(pfd.input_mask, yaz_poll_write);
- else if (cs->io_pending & CS_WANT_READ)
+ if (cs->io_pending & CS_WANT_READ)
yaz_poll_add(pfd.input_mask, yaz_poll_read);
pfd.fd = cs_fileno(cs);
pfd.client_data = 0;
-
+
int ret = yaz_poll(&pfd, 1, secs, 0);
return ret > 0;
}
Z_GDU *gdu = z_get_HTTP_Request_uri(odr, uri, 0, 1);
gdu->u.HTTP_Request->method = odr_strdup(odr, "GET");
-
+
if (z_GDU(odr, &gdu, 0, 0))
{
int len;
char *buf = odr_getbuf(odr, &len, 0);
-
+
int ret = cs_connect(conn, add);
if (ret > 0 || (ret == 0 && wait_conn(conn, 1)))
{
if (!wait_conn(conn, proxy_timeout))
break;
}
+ if (ret == 0)
+ outcome = true;
}
}
cs_close(conn);
return outcome;
}
+bool yf::Zoom::Frontend::retry(mp::Package &package,
+ mp::odr &odr,
+ BackendPtr b,
+ int &error, char **addinfo,
+ int &proxy_step, int &same_retries,
+ int &proxy_retries)
+{
+ if (b && b->m_proxy.length() && !m_p->check_proxy(b->m_proxy.c_str()))
+ {
+ log_diagnostic(package, error, *addinfo);
+ package.log("zoom", YLOG_LOG, "proxy %s fails", b->m_proxy.c_str());
+ m_backend.reset();
+ if (proxy_step) // there is a failover
+ {
+ proxy_retries++;
+ package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
+ return true;
+ }
+ error = YAZ_BIB1_PROXY_FAILURE;
+ *addinfo = odr_strdup(odr, b->m_proxy.c_str());
+ }
+ else if (same_retries == 0 && proxy_retries == 0)
+ {
+ log_diagnostic(package, error, *addinfo);
+ same_retries++;
+ package.log("zoom", YLOG_WARN, "search failed: retry");
+ m_backend.reset();
+ proxy_step = 0;
+ return true;
+ }
+ return false;
+}
+
void yf::Zoom::Frontend::handle_search(mp::Package &package)
{
Z_GDU *gdu = package.request().get();
int error = 0;
char *addinfo = 0;
std::string db(sr->databaseNames[0]);
- std::string proxy;
BackendPtr b = get_backend_from_databases(package, db, &error,
- &addinfo, odr, &proxy_step,
- proxy);
-
+ &addinfo, odr, &proxy_step);
if (error)
{
- if (proxy.length() && !m_p->check_proxy(proxy.c_str()))
- {
- if (proxy_step) // there is a failover
- {
- proxy_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
- m_backend.reset();
- goto next_proxy;
- }
- error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- addinfo = odr_strdup(odr, "proxy failure");
- }
- else if (same_retries == 0 && proxy_retries == 0)
- {
- same_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying first proxy");
- m_backend.reset();
- proxy_step = 0;
+ if (retry(package, odr, b, error, &addinfo, proxy_step,
+ same_retries, proxy_retries))
goto next_proxy;
- }
}
if (error)
{
error = YAZ_BIB1_MALFORMED_QUERY;
const char *addinfo = "CQL syntax error";
log_diagnostic(package, error, addinfo);
- apdu_res =
+ apdu_res =
odr.create_searchResponse(apdu_req, error, addinfo);
package.response() = apdu_res;
return;
addinfo = 0;
if (cn_error->which == CQL_NODE_ST)
addinfo = cn_error->u.st.index;
-
+
log_diagnostic(package, error, addinfo);
apdu_res = odr.create_searchResponse(apdu_req, error, addinfo);
package.response() = apdu_res;
cql_parser_destroy(cp);
return;
}
- char ccl_buf[1024];
- r = cql_to_ccl_buf(cn, ccl_buf, sizeof(ccl_buf));
+ r = cql_to_ccl(cn, wrbuf_vp_puts, ccl_wrbuf);
if (r)
{
error = YAZ_BIB1_MALFORMED_QUERY;
mp::wrbuf sort_spec_wrbuf;
yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sru_sortkeys_wrbuf),
sort_spec_wrbuf);
- wrbuf_puts(ccl_wrbuf, ccl_buf);
-
yaz_tok_cfg_t tc = yaz_tok_cfg_create();
yaz_tok_parse_t tp =
yaz_tok_parse_buf(tc, wrbuf_cstr(sort_spec_wrbuf));
yaz_tok_cfg_destroy(tc);
-
+
/* go through sortspec and map fields */
int token = yaz_tok_move(tp);
while (token != YAZ_TOK_EOF)
switch (cerror)
{
case CCL_ERR_UNKNOWN_QUAL:
- case CCL_ERR_TRUNC_NOT_LEFT:
+ case CCL_ERR_TRUNC_NOT_LEFT:
case CCL_ERR_TRUNC_NOT_RIGHT:
case CCL_ERR_TRUNC_NOT_BOTH:
#ifdef CCL_ERR_TRUNC_NOT_EMBED
package.log("zoom", YLOG_LOG, "RPN: %s", wrbuf_cstr(pqf_wrbuf));
ccl_rpn_delete(cn);
}
-
+
assert(pqf_wrbuf.len());
ZOOM_query q = ZOOM_query_create();
Z_RPNQuery *zquery;
zquery = p_query_rpn(odr, wrbuf_cstr(pqf_wrbuf));
mp::wrbuf wrb;
-
+
if (!strcmp(b->get_option("sru"), "solr"))
{
solr_transform_t cqlt = solr_transform_create();
-
+
status = solr_transform_rpn2solr_wrbuf(cqlt, wrb, zquery);
-
+
solr_transform_close(cqlt);
}
else
{
- cql_transform_t cqlt = cql_transform_create();
-
- status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery);
-
- cql_transform_close(cqlt);
+ status = cql_transform_rpn2cql_wrbuf(b->cqlt, wrb, zquery);
}
if (status == 0)
{
b->search(q, &hits, &error, &addinfo, odr);
}
ZOOM_query_destroy(q);
-
+
if (status)
{
error = YAZ_BIB1_MALFORMED_QUERY;
- const char *addinfo = "can not convert from RPN to CQL/SOLR";
+ const char *addinfo = "can not convert from RPN to CQL/Solr";
log_diagnostic(package, error, addinfo);
apdu_res = odr.create_searchResponse(apdu_req, error, addinfo);
package.response() = apdu_res;
if (error)
{
- if (proxy.length() && !m_p->check_proxy(proxy.c_str()))
- {
- if (proxy_step) // there is a failover
- {
- proxy_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying next proxy");
- m_backend.reset();
- goto next_proxy;
- }
- error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- addinfo = odr_strdup(odr, "proxy failure");
- }
- else if (same_retries == 0 && proxy_retries == 0)
- {
- same_retries++;
- package.log("zoom", YLOG_WARN, "search failed: trying first proxy");
- m_backend.reset();
- proxy_step = 0;
+ if (retry(package, odr, b, error, &addinfo, proxy_step,
+ same_retries, proxy_retries))
goto next_proxy;
- }
}
const char *element_set_name = 0;
Odr_int number_to_present = 0;
if (!error)
mp::util::piggyback_sr(sr, hits, number_to_present, &element_set_name);
-
+
Odr_int number_of_records_returned = 0;
Z_Records *records = get_records(
package,
if (comp && comp->which != Z_RecordComp_simple)
{
package.response() = odr.create_presentResponse(
- apdu_req,
+ apdu_req,
YAZ_BIB1_PRESENT_COMP_SPEC_PARAMETER_UNSUPP, 0);
return;
}
*pr->resultSetStartPoint - 1, *pr->numberOfRecordsRequested,
&error, &addinfo, &number_of_records_returned, odr, m_backend,
pr->preferredRecordSyntax, element_set_name);
-
+
apdu_res = odr.create_presentResponse(apdu_req, error, addinfo);
if (records)
{
*pr->resultSetStartPoint - 1, *pr->numberOfRecordsRequested,
&error, &addinfo, &number_of_records_returned, odr, m_backend,
pr->preferredRecordSyntax, element_set_name);
-
+
apdu_res = odr.create_presentResponse(apdu_req, error, addinfo);
if (records)
{
}
}
+std::string escape_cql_term(std::string inp)
+{
+ std::string res;
+ size_t l = inp.length();
+ size_t i;
+ for (i = 0; i < l; i++)
+ {
+ if (strchr("*?^\"", inp[i]))
+ res += "\\";
+ res += inp[i];
+ }
+ return res;
+}
+
+void yf::Zoom::Frontend::auth(mp::Package &package, Z_InitRequest *req,
+ int *error, char **addinfo, ODR odr)
+{
+ if (m_p->torus_auth_url.length() == 0)
+ return;
+
+ std::string user;
+ std::string password;
+ if (req->idAuthentication)
+ {
+ Z_IdAuthentication *auth = req->idAuthentication;
+ switch (auth->which)
+ {
+ case Z_IdAuthentication_open:
+ if (auth->u.open)
+ {
+ const char *cp = strchr(auth->u.open, '/');
+ if (cp)
+ {
+ user.assign(auth->u.open, cp - auth->u.open);
+ password.assign(cp + 1);
+ }
+ }
+ break;
+ case Z_IdAuthentication_idPass:
+ if (auth->u.idPass->userId)
+ user.assign(auth->u.idPass->userId);
+ if (auth->u.idPass->password)
+ password.assign(auth->u.idPass->password);
+ break;
+ }
+ }
+
+ std::string ip = package.origin().get_address();
+ yaz_log(YLOG_LOG, "IP=%s", ip.c_str());
+
+ std::string torus_query;
+ int failure_code;
+
+ if (user.length() && password.length())
+ {
+ torus_query = "userName==\"" + escape_cql_term(user) +
+ "\" and password==\"" + escape_cql_term(password) + "\"";
+ failure_code = YAZ_BIB1_INIT_AC_BAD_USERID_AND_OR_PASSWORD;
+ }
+ else
+ {
+ const char *ip_cstr = ip.c_str();
+ const char *cp = strchr(ip_cstr, ':');
+ if (cp)
+ ip_cstr = cp + 1;
+
+ torus_query = "ip encloses/net.ipaddress \"";
+ torus_query += escape_cql_term(std::string(ip_cstr));
+ torus_query += "\"";
+ failure_code = YAZ_BIB1_INIT_AC_BLOCKED_NETWORK_ADDRESS;
+ }
+
+ std::string dummy_db;
+ std::string dummy_realm;
+ xmlDoc *doc = mp::get_searchable(package, m_p->torus_auth_url, dummy_db,
+ torus_query, dummy_realm, m_p->proxy);
+ if (!doc)
+ {
+ // something fundamental broken in lookup.
+ *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+ *addinfo = odr_strdup(odr, "zoom: torus server unavailable or "
+ "incorrectly configured.");
+ return;
+ }
+ const xmlNode *ptr = xmlDocGetRootElement(doc);
+ if (ptr && ptr->type == XML_ELEMENT_NODE)
+ {
+ if (strcmp((const char *) ptr->name, "records") == 0)
+ {
+ ptr = ptr->children;
+ while (ptr && ptr->type != XML_ELEMENT_NODE)
+ ptr = ptr->next;
+ }
+ if (ptr && strcmp((const char *) ptr->name, "record") == 0)
+ {
+ ptr = ptr->children;
+ while (ptr && ptr->type != XML_ELEMENT_NODE)
+ ptr = ptr->next;
+ }
+ if (ptr && strcmp((const char *) ptr->name, "layer") == 0)
+ {
+ ptr = ptr->children;
+ while (ptr && ptr->type != XML_ELEMENT_NODE)
+ ptr = ptr->next;
+ }
+ while (ptr)
+ {
+ if (ptr && ptr->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) ptr->name, "identityId"))
+ break;
+ ptr = ptr->next;
+ }
+ }
+ if (!ptr)
+ {
+ *error = failure_code;
+ return;
+ }
+ session_realm = mp::xml::get_text(ptr);
+}
+
void yf::Zoom::Impl::process(mp::Package &package)
{
FrontendPtr f = get_frontend(package);
{
Z_InitRequest *req = gdu->u.z3950->u.initRequest;
f->m_init_gdu = gdu;
-
+
mp::odr odr;
Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
Z_InitResponse *resp = apdu->u.initResponse;
-
+
int i;
static const int masks[] = {
Z_Options_search,
Z_Options_present,
- -1
+ -1
};
for (i = 0; masks[i] != -1; i++)
if (ODR_MASK_GET(req->options, masks[i]))
ODR_MASK_SET(resp->options, masks[i]);
-
+
static const int versions[] = {
Z_ProtocolVersion_1,
Z_ProtocolVersion_2,
ODR_MASK_SET(resp->protocolVersion, versions[i]);
else
break;
-
+
*resp->preferredMessageSize = *req->preferredMessageSize;
*resp->maximumRecordSize = *req->maximumRecordSize;
-
+
+ int error = 0;
+ char *addinfo = 0;
+ f->auth(package, req, &error, &addinfo, odr);
+ if (error)
+ {
+ resp->userInformationField =
+ zget_init_diagnostics(odr, error, addinfo);
+ *resp->result = 0;
+ package.session().close();
+ }
+ else
+ f->m_is_virtual = true;
package.response() = apdu;
- f->m_is_virtual = true;
}
else
package.move();