X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=240954eb761b7efd440b23ec9fe9bed9a02b5418;hb=1f2784bfa1c1ce90defa32f13c78afd72c227bfd;hp=a4c06f33aa13a0598de57ed73145e2c0243eb1ed;hpb=8435819ba319ea8f677dfe85f0ac639e29ffad1e;p=quassel.git
diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index a4c06f33..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;
@@ -171,19 +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;
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
- // 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->dispatch(ClientRegistered(Quassel::Features{}, configured, backends, authenticators, useSsl));
+ // useSsl is only used for the legacy protocol
if (_legacy && useSsl)
startSsl();
@@ -196,16 +200,15 @@ void CoreAuthHandler::handle(const SetupData &msg)
if (!checkClientRegistered())
return;
- // The default parameter to authBackend is Database.
+ // The default parameter to authenticator 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 authenticator = msg.authenticator;
+ quInfo() << "[" << authenticator << "]";
+ if (authenticator.trimmed().isEmpty()) {
+ authenticator = QString("Database");
}
- QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, authBackend, msg.authSetupData);
+ QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, authenticator, msg.authSetupData);
if (!result.isEmpty())
_peer->dispatch(SetupFailed(result));
else
@@ -218,11 +221,16 @@ 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("Attempted to login before core was configured!
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)
- {
+ if (uid == 0) {
uid = Core::authenticateUser(msg.user, msg.password);
}
@@ -235,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!