mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-09-10 16:23:09 +00:00
Simplify logic & improve readability. Harmonize log string language
This commit is contained in:
parent
1600615153
commit
3ce689278c
1 changed files with 42 additions and 46 deletions
88
freeradius_utils/authenticate_filaire.py
Executable file → Normal file
88
freeradius_utils/authenticate_filaire.py
Executable file → Normal file
|
@ -24,53 +24,49 @@ VLAN_NOK = RADIUS_VLAN_DECISION['VLAN_NOK']
|
||||||
VLAN_OK = RADIUS_VLAN_DECISION['VLAN_OK']
|
VLAN_OK = RADIUS_VLAN_DECISION['VLAN_OK']
|
||||||
|
|
||||||
def decide_vlan(switch_ip, port_number, mac_address):
|
def decide_vlan(switch_ip, port_number, mac_address):
|
||||||
# Get port from switch and port number
|
# Get port from switch and port number
|
||||||
switch = Switch.objects.filter(switch_interface=Interface.objects.filter(ipv4=IpList.objects.filter(ipv4=switch_ip)))
|
switch = Switch.objects.filter(switch_interface=Interface.objects.filter(ipv4=IpList.objects.filter(ipv4=switch_ip)))
|
||||||
if switch:
|
if not switch:
|
||||||
sw_name = str(switch[0].switch_interface)
|
return ('?', 'Switch inconnu', VLAN_OK)
|
||||||
port = Port.objects.filter(switch=switch[0], port=port_number)
|
|
||||||
if port:
|
sw_name = str(switch[0].switch_interface)
|
||||||
port = port[0]
|
|
||||||
if port.radius == 'NO':
|
port = Port.objects.filter(switch=switch[0], port=port_number)
|
||||||
# Aucune authentification sur ce port
|
if not port:
|
||||||
decision = (sw_name, "Pas d'authentification sur ce port", VLAN_OK)
|
return (sw_name, 'Port inconnu', VLAN_OK)
|
||||||
elif port.radius == 'BLOQ':
|
|
||||||
# Prise désactivée
|
port = port[0]
|
||||||
decision = (sw_name, 'Port desactive', VLAN_NOK)
|
|
||||||
elif port.radius == 'COMMON':
|
if port.radius == 'NO':
|
||||||
# Authentification par mac
|
return (sw_name, "Pas d'authentification sur ce port", VLAN_OK)
|
||||||
interface = Interface.objects.filter(mac_address=mac_address)
|
|
||||||
if not interface:
|
if port.radius == 'BLOQ':
|
||||||
decision = (sw_name, 'Mac not found', VLAN_NOK)
|
return (sw_name, 'Port desactive', VLAN_NOK)
|
||||||
elif not interface[0].is_active():
|
|
||||||
decision = (sw_name, 'Machine non active / adherent non cotisant', VLAN_NOK)
|
if port.radius == 'STRICT':
|
||||||
else:
|
if not port.room:
|
||||||
decision = (sw_name, 'Machine OK', VLAN_OK)
|
return (sw_name, 'Chambre inconnue', VLAN_NOK)
|
||||||
elif port.radius == 'STRICT':
|
|
||||||
if port.room:
|
room_user = User.objects.filter(room=Room.objects.filter(name=port.room))
|
||||||
user = User.objects.filter(room=Room.objects.filter(name=port.room))
|
if not room_user:
|
||||||
if not user:
|
return (sw_name, 'Chambre non cotisante', VLAN_NOK)
|
||||||
decision = (sw_name, 'Chambre non cotisante', VLAN_NOK)
|
elif not room_user[0].has_access():
|
||||||
elif not user[0].has_access():
|
return (sw_name, 'Chambre resident desactive', VLAN_NOK)
|
||||||
decision = (sw_name, 'Resident desactive', VLAN_NOK)
|
# else: user OK, on passe à la verif MAC
|
||||||
else:
|
|
||||||
# Verification de la mac
|
if port.radius == 'COMMON' or port.radius == 'STRICT':
|
||||||
interface = Interface.objects.filter(mac_address=mac_address)
|
# Authentification par mac
|
||||||
if not interface:
|
interface = Interface.objects.filter(mac_address=mac_address)
|
||||||
decision = (sw_name, 'Chambre Ok, but mac not found', VLAN_NOK)
|
if not interface:
|
||||||
elif not interface[0].is_active():
|
return (sw_name, 'Machine inconnue', VLAN_NOK)
|
||||||
decision = (sw_name, 'Chambre Ok, but machine non active / adherent non cotisant', VLAN_NOK)
|
elif not interface[0].is_active():
|
||||||
else:
|
return (sw_name, 'Machine non active / adherent non cotisant', VLAN_NOK)
|
||||||
decision = (sw_name, 'Machine OK, Proprio OK', VLAN_OK)
|
|
||||||
else:
|
|
||||||
decision = (sw_name, 'Chambre inconnue', VLAN_NOK)
|
|
||||||
else:
|
|
||||||
decision = (sw_name, 'VLAN forced', int(port.radius))
|
|
||||||
else:
|
|
||||||
decision = (sw_name, 'port not found!', VLAN_OK)
|
|
||||||
else:
|
else:
|
||||||
decision = ('?', 'switch not found!', VLAN_OK)
|
return (sw_name, 'Machine OK', VLAN_OK)
|
||||||
return decision
|
|
||||||
|
# On gere bien tous les autres états possibles, il ne reste que le VLAN en dur
|
||||||
|
return (sw_name, 'VLAN impose', int(port.radius))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
parser = argparse.ArgumentParser(description='Decide radius vlan attribution')
|
parser = argparse.ArgumentParser(description='Decide radius vlan attribution')
|
||||||
|
|
Loading…
Reference in a new issue