rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 15:12:25 +00:00
Code Issues Releases Wiki Activity

Revert "Revert "Simplify logic & improve readability. Harmonize log string language""

Browse source 
This reverts commit 782cb76769
This commit is contained in:
Éloi ALAIN 2017-01-15 14:52:05 +01:00
parent b1d600e5f5
commit 8b28747fa6
1 changed files with 42 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
freeradius_utils/authenticate_filaire.py Executable file → Normal file
View file

@ -26,51 +26,47 @@ 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:
return ('?', 'Switch inconnu', VLAN_OK)
sw_name = str(switch[0].switch_interface) sw_name = str(switch[0].switch_interface)
port = Port.objects.filter(switch=switch[0], port=port_number) port = Port.objects.filter(switch=switch[0], port=port_number)
if port: if not port:
return (sw_name, 'Port inconnu', VLAN_OK)
port = port[0] port = port[0]
if port.radius == 'NO': if port.radius == 'NO':
# Aucune authentification sur ce port return (sw_name, "Pas d'authentification sur ce port", VLAN_OK)
decision = (sw_name, "Pas d'authentification sur ce port", VLAN_OK)
elif port.radius == 'BLOQ': if port.radius == 'BLOQ':
# Prise désactivée return (sw_name, 'Port desactive', VLAN_NOK)
decision = (sw_name, 'Port desactive', VLAN_NOK)
elif port.radius == 'COMMON': if port.radius == 'STRICT':
if not port.room:
return (sw_name, 'Chambre inconnue', VLAN_NOK)
room_user = User.objects.filter(room=Room.objects.filter(name=port.room))
if not room_user:
return (sw_name, 'Chambre non cotisante', VLAN_NOK)
elif not room_user[0].has_access():
return (sw_name, 'Chambre resident desactive', VLAN_NOK)
# else: user OK, on passe à la verif MAC
if port.radius == 'COMMON' or port.radius == 'STRICT':
# Authentification par mac # Authentification par mac
interface = Interface.objects.filter(mac_address=mac_address) interface = Interface.objects.filter(mac_address=mac_address)
if not interface: if not interface:
decision = (sw_name, 'Mac not found', VLAN_NOK) return (sw_name, 'Machine inconnue', VLAN_NOK)
elif not interface[0].is_active(): elif not interface[0].is_active():
decision = (sw_name, 'Machine non active / adherent non cotisant', VLAN_NOK) return (sw_name, 'Machine non active / adherent non cotisant', VLAN_NOK)
else: else:
decision = (sw_name, 'Machine OK', VLAN_OK) return (sw_name, 'Machine OK', VLAN_OK)
elif port.radius == 'STRICT':
if port.room: # On gere bien tous les autres états possibles, il ne reste que le VLAN en dur
user = User.objects.filter(room=Room.objects.filter(name=port.room)) return (sw_name, 'VLAN impose', int(port.radius))
if not user:
decision = (sw_name, 'Chambre non cotisante', VLAN_NOK)
elif not user[0].has_access():
decision = (sw_name, 'Resident desactive', VLAN_NOK)
else:
# Verification de la mac
interface = Interface.objects.filter(mac_address=mac_address)
if not interface:
decision = (sw_name, 'Chambre Ok, but mac not found', VLAN_NOK)
elif not interface[0].is_active():
decision = (sw_name, 'Chambre Ok, but machine non active / adherent non cotisant', VLAN_NOK)
else:
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:
decision = ('?', 'switch not found!', VLAN_OK)
return decision
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Decide radius vlan attribution') parser = argparse.ArgumentParser(description='Decide radius vlan attribution')