X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoreauthhandler.cpp;h=c7251cfdebcb37ced4628e075b15b115bf017d04;hb=4b0caf61565c8791efba283bbcaf73530b9feafc;hp=e2b352194a2a5454d0defa431ed9ebb1e769f4f7;hpb=620cd1aa35e05099b3f84400dd33afc207c98244;p=quassel.git
diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index e2b35219..c7251cfd 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -172,22 +172,17 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
}
QVariantList backends;
+ QVariantList authenticators;
bool configured = Core::isConfigured();
if (!configured)
+ {
backends = Core::backendInfo();
+ authenticators = Core::authenticatorInfo();
+ }
- int uptime = Core::instance()->startTime().secsTo(QDateTime::currentDateTime().toUTC());
- int updays = uptime / 86400; uptime %= 86400;
- int uphours = uptime / 3600; uptime %= 3600;
- int upmins = uptime / 60;
- QString coreInfo = tr("Quassel Core Version %1
"
- "Version date: %2
"
- "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString)
- .arg(Quassel::buildInfo().commitDate)
- .arg(updays).arg(uphours, 2, 10, QChar('0')).arg(upmins, 2, 10, QChar('0')).arg(Core::instance()->startTime().toString(Qt::TextDate));
-
- // useSsl and coreInfo are only used for the legacy protocol
- _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, coreInfo));
+ // useSsl is only used for the legacy protocol
+ // XXX: FIXME: use client features here: we cannot pass authenticators if the client is too old!
+ _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, authenticators));
if (_legacy && useSsl)
startSsl();
@@ -201,7 +196,16 @@ void CoreAuthHandler::handle(const SetupData &msg)
if (!checkClientRegistered())
return;
- QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData);
+ // The default parameter to authenticator is Database.
+ // Maybe this should be hardcoded elsewhere, i.e. as a define.
+ QString authenticator = msg.authenticator;
+ quInfo() << "[" << authenticator << "]";
+ if (authenticator.trimmed().isEmpty() || authenticator == 0)
+ {
+ authenticator = QString("Database");
+ }
+
+ QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, authenticator, msg.authSetupData);
if (!result.isEmpty())
_peer->dispatch(SetupFailed(result));
else
@@ -214,7 +218,14 @@ void CoreAuthHandler::handle(const Login &msg)
if (!checkClientRegistered())
return;
+ // First attempt local auth using the real username and password.
+ // If that fails, move onto the auth provider.
UserId uid = Core::validateUser(msg.user, msg.password);
+ if (uid == 0)
+ {
+ uid = Core::authenticateUser(msg.user, msg.password);
+ }
+
if (uid == 0) {
quInfo() << qPrintable(tr("Invalid login attempt from %1 as \"%2\"").arg(socket()->peerAddress().toString(), msg.user));
_peer->dispatch(LoginFailed(tr("Invalid username or password!
The username/password combination you supplied could not be found in the database.")));