Make authenticator changes to protocol backwards-compatible

[quassel.git] / src / core / coreauthhandler.cpp

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index af5ef47..47c5796 100644 (file)
--- 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 authBackend is Database.
+    // Maybe this should be hardcoded elsewhere, i.e. as a define.
+    QString authBackend = msg.authenticator;
+    quInfo() << "[" << authBackend << "]";
+    if (authBackend.trimmed().isEmpty() || authBackend == 0)
+    {
+        authBackend = QString("Database");
+    }
+
+    QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, authBackend, msg.authSetupData);
     if (!result.isEmpty())
         _peer->dispatch(SetupFailed(result));
     else
@@ -210,12 +220,12 @@ void CoreAuthHandler::handle(const Login &msg)
 
     //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);
-       }
-    
+
+    // Try doing direct database auth if the provider failed, first.
+    if (uid == 0) {
+        uid = Core::validateUser(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.")));