X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=7b0cba80384af7c950c1f556746c02dbe0cf9d43;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=153ca8f6d36dc033d6374503ac3de3a2697a9910;hpb=133c958c1d7ca2fc8d9b3297d24e27a8efa34993;p=metaproxy-moved-to-github.git diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp index 153ca8f..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.12 2006-01-18 11:41:08 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(); @@ -172,40 +178,46 @@ void yf::AuthSimple::process(yp2::Package &package) const return package.move(); } - switch (gdu->u.z3950->which) { - case Z_APDU_initRequest: return process_init(package); - case Z_APDU_searchRequest: return process_search(package); - case Z_APDU_scanRequest: return process_scan(package); - // In theory, we should check database authorisation for - // extended services, too (A) the proxy currently does not - // implement XS and turns off its negotiation bit; (B) it - // would be insanely complex to do as the top-level XS request - // structure does not carry a database name, but it is buried - // down in some of the possible EXTERNALs used as - // taskSpecificParameters; and (C) since many extended - // services modify the database, we'd need to more exotic - // authorisation database than we want to support. - default: break; - } + if (m_p->got_userRegister) { + switch (gdu->u.z3950->which) { + case Z_APDU_initRequest: return process_init(package); + case Z_APDU_searchRequest: return process_search(package); + case Z_APDU_scanRequest: return process_scan(package); + // In theory, we should check database authorisation for + // extended services, too (A) the proxy currently does not + // implement XS and turns off its negotiation bit; (B) it + // would be insanely complex to do as the top-level XS request + // structure does not carry a database name, but it is buried + // down in some of the possible EXTERNALs used as + // taskSpecificParameters; and (C) since many extended + // services modify the database, we'd need to more exotic + // authorisation database than we want to support. + default: break; + } + } + + if (m_p->got_targetRegister && gdu->u.z3950->which == Z_APDU_initRequest) + return check_targets(package); // Operations other than those listed above do not require authorisation return package.move(); } -static void reject_init(yp2::Package &package, 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; // This is just plain perverted. if (!auth) - return reject_init(package, "no credentials supplied"); + return reject_init(package, 0, "no credentials supplied"); if (auth->which != Z_IdAuthentication_idPass) - return reject_init(package, "only idPass authentication is supported"); + return reject_init(package, 0, + "only idPass authentication is supported"); Z_IdPass *idPass = auth->u.idPass; if (m_p->userRegister.count(idPass->userId)) { @@ -222,7 +234,7 @@ void yf::AuthSimple::process_init(yp2::Package &package) const } } - return reject_init(package, "username/password combination rejected"); + return reject_init(package, 0, "username/password combination rejected"); } @@ -237,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; @@ -253,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, @@ -269,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; @@ -282,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, @@ -300,12 +313,13 @@ void yf::AuthSimple::process_scan(yp2::Package &package) const } -static void reject_init(yp2::Package &package, 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; - Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, - YAZ_BIB1_INIT_AC_AUTHENTICATION_SYSTEM_ERROR, addinfo); + 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 package.response() = apdu; @@ -313,13 +327,58 @@ static void reject_init(yp2::Package &package, const char *addinfo) { } -static yp2::filter::Base* filter_creator() +void yf::AuthSimple::check_targets(mp::Package & package) const +{ + Z_InitRequest *initReq = package.request().get()->u.z3950->u.initRequest; + + Z_IdAuthentication *auth = initReq->idAuthentication; + // We only get into this method if we are dealing with a session + // that has been authenticated using idPass authentication. So we + // know what kind of information is in the Init Request, and we + // can trust the username without needing to re-authenticate. + assert(auth->which == Z_IdAuthentication_idPass); + std::string user = auth->u.idPass->userId; + std::list authorisedTargets = m_p->targetsByUser[user]; + + std::list targets; + Z_OtherInformation *otherInfo = initReq->otherInfo; + mp::util::get_vhost_otherinfo(&otherInfo, 1, targets); + + // Check each of the targets specified in the otherInfo package + 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); + } + } + + 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 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