mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issues with default vlan (#165)

Browse source
This commit is contained in:
Firstyear 2020-01-10 10:49:44 +11:00 committed by GitHub
parent 7135a6e42d
commit 66b90fd378
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -1,9 +1,9 @@
docker-kanidmd: docker-kanidmd:
docker build -f kanidmd/Dockerfile -t kanidmd:latest . docker build -f kanidmd/Dockerfile -t kanidm/server:latest .
docker-radiusd: 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: vendor-prep:
cargo vendor cargo vendor

5
kanidm_rlm_python/kanidmradius.py
View file

@ -32,6 +32,7 @@ else:
CA = False CA = False
USER = CONFIG.get("kanidm_client", "user") USER = CONFIG.get("kanidm_client", "user")
SECRET = CONFIG.get("kanidm_client", "secret") SECRET = CONFIG.get("kanidm_client", "secret")
DEFAULT_VLAN = CONFIG.get("radiusd", "vlan")
URL = CONFIG.get('kanidm_client', 'url') URL = CONFIG.get('kanidm_client', 'url')
AUTH_URL = "%s/v1/auth" % URL AUTH_URL = "%s/v1/auth" % URL
@ -102,7 +103,9 @@ def authorize(args):
return radiusd.RLM_MODULE_NOTFOUND return radiusd.RLM_MODULE_NOTFOUND
# look up them in config for group vlan if possible. # 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)) print("selected vlan %s:%s" % (username, uservlan))
# Convert the tok groups to groups. # Convert the tok groups to groups.
name = tok["name"] name = tok["name"]