X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=63356cff68aef7431159afbbb57ce498ec2bfda8;hb=e207284fc2943aa6a933cf3405f60bcdc584280d;hp=4a2a1052f444e0660ef5afcaa801fd66d915211a;hpb=69c50fae6d6f6eea04890d1433cb3503544763a0;p=metaproxy-moved-to-github.git diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp index 4a2a105..63356cf 100644 --- a/src/filter_auth_simple.cpp +++ b/src/filter_auth_simple.cpp @@ -1,7 +1,7 @@ -/* $Id: filter_auth_simple.cpp,v 1.15 2006-01-18 14:38:48 mike Exp $ - Copyright (c) 2005, Index Data. +/* $Id: filter_auth_simple.cpp,v 1.20 2006-06-10 14:29:12 adam Exp $ + Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" @@ -20,9 +20,10 @@ #include #include -namespace yf = yp2::filter; +namespace mp = metaproxy_1; +namespace yf = mp::filter; -namespace yp2 { +namespace metaproxy_1 { namespace filter { class AuthSimple::Rep { friend class AuthSimple; @@ -37,11 +38,11 @@ namespace yp2 { bool got_userRegister, got_targetRegister; std::map userRegister; std::map > targetsByUser; - std::map userBySession; - bool discardUnauthorisedDBs; + std::map userBySession; + bool discardUnauthorisedTargets; Rep() { got_userRegister = false; got_targetRegister = false; - discardUnauthorisedDBs = false; } + discardUnauthorisedTargets = false; } }; } } @@ -56,11 +57,11 @@ yf::AuthSimple::~AuthSimple() } -static void die(std::string s) { throw yp2::filter::FilterException(s); } +static void die(std::string s) { throw mp::filter::FilterException(s); } // Read XML config.. Put config info in m_p. -void yp2::filter::AuthSimple::configure(const xmlNode * ptr) +void mp::filter::AuthSimple::configure(const xmlNode * ptr) { std::string userRegisterName; std::string targetRegisterName; @@ -69,14 +70,14 @@ void yp2::filter::AuthSimple::configure(const xmlNode * ptr) if (ptr->type != XML_ELEMENT_NODE) continue; if (!strcmp((const char *) ptr->name, "userRegister")) { - userRegisterName = yp2::xml::get_text(ptr); + userRegisterName = mp::xml::get_text(ptr); m_p->got_userRegister = true; } else if (!strcmp((const char *) ptr->name, "targetRegister")) { - targetRegisterName = yp2::xml::get_text(ptr); + targetRegisterName = mp::xml::get_text(ptr); m_p->got_targetRegister = true; } else if (!strcmp((const char *) ptr->name, - "discardUnauthorisedDBs")) { - m_p->discardUnauthorisedDBs = true; + "discardUnauthorisedTargets")) { + m_p->discardUnauthorisedTargets = true; } else { die("Bad element in auth_simple: <" + std::string((const char *) ptr->name) + ">"); @@ -94,7 +95,7 @@ void yp2::filter::AuthSimple::configure(const xmlNode * ptr) } -void yp2::filter::AuthSimple::config_userRegister(std::string filename) +void mp::filter::AuthSimple::config_userRegister(std::string filename) { FILE *fp = fopen(filename.c_str(), "r"); if (fp == 0) @@ -134,7 +135,7 @@ void yp2::filter::AuthSimple::config_userRegister(std::string filename) // I feel a little bad about the duplication of code between this and // config_userRegister(). But not bad enough to refactor. // -void yp2::filter::AuthSimple::config_targetRegister(std::string filename) +void mp::filter::AuthSimple::config_targetRegister(std::string filename) { FILE *fp = fopen(filename.c_str(), "r"); if (fp == 0) @@ -166,7 +167,7 @@ void yp2::filter::AuthSimple::config_targetRegister(std::string filename) } -void yf::AuthSimple::process(yp2::Package &package) const +void yf::AuthSimple::process(mp::Package &package) const { Z_GDU *gdu = package.request().get(); @@ -203,10 +204,10 @@ void yf::AuthSimple::process(yp2::Package &package) const } -static void reject_init(yp2::Package &package, int err, const char *addinfo); +static void reject_init(mp::Package &package, int err, const char *addinfo); -void yf::AuthSimple::process_init(yp2::Package &package) const +void yf::AuthSimple::process_init(mp::Package &package) const { Z_IdAuthentication *auth = package.request().get()->u.z3950->u.initRequest->idAuthentication; @@ -241,14 +242,15 @@ void yf::AuthSimple::process_init(yp2::Package &package) const static bool contains(std::list list, std::string thing) { std::list::const_iterator i; for (i = list.begin(); i != list.end(); i++) - if (*i == thing) + if (mp::util::database_name_normalize(*i) == + mp::util::database_name_normalize(thing)) return true; - + return false; } -void yf::AuthSimple::process_search(yp2::Package &package) const +void yf::AuthSimple::process_search(mp::Package &package) const { Z_SearchRequest *req = package.request().get()->u.z3950->u.searchRequest; @@ -264,7 +266,7 @@ void yf::AuthSimple::process_search(yp2::Package &package) const if (!contains(pdb.dbs, req->databaseNames[i]) && !contains(pdb.dbs, "*")) { // Make an Search rejection APDU - yp2::odr odr; + mp::odr odr; Z_APDU *apdu = odr.create_searchResponse( package.request().get()->u.z3950, YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, @@ -280,7 +282,7 @@ void yf::AuthSimple::process_search(yp2::Package &package) const } -void yf::AuthSimple::process_scan(yp2::Package &package) const +void yf::AuthSimple::process_scan(mp::Package &package) const { Z_ScanRequest *req = package.request().get()->u.z3950->u.scanRequest; @@ -296,7 +298,7 @@ void yf::AuthSimple::process_scan(yp2::Package &package) const if (!contains(pdb.dbs, req->databaseNames[i]) && !contains(pdb.dbs, "*")) { // Make an Scan rejection APDU - yp2::odr odr; + mp::odr odr; Z_APDU *apdu = odr.create_scanResponse( package.request().get()->u.z3950, YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, @@ -312,12 +314,12 @@ void yf::AuthSimple::process_scan(yp2::Package &package) const } -static void reject_init(yp2::Package &package, int err, const char *addinfo) { +static void reject_init(mp::Package &package, int err, const char *addinfo) { if (err == 0) err = YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR; // Make an Init rejection APDU Z_GDU *gdu = package.request().get(); - yp2::odr odr; + mp::odr odr; Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, err, addinfo); apdu->u.initResponse->implementationName = "YP2/YAZ"; *apdu->u.initResponse->result = 0; // reject @@ -326,7 +328,7 @@ static void reject_init(yp2::Package &package, int err, const char *addinfo) { } -void yf::AuthSimple::check_targets(yp2::Package & package) const +void yf::AuthSimple::check_targets(mp::Package & package) const { Z_InitRequest *initReq = package.request().get()->u.z3950->u.initRequest; @@ -341,60 +343,43 @@ void yf::AuthSimple::check_targets(yp2::Package & package) const std::list targets; Z_OtherInformation *otherInfo = initReq->otherInfo; - yp2::util::get_vhost_otherinfo(&otherInfo, 0, targets); + mp::util::get_vhost_otherinfo(&otherInfo, 1, targets); // Check each of the targets specified in the otherInfo package std::list::iterator i; - printf("pre: got %d targets\n", targets.size()); - i = targets.begin(); - while (i != targets.end()) { - printf("pre: considering target '%s'\n", (*i).c_str()); - i++; - } - i = targets.begin(); while (i != targets.end()) { - printf("checking target '%s'\n", (*i).c_str()); if (contains(authorisedTargets, *i) || contains(authorisedTargets, "*")) { - printf("target '%s' is ok\n", (*i).c_str()); i++; } else { - printf("target '%s' sucks\n", (*i).c_str()); - if (!m_p->discardUnauthorisedDBs) + if (!m_p->discardUnauthorisedTargets) return reject_init(package, YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, i->c_str()); i = targets.erase(i); } } - printf("post: got %d targets\n", targets.size()); - i = targets.begin(); - while (i != targets.end()) { - printf("post: considering target '%s'\n", (*i).c_str()); - i++; - } - if (targets.size() == 0) return reject_init(package, YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, + // ### It would be better to use the Z-db name "all databases"); - // ### This is a no-op if the list has not changed - yp2::odr odr; - yp2::util::set_vhost_otherinfo(&otherInfo, odr, targets); + mp::odr odr; + mp::util::set_vhost_otherinfo(&otherInfo, odr, targets); package.move(); } -static yp2::filter::Base* filter_creator() +static mp::filter::Base* filter_creator() { - return new yp2::filter::AuthSimple; + return new mp::filter::AuthSimple; } extern "C" { - struct yp2_filter_struct yp2_filter_auth_simple = { + struct metaproxy_1_filter_struct metaproxy_1_filter_auth_simple = { 0, "auth_simple", filter_creator