/***************************************************************************
- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
LdapAuthenticator::~LdapAuthenticator()
{
- if (_connection != 0)
- {
+ if (_connection != 0) {
ldap_unbind_ext(_connection, 0, 0);
}
}
return true;
}
+
QString LdapAuthenticator::backendId() const
{
- // We identify the backend to use for the monolithic core by its displayname.
+ // We identify the backend to use for the monolithic core by this identifier.
// so only change this string if you _really_ have to and make sure the core
// setup for the mono client still works ;)
return QString("LDAP");
}
+
+QString LdapAuthenticator::displayName() const
+{
+ return tr("LDAP");
+}
+
+
QString LdapAuthenticator::description() const
{
return tr("Authenticate users using an LDAP server.");
return keys;
}
+
QVariantMap LdapAuthenticator::setupDefaults() const
{
QVariantMap map;
return map;
}
-void LdapAuthenticator::setConnectionProperties(const QVariantMap &properties)
+
+void LdapAuthenticator::setAuthProperties(const QVariantMap &properties)
{
_hostName = properties["Hostname"].toString();
_port = properties["Port"].toInt();
UserId LdapAuthenticator::validateUser(const QString &username, const QString &password)
{
bool result = ldapAuth(username, password);
- if (!result)
- {
+ if (!result) {
return UserId();
}
// Users created via LDAP have empty passwords, but authenticator column = LDAP.
// On the other hand, if auth succeeds and the user already exists, do a final
// cross-check to confirm we're using the right auth provider.
- UserId quasselID = Core::validateUser(username, QString());
- if (!quasselID.isValid())
- {
+ UserId quasselId = Core::validateUser(username, QString());
+ if (!quasselId.isValid()) {
return Core::addUser(username, QString(), backendId());
}
- else if (!(Core::checkAuthProvider(quasselID, backendId())))
- {
+ else if (!(Core::checkAuthProvider(quasselId, backendId()))) {
return 0;
}
- return quasselID;
+ return quasselId;
}
+
bool LdapAuthenticator::setup(const QVariantMap &settings)
{
- setConnectionProperties(settings);
+ setAuthProperties(settings);
bool status = ldapConnect();
return status;
}
+
Authenticator::State LdapAuthenticator::init(const QVariantMap &settings)
{
- setConnectionProperties(settings);
+ setAuthProperties(settings);
bool status = ldapConnect();
- if (!status)
- {
+ if (!status) {
quInfo() << qPrintable(backendId()) << "Authenticator cannot connect.";
return NotAvailable;
}
return true;
}
+
void LdapAuthenticator::ldapDisconnect()
{
if (_connection == 0) {
_connection = 0;
}
+
bool LdapAuthenticator::ldapAuth(const QString &username, const QString &password)
{
if (password.isEmpty()) {
// Attempt to establish a connection.
if (_connection == 0) {
- if (not ldapConnect()) {
+ if (!ldapConnect()) {
return false;
}
}
QByteArray baseDN = _baseDN.toLocal8Bit();
QByteArray uidAttribute = _uidAttribute.toLocal8Bit();
- cred.bv_val = const_cast<char*>(bindPassword.size() > 0 ? bindPassword.constData() : NULL);
+ cred.bv_val = (bindPassword.size() > 0 ? bindPassword.data() : NULL);
cred.bv_len = bindPassword.size();
res = ldap_sasl_bind_s(_connection, bindDN.size() > 0 ? bindDN.constData() : 0, LDAP_SASL_SIMPLE, &cred, 0, 0, 0);
return false;
}
- const QByteArray passwordArray = password.toLocal8Bit();
- cred.bv_val = const_cast<char*>(passwordArray.constData());
+ QByteArray passwordArray = password.toLocal8Bit();
+ cred.bv_val = passwordArray.data();
cred.bv_len = password.size();
char *userDN = ldap_get_dn(_connection, entry);