X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=dc9bba5875e7484a5207c8a9f4f054cc2afa0362;hb=c8c77a99eb358f5dafeeb9d175a3f3a77520f741;hp=d5a4c820406427bea73e76ce1b7cf147e517946f;hpb=43f83ff3bbbb31c8fee9ba67da5a89f9cddf0ae7;p=metaproxy-moved-to-github.git diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp index d5a4c82..dc9bba5 100644 --- a/src/filter_auth_simple.cpp +++ b/src/filter_auth_simple.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_auth_simple.cpp,v 1.1 2006-01-12 10:04:34 adam Exp $ +/* $Id: filter_auth_simple.cpp,v 1.10 2006-01-18 11:12:15 mike Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -10,11 +10,15 @@ #include "package.hpp" #include +#include #include "util.hpp" #include "filter_auth_simple.hpp" #include +#include +#include +#include namespace yf = yp2::filter; @@ -22,58 +26,263 @@ namespace yp2 { namespace filter { class AuthSimple::Rep { friend class AuthSimple; - int dummy; // private data + struct PasswordAndDBs { + std::string password; + std::list dbs; + PasswordAndDBs() {}; + PasswordAndDBs(std::string pw) : password(pw) {}; + void addDB(std::string db) { dbs.push_back(db); } + }; + boost::mutex mutex; + std::map userRegister; + std::map > targetsByUser; + std::map userBySession; }; } } yf::AuthSimple::AuthSimple() : m_p(new Rep) { - m_p->dummy = 1; + // nothing to do } yf::AuthSimple::~AuthSimple() { // must have a destructor because of boost::scoped_ptr } + +static void die(std::string s) { throw yp2::filter::FilterException(s); } + + +// Read XML config.. Put config info in m_p. +void yp2::filter::AuthSimple::configure(const xmlNode * ptr) +{ + std::string userRegisterName; + bool got_userRegisterName = false; + std::string targetRegisterName; + bool got_targetRegisterName = 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); + got_userRegisterName = true; + } else if (!strcmp((const char *) ptr->name, "targetRegister")) { + targetRegisterName = yp2::xml::get_text(ptr); + got_targetRegisterName = true; + } else { + die("Bad element in auth_simple: <" + + std::string((const char *) ptr->name) + ">"); + } + } + + if (!got_userRegisterName && !got_targetRegisterName) + die("auth_simple: no user-register or target-register " + "filename specified"); + + if (got_userRegisterName) + config_userRegister(userRegisterName); + if (got_targetRegisterName) + config_targetRegister(targetRegisterName); +} + + +void yp2::filter::AuthSimple::config_userRegister(std::string filename) +{ + FILE *fp = fopen(filename.c_str(), "r"); + if (fp == 0) + die("can't open auth_simple user-register '" + filename + "': " + + strerror(errno)); + + char buf[1000]; + while (fgets(buf, sizeof buf, fp)) { + if (*buf == '\n' || *buf == '#') + continue; + buf[strlen(buf)-1] = 0; + char *passwdp = strchr(buf, ':'); + if (passwdp == 0) + die("auth_simple user-register '" + filename + "': " + + "no password on line: '" + buf + "'"); + *passwdp++ = 0; + char *databasesp = strchr(passwdp, ':'); + if (databasesp == 0) + die("auth_simple user-register '" + filename + "': " + + "no databases on line: '" + buf + ":" + passwdp + "'"); + *databasesp++ = 0; + yf::AuthSimple::Rep::PasswordAndDBs tmp(passwdp); + boost::split(tmp.dbs, databasesp, boost::is_any_of(",")); + m_p->userRegister[buf] = tmp; + + if (0) { // debugging + printf("Added user '%s' -> password '%s'\n", buf, passwdp); + std::list::const_iterator i; + for (i = tmp.dbs.begin(); i != tmp.dbs.end(); i++) { + printf("db '%s'\n", (*i).c_str()); + } + } + } +} + + +void yp2::filter::AuthSimple::config_targetRegister(std::string filename) +{ + // ### empty! +} + + void yf::AuthSimple::process(yp2::Package &package) const { Z_GDU *gdu = package.request().get(); - if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == - Z_APDU_initRequest) - { - // we have a Z39.50 init request - Z_InitRequest *init = gdu->u.z3950->u.initRequest; + if (!gdu || gdu->which != Z_GDU_Z3950) { + // Pass on the package -- This means that authentication is + // waived, which may not be the correct thing for non-Z APDUs + // as it means that SRW sessions don't demand authentication + 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; + } + + // Operations other than those listed above do not require authorisation + return package.move(); +} + + +static void reject_init(yp2::Package &package, const char *addinfo); + + +void yf::AuthSimple::process_init(yp2::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"); + if (auth->which != Z_IdAuthentication_idPass) + return reject_init(package, "only idPass authentication is supported"); + Z_IdPass *idPass = auth->u.idPass; - // for now reject if we don't supply _some_ auth - if (!init->idAuthentication) - { + if (m_p->userRegister.count(idPass->userId)) { + // groupId is ignored, in accordance with ancient tradition. + yf::AuthSimple::Rep::PasswordAndDBs pdbs = + m_p->userRegister[idPass->userId]; + if (pdbs.password == idPass->password) { + // Success! Remember who the user is for future reference + { + boost::mutex::scoped_lock lock(m_p->mutex); + m_p->userBySession[package.session()] = idPass->userId; + } + return package.move(); + } + } + + return reject_init(package, "username/password combination rejected"); +} + + +// I find it unutterable disappointing that I have to provide this +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) + return true; + + return false; +} + + +void yf::AuthSimple::process_search(yp2::Package &package) const +{ + Z_SearchRequest *req = + package.request().get()->u.z3950->u.searchRequest; + + if (m_p->userBySession.count(package.session()) == 0) { + // It's a non-authenticated session, so just accept the operation + return package.move(); + } + + 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]) && + !contains(pdb.dbs, "*")) { + // Make an Search rejection APDU yp2::odr odr; - Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse); - - apdu->u.initResponse->implementationName = "YP2/YAZ"; - *apdu->u.initResponse->result = 0; // reject - + Z_APDU *apdu = odr.create_searchResponse( + package.request().get()->u.z3950, + YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, + req->databaseNames[i]); package.response() = apdu; - package.session().close(); return; } - // if we get here access is granted.. - - // should authentication be altered of deleted? - // that could be configurable.. } - package.move(); // pass on package + + // All the requested databases are acceptable + return package.move(); } -void yp2::filter::AuthSimple::configure(const xmlNode * ptr) + +void yf::AuthSimple::process_scan(yp2::Package &package) const { - // Read XML config.. Put config info in m_p.. - m_p->dummy = 1; + Z_ScanRequest *req = + package.request().get()->u.z3950->u.scanRequest; + + if (m_p->userBySession.count(package.session()) == 0) { + // It's a non-authenticated session, so just accept the operation + return package.move(); + } + + 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])) { + // Make an Scan rejection APDU + yp2::odr odr; + Z_APDU *apdu = odr.create_scanResponse( + package.request().get()->u.z3950, + YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, + req->databaseNames[i]); + package.response() = apdu; + package.session().close(); + return; + } + } + + // All the requested databases are acceptable + return package.move(); +} + + +static void reject_init(yp2::Package &package, const char *addinfo) { + // 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); + apdu->u.initResponse->implementationName = "YP2/YAZ"; + *apdu->u.initResponse->result = 0; // reject + package.response() = apdu; + package.session().close(); } + static yp2::filter::Base* filter_creator() { return new yp2::filter::AuthSimple;