X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoreauthhandler.cpp;h=e3809246002bcdd1b0b61825275a4597b493267f;hb=d98cc721477645abcb5387313f3ad2c96a580ad6;hp=d52a50b86881e949d8cbf7b6901a20d284c6c151;hpb=f51494caaac1f102d5f28a026ccce871312ddd94;p=quassel.git
diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index d52a50b8..e3809246 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2015 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -158,7 +158,8 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
else
useSsl = _connectionFeatures & Protocol::Encryption;
- if (Quassel::isOptionSet("require-ssl") && !useSsl) {
+ 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("SSL is required!
You need to use SSL in order to connect to this core.")));
_peer->close();
return;
@@ -209,6 +210,7 @@ void CoreAuthHandler::handle(const Login &msg)
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));
_peer->dispatch(LoginFailed(tr("Invalid username or password!
The username/password combination you supplied could not be found in the database.")));
return;
}