X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=240954eb761b7efd440b23ec9fe9bed9a02b5418;hb=cdc6091a2e02b84a48937cda287a0769ceb8726a;hp=a05fa95b4f63f78530f61afba3ee9b63ad5f54f9;hpb=9f91e0dd3c4eb5c2e2dedfc8d36a068d433d51b1;p=quassel.git

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index a05fa95b..240954eb 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  *
@@ -25,7 +25,7 @@
 #endif
 
 #include "core.h"
-#include "logger.h"
+#include "logmessage.h"
 
 using namespace Protocol;
 
@@ -221,6 +221,12 @@ void CoreAuthHandler::handle(const Login &msg)
     if (!checkClientRegistered())
         return;
 
+    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);
@@ -240,8 +246,12 @@ void CoreAuthHandler::handle(const Login &msg)
     const auto &clientFeatures = _peer->features();
     auto unsupported = clientFeatures.toStringList(false);
     if (!unsupported.isEmpty()) {
-        quInfo() << qPrintable(tr("Client does not support the following features: %1").arg(unsupported.join(", ")));
+        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(", ")));
     }