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

Always check active flag

Browse source
This commit is contained in:
Gina Häußge 2017-11-28 13:04:10 +01:00
parent 14bd0632c0
commit aa65671ac7
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/octoprint/server/__init__.py
View file

@ -129,17 +129,23 @@ def load_user(id):
if id == "_api":
return users.ApiUser()
if not userManager.enabled:
return users.DummyUser()
if session and "usersession.id" in session:
sessionid = session["usersession.id"]
else:
sessionid = None
if userManager.enabled:
if sessionid:
return userManager.findUser(userid=id, session=sessionid)
else:
return userManager.findUser(userid=id)
return users.DummyUser()
if sessionid:
user = userManager.findUser(userid=id, session=sessionid)
else:
user = userManager.findUser(userid=id)
if user and user.is_active():
return user
return None
#~~ startup code

6
src/octoprint/server/util/flask.py
View file

@ -487,7 +487,7 @@ def passive_login():
else:
user = flask.ext.login.current_user
if user is not None and not user.is_anonymous():
if user is not None and not user.is_anonymous() and user.is_active():
flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id()))
if hasattr(user, "session"):
flask.session["usersession.id"] = user.session
@ -506,7 +506,7 @@ def passive_login():
remoteAddr = get_remote_address(flask.request)
if netaddr.IPAddress(remoteAddr) in localNetworks:
user = octoprint.server.userManager.findUser(autologinAs)
if user is not None:
if user is not None and user.is_active():
user = octoprint.server.userManager.login_user(user)
flask.session["usersession.id"] = user.session
flask.g.user = user
@ -1213,7 +1213,7 @@ def get_json_command_from_request(request, valid_commands):
data = request.json
if data is None:
return None, None, make_response("Expected content-type JSON", 400)
if not "command" in data.keys() or not data["command"] in valid_commands.keys():
return None, None, make_response("Expected valid command", 400)