X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=dcf58054a58664c83a63c7a42b579f8a4aa4d517;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=d394777f94d99a276e97e78d61b91fc01620c75f;hpb=85189f2d04df4cfc8b16ee78187fb89d00dfe3ff;p=metaproxy-moved-to-github.git diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp index d394777..dcf5805 100644 --- a/src/filter_auth_simple.cpp +++ b/src/filter_auth_simple.cpp @@ -1,7 +1,5 @@ -/* $Id: filter_auth_simple.cpp,v 1.25 2008-02-20 15:07:51 adam Exp $ - Copyright (c) 2005-2007, Index Data. - -This file is part of Metaproxy. +/* 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 @@ -14,20 +12,18 @@ 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 Metaproxy; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +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 @@ -75,8 +71,39 @@ yf::AuthSimple::~AuthSimple() 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 mp::filter::AuthSimple::configure(const xmlNode * ptr, bool test_only) +void mp::filter::AuthSimple::configure(const xmlNode * ptr, bool test_only, + const char *path) { std::string userRegisterName; std::string targetRegisterName; @@ -109,6 +136,17 @@ void mp::filter::AuthSimple::configure(const xmlNode * ptr, bool test_only) 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 mp::filter::AuthSimple::config_userRegister(std::string filename) { @@ -118,7 +156,8 @@ void mp::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; @@ -133,17 +172,18 @@ void mp::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); } @@ -168,7 +208,7 @@ void mp::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 @@ -224,26 +264,23 @@ static void reject_init(mp::Package &package, int err, const char *addinfo); 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; - if (!auth) + std::string password; + std::string user = get_user(initReq, password); + + 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(); } @@ -257,10 +294,10 @@ void yf::AuthSimple::process_init(mp::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 (mp::util::database_name_normalize(*i) == + if (mp::util::database_name_normalize(*i) == mp::util::database_name_normalize(thing)) return true; - + return false; } @@ -283,7 +320,7 @@ void yf::AuthSimple::process_search(mp::Package &package) const // Make an Search rejection APDU 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; @@ -315,7 +352,7 @@ void yf::AuthSimple::process_scan(mp::Package &package) const // Make an Scan rejection APDU 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; @@ -329,31 +366,24 @@ void yf::AuthSimple::process_scan(mp::Package &package) const } -static void reject_init(mp::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(); 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(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; @@ -404,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 */ +