X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=0d07a047b21beaeda5c01e7ae3c002fe2dc9750e;hb=d0123337d70b0fb97b578cc57467bb94980f1014;hp=b562d560897f9be61045cafb02cc9312cb03b5e0;hpb=dfe3b676252e4151e88800739b2268127e92ab37;p=metaproxy-moved-to-github.git diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp index b562d56..0d07a04 100644 --- a/src/filter_auth_simple.cpp +++ b/src/filter_auth_simple.cpp @@ -1,8 +1,20 @@ -/* $Id: filter_auth_simple.cpp,v 1.5 2006-01-17 17:24:14 mike Exp $ - Copyright (c) 2005, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2009 Index Data -%LICENSE% - */ +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include "config.hpp" @@ -20,9 +32,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; @@ -34,8 +47,14 @@ namespace yp2 { void addDB(std::string db) { dbs.push_back(db); } }; boost::mutex mutex; + bool got_userRegister, got_targetRegister; std::map userRegister; - std::map userBySession; + std::map > targetsByUser; + std::map userBySession; + bool discardUnauthorisedTargets; + Rep() { got_userRegister = false; + got_targetRegister = false; + discardUnauthorisedTargets = false; } }; } } @@ -50,70 +69,119 @@ yf::AuthSimple::~AuthSimple() } +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, bool test_only) { - std::string filename; - bool got_filename = false; + std::string userRegisterName; + std::string targetRegisterName; for (ptr = ptr->children; ptr != 0; ptr = ptr->next) { if (ptr->type != XML_ELEMENT_NODE) continue; - if (!strcmp((const char *) ptr->name, "filename")) { - filename = yp2::xml::get_text(ptr); - got_filename = true; + if (!strcmp((const char *) ptr->name, "userRegister")) { + userRegisterName = mp::xml::get_text(ptr); + m_p->got_userRegister = true; + } else if (!strcmp((const char *) ptr->name, "targetRegister")) { + targetRegisterName = mp::xml::get_text(ptr); + m_p->got_targetRegister = true; + } else if (!strcmp((const char *) ptr->name, + "discardUnauthorisedTargets")) { + m_p->discardUnauthorisedTargets = true; } else { - throw yp2::filter::FilterException("Bad element in auth_simple: <" - + std::string((const char *) - ptr->name) + ">"); + die("Bad element in auth_simple: <" + + std::string((const char *) ptr->name) + ">"); } } - if (!got_filename) - throw yp2::filter::FilterException("auth_simple: no user-register " - "filename specified"); + if (!m_p->got_userRegister && !m_p->got_targetRegister) + die("auth_simple: no user-register or target-register " + "filename specified"); + if (m_p->got_userRegister) + config_userRegister(userRegisterName); + if (m_p->got_targetRegister) + config_targetRegister(targetRegisterName); +} + + +void mp::filter::AuthSimple::config_userRegister(std::string filename) +{ FILE *fp = fopen(filename.c_str(), "r"); if (fp == 0) - throw yp2::filter::FilterException("can't open auth_simple " - "user-register '" + filename + - "': " + strerror(errno)); + die("can't open auth_simple user-register '" + filename + "': " + + strerror(errno)); char buf[1000]; - while (fgets(buf, sizeof buf, fp)) { + while (fgets(buf, sizeof buf, fp)) + { if (*buf == '\n' || *buf == '#') continue; buf[strlen(buf)-1] = 0; char *passwdp = strchr(buf, ':'); if (passwdp == 0) - throw yp2::filter::FilterException("auth_simple user-register '" + - filename + "': " + - "no password on line: '" - + buf + "'"); + die("auth_simple user-register '" + filename + "': " + + "no password on line: '" + buf + "'"); *passwdp++ = 0; char *databasesp = strchr(passwdp, ':'); if (databasesp == 0) - throw yp2::filter::FilterException("auth_simple user-register '" + - filename + "': " + - "no databases on line: '" + - buf + ":" + passwdp + "'"); + 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 (1) { // debugging + 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++) { + for (i = tmp.dbs.begin(); i != tmp.dbs.end(); i++) printf("db '%s'\n", (*i).c_str()); + } + } + fclose(fp); +} + + +// I feel a little bad about the duplication of code between this and +// config_userRegister(). But not bad enough to refactor. +// +void mp::filter::AuthSimple::config_targetRegister(std::string filename) +{ + FILE *fp = fopen(filename.c_str(), "r"); + if (fp == 0) + die("can't open auth_simple target-register '" + filename + "': " + + strerror(errno)); + + char buf[1000]; + while (fgets(buf, sizeof buf, fp)) { + if (*buf == '\n' || *buf == '#') + continue; + buf[strlen(buf)-1] = 0; + char *targetsp = strchr(buf, ':'); + if (targetsp == 0) + die("auth_simple target-register '" + filename + "': " + + "no targets on line: '" + buf + "'"); + *targetsp++ = 0; + std::list tmp; + boost::split(tmp, targetsp, boost::is_any_of(",")); + m_p->targetsByUser[buf] = tmp; + + if (0) { // debugging + printf("Added user '%s' with targets:\n", buf); + std::list::const_iterator i; + for (i = tmp.begin(); i != tmp.end(); i++) { + printf("\t%s\n", (*i).c_str()); } } } } -void yf::AuthSimple::process(yp2::Package &package) const +void yf::AuthSimple::process(mp::Package &package) const { Z_GDU *gdu = package.request().get(); @@ -124,31 +192,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); - 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)) { @@ -165,7 +248,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"); } @@ -173,14 +256,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; @@ -193,9 +277,10 @@ void yf::AuthSimple::process_search(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 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, @@ -211,7 +296,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; @@ -224,9 +309,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, @@ -242,26 +328,70 @@ 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); - apdu->u.initResponse->implementationName = "YP2/YAZ"; + mp::odr odr; + Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, err, addinfo); *apdu->u.initResponse->result = 0; // reject package.response() = apdu; package.session().close(); } -static yp2::filter::Base* filter_creator() +void yf::AuthSimple::check_targets(mp::Package & package) const { - return new yp2::filter::AuthSimple; + 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::remove_vhost_otherinfo(otherInfo, 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 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 @@ -272,8 +402,9 @@ extern "C" { /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +