X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy-config.cpp;h=75818644129031053cdc291cc29c4ffda7cfe080;hb=850cba55769a7ed94d4da0e7c05b823e54ce3cc3;hp=951f1aa194b8b30f13667dfbddb0684ce7600639;hpb=94ada984aeaa696d6a0ba1ee1c33786b4a4350fe;p=yazproxy-moved-to-github.git diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp index 951f1aa..7581864 100644 --- a/src/yaz-proxy-config.cpp +++ b/src/yaz-proxy-config.cpp @@ -1,4 +1,4 @@ -/* $Id: yaz-proxy-config.cpp,v 1.16 2005-02-20 21:59:08 adam Exp $ +/* $Id: yaz-proxy-config.cpp,v 1.21 2005-06-21 18:46:04 adam Exp $ Copyright (c) 1998-2005, Index Data. This file is part of the yaz-proxy. @@ -21,84 +21,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include -#if HAVE_DLFCN_H -#include -#endif - #include #include "proxyp.h" - -class Yaz_ProxyModule { -private: - void *m_dl_handle; /* dlopen/close handle */ - Yaz_ProxyModule_entry *m_entry; - Yaz_ProxyModule *m_next; - void *m_user_handle; /* user handle */ -public: - Yaz_ProxyModule(void *dl_handle, Yaz_ProxyModule_entry *ent, - Yaz_ProxyModule *next); - ~Yaz_ProxyModule(); - Yaz_ProxyModule *get_next() { return m_next; }; - int authenticate(const char *user, const char *group, const char *password); -}; - -Yaz_ProxyModule::Yaz_ProxyModule(void *dl_handle, Yaz_ProxyModule_entry *ent, - Yaz_ProxyModule *next) -{ - m_dl_handle = dl_handle; - m_entry = ent; - m_next = next; - m_user_handle = 0; - if (m_entry->int_version == 0) - { - struct Yaz_ProxyModule_int0 *int0 = - reinterpret_cast(m_entry->fl); - if (int0->init) - m_user_handle = (*int0->init)(); - } -} - -Yaz_ProxyModule::~Yaz_ProxyModule() -{ - if (m_entry->int_version == 0) - { - struct Yaz_ProxyModule_int0 *int0 = - reinterpret_cast(m_entry->fl); - if (int0->destroy) - (*int0->destroy)(m_user_handle); - } -#if HAVE_DLFCN_H - dlclose(m_dl_handle); -#endif -} - -int Yaz_ProxyModule::authenticate(const char *user, const char *group, - const char *password) -{ - if (m_entry->int_version == 0) - { - struct Yaz_ProxyModule_int0 *int0 = - reinterpret_cast(m_entry->fl); - - if (!int0->authenticate) - return YAZPROXY_RET_NOT_ME; - return (*int0->authenticate)(m_user_handle, user, group, password); - } - return YAZPROXY_RET_NOT_ME; -} - class Yaz_ProxyConfigP { friend class Yaz_ProxyConfig; - Yaz_ProxyModule *m_modules; - + Yaz_ProxyModules m_modules; int mycmp(const char *hay, const char *item, size_t len); int match_list(int v, const char *m); int atoi_l(const char **cp); #if HAVE_XSLT void load_modules(void); - void unload_modules(void); int check_schema(xmlNodePtr ptr, Z_RecordComposition *comp, const char *schema_identifier); xmlDocPtr m_docPtr; @@ -108,9 +42,9 @@ class Yaz_ProxyConfigP { int *target_idletime, int *client_idletime, int *keepalive_limit_bw, int *keepalive_limit_pdu, int *pre_init, const char **cql2rpn, - const char **authentication, const char **negotiation_charset, - const char **negotiation_lang); + const char **negotiation_lang, + const char **target_charset); void return_limit(xmlNodePtr ptr, int *limit_bw, int *limit_pdu, int *limit_req); int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query, @@ -130,13 +64,12 @@ class Yaz_ProxyConfigP { ~Yaz_ProxyConfigP(); }; -Yaz_ProxyConfigP::Yaz_ProxyConfigP() +Yaz_ProxyConfigP::Yaz_ProxyConfigP() : m_modules() { #if HAVE_XSLT m_docPtr = 0; m_proxyPtr = 0; #endif - m_modules = 0; } Yaz_ProxyConfigP::~Yaz_ProxyConfigP() @@ -149,7 +82,7 @@ Yaz_ProxyConfigP::~Yaz_ProxyConfigP() Yaz_ProxyConfig::Yaz_ProxyConfig() { - m_cp = new Yaz_ProxyConfigP; + m_cp = new Yaz_ProxyConfigP(); } Yaz_ProxyConfig::~Yaz_ProxyConfig() @@ -158,13 +91,6 @@ Yaz_ProxyConfig::~Yaz_ProxyConfig() } #if HAVE_XSLT -void Yaz_ProxyConfigP::unload_modules() -{ - yaz_log(YLOG_WARN, "unload_modules not implemented yet"); -} -#endif - -#if HAVE_XSLT void Yaz_ProxyConfigP::load_modules() { if (!m_proxyPtr) @@ -177,32 +103,7 @@ void Yaz_ProxyConfigP::load_modules() && !strcmp((const char *) ptr->name, "module") && (fname = get_text(ptr))) { -#if HAVE_DLFCN_H - void *dl_handle = dlopen(fname, RTLD_NOW|RTLD_GLOBAL); - if (dl_handle) - { - Yaz_ProxyModule_entry *fl_ptr = 0; - fl_ptr = reinterpret_cast - (dlsym(dl_handle, "yazproxy_module")); - if (fl_ptr) - { - Yaz_ProxyModule *m = new Yaz_ProxyModule(dl_handle, - fl_ptr, - m_modules); - m_modules = m; - yaz_log(YLOG_LOG, "Loading %s OK", fname); - } - else - { - yaz_log(YLOG_WARN, "Loading %s FAIL: missing yazproxy_module symbol", fname); - dlclose(dl_handle); - } - } - else - yaz_log(YLOG_WARN, "Loading %s FAIL: dlopen failed", fname); -#else - yaz_log(YLOG_WARN, "Loading &s FAIL: dl unsupported", fname); -#endif + m_modules.add_module(fname); } } } @@ -237,7 +138,7 @@ int Yaz_ProxyConfig::read_xml(const char *fname) xmlFreeDoc(m_cp->m_docPtr); m_cp->m_docPtr = ndoc; - m_cp->unload_modules(); + m_cp->m_modules.unload_modules(); m_cp->load_modules(); return 0; #else @@ -308,9 +209,9 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr, int *keepalive_limit_pdu, int *pre_init, const char **cql2rpn, - const char **authentication, const char **negotiation_charset, - const char **negotiation_lang) + const char **negotiation_lang, + const char **target_charset) { *pre_init = 0; int no_url = 0; @@ -375,11 +276,11 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr, *cql2rpn = t; } if (ptr->type == XML_ELEMENT_NODE - && !strcmp((const char *) ptr->name, "authentication")) + && !strcmp((const char *) ptr->name, "target-charset")) { const char *t = get_text(ptr); - if (t) - *authentication = t; + if (t && target_charset) + *target_charset = t; } if (ptr->type == XML_ELEMENT_NODE && !strcmp((const char *) ptr->name, "negotiation-charset")) @@ -508,8 +409,8 @@ int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl, #if HAVE_XSLT int Yaz_ProxyConfigP::check_type_1_structure(ODR odr, xmlNodePtr ptr, - Z_RPNStructure *q, - char **addinfo) + Z_RPNStructure *q, + char **addinfo) { if (q->which == Z_RPNStructure_complex) { @@ -632,19 +533,106 @@ const char *Yaz_ProxyConfig::check_mime_type(const char *path) } -int Yaz_ProxyConfig::check_authentication(const char *user, - const char *group, - const char *password) +void Yaz_ProxyConfig::target_authentication(const char *name, + ODR odr, Z_InitRequest *req) { - Yaz_ProxyModule *m = m_cp->m_modules; +#if HAVE_XSLT + xmlNodePtr ptr = m_cp->find_target_node(name, 0); + if (!ptr) + return ; + + for (ptr = ptr->children; ptr; ptr = ptr->next) + if (ptr->type == XML_ELEMENT_NODE && + !strcmp((const char *) ptr->name, "target-authentication")) + { + struct _xmlAttr *attr; + const char *type = "open"; + for (attr = ptr->properties; attr; attr = attr->next) + { + if (!strcmp((const char *) attr->name, "type") && + attr->children && attr->children->type == XML_TEXT_NODE) + type = (const char *) attr->children->content; + } + const char *t = m_cp->get_text(ptr); + if (!t || !strcmp(type, "none")) + req->idAuthentication = 0; + else if (!strcmp(type, "anonymous")) + { + req->idAuthentication = + (Z_IdAuthentication *) + odr_malloc (odr, sizeof(*req->idAuthentication)); + req->idAuthentication->which = + Z_IdAuthentication_anonymous; + req->idAuthentication->u.anonymous = odr_nullval(); + } + else if (!strcmp(type, "open")) + { + req->idAuthentication = + (Z_IdAuthentication *) + odr_malloc (odr, sizeof(*req->idAuthentication)); + req->idAuthentication->which = + Z_IdAuthentication_open; + req->idAuthentication->u.open = odr_strdup (odr, t); + } + else if (!strcmp(type, "idPass")) + { + char user[64], group[64], password[64]; + *group = '\0'; + *password = '\0'; + *user = '\0'; + sscanf(t, "%63[^:]:%63[^:]:%63s", user, group, password); + + req->idAuthentication = + (Z_IdAuthentication *) + odr_malloc (odr, sizeof(*req->idAuthentication)); + req->idAuthentication->which = + Z_IdAuthentication_idPass; + req->idAuthentication->u.idPass = + (Z_IdPass*) odr_malloc(odr, sizeof(Z_IdPass)); + req->idAuthentication->u.idPass->userId = + *user ? odr_strdup(odr, user) : 0; + req->idAuthentication->u.idPass->groupId = + *group ? odr_strdup(odr, group) : 0; + req->idAuthentication->u.idPass->password = + *password ? odr_strdup(odr, password) : 0; + } + } +#endif +} +int Yaz_ProxyConfig::client_authentication(const char *name, + const char *user, + const char *group, + const char *password, + const char *peer_IP) +{ int ret = YAZPROXY_RET_NOT_ME; - for (; m; m = m->get_next()) - { - ret = m->authenticate(user, group, password); - if (ret != YAZPROXY_RET_NOT_ME) - break; - } +#if HAVE_XSLT + xmlNodePtr ptr; + ptr = m_cp->find_target_node(name, 0); + if (!ptr) + return 1; + for (ptr = ptr->children; ptr; ptr = ptr->next) + if (ptr->type == XML_ELEMENT_NODE && + !strcmp((const char *) ptr->name, "client-authentication")) + { + struct _xmlAttr *attr; + const char *module_name = 0; + for (attr = ptr->properties; attr; attr = attr->next) + { + if (!strcmp((const char *) attr->name, "module") && + attr->children && attr->children->type == XML_TEXT_NODE) + module_name = (const char *) attr->children->content; + } + ret = m_cp->m_modules.authenticate(module_name, + name, ptr, + user, group, password, + peer_IP + ); + if (ret != YAZPROXY_RET_NOT_ME) + break; + } +#endif if (ret == YAZPROXY_RET_PERM) return 0; return 1; @@ -921,7 +909,8 @@ int Yaz_ProxyConfig::get_target_no(int no, const char **cql2rpn, const char **authentication, const char **negotiation_charset, - const char **negotiation_lang) + const char **negotiation_lang, + const char **target_charset) { #if HAVE_XSLT xmlNodePtr ptr; @@ -948,8 +937,8 @@ int Yaz_ProxyConfig::get_target_no(int no, limit_bw, limit_pdu, limit_req, target_idletime, client_idletime, keepalive_limit_bw, keepalive_limit_pdu, - pre_init, cql2rpn, authentication, - negotiation_charset, negotiation_lang); + pre_init, cql2rpn, + negotiation_charset, negotiation_lang, target_charset); return 1; } i++; @@ -1147,9 +1136,9 @@ void Yaz_ProxyConfig::get_target_info(const char *name, int *keepalive_limit_pdu, int *pre_init, const char **cql2rpn, - const char **authentication, const char **negotiation_charset, - const char **negotiation_lang) + const char **negotiation_lang, + const char **target_charset) { #if HAVE_XSLT xmlNodePtr ptr; @@ -1185,8 +1174,9 @@ void Yaz_ProxyConfig::get_target_info(const char *name, m_cp->return_target_info(ptr, url, limit_bw, limit_pdu, limit_req, target_idletime, client_idletime, keepalive_limit_bw, keepalive_limit_pdu, - pre_init, cql2rpn, authentication, - negotiation_charset, negotiation_lang); + pre_init, cql2rpn, + negotiation_charset, negotiation_lang, + target_charset); } #else *url = name;