-/* $Id: filter_auth_simple.cpp,v 1.3 2006-01-16 16:32:33 mike Exp $
+/* $Id: filter_auth_simple.cpp,v 1.4 2006-01-17 17:13:31 mike Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
#include "package.hpp"
#include <boost/thread/mutex.hpp>
+#include <boost/algorithm/string.hpp>
#include "util.hpp"
#include "filter_auth_simple.hpp"
#include <yaz/zgdu.h>
+#include <yaz/diagbib1.h>
#include <stdio.h>
#include <errno.h>
namespace filter {
class AuthSimple::Rep {
friend class AuthSimple;
- typedef std::map<std::string, std::string> userpass;
- userpass reg;
+ struct PasswordAndDBs {
+ std::string password;
+ std::list<std::string> dbs;
+ PasswordAndDBs() {};
+ PasswordAndDBs(std::string pw) : password(pw) {};
+ void addDB(std::string db) { dbs.push_back(db); }
+ };
+ boost::mutex mutex;
+ std::map<std::string, PasswordAndDBs> userRegister;
+ std::map<yp2::Session, std::string> userBySession;
};
}
}
}
-void reject(yp2::Package &package, const char *addinfo) {
- // Make an Init rejection APDU
- Z_GDU *gdu = package.request().get();
- yp2::odr odr;
- Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 1014, addinfo);
- apdu->u.initResponse->implementationName = "YP2/YAZ";
- *apdu->u.initResponse->result = 0; // reject
- package.response() = apdu;
- package.session().close();
-}
-
-
-void yf::AuthSimple::process(yp2::Package &package) const
-{
- Z_GDU *gdu = package.request().get();
-
- if (!gdu || gdu->which != Z_GDU_Z3950 ||
- gdu->u.z3950->which != Z_APDU_initRequest) {
- // pass on package -- I think that means authentication is
- // accepted which may not be the correct thing for non-Z APDUs
- // as it means that SRW sessions don't demand authentication
- return package.move();
- }
-
- Z_IdAuthentication *auth = gdu->u.z3950->u.initRequest->idAuthentication;
- if (!auth)
- return reject(package, "no credentials supplied");
- if (auth->which != Z_IdAuthentication_idPass)
- return reject(package, "only idPass authentication is supported");
- Z_IdPass *idPass = auth->u.idPass;
- // groupId is ignored, in accordance with ancient tradition
- if (m_p->reg[idPass->userId] == idPass->password) {
- // Success! Should the authentication information now be
- // altered or deleted? That could be configurable.
- return package.move();
- }
- return reject(package, "username/password combination rejected");
-}
-
-
// Read XML config.. Put config info in m_p.
void yp2::filter::AuthSimple::configure(const xmlNode * ptr)
{
filename = yp2::xml::get_text(ptr);
got_filename = true;
} else {
- throw yp2::filter::FilterException("Bad element in auth_simple: "
+ throw yp2::filter::FilterException("Bad element in auth_simple: <"
+ std::string((const char *)
- ptr->name));
+ ptr->name) + ">");
}
}
if (*buf == '\n' || *buf == '#')
continue;
buf[strlen(buf)-1] = 0;
- char *cp = strchr(buf, ':');
- if (cp == 0)
+ char *passwdp = strchr(buf, ':');
+ if (passwdp == 0)
+ throw yp2::filter::FilterException("auth_simple user-register '" +
+ filename + "': " +
+ "no password on line: '"
+ + buf + "'");
+ *passwdp++ = 0;
+ char *databasesp = strchr(passwdp, ':');
+ if (databasesp == 0)
throw yp2::filter::FilterException("auth_simple user-register '" +
- filename + "': bad line: " +
- buf);
- *cp++ = 0;
- m_p->reg[buf] = cp;
- //printf("Added user '%s' -> password '%s'\n", buf, cp);
+ filename + "': " +
+ "no databases on line: '" +
+ buf + ":" + passwdp + "'");
+ *databasesp++ = 0;
+ yf::AuthSimple::Rep::PasswordAndDBs tmp(passwdp);
+ boost::split(tmp.dbs, databasesp, boost::is_any_of(","));
+ m_p->userRegister[buf] = tmp;
+
+ if (1) { // debugging
+ printf("Added user '%s' -> password '%s'\n", buf, passwdp);
+ std::list<std::string>::const_iterator i;
+ for (i = tmp.dbs.begin(); i != tmp.dbs.end(); i++) {
+ printf("db '%s'\n", (*i).c_str());
+ }
+ }
+ }
+}
+
+
+void yf::AuthSimple::process(yp2::Package &package) const
+{
+ Z_GDU *gdu = package.request().get();
+
+ if (!gdu || gdu->which != Z_GDU_Z3950) {
+ // Pass on the package -- This means that authentication is
+ // waived, which may not be the correct thing for non-Z APDUs
+ // as it means that SRW sessions don't demand authentication
+ return package.move();
+ }
+
+ switch (gdu->u.z3950->which) {
+ case Z_APDU_initRequest: return process_init(package);
+ case Z_APDU_searchRequest: return process_search(package);
+ default: break;
+ }
+
+ // Operations other than those listed above do not require authorisation
+ return package.move();
+}
+
+
+static void reject_init(yp2::Package &package, const char *addinfo);
+
+
+void yf::AuthSimple::process_init(yp2::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");
+ if (auth->which != Z_IdAuthentication_idPass)
+ return reject_init(package, "only idPass authentication is supported");
+ Z_IdPass *idPass = auth->u.idPass;
+
+ if (m_p->userRegister.count(idPass->userId)) {
+ // groupId is ignored, in accordance with ancient tradition.
+ yf::AuthSimple::Rep::PasswordAndDBs pdbs =
+ m_p->userRegister[idPass->userId];
+ if (pdbs.password == idPass->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;
+ }
+ return package.move();
+ }
+ }
+
+ return reject_init(package, "username/password combination rejected");
+}
+
+
+// I find it unutterable disappointing that I have to provide this
+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)
+ return true;
+
+ return false;
+}
+
+
+void yf::AuthSimple::process_search(yp2::Package &package) const
+{
+ Z_SearchRequest *req =
+ package.request().get()->u.z3950->u.searchRequest;
+
+ if (m_p->userBySession.count(package.session()) == 0) {
+ // It's a non-authenticated session, so just accept the operation
+ return package.move();
}
+
+ 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])) {
+ // Make an Search rejection APDU
+ yp2::odr odr;
+ Z_APDU *apdu = odr.create_searchResponse(
+ package.request().get()->u.z3950,
+ YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED,
+ req->databaseNames[i]);
+ package.response() = apdu;
+ package.session().close();
+ return;
+ }
+ }
+
+ // All the requested databases are acceptable
+ return package.move();
+}
+
+
+static void reject_init(yp2::Package &package, const char *addinfo) {
+ // 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);
+ apdu->u.initResponse->implementationName = "YP2/YAZ";
+ *apdu->u.initResponse->result = 0; // reject
+ package.response() = apdu;
+ package.session().close();
}
+
static yp2::filter::Base* filter_creator()
{
return new yp2::filter::AuthSimple;
projects / metaproxy-moved-to-github.git / commitdiff