-/* $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 <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/algorithm/string.hpp>
-#include "util.hpp"
+#include <metaproxy/util.hpp>
#include "filter_auth_simple.hpp"
#include <yaz/zgdu.h>
// 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;
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;
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<std::string>::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);
}
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;
+
+ std::string password;
+ std::string user = get_user(initReq, password);
- if (!auth)
+ 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();
}
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 (mp::util::database_name_normalize(*i) ==
+ if (mp::util::database_name_normalize(*i) ==
mp::util::database_name_normalize(thing))
return true;
-
+
return false;
}
// 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;
// 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;
}
-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();
}
+std::string yf::AuthSimple::get_user(Z_InitRequest *initReq,
+ std::string &password) const
+{
+ 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;
+}
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<std::string> authorisedTargets = m_p->targetsByUser[user];
std::list<std::string> 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<std::string>::iterator i;
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();
}
/*
* 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
*/
+