mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-25 10:46:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix status returned to banned user.

Browse source
This commit is contained in:
Vladimir Golovnev (Glassez) 2014-11-03 16:22:25 +03:00
parent 6f14b34470
commit 651bf4f9aa
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/webui/abstractrequesthandler.cpp
View file

@ -38,22 +38,25 @@
AbstractRequestHandler::AbstractRequestHandler(const HttpRequest &request, const HttpEnvironment &env, WebApplication *app) AbstractRequestHandler::AbstractRequestHandler(const HttpRequest &request, const HttpEnvironment &env, WebApplication *app)
: app_(app), session_(0), request_(request), env_(env) : app_(app), session_(0), request_(request), env_(env)
{ {
if (isBanned())
{
status(403, "Forbidden");
print(QObject::tr("Your IP address has been banned after too many failed authentication attempts."));
return;
}
sessionInitialize(); sessionInitialize();
if (!sessionActive() && !isAuthNeeded())
if (!sessionActive() && !isAuthNeeded()) sessionStart(); sessionStart();
} }
HttpResponse AbstractRequestHandler::run() HttpResponse AbstractRequestHandler::run()
{ {
response_ = HttpResponse(); response_ = HttpResponse();
processRequest();
if (isBanned())
{
status(403, "Forbidden");
print(QObject::tr("Your IP address has been banned after too many failed authentication attempts."));
}
else
{
processRequest();
}
return response_; return response_;
} }

11
src/webui/www/private/login.html
View file

@ -20,8 +20,15 @@
url: '/login', url: '/login',
method: 'post', method: 'post',
data: $('loginform').toQueryString(), data: $('loginform').toQueryString(),
onFailure: function() { onComplete: function() {
alert("_(Unable to log in, qBittorrent is probably unreachable.)"); $('password').set('value', '');
},
onFailure: function(xhr) {
if (xhr.responseText != "") {
$('error_msg').set('html', xhr.responseText);
} else {
$('error_msg').set('html', '_(Unable to log in, qBittorrent is probably unreachable.)');
}
}, },
onSuccess: function(text) { onSuccess: function(text) {
if (text == "Ok.") { if (text == "Ok.") {