Merge branch 'fix-unknown-user' into 'master'
Fix AttributeError when username is unknown See merge request re2o/re2o-radius!4
This commit is contained in:
commit
eb5f65e3a1
1 changed files with 16 additions and 5 deletions
21
auth.py
21
auth.py
|
@ -159,9 +159,20 @@ def authorize(data):
|
||||||
nas_type = data_from_api["nas"]
|
nas_type = data_from_api["nas"]
|
||||||
user = data_from_api["user"]
|
user = data_from_api["user"]
|
||||||
|
|
||||||
if not nas_type or nas_type and nas_type["port_access_mode"] == "802.1X":
|
if not nas_type or (nas_type and nas_type["port_access_mode"]) == "802.1X":
|
||||||
password = user.get("pwd_ntlm", "")
|
|
||||||
logger.info(username.encode("utf-8"))
|
# The user doesn't exist
|
||||||
|
if not user:
|
||||||
|
logger.info("User \"{0}\" does not exist, reject".format(username))
|
||||||
|
return radiusd.RLM_MODULE_REJECT
|
||||||
|
|
||||||
|
password = user.get("pwd_ntlm", None)
|
||||||
|
|
||||||
|
if not password:
|
||||||
|
logger.info("User \"{0}\" doesn't have a NTLM password, reject".format(username))
|
||||||
|
return radiusd.RLM_MODULE_REJECT
|
||||||
|
|
||||||
|
logger.info("User \"{0}\" accepted in authorize".format(username))
|
||||||
|
|
||||||
return (
|
return (
|
||||||
radiusd.RLM_MODULE_UPDATED,
|
radiusd.RLM_MODULE_UPDATED,
|
||||||
|
@ -249,8 +260,8 @@ def post_auth(data):
|
||||||
result, log = check_user_machine_and_register(
|
result, log = check_user_machine_and_register(
|
||||||
nas_type, user, user_interface, nas, username, mac)
|
nas_type, user, user_interface, nas, username, mac)
|
||||||
|
|
||||||
logger.info(log.encode("utf-8"))
|
logger.info(log)
|
||||||
logger.info(username.encode("utf-8"))
|
logger.info(username)
|
||||||
|
|
||||||
if not result:
|
if not result:
|
||||||
return radiusd.RLM_MODULE_REJECT
|
return radiusd.RLM_MODULE_REJECT
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue