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

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index 34fc2227..af5ef476 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   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  *
@@ -172,22 +172,16 @@ 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("<b>Quassel Core Version %1</b><br>"
-                          "Built: %2<br>"
-                          "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString)
-                          .arg(Quassel::buildInfo().buildDate)
-                          .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
+    _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, authenticators, useSsl));
 
     if (_legacy && useSsl)
         startSsl();
@@ -201,7 +195,7 @@ void CoreAuthHandler::handle(const SetupData &msg)
     if (!checkClientRegistered())
         return;
 
-    QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData);
+    QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, msg.authenticator, msg.authSetupData);
     if (!result.isEmpty())
         _peer->dispatch(SetupFailed(result));
     else
@@ -214,7 +208,14 @@ void CoreAuthHandler::handle(const Login &msg)
     if (!checkClientRegistered())
         return;
 
-    UserId uid = Core::validateUser(msg.user, msg.password);
+    //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);
+	}
+    
     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.")));