pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only send "deactivated" status if password matches

Browse source
This commit is contained in:
Gina Häußge 2017-10-25 17:30:56 +02:00
parent 0afa854763
commit 14b8fd7fa5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/server/api/__init__.py
View file

@ -204,10 +204,10 @@ def login():
user = octoprint.server.userManager.findUser(username)
if user is not None:
if not user.is_active():
return make_response(("Your account is deactivated", 403, []))
if octoprint.server.userManager.checkPassword(username, password):
if not user.is_active():
return make_response(("Your account is deactivated", 403, []))
if octoprint.server.userManager.enabled:
user = octoprint.server.userManager.login_user(user)
session["usersession.id"] = user.session