github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Return a 401 status code on login failure.

Browse Source 
fix #358
This commit is contained in:
Antoine Nguyen
2013-01-02 17:20:03 +01:00
parent bc9cbd30b1
commit 71dc39bbb6
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/auth/views.py
+23 -24
View File
@@ -1,11 +1,11 @@
# coding: utf-8
from django.views.decorators.cache import never_cache
from django.contrib.auth import authenticate, login, logout
from django.http import HttpResponseRedirect
from django.http import HttpResponse, HttpResponseRedirect
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
from modoboa.lib import events
from modoboa.lib.webutils import _render
from modoboa.lib.webutils import _render_to_string
from modoboa.admin import views as admviews
from forms import LoginForm
from modoboa.auth.lib import *
@@ -17,37 +17,36 @@ def dologin(request):
if form.is_valid():
user = authenticate(username=form.cleaned_data["username"],
password=form.cleaned_data["password"])
if user:
if user.is_active:
if not form.cleaned_data["rememberme"]:
request.session.set_expiry(0)
login(request, user)
if request.user.id != 1:
request.session["password"] = encrypt(request.POST["password"])
if user and user.is_active:
if not form.cleaned_data["rememberme"]:
request.session.set_expiry(0)
login(request, user)
if request.user.id != 1:
request.session["password"] = encrypt(request.POST["password"])
request.session["django_language"] = \
parameters.get_user(request.user, "LANG", app="general")
request.session["django_language"] = \
parameters.get_user(request.user, "LANG", app="general")
events.raiseEvent("UserLogin", request,
form.cleaned_data["username"],
form.cleaned_data["password"])
events.raiseEvent("UserLogin", request,
form.cleaned_data["username"],
form.cleaned_data["password"])
next = request.POST["next"]
if next.strip() in ["", "None"]:
next = reverse(admviews.domains)
return HttpResponseRedirect(next)
else:
error = _("Account is disabled.")
next = request.POST["next"]
if next.strip() in ["", "None"]:
next = reverse(admviews.domains)
return HttpResponseRedirect(next)
error = _("Your username and password didn't match. Please try again.")
next = request.POST.get("next", None)
httpcode = 401
else:
form = LoginForm()
next = request.GET.get("next", None)
httpcode = 200
return _render(request, "registration/login.html", {
"form" : form, "error" : error, "next" : next,
"annoucements" : events.raiseQueryEvent("GetAnnouncement", "loginpage")
})
return HttpResponse(_render_to_string(request, "registration/login.html", {
"form" : form, "error" : error, "next" : next,
"annoucements" : events.raiseQueryEvent("GetAnnouncement", "loginpage")
}), status=httpcode)
dologin = never_cache(dologin)