X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=26cdfcfc9242dfb4c228135d19fa6c679a0d2f38;hp=d499301089d7b1726c9d5bd74c0ce58908c9c0e0;hb=08bace4e9ecf08273f094c0c6aa8b3363d38ac3e;hpb=bbe4e00c72ef57febad268b6937d950c01969a54
diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index d4993010..26cdfcfc 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2005-2015 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 *
@@ -176,18 +176,8 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
if (!configured)
backends = Core::backendInfo();
- int uptime = Core::instance()->startTime().secsTo(QDateTime::currentDateTime().toUTC());
- int updays = uptime / 86400; uptime %= 86400;
- int uphours = uptime / 3600; uptime %= 3600;
- int upmins = uptime / 60;
- QString coreInfo = tr("Quassel Core Version %1
"
- "Version date: %2
"
- "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString)
- .arg(Quassel::buildInfo().commitDate)
- .arg(updays).arg(uphours, 2, 10, QChar('0')).arg(upmins, 2, 10, QChar('0')).arg(Core::instance()->startTime().toString(Qt::TextDate));
-
- // useSsl and coreInfo are only used for the legacy protocol
- _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, coreInfo));
+ // useSsl is only used for the legacy protocol
+ _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl));
if (_legacy && useSsl)
startSsl();
@@ -214,6 +204,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;
+ }
+
UserId uid = Core::validateUser(msg.user, msg.password);
if (uid == 0) {
quInfo() << qPrintable(tr("Invalid login attempt from %1 as \"%2\"").arg(socket()->peerAddress().toString(), msg.user));