#include <yaz/tokenizer.h>
#include <yaz/zoom.h>
#include <yaz/otherinfo.h>
+#include <yaz/match_glob.h>
namespace mp = metaproxy_1;
namespace yf = mp::filter;
class Zoom::Backend : boost::noncopyable {
friend class Impl;
friend class Frontend;
- std::string zurl;
mp::wrbuf m_apdu_wrbuf;
ZOOM_connection m_connection;
ZOOM_resultset m_resultset;
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 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);
- BackendPtr get_backend_from_databases(mp::Package &package,
- std::string &database,
- int *error,
- char **addinfo,
- mp::odr &odr,
- int *proxy_step);
+ void get_backend_from_databases(mp::Package &package,
+ std::string &database,
+ int *error,
+ char **addinfo,
+ mp::odr &odr,
+ int *proxy_step);
bool create_content_session(mp::Package &package,
BackendPtr b,
std::string torus_searchable_url;
std::string torus_content_url;
std::string torus_auth_url;
+ std::string torus_allow_ip;
std::string default_realm;
std::string torus_auth_hostname;
std::map<std::string,std::string> fieldmap;
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, "allow_ip"))
+ torus_allow_ip = 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, "auth_hostname"))
return true;
}
-yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
+void yf::Zoom::Frontend::get_backend_from_databases(
mp::Package &package,
std::string &database, int *error, char **addinfo, mp::odr &odr,
int *proxy_step)
bool connection_reuse = false;
std::string proxy;
- std::list<BackendPtr>::const_iterator map_it;
if (m_backend && !m_backend->enable_explain &&
m_backend->m_frontend_database == database)
{
else
torus_db = database;
- std::string authentication;
- std::string content_authentication;
std::string content_proxy;
std::string realm = session_realm;
if (realm.length() == 0)
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
sprintf(msg, "zoom: bad database argument: %s", name);
*addinfo = msg;
- return notfound;
+ return;
}
}
if (proxy.length())
if (connection_reuse)
{
m_backend->connect("", error, addinfo, odr);
- return m_backend;
- }
-
- if (param_user)
- {
- authentication = std::string(param_user);
- if (param_password)
- authentication += "/" + std::string(param_password);
- }
- if (param_content_user)
- {
- content_authentication = std::string(param_content_user);
- if (param_content_password)
- content_authentication += "/" + std::string(param_content_password);
+ return;
}
if (torus_db.compare("IR-Explain---1") == 0)
*error = YAZ_BIB1_UNSPECIFIED_ERROR;
if (torus_addinfo.length())
*addinfo = odr_strdup(odr, torus_addinfo.c_str());
- BackendPtr b;
- return b;
+ return;
}
const xmlNode *ptr = xmlDocGetRootElement(doc);
if (ptr && ptr->type == XML_ELEMENT_NODE)
sprintf(*addinfo, "multiple records for udb=%s",
database.c_str());
xmlFreeDoc(doc);
- BackendPtr b;
- return b;
+ return;
}
sptr = m_p->parse_torus_record(ptr);
}
odr, 40 + strlen((const char *) ptr->name));
sprintf(*addinfo, "bad root element for torus: %s", ptr->name);
xmlFreeDoc(doc);
- BackendPtr b;
- return b;
+ return;
}
}
xmlFreeDoc(doc);
{
*error = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
*addinfo = odr_strdup(odr, torus_db.c_str());
- BackendPtr b;
- return b;
+ return;
}
xsltStylesheetPtr xsp = 0;
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
*addinfo = odr_strdup(odr, "zoom: xmlParseMemory failed "
"for literalTransform XSL");
- BackendPtr b;
- return b;
+ return;
}
xsp = xsltParseStylesheetDoc(xsp_doc);
if (!xsp)
*addinfo =
odr_strdup(odr,"zoom: xsltParseStylesheetDoc failed "
"for literalTransform XSL");
- BackendPtr b;
xmlFreeDoc(xsp_doc);
- return b;
+ return;
}
}
else if (sptr->transform_xsl_fname.length())
odr_malloc(odr, 40 + sptr->transform_xsl_fname.length());
sprintf(*addinfo, "zoom: could not open file %s",
sptr->transform_xsl_fname.c_str());
- BackendPtr b;
- return b;
+ return;
}
xmlDoc *xsp_doc = xmlParseFile(fname.c_str());
if (!xsp_doc)
*addinfo = (char *) odr_malloc(odr, 50 + fname.length());
sprintf(*addinfo, "zoom: xmlParseFile failed for file %s",
fname.c_str());
- BackendPtr b;
- return b;
+ return;
}
xsp = xsltParseStylesheetDoc(xsp_doc);
if (!xsp)
*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;
+ return;
}
}
{
*error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
*addinfo = odr_strdup(odr, "zoom: missing/invalid cql2rpn file");
- BackendPtr b;
xsltFreeStylesheet(xsp);
- return b;
+ return;
}
m_backend.reset();
maximumRecords > 0 */
b->set_option("piggyback", sptr->piggyback ? "1" : "0");
- if (content_authentication.length() == 0)
- content_authentication = sptr->contentAuthentication;
-
- if (authentication.length() == 0)
- authentication = sptr->authentication;
+ std::string authentication = sptr->authentication;
+ if (param_user)
+ {
+ authentication = std::string(param_user);
+ if (param_password)
+ authentication += "/" + std::string(param_password);
+ }
+ std::string content_authentication = sptr->contentAuthentication;
+ if (param_content_user)
+ {
+ content_authentication = std::string(param_content_user);
+ if (param_content_password)
+ content_authentication += "/" + std::string(param_content_password);
+ }
if (proxy.length() == 0)
proxy = sptr->cfProxy;
{
// A CF target
b->set_option("user", sptr->cfAuth);
- if (authentication.length())
+ if (param_user)
+ {
+ out_names[no_out_args] = "user";
+ out_values[no_out_args++] = odr_strdup(odr, param_user);
+ if (param_password)
+ {
+ out_names[no_out_args] = "password";
+ out_values[no_out_args++] = odr_strdup(odr, param_password);
+ }
+ }
+ else if (authentication.length())
{
size_t found = authentication.find('/');
if (found != std::string::npos)
realm);
if (*error == 0)
m_backend = b;
- return b;
}
void yf::Zoom::Frontend::prepare_elements(BackendPtr b,
error, err_msg);
}
-yf::Zoom::BackendPtr yf::Zoom::Frontend::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 yf::Zoom::Frontend::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)
{
m_backend.reset();
*addinfo =
odr_strdup(odr, "IR-Explain---1 unsupported. "
"Torus explain_xsl not defined");
- return m_backend;
+ return;
}
else if (query->which == Z_Query_type_104 &&
query->u.type_104->which == Z_External_CQL)
if (b->explain_doc)
xmlFreeDoc(b->explain_doc);
b->explain_doc = doc;
- return m_backend;
}
else
{
*error = YAZ_BIB1_QUERY_TYPE_UNSUPP;
*addinfo = odr_strdup(odr, "IR-Explain---1 only supports CQL");
- return m_backend;
}
}
struct yaz_poll_fd pfd;
yaz_poll_add(pfd.input_mask, yaz_poll_except);
- if (cs->io_pending && CS_WANT_WRITE)
+ if (cs->io_pending & CS_WANT_WRITE)
yaz_poll_add(pfd.input_mask, yaz_poll_write);
if (cs->io_pending & CS_WANT_READ)
yaz_poll_add(pfd.input_mask, yaz_poll_read);
char *addinfo = 0;
std::string db(sr->databaseNames[0]);
- BackendPtr b = get_backend_from_databases(package, db, &error,
- &addinfo, odr, &proxy_step);
+ get_backend_from_databases(package, db, &error,
+ &addinfo, odr, &proxy_step);
+ BackendPtr b = m_backend;
if (error)
{
if (retry(package, odr, b, error, &addinfo, proxy_step,
}
Z_OtherInformation **oi = &req->otherInfo;
- const char *ip =
+ const char *ip_cstr =
yaz_oi_get_string_oid(oi, yaz_oid_userinfo_client_ip, 1, 0);
- if (!ip)
- ip = package.origin().get_address().c_str();
+ std::string ip;
+ if (ip_cstr)
+ ip = ip_cstr;
+ else
+ ip = package.origin().get_address();
- yaz_log(YLOG_LOG, "IP=%s", ip);
+ yaz_log(YLOG_LOG, "IP=%s", ip.c_str());
+ {
+ NMEM nmem = nmem_create();
+ char **darray;
+ int i, num;
+ nmem_strsplit_blank(nmem, m_p->torus_allow_ip.c_str(), &darray, &num);
+ for (i = 0; i < num; i++)
+ {
+ yaz_log(YLOG_LOG, "check against %s+%s", darray[i], ip.c_str());
+ if (yaz_match_glob(darray[i], ip.c_str()))
+ break;
+ }
+ nmem_destroy(nmem);
+ if (i < num)
+ return; /* allow this IP */
+ }
std::string torus_query;
int failure_code;
projects / metaproxy-moved-to-github.git / blobdiff