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

Filter general sur clubs et user + pas d'autocapture si plus d'un user dans le local/chambre

Browse source
This commit is contained in:
Gabriel Detraz 2017-10-26 00:55:53 +02:00 committed by root
parent d7e75e59b6
commit 95d5562861
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
freeradius_utils/auth.py
View file

@ -292,11 +292,12 @@ def decide_vlan_and_register_switch(nas, nas_type, port_number, mac_address):
if not port.room: if not port.room:
return (sw_name, u'Chambre inconnue', VLAN_NOK) return (sw_name, u'Chambre inconnue', VLAN_NOK)
room_user = User.objects.filter(room=port.room) room_user = User.objects.filter(Q(club__room=port.room) | Q(adherent__room=port.room))
if not room_user: if not room_user:
return (sw_name, u'Chambre non cotisante', VLAN_NOK) return (sw_name, u'Chambre non cotisante', VLAN_NOK)
elif not room_user.first().has_access(): for user in room_user:
return (sw_name, u'Chambre resident desactive', VLAN_NOK) if not user.has_access():
return (sw_name, u'Chambre resident desactive', VLAN_NOK)
# else: user OK, on passe à la verif MAC # else: user OK, on passe à la verif MAC
if port.radius == 'COMMON' or port.radius == 'STRICT': if port.radius == 'COMMON' or port.radius == 'STRICT':
@ -309,9 +310,12 @@ def decide_vlan_and_register_switch(nas, nas_type, port_number, mac_address):
elif not port.room: elif not port.room:
return (sw_name, u'Chambre et machine inconnues', VLAN_NOK) return (sw_name, u'Chambre et machine inconnues', VLAN_NOK)
else: else:
room_user = User.objects.filter(room=Room.objects.filter(name=port.room)) if not room_user:
room_user = User.objects.filter(Q(club__room=port.room) | Q(adherent__room=port.room))
if not room_user: if not room_user:
return (sw_name, u'Machine et propriétaire de la chambre inconnus', VLAN_NOK) return (sw_name, u'Machine et propriétaire de la chambre inconnus', VLAN_NOK)
elif room_user.count() > 1:
return (sw_name, u'Machine inconnue, il y a au moins 2 users dans la chambre/local -> ajout de mac automatique impossible', VLAN_NOK)
elif not room_user.first().has_access(): elif not room_user.first().has_access():
return (sw_name, u'Machine inconnue et adhérent non cotisant', VLAN_NOK) return (sw_name, u'Machine inconnue et adhérent non cotisant', VLAN_NOK)
else: else: