-/* $Id: filter_auth_simple.cpp,v 1.12 2006-01-18 11:41:08 mike Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: filter_auth_simple.cpp,v 1.22 2007-01-25 14:05:54 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
#include <stdio.h>
#include <errno.h>
-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;
bool got_userRegister, got_targetRegister;
std::map<std::string, PasswordAndDBs> userRegister;
std::map<std::string, std::list<std::string> > targetsByUser;
- std::map<yp2::Session, std::string> userBySession;
+ std::map<mp::Session, std::string> userBySession;
+ bool discardUnauthorisedTargets;
+ Rep() { got_userRegister = false;
+ got_targetRegister = false;
+ discardUnauthorisedTargets = false; }
};
}
}
}
-static void die(std::string s) { throw yp2::filter::FilterException(s); }
+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)
{
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) + ">");
}
-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)
// 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)
}
-void yf::AuthSimple::process(yp2::Package &package) const
+void yf::AuthSimple::process(mp::Package &package) const
{
Z_GDU *gdu = package.request().get();
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(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)) {
}
}
- return reject_init(package, "username/password combination rejected");
+ return reject_init(package, 0, "username/password combination rejected");
}
static bool contains(std::list<std::string> list, std::string thing) {
std::list<std::string>::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;
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,
}
-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;
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,
}
-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);
+ 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;
}
-static yp2::filter::Base* filter_creator()
+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::list<std::string> authorisedTargets = m_p->targetsByUser[user];
+
+ std::list<std::string> targets;
+ Z_OtherInformation *otherInfo = initReq->otherInfo;
+ mp::util::get_vhost_otherinfo(otherInfo, targets);
+
+ // Check each of the targets specified in the otherInfo package
+ std::list<std::string>::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 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
projects / metaproxy-moved-to-github.git / blobdiff