From 66b90fd378a54dc7b149db30d243b8ed1e94e77f Mon Sep 17 00:00:00 2001 From: Firstyear Date: Fri, 10 Jan 2020 10:49:44 +1100 Subject: [PATCH] Fix issues with default vlan (#165) --- Makefile | 4 ++-- kanidm_rlm_python/kanidmradius.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8410017cd..34964ab1a 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ docker-kanidmd: - docker build -f kanidmd/Dockerfile -t kanidmd:latest . + docker build -f kanidmd/Dockerfile -t kanidm/server:latest . docker-radiusd: - docker build -f kanidm_rlm_python/Dockerfile -t kanidm_radius:latest kanidm_rlm_python + docker build -f kanidm_rlm_python/Dockerfile -t kanidm/radius:latest kanidm_rlm_python vendor-prep: cargo vendor diff --git a/kanidm_rlm_python/kanidmradius.py b/kanidm_rlm_python/kanidmradius.py index 58910901f..0748d5791 100644 --- a/kanidm_rlm_python/kanidmradius.py +++ b/kanidm_rlm_python/kanidmradius.py @@ -32,6 +32,7 @@ else: CA = False USER = CONFIG.get("kanidm_client", "user") SECRET = CONFIG.get("kanidm_client", "secret") +DEFAULT_VLAN = CONFIG.get("radiusd", "vlan") URL = CONFIG.get('kanidm_client', 'url') AUTH_URL = "%s/v1/auth" % URL @@ -102,7 +103,9 @@ def authorize(args): return radiusd.RLM_MODULE_NOTFOUND # look up them in config for group vlan if possible. - uservlan = reduce(check_vlan, tok["groups"], 0) + uservlan = reduce(check_vlan, tok["groups"], DEFAULT_VLAN) + if uservlan == 0: + print("mistake!") print("selected vlan %s:%s" % (username, uservlan)) # Convert the tok groups to groups. name = tok["name"]