X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=d8f81abe516d0801f8bce7f75c71036001e31969;hp=3514ecd15580e0c4b4faa0193f014bdfae721bb7;hb=8efbb2ef22f5f007b5dc6d5b15ecf070ccef08ca;hpb=8c6448c2e0048389fbac9e2e9daf22b5b050d5b6
diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index 3514ecd1..d8f81abe 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2005-2018 by the Quassel Project *
+ * Copyright (C) 2005-2019 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -26,8 +26,6 @@
#include "core.h"
-using namespace Protocol;
-
CoreAuthHandler::CoreAuthHandler(QTcpSocket* socket, QObject* parent)
: AuthHandler(parent)
, _peer(nullptr)
@@ -140,7 +138,7 @@ void CoreAuthHandler::onProtocolVersionMismatch(int actual, int expected)
"This core needs at least client/core protocol version %1 (got: %2).
"
"Please consider upgrading your client.")
.arg(expected, actual);
- _peer->dispatch(ClientDenied(errorString));
+ _peer->dispatch(Protocol::ClientDenied(errorString));
_peer->close();
}
@@ -150,14 +148,14 @@ bool CoreAuthHandler::checkClientRegistered()
qWarning() << qPrintable(tr("Client")) << qPrintable(socket()->peerAddress().toString())
<< qPrintable(tr("did not send a registration message before trying to login, rejecting."));
_peer->dispatch(
- ClientDenied(tr("Client not initialized!
You need to send a registration message before trying to login.")));
+ Protocol::ClientDenied(tr("Client not initialized!
You need to send a registration message before trying to login.")));
_peer->close();
return false;
}
return true;
}
-void CoreAuthHandler::handle(const RegisterClient& msg)
+void CoreAuthHandler::handle(const Protocol::RegisterClient& msg)
{
bool useSsl;
if (_legacy)
@@ -167,7 +165,7 @@ void CoreAuthHandler::handle(const RegisterClient& msg)
if (Quassel::isOptionSet("require-ssl") && !useSsl && !_peer->isLocal()) {
qInfo() << qPrintable(tr("SSL required but non-SSL connection attempt from %1").arg(socket()->peerAddress().toString()));
- _peer->dispatch(ClientDenied(tr("SSL is required!
You need to use SSL in order to connect to this core.")));
+ _peer->dispatch(Protocol::ClientDenied(tr("SSL is required!
You need to use SSL in order to connect to this core.")));
_peer->close();
return;
}
@@ -186,7 +184,7 @@ void CoreAuthHandler::handle(const RegisterClient& msg)
}
}
- _peer->dispatch(ClientRegistered(Quassel::Features{}, configured, backends, authenticators, useSsl));
+ _peer->dispatch(Protocol::ClientRegistered(Quassel::Features{}, configured, backends, authenticators, useSsl));
// useSsl is only used for the legacy protocol
if (_legacy && useSsl)
@@ -195,7 +193,7 @@ void CoreAuthHandler::handle(const RegisterClient& msg)
_clientRegistered = true;
}
-void CoreAuthHandler::handle(const SetupData& msg)
+void CoreAuthHandler::handle(const Protocol::SetupData& msg)
{
if (!checkClientRegistered())
return;
@@ -210,12 +208,12 @@ void CoreAuthHandler::handle(const SetupData& msg)
QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, authenticator, msg.authSetupData);
if (!result.isEmpty())
- _peer->dispatch(SetupFailed(result));
+ _peer->dispatch(Protocol::SetupFailed(result));
else
- _peer->dispatch(SetupDone());
+ _peer->dispatch(Protocol::SetupDone());
}
-void CoreAuthHandler::handle(const Login& msg)
+void CoreAuthHandler::handle(const Protocol::Login& msg)
{
if (!checkClientRegistered())
return;
@@ -223,25 +221,35 @@ void CoreAuthHandler::handle(const Login& msg)
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(
+ _peer->dispatch(Protocol::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);
+
+ // Check to see if the user has the "Database" authenticator configured.
+ UserId uid = 0;
+ if (Core::getUserAuthenticator(msg.user) == "Database") {
+ uid = Core::validateUser(msg.user, msg.password);
+ }
+
+ // If they did not, *or* if the database login fails, try to use a different authenticator.
+ // TODO: this logic should likely be moved into Core::authenticateUser in the future.
+ // Right now a core can only have one authenticator configured; this might be something
+ // to change in the future.
if (uid == 0) {
uid = Core::authenticateUser(msg.user, msg.password);
}
if (uid == 0) {
qInfo() << qPrintable(tr("Invalid login attempt from %1 as \"%2\"").arg(socket()->peerAddress().toString(), msg.user));
- _peer->dispatch(LoginFailed(tr(
+ _peer->dispatch(Protocol::LoginFailed(tr(
"Invalid username or password!
The username/password combination you supplied could not be found in the database.")));
return;
}
- _peer->dispatch(LoginSuccess());
+ _peer->dispatch(Protocol::LoginSuccess());
qInfo() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).")
.arg(socket()->peerAddress().toString(), msg.user, QString::number(uid.toInt())));