X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=6849917c79404f74ce107d32a6182cd52056348e;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=aca263461567f9c06e5ae101204fd1723a3d7ac1;hpb=66ed48c630abf19ec779a29c5d2b67a9938685a5;p=metaproxy-moved-to-github.git

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index aca2634..6849917 100644
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2009 Index Data
+   Copyright (C) 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
@@ -18,20 +18,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "config.hpp"
 
-#include "filter.hpp"
-#include "package.hpp"
+#include "filter_virt_db.hpp"
+#include <metaproxy/package.hpp>
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "util.hpp"
-#include "filter_virt_db.hpp"
+#include <metaproxy/util.hpp>
 
 #include <yaz/zgdu.h>
 #include <yaz/otherinfo.h>
 #include <yaz/diagbib1.h>
 #include <yaz/match_glob.h>
+#include <yaz/log.h>
+#include <yaz/oid_db.h>
 
 #include <map>
 #include <iostream>
@@ -52,6 +53,7 @@ namespace metaproxy_1 {
         };
         struct VirtualDB::Map {
             Map(std::string database, std::list<std::string> targets, std::string route);
+            Map(std::string database, std::string target, std::string route);
             Map();
             bool match(const std::string db) const;
             std::string m_dbpattern;
@@ -79,6 +81,7 @@ namespace metaproxy_1 {
             void search(Package &package, Z_APDU *apdu);
             void present(Package &package, Z_APDU *apdu);
             void scan(Package &package, Z_APDU *apdu);
+            int relay_apdu(Package &package, Z_APDU *apdu);
 
             void close(Package &package);
             typedef std::map<std::string,VirtualDB::Set>::iterator Sets_it;
@@ -88,25 +91,26 @@ namespace metaproxy_1 {
                                   BackendPtr b);
             void fixup_npr_records(ODR odr, Z_Records *records,
                                    BackendPtr b);
-    
+
             BackendPtr lookup_backend_from_databases(
                 std::list<std::string> databases);
             BackendPtr create_backend_from_databases(
                 std::list<std::string> databases,
                 int &error_code,
                 std::string &failing_database);
-            
+
             BackendPtr init_backend(std::list<std::string> database,
                                     Package &package,
                                     int &error_code, std::string &addinfo);
             Rep *m_p;
-        };            
+        };
         class VirtualDB::Rep {
             friend class VirtualDB;
             friend struct Frontend;
-            
+
             FrontendPtr get_frontend(Package &package);
             void release_frontend(Package &package);
+            void refresh_torus();
         private:
             std::list<VirtualDB::Map>m_maps;
             typedef std::map<std::string,VirtualDB::Set>::iterator Sets_it;
@@ -174,7 +178,7 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases
         // see if we have a route conflict.
         if (!first_route && b->m_route != map_it->m_route)
         {
-            // we have a conflict.. 
+            // we have a conflict.. routing must be same for all
             error_code =  YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
             BackendPtr ptr;
             return ptr;
@@ -208,10 +212,19 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend(
     Z_GDU *org_gdu = m_init_gdu.get();
     Z_InitRequest *org_init = org_gdu->u.z3950->u.initRequest;
 
+
+    const char *peer_name = yaz_oi_get_string_oid(
+        &org_init->otherInfo, yaz_oid_userinfo_client_ip, 1, 0);
+    if (peer_name)
+        yaz_oi_set_string_oid(&init_apdu->u.initRequest->otherInfo, odr,
+                              yaz_oid_userinfo_client_ip, 1, peer_name);
+
     req->idAuthentication = org_init->idAuthentication;
     req->implementationId = org_init->implementationId;
     req->implementationName = org_init->implementationName;
     req->implementationVersion = org_init->implementationVersion;
+    *req->preferredMessageSize = *org_init->preferredMessageSize;
+    *req->maximumRecordSize = *org_init->maximumRecordSize;
 
     ODR_MASK_SET(req->options, Z_Options_search);
     ODR_MASK_SET(req->options, Z_Options_present);
@@ -223,49 +236,49 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend(
     ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3);
 
     init_package.request() = init_apdu;
-    
-    init_package.move(b->m_route);  // sending init 
+
+    init_package.move(b->m_route);  // sending init
 
     Z_GDU *gdu = init_package.response().get();
     // we hope to get an init response
-    if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
-        Z_APDU_initResponse)
+    error_code = 0;
+    if (gdu && gdu->which == Z_GDU_Z3950
+        && gdu->u.z3950->which == Z_APDU_initResponse)
     {
         Z_InitResponse *res = gdu->u.z3950->u.initResponse;
         if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
         {
             b->m_named_result_sets = true;
         }
-        if (!*res->result)
+        if (*res->result && !init_package.session().is_closed())
         {
-            error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
-            mp::util::get_init_diagnostics(res, error_code, addinfo);
-            BackendPtr null;
-            return null; 
+            m_backend_list.push_back(b);
+            return b;
         }
+        mp::util::get_init_diagnostics(res, error_code, addinfo);
     }
-    else
+    if (error_code == 0)
     {
-        error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
-        // addinfo = database;
-        BackendPtr null;
-        return null;
-    }        
-    if (init_package.session().is_closed())
+        std::list<std::string>::const_iterator db_it = databases.begin();
+        error_code = YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED;
+        if (db_it != databases.end())
+            addinfo = *db_it;
+    }
+    if (!init_package.session().is_closed())
     {
-        error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
-        // addinfo = database;
-        BackendPtr null;
-        return null;
+        Package close_package(b->m_backend_session, package.origin());
+        close_package.copy_filter(package);
+        close_package.session().close();
+        close_package.move(b->m_route);  // closing it
     }
-
-    m_backend_list.push_back(b);
-    return b;
+    BackendPtr null;
+    return null;
 }
 
 void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
 {
-    Z_SearchRequest *req = apdu_req->u.searchRequest;
+    yazpp_1::GDU ngdu(apdu_req);
+    Z_SearchRequest *req = ngdu.get()->u.z3950->u.searchRequest;
     std::string vhost;
     std::string resultSetId = req->resultSetName;
     mp::odr odr;
@@ -275,56 +288,40 @@ void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
     for (i = 0; i<req->num_databaseNames; i++)
         databases.push_back(req->databaseNames[i]);
 
-    BackendPtr b; // null for now
     Sets_it sets_it = m_sets.find(req->resultSetName);
     if (sets_it != m_sets.end())
     {
-        // result set already exist 
+        // result set already exist
         // if replace indicator is off: we return diagnostic if
         // result set already exist.
         if (*req->replaceIndicator == 0)
         {
-            Z_APDU *apdu = 
+            Z_APDU *apdu =
                 odr.create_searchResponse(
                     apdu_req,
                     YAZ_BIB1_RESULT_SET_EXISTS_AND_REPLACE_INDICATOR_OFF,
                     0);
             package.response() = apdu;
-            
-            return;
-        } 
-        sets_it->second.m_backend->m_number_of_sets--;
 
-        // pick up any existing backend with a database match
-        std::list<BackendPtr>::const_iterator map_it;
-        map_it = m_backend_list.begin();
-        for (; map_it != m_backend_list.end(); map_it++)
-        {
-            BackendPtr tmp = *map_it;
-            if (tmp->m_frontend_databases == databases)
-                break;
+            return;
         }
-        if (map_it != m_backend_list.end()) 
-            b = *map_it;
+        sets_it->second.m_backend->m_number_of_sets--;
     }
-    else
+    // pick up any existing database with named result sets ..
+    // or one which has no result sets.. yet.
+    BackendPtr b; // null for now
+    std::list<BackendPtr>::const_iterator map_it;
+    map_it = m_backend_list.begin();
+    for (; map_it != m_backend_list.end(); map_it++)
     {
-        // new result set.
-
-        // pick up any existing database with named result sets ..
-        // or one which has no result sets.. yet.
-        std::list<BackendPtr>::const_iterator map_it;
-        map_it = m_backend_list.begin();
-        for (; map_it != m_backend_list.end(); map_it++)
+        BackendPtr tmp = *map_it;
+        if (tmp->m_frontend_databases == databases &&
+            (tmp->m_named_result_sets ||
+             tmp->m_number_of_sets == 0))
         {
-            BackendPtr tmp = *map_it;
-            if (tmp->m_frontend_databases == databases &&
-                (tmp->m_named_result_sets ||
-                 tmp->m_number_of_sets == 0))
-                break;
-        }
-        if (map_it != m_backend_list.end()) 
             b = *map_it;
+            break;
+        }
     }
     if (!b)  // no backend yet. Must create a new one
     {
@@ -334,8 +331,8 @@ void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
         if (!b)
         {
             // did not get a backend (unavailable somehow?)
-            
-            Z_APDU *apdu = 
+
+            Z_APDU *apdu =
                 odr.create_searchResponse(
                     apdu_req, error_code, addinfo.c_str());
             package.response() = apdu;
@@ -370,8 +367,8 @@ void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
 
     *req->replaceIndicator = 1;
 
-    search_package.request() = yazpp_1::GDU(apdu_req);
-    
+    search_package.request() = ngdu;
+
     search_package.move(b->m_route);
 
     if (search_package.session().is_closed())
@@ -396,7 +393,7 @@ yf::VirtualDB::Frontend::Frontend(Rep *rep)
 void yf::VirtualDB::Frontend::close(mp::Package &package)
 {
     std::list<BackendPtr>::const_iterator b_it;
-    
+
     for (b_it = m_backend_list.begin(); b_it != m_backend_list.end(); b_it++)
     {
         (*b_it)->m_backend_session.close();
@@ -416,13 +413,13 @@ yf::VirtualDB::FrontendPtr yf::VirtualDB::Rep::get_frontend(mp::Package &package
     boost::mutex::scoped_lock lock(m_mutex);
 
     std::map<mp::Session,yf::VirtualDB::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;
@@ -440,7 +437,7 @@ void yf::VirtualDB::Rep::release_frontend(mp::Package &package)
 {
     boost::mutex::scoped_lock lock(m_mutex);
     std::map<mp::Session,yf::VirtualDB::FrontendPtr>::iterator it;
-    
+
     it = m_clients.find(package.session());
     if (it != m_clients.end())
     {
@@ -457,6 +454,7 @@ void yf::VirtualDB::Rep::release_frontend(mp::Package &package)
     }
 }
 
+
 yf::VirtualDB::Set::Set(BackendPtr b, std::string setname)
     :  m_backend(b), m_setname(setname)
 {
@@ -472,12 +470,20 @@ yf::VirtualDB::Set::~Set()
 {
 }
 
-yf::VirtualDB::Map::Map(std::string database, 
+yf::VirtualDB::Map::Map(std::string database,
                         std::list<std::string> targets, std::string route)
-    : m_dbpattern(database), m_targets(targets), m_route(route) 
+    : m_dbpattern(database), m_targets(targets), m_route(route)
 {
 }
 
+yf::VirtualDB::Map::Map(std::string database,
+                        std::string target, std::string route)
+    : m_dbpattern(database), m_route(route)
+{
+    m_targets.push_back(target);
+}
+
+
 yf::VirtualDB::Map::Map()
 {
 }
@@ -507,7 +513,7 @@ void yf::VirtualDB::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr,
 
         // consider each of the frontend databases..
         std::list<std::string>::const_iterator db_it;
-        for (db_it = b->m_frontend_databases.begin(); 
+        for (db_it = b->m_frontend_databases.begin();
              db_it != b->m_frontend_databases.end(); db_it++)
         {
             // see which target it corresponds to.. (if any)
@@ -520,7 +526,7 @@ void yf::VirtualDB::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr,
                 map_it++;
             }
             if (map_it != m_p->m_maps.end())
-            { 
+            {
                 std::list<std::string>::const_iterator t
                     = map_it->m_targets.begin();
                 while (t != map_it->m_targets.end())
@@ -533,7 +539,7 @@ void yf::VirtualDB::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr,
                     t++;
                 }
             }
-            
+
         }
         db_it = b->m_frontend_databases.begin();
         if (db_it != b->m_frontend_databases.end())
@@ -581,14 +587,15 @@ void yf::VirtualDB::Frontend::fixup_package(mp::Package &p, BackendPtr b)
 
 void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
 {
-    Z_PresentRequest *req = apdu_req->u.presentRequest;
+    yazpp_1::GDU ngdu(apdu_req);
+    Z_PresentRequest *req = ngdu.get()->u.z3950->u.presentRequest;
     std::string resultSetId = req->resultSetId;
     mp::odr odr;
 
     Sets_it sets_it = m_sets.find(resultSetId);
     if (sets_it == m_sets.end())
     {
-        Z_APDU *apdu = 
+        Z_APDU *apdu =
             odr.create_presentResponse(
                 apdu_req,
                 YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
@@ -598,14 +605,14 @@ void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
     }
     Session *id =
         new mp::Session(sets_it->second.m_backend->m_backend_session);
-    
+
     // sending present to backend
     Package present_package(*id, package.origin());
     present_package.copy_filter(package);
 
     req->resultSetId = odr_strdup(odr, sets_it->second.m_setname.c_str());
-    
-    present_package.request() = yazpp_1::GDU(apdu_req);
+
+    present_package.request() = ngdu;
 
     present_package.move(sets_it->second.m_backend->m_route);
 
@@ -615,7 +622,6 @@ void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
     {
         package.response() = present_package.response();
         package.session().close();
-        return;
     }
     else
     {
@@ -624,9 +630,31 @@ void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
     delete id;
 }
 
+int yf::VirtualDB::Frontend::relay_apdu(mp::Package &package, Z_APDU *apdu_req)
+{
+    int no = 0;
+    std::list<BackendPtr>::const_iterator map_it;
+    map_it = m_backend_list.begin();
+    for (; map_it != m_backend_list.end(); map_it++)
+    {
+        BackendPtr b = *map_it;
+
+        Package relay_package(b->m_backend_session, package.origin());
+        relay_package.copy_filter(package);
+
+        relay_package.request() = yazpp_1::GDU(apdu_req);
+
+        relay_package.move(b->m_route);
+        package.response() = relay_package.response();
+        no++;
+    }
+    return no;
+}
+
 void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
 {
-    Z_ScanRequest *req = apdu_req->u.scanRequest;
+    yazpp_1::GDU ngdu(apdu_req);
+    Z_ScanRequest *req = ngdu.get()->u.z3950->u.scanRequest;
     std::string vhost;
     mp::odr odr;
 
@@ -645,7 +673,7 @@ void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
         if (tmp->m_frontend_databases == databases)
             break;
     }
-    if (map_it != m_backend_list.end()) 
+    if (map_it != m_backend_list.end())
         b = *map_it;
     if (!b)  // no backend yet. Must create a new one
     {
@@ -659,7 +687,7 @@ void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
                 odr.create_scanResponse(
                     apdu_req, error_code, addinfo.c_str());
             package.response() = apdu;
-            
+
             return;
         }
     }
@@ -676,8 +704,9 @@ void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
                                                 &req->num_databaseNames,
                                                 &req->databaseNames);
     }
-    scan_package.request() = yazpp_1::GDU(apdu_req);
-    
+
+    scan_package.request() = ngdu;
+
     scan_package.move(b->m_route);
 
     if (scan_package.session().is_closed())
@@ -690,23 +719,22 @@ void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
 }
 
 
-void yf::VirtualDB::add_map_db2targets(std::string db, 
-                                     std::list<std::string> targets,
-                                     std::string route)
+void yf::VirtualDB::add_map_db2targets(std::string db,
+                                       std::list<std::string> targets,
+                                       std::string route)
 {
     m_p->m_maps.push_back(
         VirtualDB::Map(mp::util::database_name_normalize(db), targets, route));
 }
 
 
-void yf::VirtualDB::add_map_db2target(std::string db, 
-                                    std::string target,
-                                    std::string route)
-{
-    std::list<std::string> targets;
-    targets.push_back(target);
+void yf::VirtualDB::add_map_db2target(std::string db,
+                                      std::string target,
+                                      std::string route)
 
-    add_map_db2targets(db, targets, route);
+{
+    m_p->m_maps.push_back(
+        VirtualDB::Map(mp::util::database_name_normalize(db), target, route));
 }
 
 void yf::VirtualDB::process(mp::Package &package) const
@@ -714,12 +742,12 @@ void yf::VirtualDB::process(mp::Package &package) const
     FrontendPtr f = m_p->get_frontend(package);
 
     Z_GDU *gdu = package.request().get();
-    
+
     if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
         Z_APDU_initRequest && !f->m_is_virtual)
     {
         Z_InitRequest *req = gdu->u.z3950->u.initRequest;
-        
+
         std::list<std::string> vhosts;
         mp::util::get_vhost_otherinfo(req->otherInfo, vhosts);
 
@@ -730,23 +758,23 @@ void yf::VirtualDB::process(mp::Package &package) const
         else
         {
             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,
                 Z_Options_namedResultSets,
                 Z_Options_scan,
-                -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,
@@ -758,7 +786,10 @@ void yf::VirtualDB::process(mp::Package &package) const
                     ODR_MASK_SET(resp->protocolVersion, versions[i]);
                 else
                     break;
-            
+
+            *resp->preferredMessageSize = *req->preferredMessageSize;
+            *resp->maximumRecordSize = *req->maximumRecordSize;
+
             package.response() = apdu;
             f->m_is_virtual = true;
         }
@@ -771,12 +802,12 @@ void yf::VirtualDB::process(mp::Package &package) const
         if (apdu->which == Z_APDU_initRequest)
         {
             mp::odr odr;
-            
+
             package.response() = odr.create_close(
                 apdu,
                 Z_Close_protocolError,
                 "double init");
-            
+
             package.session().close();
         }
         else if (apdu->which == Z_APDU_searchRequest)
@@ -793,24 +824,32 @@ void yf::VirtualDB::process(mp::Package &package) const
         }
         else if (apdu->which == Z_APDU_close)
         {
-            package.session().close();
+            if (f->relay_apdu(package, apdu) == 0)
+            {
+                mp::odr odr;
+
+                package.response() = odr.create_close(
+                    apdu, Z_Close_finished, "virt_db");
+
+                package.session().close();
+            }
         }
         else
         {
             mp::odr odr;
-            
+
             package.response() = odr.create_close(
                 apdu, Z_Close_protocolError,
                 "unsupported APDU in filter_virt_db");
-            
+
             package.session().close();
         }
     }
     m_p->release_frontend(package);
 }
 
-
-void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only)
+void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only,
+                                      const char *path)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -818,7 +857,7 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only)
             continue;
         if (!strcmp((const char *) ptr->name, "pass-vhosts"))
         {
-            m_p->pass_vhosts = mp::xml::get_bool(ptr->children, false);
+            m_p->pass_vhosts = mp::xml::get_bool(ptr, false);
         }
         else if (!strcmp((const char *) ptr->name, "virtual"))
         {
@@ -829,25 +868,28 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only)
             {
                 if (v_node->type != XML_ELEMENT_NODE)
                     continue;
-                
+
                 if (mp::xml::is_element_mp(v_node, "database"))
                     database = mp::xml::get_text(v_node);
                 else if (mp::xml::is_element_mp(v_node, "target"))
                     targets.push_back(mp::xml::get_text(v_node));
                 else
                     throw mp::filter::FilterException
-                        ("Bad element " 
+                        ("Bad element "
                          + std::string((const char *) v_node->name)
                          + " in virtual section"
                             );
             }
             std::string route = mp::xml::get_route(ptr);
-            add_map_db2targets(database, targets, route);
+
+            VirtualDB::Map vmap(mp::util::database_name_normalize(database),
+                                targets, route);
+            m_p->m_maps.push_back(vmap);
         }
         else
         {
             throw mp::filter::FilterException
-                ("Bad element " 
+                ("Bad element "
                  + std::string((const char *) ptr->name)
                  + " in virt_db filter");
         }