X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=c7251cfdebcb37ced4628e075b15b115bf017d04;hb=4b0caf61565c8791efba283bbcaf73530b9feafc;hp=af5ef476a1f6b6433cbe9ce617c4422f77f3a1c5;hpb=61aac1868f15babb7086d8bc6bbcff530346f438;p=quassel.git
diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index af5ef476..c7251cfd 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -172,16 +172,17 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
}
QVariantList backends;
- QVariantList authenticators;
+ QVariantList authenticators;
bool configured = Core::isConfigured();
if (!configured)
- {
+ {
backends = Core::backendInfo();
- authenticators = Core::authenticatorInfo();
- }
+ authenticators = Core::authenticatorInfo();
+ }
// useSsl is only used for the legacy protocol
- _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, authenticators, useSsl));
+ // 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();
@@ -195,7 +196,16 @@ void CoreAuthHandler::handle(const SetupData &msg)
if (!checkClientRegistered())
return;
- QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, msg.authenticator, msg.authSetupData);
+ // 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
@@ -208,14 +218,14 @@ void CoreAuthHandler::handle(const Login &msg)
if (!checkClientRegistered())
return;
- //UserId uid = Core::validateUser(msg.user, msg.password);
- UserId uid = Core::authenticateUser(msg.user, msg.password);
-
- // Try doing direct database auth if the provider failed, first.
- if (uid == 0) {
- uid = Core::validateUser(msg.user, msg.password);
- }
-
+ // 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.")));