X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy-config.cpp;h=47b79b5620d0e2bd72e820382cdddefccbf7ff4a;hp=24fa1b0be785f48b729b5a7571c4839e12ea453a;hb=7fa984c171c65d05d34775c4533808793b2109cb;hpb=9f38fa901bed3a1bcc18581520aeb5a7e29ff630

diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp
index 24fa1b0..47b79b5 100644
--- a/src/yaz-proxy-config.cpp
+++ b/src/yaz-proxy-config.cpp
@@ -1,7 +1,5 @@
-/* $Id: yaz-proxy-config.cpp,v 1.32 2006-06-09 09:35:14 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2009 Index Data
 
 YAZ proxy 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
@@ -14,15 +12,15 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include <ctype.h>
 
 #include <yaz/log.h>
 #include "proxyp.h"
+#include <yaz/oid_db.h>
 
 class Yaz_ProxyConfigP {
     friend class Yaz_ProxyConfig;
@@ -31,7 +29,7 @@ class Yaz_ProxyConfigP {
     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
+#if YAZ_HAVE_XSLT
     void load_modules(void);
     int check_schema(xmlNodePtr ptr, Z_RecordComposition *comp,
                      const char *schema_identifier);
@@ -41,6 +39,7 @@ class Yaz_ProxyConfigP {
                             int *limit_bw, int *limit_pdu, int *limit_req,
                             int *limit_search,
                             int *target_idletime, int *client_idletime,
+                            int *max_sockets,
                             int *keepalive_limit_bw, int *keepalive_limit_pdu,
                             int *pre_init, const char **cql2rpn,
                             const char **negotiation_charset,
@@ -52,8 +51,7 @@ class Yaz_ProxyConfigP {
                       int *limit_search);
     int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
                      char **addinfo);
-    xmlNodePtr find_target_node(const char *name, const char *db);
-    xmlNodePtr find_target_db(xmlNodePtr ptr, const char *db);
+    xmlNodePtr find_target_node(const char *name);
     const char *get_text(xmlNodePtr ptr);
     void get_period(xmlNodePtr ptr, int *period);
     int check_type_1_attributes(ODR odr, xmlNodePtr ptr,
@@ -61,7 +59,7 @@ class Yaz_ProxyConfigP {
                                 char **addinfo);
     int check_type_1_structure(ODR odr, xmlNodePtr ptr, Z_RPNStructure *q,
                                char **addinfo);
-    int get_explain_ptr(const char *host, const char *db,
+    int get_explain_ptr(const char *db,
                         xmlNodePtr *ptr_target, xmlNodePtr *ptr_explain);
 #endif
     Yaz_ProxyConfigP();
@@ -70,7 +68,7 @@ class Yaz_ProxyConfigP {
 
 Yaz_ProxyConfigP::Yaz_ProxyConfigP()  : m_modules()
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     m_docPtr = 0;
     m_proxyPtr = 0;
 #endif
@@ -78,7 +76,7 @@ Yaz_ProxyConfigP::Yaz_ProxyConfigP()  : m_modules()
 
 Yaz_ProxyConfigP::~Yaz_ProxyConfigP()
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     if (m_docPtr)
         xmlFreeDoc(m_docPtr);
 #endif
@@ -94,7 +92,7 @@ Yaz_ProxyConfig::~Yaz_ProxyConfig()
     delete m_cp;
 }
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 void Yaz_ProxyConfigP::load_modules()
 {
     if (!m_proxyPtr)
@@ -115,7 +113,7 @@ void Yaz_ProxyConfigP::load_modules()
 
 int Yaz_ProxyConfig::read_xml(const char *fname)
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlDocPtr ndoc = xmlParseFile(fname);
 
     if (!ndoc)
@@ -150,7 +148,7 @@ int Yaz_ProxyConfig::read_xml(const char *fname)
 #endif
 }
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 const char *Yaz_ProxyConfigP::get_text(xmlNodePtr ptr)
 {
     for(ptr = ptr->children; ptr; ptr = ptr->next)
@@ -180,7 +178,7 @@ void Yaz_ProxyConfigP::get_period(xmlNodePtr ptr, int *period)
 }
 #endif
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 void Yaz_ProxyConfigP::return_limit(xmlNodePtr ptr,
                                     int *limit_bw,
                                     int *limit_pdu,
@@ -221,7 +219,7 @@ void Yaz_ProxyConfigP::return_limit(xmlNodePtr ptr,
 }
 #endif
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
                                           const char **url,
                                           int *limit_bw,
@@ -230,6 +228,7 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
                                           int *limit_search,
                                           int *target_idletime,
                                           int *client_idletime,
+                                          int *max_sockets,
                                           int *keepalive_limit_bw,
                                           int *keepalive_limit_pdu,
                                           int *pre_init,
@@ -296,6 +295,15 @@ void Yaz_ProxyConfigP::return_target_info(xmlNodePtr ptr,
             }
         }
         if (ptr->type == XML_ELEMENT_NODE
+            && !strcmp((const char *) ptr->name, "max-sockets"))
+        {
+            const char *t = get_text(ptr);
+            if (t && max_sockets)
+            {
+                *max_sockets = atoi(t);
+            }
+        }
+        if (ptr->type == XML_ELEMENT_NODE
             && !strcmp((const char *) ptr->name, "cql2rpn"))
         {
             const char *t = get_text(ptr);
@@ -368,7 +376,7 @@ int Yaz_ProxyConfigP::match_list(int v, const char *m)
     return 0;
 }
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl,
                                               Z_AttributeList *attrs,
                                               char **addinfo)
@@ -381,7 +389,7 @@ int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl,
         if (!el->attributeType)
             continue;
         int type = *el->attributeType;
-        int *value = 0;
+        Odr_int *value = 0;
 
         if (el->which == Z_AttributeValue_numeric && el->value.numeric)
             value = el->value.numeric;
@@ -421,7 +429,7 @@ int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl,
                     {
                         if (!match_list(*value, match_value))
                             continue;
-                        sprintf (addinfo_str, "%d", *value);
+                        sprintf (addinfo_str, ODR_INT_PRINTF, *value);
                     }
                     else
                         continue;
@@ -441,7 +449,7 @@ int Yaz_ProxyConfigP::check_type_1_attributes(ODR odr, xmlNodePtr ptrl,
 }
 #endif
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 int Yaz_ProxyConfigP::check_type_1_structure(ODR odr, xmlNodePtr ptr,
                                              Z_RPNStructure *q,
                                              char **addinfo)
@@ -467,7 +475,7 @@ int Yaz_ProxyConfigP::check_type_1_structure(ODR odr, xmlNodePtr ptr,
 }
 #endif
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 int Yaz_ProxyConfigP::check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
                                    char **addinfo)
 {
@@ -479,10 +487,10 @@ int Yaz_ProxyConfigP::check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
 int Yaz_ProxyConfig::check_query(ODR odr, const char *name, Z_Query *query,
                                  char **addinfo)
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlNodePtr ptr;
 
-    ptr = m_cp->find_target_node(name, 0);
+    ptr = m_cp->find_target_node(name);
     if (ptr)
     {
         if (query->which == Z_Query_type_1 || query->which == Z_Query_type_101)
@@ -492,7 +500,7 @@ int Yaz_ProxyConfig::check_query(ODR odr, const char *name, Z_Query *query,
     return 0;
 }
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 int Yaz_ProxyConfigP::check_schema(xmlNodePtr ptr, Z_RecordComposition *comp,
                                    const char *schema_identifier)
 {
@@ -572,8 +580,8 @@ const char *Yaz_ProxyConfig::check_mime_type(const char *path)
 void Yaz_ProxyConfig::target_authentication(const char *name,
                                             ODR odr, Z_InitRequest *req)
 {
-#if HAVE_XSLT
-    xmlNodePtr ptr = m_cp->find_target_node(name, 0);
+#if YAZ_HAVE_XSLT
+    xmlNodePtr ptr = m_cp->find_target_node(name);
     if (!ptr)
         return ;
 
@@ -645,9 +653,9 @@ int Yaz_ProxyConfig::client_authentication(const char *name,
                                            const char *peer_IP)
 {
     int ret = YAZPROXY_RET_NOT_ME;
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlNodePtr ptr;
-    ptr = m_cp->find_target_node(name, 0);
+    ptr = m_cp->find_target_node(name);
     if (!ptr)
         return 1;
     for (ptr = ptr->children; ptr; ptr = ptr->next)
@@ -676,6 +684,44 @@ int Yaz_ProxyConfig::client_authentication(const char *name,
     return 1;
 }
 
+int Yaz_ProxyConfig::global_client_authentication(const char *user,
+                                                  const char *group,
+                                                  const char *password,
+                                                  const char *peer_IP)
+{
+    int ret = YAZPROXY_RET_NOT_ME;
+#if YAZ_HAVE_XSLT
+    if (!m_cp->m_proxyPtr)
+        return 1;
+    xmlNodePtr ptr;
+    for (ptr = m_cp->m_proxyPtr->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,
+                                               NULL, ptr,
+                                               user, group, password,
+                                               peer_IP
+                );
+            if (ret != YAZPROXY_RET_NOT_ME)
+                break;
+        }
+    }
+#endif
+    if (ret == YAZPROXY_RET_PERM)
+        return 0;
+    return 1;
+}
+
 int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
                                   Odr_oid *syntax, Z_RecordComposition *comp,
                                   char **addinfo,
@@ -716,11 +762,11 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
         xfree (*usemarcon_ini_stage2);
         *usemarcon_ini_stage2 = 0;
     }
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     int syntax_has_matched = 0;
     xmlNodePtr ptr;
 
-    ptr = m_cp->find_target_node(name, 0);
+    ptr = m_cp->find_target_node(name);
     if (!ptr)
         return 0;
     for(ptr = ptr->children; ptr; ptr = ptr->next)
@@ -784,8 +830,10 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
                 }
                 else if (syntax)
                 {
-                    int match_oid[OID_SIZE];
-                    oid_name_to_oid(CLASS_RECSYN, match_type, match_oid);
+                    Odr_oid *match_oid 
+                        = yaz_string_to_oid_odr(yaz_oid_std(),
+                                                CLASS_RECSYN, match_type,
+                                                odr);
                     if (oid_oidcmp(match_oid, syntax) == 0)
                         match = 1;
                 }
@@ -839,8 +887,8 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
                         return 25;
                     if (syntax)
                     {
-                        char dotoid_str[100];
-                        oid_to_dotstring(syntax, dotoid_str);
+                        char dotoid_str[OID_STR_MAX];
+                        oid_oid_to_dotstring(syntax, dotoid_str);
                         *addinfo = odr_strdup(odr, dotoid_str);
                     }
                     return atoi(match_error);
@@ -853,36 +901,12 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
     return 0;
 }
 
-#if HAVE_XSLT
-xmlNodePtr Yaz_ProxyConfigP::find_target_db(xmlNodePtr ptr, const char *db)
-{
-    xmlNodePtr dptr;
-    if (!db)
-        return ptr;
-    if (!ptr)
-        return 0;
-    for (dptr = ptr->children; dptr; dptr = dptr->next)
-        if (dptr->type == XML_ELEMENT_NODE &&
-            !strcmp((const char *) dptr->name, "database"))
-        {
-            struct _xmlAttr *attr;
-            for (attr = dptr->properties; attr; attr = attr->next)
-                if (!strcmp((const char *) attr->name, "name"))
-                {
-                    if (attr->children
-                        && attr->children->type==XML_TEXT_NODE
-                        && attr->children->content
-                        && (!strcmp((const char *) attr->children->content, db)
-                            || !strcmp((const char *) attr->children->content,
-                                       "*")))
-                        return dptr;
-                }
-        }
-    return ptr;
-}
 
-xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db)
+#if YAZ_HAVE_XSLT
+
+xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name)
 {
+    /* db seems always to be passed as NULL */
     xmlNodePtr ptr;
     if (!m_proxyPtr)
         return 0;
