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

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index af5ef476..6cccaf87 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -171,18 +171,23 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
         return;
     }
 
+    _peer->setFeatures(std::move(msg.features));
+    _peer->setBuildDate(msg.buildDate);
+    _peer->setClientVersion(msg.clientVersion);
+
     QVariantList backends;
-	QVariantList authenticators;
+    QVariantList authenticators;
     bool configured = Core::isConfigured();
-    if (!configured)
-	{
+    if (!configured) {
         backends = Core::backendInfo();
-		authenticators = Core::authenticatorInfo();
-	}
+        if (_peer->hasFeature(Quassel::Feature::Authenticators)) {
+            authenticators = Core::authenticatorInfo();
+        }
+    }
 
-    // useSsl is only used for the legacy protocol
-    _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, authenticators, useSsl));
+    _peer->dispatch(ClientRegistered(Quassel::Features{}, configured, backends, authenticators, useSsl));
 
+    // useSsl is only used for the legacy protocol
     if (_legacy && useSsl)
         startSsl();
 
@@ -195,7 +200,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 +221,19 @@ 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);
-	}
-    
+    if (!Core::isConfigured()) {
+        qWarning() << qPrintable(tr("Client")) << qPrintable(socket()->peerAddress().toString()) << qPrintable(tr("attempted to login before the core was configured, rejecting."));
+        _peer->dispatch(ClientDenied(tr("<b>Attempted to login before core was configured!</b><br>The core must be configured before attempting to login.")));
+        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("<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database.")));
@@ -225,6 +243,19 @@ void CoreAuthHandler::handle(const Login &msg)
 
     quInfo() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).").arg(socket()->peerAddress().toString(), msg.user, QString::number(uid.toInt())));
 
+    const auto &clientFeatures = _peer->features();
+    auto unsupported = clientFeatures.toStringList(false);
+    if (!unsupported.isEmpty()) {
+        if (unsupported.contains("NoFeatures"))
+            quInfo() << qPrintable(tr("Client does not support extended features."));
+        else
+            quInfo() << qPrintable(tr("Client does not support the following features: %1").arg(unsupported.join(", ")));
+    }
+
+    if (!clientFeatures.unknownFeatures().isEmpty()) {
+        quInfo() << qPrintable(tr("Client supports unknown features: %1").arg(clientFeatures.unknownFeatures().join(", ")));
+    }
+
     disconnect(socket(), 0, this, 0);
     disconnect(_peer, 0, this, 0);
     _peer->setParent(0); // Core needs to take care of this one now!