rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 19:33:11 +00:00
Code Issues Releases Wiki Activity

cached values for radius policies

Browse source
This commit is contained in:
Hugo LEVY-FALK 2018-12-08 21:47:21 +01:00 committed by chirac
parent 7e9de612fa
commit 789a648bd0
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
freeradius_utils/auth.py
View file

@ -60,10 +60,6 @@ from users.models import User
from preferences.models import RadiusOption from preferences.models import RadiusOption
OPTIONS, created = RadiusOption.objects.get_or_create()
VLAN_OK = OPTIONS.vlan_decision_ok.vlan_id
RADIUS_POLICY = OPTIONS.radius_general_policy
#: Serveur radius de test (pas la prod) #: Serveur radius de test (pas la prod)
TEST_SERVER = bool(os.getenv('DBG_FREERADIUS', False)) TEST_SERVER = bool(os.getenv('DBG_FREERADIUS', False))
@ -370,7 +366,7 @@ def decide_vlan_switch(nas_machine, nas_type, port_number,
extra_log = "" extra_log = ""
# Si le NAS est inconnu, on place sur le vlan defaut # Si le NAS est inconnu, on place sur le vlan defaut
if not nas_machine: if not nas_machine:
return ('?', u'Chambre inconnue', u'Nas inconnu', VLAN_OK, True) return ('?', u'Chambre inconnue', u'Nas inconnu', RadiusOption.get_cached_value('vlan_decision_ok').vlan_id, True)
sw_name = str(getattr(nas_machine, 'short_name', str(nas_machine))) sw_name = str(getattr(nas_machine, 'short_name', str(nas_machine)))
@ -389,8 +385,8 @@ def decide_vlan_switch(nas_machine, nas_type, port_number,
sw_name, sw_name,
"Chambre inconnue", "Chambre inconnue",
u'Port inconnu', u'Port inconnu',
OPTIONS.unknown_port_vlan.vlan_id, RadiusOption('unknown_port_vlan').vlan_id,
OPTIONS.unknown_port != OPTIONS.REJECT RadiusOption('unknown_port')!= RadiusOption.REJECT
) )
# On récupère le profil du port # On récupère le profil du port
@ -402,7 +398,7 @@ def decide_vlan_switch(nas_machine, nas_type, port_number,
DECISION_VLAN = int(port_profile.vlan_untagged.vlan_id) DECISION_VLAN = int(port_profile.vlan_untagged.vlan_id)
extra_log = u"Force sur vlan " + str(DECISION_VLAN) extra_log = u"Force sur vlan " + str(DECISION_VLAN)
else: else:
DECISION_VLAN = VLAN_OK DECISION_VLAN = RadiusOption.get_cached_value('vlan_decision_ok')
# Si le port est désactivé, on rejette la connexion # Si le port est désactivé, on rejette la connexion
if not port.state: if not port.state:
@ -442,8 +438,8 @@ def decide_vlan_switch(nas_machine, nas_type, port_number,
sw_name, sw_name,
"Inconnue", "Inconnue",
u'Chambre inconnue', u'Chambre inconnue',
OPTIONS.unknown_room_vlan.vlan_id, RadiusOption('unknown_room_vlan').vlan_id,
OPTIONS.unknown_room != OPTIONS.REJECT RadiusOption('unknown_room')!= RadiusOption.REJECT
) )
room_user = User.objects.filter( room_user = User.objects.filter(
@ -471,8 +467,8 @@ def decide_vlan_switch(nas_machine, nas_type, port_number,
sw_name, sw_name,
room, room,
u'Utilisateur non cotisant', u'Utilisateur non cotisant',
OPTIONS.non_member_vlan.vlan_id, RadiusOption('non_member_vlan').vlan_id,
OPTIONS.non_member != OPTIONS.REJECT RadiusOption('non_member')!= RadiusOption.REJECT
) )
# else: user OK, on passe à la verif MAC # else: user OK, on passe à la verif MAC
@ -504,8 +500,8 @@ def decide_vlan_switch(nas_machine, nas_type, port_number,
sw_name, sw_name,
"", "",
u'Machine inconnue', u'Machine inconnue',
OPTIONS.unknown_machine_vlan.vlan_id, RadiusOption('unknown_machine_vlan').vlan_id,
OPTIONS.unknown_machine != OPTIONS.REJECT RadiusOption('unknown_machine')!= RadiusOption.REJECT
) )
# L'interface a été trouvée, on vérifie qu'elle est active, # L'interface a été trouvée, on vérifie qu'elle est active,
@ -519,20 +515,20 @@ def decide_vlan_switch(nas_machine, nas_type, port_number,
sw_name, sw_name,
room, room,
u'Adherent banni', u'Adherent banni',
OPTIONS.banned_vlan.vlan_id, RadiusOption('banned_vlan').vlan_id,
OPTIONS.banned != OPTIONS.REJECT RadiusOption('banned')!= RadiusOption.REJECT
) )
if not interface.is_active: if not interface.is_active:
return ( return (
sw_name, sw_name,
room, room,
u'Machine non active / adherent non cotisant', u'Machine non active / adherent non cotisant',
OPTIONS.non_member_vlan.vlan_id, RadiusOption('non_member_vlan').vlan_id,
OPTIONS.non_member != OPTIONS.REJECT RadiusOption('non_member')!= RadiusOption.REJECT
) )
# Si on choisi de placer les machines sur le vlan # Si on choisi de placer les machines sur le vlan
# correspondant à leur type : # correspondant à leur type :
if RADIUS_POLICY == 'MACHINE': if RadiusOption.get_cached_value('radius_general_policy') == 'MACHINE':
DECISION_VLAN = interface.type.ip_type.vlan.vlan_id DECISION_VLAN = interface.type.ip_type.vlan.vlan_id
if not interface.ipv4: if not interface.ipv4:
interface.assign_ipv4() interface.assign_ipv4()