@@ -902,9 +926,7 @@ xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db)
                     {
                         xmlChar *t = attr->children->content;
                         if (!t || *t == '1')
-                        {
-                            return find_target_db(ptr, db);
-                        }
+                            return ptr;
                     }
             }
             else
@@ -922,7 +944,7 @@ xmlNodePtr Yaz_ProxyConfigP::find_target_node(const char *name, const char *db)
                                 || !strcmp((const char *) attr->children->content,
                                            "*")))
                         {
-                            return find_target_db(ptr, db);
+                            return ptr;
                         }
                     }
             }
@@ -941,6 +963,7 @@ int Yaz_ProxyConfig::get_target_no(int no,
                                    int *limit_search,
                                    int *target_idletime,
                                    int *client_idletime,
+                                   int *max_sockets,
                                    int *max_clients,
                                    int *keepalive_limit_bw,
                                    int *keepalive_limit_pdu,
@@ -952,7 +975,7 @@ int Yaz_ProxyConfig::get_target_no(int no,
                                    const char **target_charset,
                                    const char **default_client_query_charset)
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlNodePtr ptr;
     if (!m_cp->m_proxyPtr)
         return 0;
@@ -977,6 +1000,7 @@ int Yaz_ProxyConfig::get_target_no(int no,
                     limit_bw, limit_pdu, limit_req,
                     limit_search,
                     target_idletime, client_idletime,
+                    max_sockets,
                     keepalive_limit_bw, keepalive_limit_pdu,
                     pre_init, cql2rpn,
                     negotiation_charset, negotiation_lang, target_charset,
@@ -998,7 +1022,7 @@ int Yaz_ProxyConfigP::mycmp(const char *hay, const char *item, size_t len)
 
 int Yaz_ProxyConfig::get_file_access_info(const char *path)
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlNodePtr ptr;
     if (!m_cp->m_proxyPtr)
         return 0;
@@ -1028,7 +1052,7 @@ void Yaz_ProxyConfig::get_generic_info(int *log_mask,
     *max_connect = 0;
     *limit_connect = 0;
     *num_msg_threads = 0;
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlNodePtr ptr;
     if (!m_cp->m_proxyPtr)
         return;
@@ -1110,6 +1134,9 @@ void Yaz_ProxyConfig::get_generic_info(int *log_mask,
             !strcmp((const char *) ptr->name, "module"))
             ;
         else if (ptr->type == XML_ELEMENT_NODE &&
+            !strcmp((const char *) ptr->name, "client-authentication"))
+            ;
+        else if (ptr->type == XML_ELEMENT_NODE &&
             !strcmp((const char *) ptr->name, "threads"))
         {
             const char *t = m_cp->get_text(ptr);
@@ -1127,8 +1154,8 @@ void Yaz_ProxyConfig::get_generic_info(int *log_mask,
 #endif
 }
 
-#if HAVE_XSLT
-int Yaz_ProxyConfigP::get_explain_ptr(const char *host, const char *db,
+#if YAZ_HAVE_XSLT
+int Yaz_ProxyConfigP::get_explain_ptr(const char *db,
                                       xmlNodePtr *ptr_target,
                                       xmlNodePtr *ptr_explain)
 {
@@ -1142,6 +1169,19 @@ int Yaz_ProxyConfigP::get_explain_ptr(const char *host, const char *db,
         if (ptr->type == XML_ELEMENT_NODE &&
             !strcmp((const char *) ptr->name, "target"))
         {
+            int db_match_on_name = 0;
+            struct _xmlAttr *attr;
+
+            for (attr = ptr->properties; attr; attr = attr->next)
+                if (!strcmp((const char *) attr->name, "name"))
+                {
+                    if (attr->children
+                        && attr->children->type==XML_TEXT_NODE
+                        && attr->children->content
+                        && (!strcmp((const char *) attr->children->content,
+                                    db)))
+                        db_match_on_name = 1;
+                }
             *ptr_target = ptr;
             xmlNodePtr ptr = (*ptr_target)->children;
             for (; ptr; ptr = ptr->next)
@@ -1175,6 +1215,8 @@ int Yaz_ProxyConfigP::get_explain_ptr(const char *host, const char *db,
                     return 1;
                 }
             }
+            if (db_match_on_name)
+                return 1;
         }
     }
     return 0;
@@ -1184,9 +1226,9 @@ int Yaz_ProxyConfigP::get_explain_ptr(const char *host, const char *db,
 const char *Yaz_ProxyConfig::get_explain_name(const char *db,
                                               const char **backend_db)
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlNodePtr ptr_target, ptr_explain;
-    if (m_cp->get_explain_ptr(0, db, &ptr_target, &ptr_explain)
+    if (m_cp->get_explain_ptr(db, &ptr_target, &ptr_explain)
         && ptr_target)
     {
         struct _xmlAttr *attr;
@@ -1220,28 +1262,38 @@ const char *Yaz_ProxyConfig::get_explain_name(const char *db,
 }
 
 char *Yaz_ProxyConfig::get_explain_doc(ODR odr, const char *name,
-                                       const char *db, int *len)
+                                       const char *db, int *len,
+                                       int *http_status)
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlNodePtr ptr_target, ptr_explain;
-    if (m_cp->get_explain_ptr(0 /* host */, db, &ptr_target, &ptr_explain))
+    if (m_cp->get_explain_ptr(db, &ptr_target, &ptr_explain))
     {
-        xmlNodePtr ptr2 = xmlCopyNode(ptr_explain, 1);
-
-        xmlDocPtr doc = xmlNewDoc((const xmlChar *) "1.0");
-
-        xmlDocSetRootElement(doc, ptr2);
-
-        xmlChar *buf_out;
-        xmlDocDumpMemory(doc, &buf_out, len);
-        char *content = (char*) odr_malloc(odr, *len);
-        memcpy(content, buf_out, *len);
+        if (!ptr_explain)
+        {
+            *http_status = 500;
+            return 0;
+        }
+        else
+        {
+            xmlNodePtr ptr2 = xmlCopyNode(ptr_explain, 1);
+            
+            xmlDocPtr doc = xmlNewDoc((const xmlChar *) "1.0");
+            
+            xmlDocSetRootElement(doc, ptr2);
+            
+            xmlChar *buf_out;
+            xmlDocDumpMemory(doc, &buf_out, len);
+            char *content = (char*) odr_malloc(odr, *len);
+            memcpy(content, buf_out, *len);
 
-        xmlFree(buf_out);
-        xmlFreeDoc(doc);
-        return content;
+            xmlFree(buf_out);
+            xmlFreeDoc(doc);
+            return content;
+        }
     }
 #endif
+    *http_status = 404;
     return 0;
 }
 
@@ -1253,6 +1305,7 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
                                       int *limit_search,
                                       int *target_idletime,
                                       int *client_idletime,
+                                      int *max_sockets,
                                       int *max_clients,
                                       int *keepalive_limit_bw,
                                       int *keepalive_limit_pdu,
@@ -1263,7 +1316,7 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
                                       const char **target_charset,
                                       const char **default_client_query_charset)
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlNodePtr ptr;
     if (!m_cp->m_proxyPtr)
     {
@@ -1286,7 +1339,7 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
             }
         }
     }
-    ptr = m_cp->find_target_node(name, 0);
+    ptr = m_cp->find_target_node(name);
     if (ptr)
     {
         if (name)
@@ -1297,6 +1350,7 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
         m_cp->return_target_info(ptr, url, limit_bw, limit_pdu, limit_req,
                                  limit_search,
                                  target_idletime, client_idletime,
+                                 max_sockets,
                                  keepalive_limit_bw, keepalive_limit_pdu,
                                  pre_init, cql2rpn,
                                  negotiation_charset, negotiation_lang,
@@ -1313,6 +1367,7 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab