X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=ee505a7455e3af870fbe3939ca5104d3a4c6c10f;hp=d559e44e162c505fe6cbbe8b10309e2d5f929bbe;hb=af29862368978b94f00f13b957f685d78c7e8104;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index d559e44e..ee505a74 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -25,9 +25,6 @@
 #endif
 
 #include "core.h"
-#include "logmessage.h"
-
-using namespace Protocol;
 
 CoreAuthHandler::CoreAuthHandler(QTcpSocket* socket, QObject* parent)
     : AuthHandler(parent)
@@ -141,7 +138,7 @@ void CoreAuthHandler::onProtocolVersionMismatch(int actual, int expected)
                              "This core needs at least client/core protocol version %1 (got: %2).<br>"
                              "Please consider upgrading your client.")
                               .arg(expected, actual);
-    _peer->dispatch(ClientDenied(errorString));
+    _peer->dispatch(Protocol::ClientDenied(errorString));
     _peer->close();
 }
 
@@ -151,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("<b>Client not initialized!</b><br>You need to send a registration message before trying to login.")));
+            Protocol::ClientDenied(tr("<b>Client not initialized!</b><br>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,8 +164,8 @@ void CoreAuthHandler::handle(const RegisterClient& msg)
         useSsl = _connectionFeatures & Protocol::Encryption;
 
     if (Quassel::isOptionSet("require-ssl") && !useSsl && !_peer->isLocal()) {
-        quInfo() << qPrintable(tr("SSL required but non-SSL connection attempt from %1").arg(socket()->peerAddress().toString()));
-        _peer->dispatch(ClientDenied(tr("<b>SSL is required!</b><br>You need to use SSL in order to connect to this core.")));
+        qInfo() << qPrintable(tr("SSL required but non-SSL connection attempt from %1").arg(socket()->peerAddress().toString()));
+        _peer->dispatch(Protocol::ClientDenied(tr("<b>SSL is required!</b><br>You need to use SSL in order to connect to this core.")));
         _peer->close();
         return;
     }
@@ -187,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)
@@ -196,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;
@@ -204,19 +201,19 @@ void CoreAuthHandler::handle(const SetupData& msg)
     // The default parameter to authenticator is Database.
     // Maybe this should be hardcoded elsewhere, i.e. as a define.
     QString authenticator = msg.authenticator;
-    quInfo() << "[" << authenticator << "]";
+    qInfo() << "[" << 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));
+        _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;
@@ -224,7 +221,7 @@ 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("<b>Attempted to login before core was configured!</b><br>The core must be configured before attempting to login.")));
         return;
     }
@@ -237,27 +234,27 @@ void CoreAuthHandler::handle(const Login& msg)
     }
 
     if (uid == 0) {
-        quInfo() << qPrintable(tr("Invalid login attempt from %1 as \"%2\"").arg(socket()->peerAddress().toString(), msg.user));
-        _peer->dispatch(LoginFailed(tr(
+        qInfo() << qPrintable(tr("Invalid login attempt from %1 as \"%2\"").arg(socket()->peerAddress().toString(), msg.user));
+        _peer->dispatch(Protocol::LoginFailed(tr(
             "<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database.")));
         return;
     }
-    _peer->dispatch(LoginSuccess());
+    _peer->dispatch(Protocol::LoginSuccess());
 
-    quInfo() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).")
-                               .arg(socket()->peerAddress().toString(), msg.user, QString::number(uid.toInt())));
+    qInfo() << 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."));
+            qInfo() << qPrintable(tr("Client does not support extended features."));
         else
-            quInfo() << qPrintable(tr("Client does not support the following features: %1").arg(unsupported.join(", ")));
+            qInfo() << 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(", ")));
+        qInfo() << qPrintable(tr("Client supports unknown features: %1").arg(clientFeatures.unknownFeatures().join(", ")));
     }
 
     disconnect(socket(), nullptr, this, nullptr);