crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Patch propre serveurs-proxy federez dans auth.py

Browse source
This commit is contained in:
Gabriel Detraz 2015-05-01 01:46:45 +02:00
parent c1660df7ae
commit edde503c9e
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
freeradius/auth.py
View file

@ -298,7 +298,7 @@ def authorize_wifi(data):
# Kludge : vlan isolement pas possible, donc reject quand-même # Kludge : vlan isolement pas possible, donc reject quand-même
if not WIFI_DYN_VLAN and bl.value['type'] in BL_ISOLEMENT: if not WIFI_DYN_VLAN and bl.value['type'] in BL_ISOLEMENT:
return radiusd.RLM_MODULE_REJECT return radiusd.RLM_MODULE_REJECT
if not machine.get('ipsec', False): if not machine.get('ipsec', False):
logger.error('WiFi auth but machine has no password') logger.error('WiFi auth but machine has no password')
@ -372,9 +372,16 @@ def authorize_nas(data, ldap):
ip = data.get('NAS-Identifier', '') ip = data.get('NAS-Identifier', '')
is_v6 = ':' in ip is_v6 = ':' in ip
ip_stm = ("FreeRADIUS-Client-IP%s-Address" % ('v6'*is_v6, ), ip) ip_stm = ("FreeRADIUS-Client-IP%s-Address" % ('v6'*is_v6, ), ip)
# Find machine # Find machine
base_filter = u'(|(objectClass=machineCrans)(objectClass=borneWifi))' # On rajoute les Machines du club federez au base_filter (federez-wifi):
fed = ldap.search(u'(nom=Federez)')[0]
mach_fed = fed.machines()
base_filter = u'(|(objectClass=machineCrans)(objectClass=borneWifi)'
for mach in mach_fed:
base_filter = base_filter + "(mid=%s)" % mach['mid'][0]
base_filter = base_filter + u')'
if is_v6: if is_v6:
addr = netaddr.IPAddress(ip).value addr = netaddr.IPAddress(ip).value
# EUI64, hein ? # EUI64, hein ?
@ -386,7 +393,7 @@ def authorize_nas(data, ldap):
m_filter = u'(macAddress=%s)' % mac m_filter = u'(macAddress=%s)' % mac
else: else:
m_filter = u'(ipHostNumber=%s)' % escape_ldap(ip) m_filter = u'(ipHostNumber=%s)' % escape_ldap(ip)
machines = ldap.search(u'(&%s%s)' % (base_filter, m_filter)) machines = ldap.search(u'(&%s%s)' % (base_filter, m_filter))
if not machines: if not machines: