X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=74d17a79b0c37a5f80e8ca3b63eb5ab0b5fa10d6;hb=73f37c91c144b070020df2f27472c09b62367acf;hp=63356cff68aef7431159afbbb57ce498ec2bfda8;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp index 63356cf..74d17a7 100644 --- a/src/filter_auth_simple.cpp +++ b/src/filter_auth_simple.cpp @@ -1,18 +1,30 @@ -/* $Id: filter_auth_simple.cpp,v 1.20 2006-06-10 14:29:12 adam Exp $ - Copyright (c) 2005-2006, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2012 Index Data - See the LICENSE file for details - */ +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 @@ -61,7 +73,8 @@ static void die(std::string s) { throw mp::filter::FilterException(s); } // Read XML config.. Put config info in m_p. -void mp::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; @@ -103,7 +116,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; @@ -121,14 +135,15 @@ void mp::filter::AuthSimple::config_userRegister(std::string filename) boost::split(tmp.dbs, databasesp, boost::is_any_of(",")); 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); } @@ -242,10 +257,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; } @@ -268,7 +283,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; @@ -300,7 +315,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; @@ -314,14 +329,13 @@ 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(); @@ -342,8 +356,8 @@ void yf::AuthSimple::check_targets(mp::Package & package) const std::list authorisedTargets = m_p->targetsByUser[user]; std::list targets; - Z_OtherInformation *otherInfo = initReq->otherInfo; - mp::util::get_vhost_otherinfo(&otherInfo, 1, 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; @@ -366,9 +380,8 @@ void yf::AuthSimple::check_targets(mp::Package & package) const 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); + mp::util::set_vhost_otherinfo(otherInfo, odr, targets); package.move(); } @@ -390,8 +403,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 */ +