X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_auth_simple.cpp;h=33a94fa5e8832fee63cbf23b44369226463ce516;hb=f47e8cf4cde2ba5465106e219c803e6424a4f177;hp=dc9bba5875e7484a5207c8a9f4f054cc2afa0362;hpb=c8c77a99eb358f5dafeeb9d175a3f3a77520f741;p=metaproxy-moved-to-github.git diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp index dc9bba5..33a94fa 100644 --- a/src/filter_auth_simple.cpp +++ b/src/filter_auth_simple.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_auth_simple.cpp,v 1.10 2006-01-18 11:12:15 mike Exp $ +/* $Id: filter_auth_simple.cpp,v 1.17 2006-01-18 15:07:09 mike Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -34,9 +34,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 > targetsByUser; std::map userBySession; + bool discardUnauthorisedTargets; + Rep() { got_userRegister = false; + got_targetRegister = false; + discardUnauthorisedTargets = false; } }; } } @@ -58,32 +63,33 @@ static void die(std::string s) { throw yp2::filter::FilterException(s); } 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; + m_p->got_userRegister = true; } else if (!strcmp((const char *) ptr->name, "targetRegister")) { targetRegisterName = yp2::xml::get_text(ptr); - got_targetRegisterName = true; + 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) + ">"); } } - if (!got_userRegisterName && !got_targetRegisterName) + if (!m_p->got_userRegister && !m_p->got_targetRegister) die("auth_simple: no user-register or target-register " "filename specified"); - if (got_userRegisterName) + if (m_p->got_userRegister) config_userRegister(userRegisterName); - if (got_targetRegisterName) + if (m_p->got_targetRegister) config_targetRegister(targetRegisterName); } @@ -125,9 +131,38 @@ void yp2::filter::AuthSimple::config_userRegister(std::string filename) } +// 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) { - // ### empty! + 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()); + } + } + } } @@ -142,28 +177,33 @@ 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); - // 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_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(yp2::Package &package, int err, const char *addinfo); void yf::AuthSimple::process_init(yp2::Package &package) const @@ -173,9 +213,10 @@ void yf::AuthSimple::process_init(yp2::Package &package) const // 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)) { @@ -192,7 +233,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"); } @@ -252,7 +293,8 @@ 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; Z_APDU *apdu = odr.create_scanResponse( @@ -270,12 +312,13 @@ void yf::AuthSimple::process_scan(yp2::Package &package) const } -static void reject_init(yp2::Package &package, const char *addinfo) { +static void reject_init(yp2::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); + 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; @@ -283,6 +326,51 @@ static void reject_init(yp2::Package &package, const char *addinfo) { } +void yf::AuthSimple::check_targets(yp2::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::list authorisedTargets = m_p->targetsByUser[user]; + + std::list targets; + Z_OtherInformation *otherInfo = initReq->otherInfo; + yp2::util::get_vhost_otherinfo(&otherInfo, 1, 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"); + + yp2::odr odr; + yp2::util::set_vhost_otherinfo(&otherInfo, odr, targets); + package.move(); +} + + static yp2::filter::Base* filter_creator() { return new yp2::filter::AuthSimple;