X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=7b0cba80384af7c950c1f556746c02dbe0cf9d43;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=7d94e1970fc62d2ac737f02d3c4c6405ff5a00b1;hpb=b4f8ee7ba153d89ddb0b01a6a6e355442e19f09d;p=metaproxy-moved-to-github.git diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp index 7d94e19..7b0cba8 100644 --- a/src/filter_auth_simple.cpp +++ b/src/filter_auth_simple.cpp @@ -1,5 +1,5 @@ -/* $Id: filter_auth_simple.cpp,v 1.13 2006-01-18 13:32:59 mike Exp $ - Copyright (c) 2005, Index Data. +/* $Id: filter_auth_simple.cpp,v 1.18 2006-03-16 10:40:59 adam Exp $ + Copyright (c) 2005-2006, Index Data. %LICENSE% */ @@ -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,7 +38,11 @@ namespace yp2 { bool got_userRegister, got_targetRegister; std::map userRegister; std::map > targetsByUser; - std::map userBySession; + std::map userBySession; + bool discardUnauthorisedTargets; + Rep() { got_userRegister = false; + got_targetRegister = false; + discardUnauthorisedTargets = false; } }; } } @@ -52,26 +57,27 @@ 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; - m_p->got_userRegister = false; - m_p->got_targetRegister = false; for (ptr = ptr->children; ptr != 0; ptr = ptr->next) { 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, + "discardUnauthorisedTargets")) { + m_p->discardUnauthorisedTargets = true; } else { die("Bad element in auth_simple: <" + std::string((const char *) ptr->name) + ">"); @@ -89,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) @@ -129,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) @@ -161,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(); @@ -198,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; @@ -243,7 +249,7 @@ static bool contains(std::list list, std::string thing) { } -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; @@ -259,7 +265,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, @@ -275,7 +281,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; @@ -288,9 +294,10 @@ void yf::AuthSimple::process_scan(yp2::Package &package) const std::string user = m_p->userBySession[package.session()]; yf::AuthSimple::Rep::PasswordAndDBs pdb = m_p->userRegister[user]; for (int i = 0; i < req->num_databaseNames; i++) { - if (!contains(pdb.dbs, req->databaseNames[i])) { + 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, @@ -306,12 +313,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 @@ -320,7 +327,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; @@ -335,36 +342,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::const_iterator i; - for (i = targets.begin(); i != targets.end(); i++) { - printf("checking target '%s'\n", (*i).c_str()); - if (!contains(authorisedTargets, *i)) { - // ### check whether to quietly discard this target, or to reject - return reject_init(package, - YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, - i->c_str()); + std::list::iterator i; + + i = targets.begin(); + while (i != targets.end()) { + if (contains(authorisedTargets, *i) || + contains(authorisedTargets, "*")) { + i++; + } else { + if (!m_p->discardUnauthorisedTargets) + return reject_init(package, + YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, i->c_str()); + i = targets.erase(i); } } -/* - // ### This is a no-op if the list has not changed - yp2::odr odr; - yp2::util::set_vhost_otherinfo(&otherInfo, odr, targets); -*/ + 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"); + + 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