X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=dcf58054a58664c83a63c7a42b579f8a4aa4d517;hb=75eedebe94c90cf8b72499594fa7f5a12f34c192;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..dcf5805 100644 --- a/src/filter_auth_simple.cpp +++ b/src/filter_auth_simple.cpp @@ -1,18 +1,29 @@ -/* $Id: filter_auth_simple.cpp,v 1.13 2006-01-18 13:32:59 mike Exp $ - Copyright (c) 2005, Index Data. - -%LICENSE% - */ +/* This file is part of Metaproxy. + Copyright (C) Index Data + +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" -#include "filter.hpp" -#include "package.hpp" +#include +#include #include -#include -#include "util.hpp" +#include #include "filter_auth_simple.hpp" #include @@ -20,9 +31,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 +49,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 +68,58 @@ 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); } +static std::string get_user(Z_InitRequest *initReq, std::string &password) +{ + Z_IdAuthentication *auth = initReq->idAuthentication; + std::string user; + if (auth) + { + const char *cp; + switch (auth->which) + { + case Z_IdAuthentication_open: + cp = strchr(auth->u.open, '/'); + if (cp) + { + user.assign(auth->u.open, cp - auth->u.open); + password.assign(cp + 1); + } + else + user = auth->u.open; + break; + case Z_IdAuthentication_idPass: + if (auth->u.idPass->userId) + user = auth->u.idPass->userId; + if (auth->u.idPass->password) + password = auth->u.idPass->password; + break; + } + } + return user; +} + // 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, + const char *path) { 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) + ">"); @@ -88,8 +136,19 @@ void yp2::filter::AuthSimple::configure(const xmlNode * ptr) config_targetRegister(targetRegisterName); } +static void split_db(std::list &dbs, + const char *databasesp) +{ + const char *cp; + while ((cp = strchr(databasesp, ','))) + { + dbs.push_back(std::string(databasesp, cp - databasesp)); + databasesp = cp + 1; + } + dbs.push_back(std::string(databasesp)); +} -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) @@ -97,7 +156,8 @@ void yp2::filter::AuthSimple::config_userRegister(std::string 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; @@ -112,24 +172,25 @@ void yp2::filter::AuthSimple::config_userRegister(std::string filename) "no databases on line: '" + buf + ":" + passwdp + "'"); *databasesp++ = 0; yf::AuthSimple::Rep::PasswordAndDBs tmp(passwdp); - boost::split(tmp.dbs, databasesp, boost::is_any_of(",")); + split_db(tmp.dbs, databasesp); m_p->userRegister[buf] = tmp; - if (0) { // 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 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) @@ -147,7 +208,7 @@ void yp2::filter::AuthSimple::config_targetRegister(std::string filename) "no targets on line: '" + buf + "'"); *targetsp++ = 0; std::list tmp; - boost::split(tmp, targetsp, boost::is_any_of(",")); + split_db(tmp, targetsp); m_p->targetsByUser[buf] = tmp; if (0) { // debugging @@ -161,7 +222,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,31 +259,28 @@ 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; - // This is just plain perverted. + Z_InitRequest *initReq = package.request().get()->u.z3950->u.initRequest; + + std::string password; + std::string user = get_user(initReq, password); - if (!auth) + if (user.length() == 0) return reject_init(package, 0, "no credentials supplied"); - if (auth->which != Z_IdAuthentication_idPass) - return reject_init(package, 0, - "only idPass authentication is supported"); - Z_IdPass *idPass = auth->u.idPass; - if (m_p->userRegister.count(idPass->userId)) { + if (m_p->userRegister.count(user)) { // groupId is ignored, in accordance with ancient tradition. yf::AuthSimple::Rep::PasswordAndDBs pdbs = - m_p->userRegister[idPass->userId]; - if (pdbs.password == idPass->password) { + m_p->userRegister[user]; + if (pdbs.password == 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; + m_p->userBySession[package.session()] = user; } return package.move(); } @@ -236,14 +294,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; @@ -259,9 +318,9 @@ 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, + package.request().get()->u.z3950, YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, req->databaseNames[i]); package.response() = apdu; @@ -275,7 +334,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,11 +347,12 @@ 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, + package.request().get()->u.z3950, YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED, req->databaseNames[i]); package.response() = apdu; @@ -306,65 +366,64 @@ 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 package.response() = apdu; package.session().close(); } - -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; - 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::string password; + std::string user = get_user(initReq, password); std::list authorisedTargets = m_p->targetsByUser[user]; std::list targets; - Z_OtherInformation *otherInfo = initReq->otherInfo; - yp2::util::get_vhost_otherinfo(&otherInfo, 0, 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::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 @@ -375,8 +434,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 */ +