X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=c01115f4bd12993ce6b368ffa1ea72bd45c05f40;hp=af5ef476a1f6b6433cbe9ce617c4422f77f3a1c5;hb=53861faa5551606eea31588b65ba501b24fb2e1a;hpb=61aac1868f15babb7086d8bc6bbcff530346f438

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index af5ef476..c01115f4 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -172,16 +172,20 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
     }
 
     QVariantList backends;
-	QVariantList authenticators;
+    QVariantList authenticators;
     bool configured = Core::isConfigured();
-    if (!configured)
-	{
+    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));
+
+    _peer->setBuildDate(msg.buildDate);
+    _peer->setClientVersion(msg.clientVersion);
+    _peer->setFeatures(Quassel::Features(msg.clientFeatures));
 
     if (_legacy && useSsl)
         startSsl();
@@ -195,7 +199,15 @@ 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 = 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 +220,13 @@ 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("<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database.")));