X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=6cccaf87c2983ed27685601ac72e4c06ab60c5f3;hb=6a63070246d89aa2a2474e3a9a1035fa889ad77e;hp=aa1d9571029c07cadfdc6e7e0fe4d7ff5261c928;hpb=c1722505b4906fe59c48aad54e6545a17afb78d7;p=quassel.git
diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index aa1d9571..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,21 +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) {
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->_buildDate = msg.buildDate;
- _peer->_clientVersion = msg.clientVersion;
+ _peer->dispatch(ClientRegistered(Quassel::Features{}, configured, backends, authenticators, useSsl));
+ // useSsl is only used for the legacy protocol
if (_legacy && useSsl)
startSsl();
@@ -219,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("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);
@@ -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!