Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Benjamin Graillot
scripts
Commits
18b63786
Commit
18b63786
authored
Dec 17, 2017
by
Hamza Dely
Browse files
On récupère le nom du bâtiment et le numéro de switch séparemment
parent
80fe6ce9
Changes
1
Hide whitespace changes
Inline
Side-by-side
freeradius/3.0/auth.py
View file @
18b63786
...
@@ -927,17 +927,16 @@ class RadiusEventHandler(object):
...
@@ -927,17 +927,16 @@ class RadiusEventHandler(object):
def
_plug_info
(
self
,
nas_id
,
port
):
def
_plug_info
(
self
,
nas_id
,
port
):
"""Renvoie la chambre associé à un NAS et une prise donnée d'une part
"""Renvoie la chambre associé à un NAS et une prise donnée d'une part
et l'ensemble des adhérents y résidant d'autre part"""
et l'ensemble des adhérents y résidant d'autre part"""
nas_id
=
nas_id
.
replace
(
'-'
,
''
)
building
=
nas_id
[
3
]
plug
=
"%d%02d"
%
(
int
(
nas_id
[
3
:]),
int
(
port
))
plug
=
"%d%02d"
%
(
int
(
nas_id
[
5
:]),
int
(
port
))
logger
.
debug
(
'Trying to find a match by room (plug %s)'
,
plug
)
logger
.
debug
(
'Trying to find a match by room (plug %s)'
,
plug
)
building
,
plug_nb
=
plug
[
0
],
plug
[
1
:]
room
=
reverse
(
building
,
plug
)
room
=
reverse
(
building
,
plug_nb
)
if
room
:
if
room
:
room
=
room
[
0
]
room
=
room
[
0
]
logger
.
debug
(
'Found room %s%s'
,
building
.
upper
(),
crans_utils
.
escape
(
room
))
logger
.
debug
(
'Found room %s%s'
,
building
.
upper
(),
crans_utils
.
escape
(
room
))
return
self
.
ldap
.
search
(
'(&(chbre=%s%s)(!(chbre=EXT)))'
%
(
building
,
room
))
return
self
.
ldap
.
search
(
'(&(chbre=%s%s)(!(chbre=EXT)))'
%
(
building
,
room
))
else
:
else
:
logger
.
debug
(
'No room for plug %s
'
,
plug
)
logger
.
debug
(
'No room for plug %s
%s'
,
building
,
plug
)
return
[]
return
[]
def
__find_match
(
self
,
request
,
m_type
):
def
__find_match
(
self
,
request
,
m_type
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment