Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
re2o
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
36
Issues
36
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
federez
re2o
Commits
6e20c134
Commit
6e20c134
authored
Jan 23, 2019
by
chirac
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hotfix_radius' into '2.7'
Hotfix radius See merge request
!399
parents
beae8ee8
0e79ab4e
Pipeline
#1785
passed with stage
in 5 minutes and 21 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
freeradius_utils/auth.py
freeradius_utils/auth.py
+4
-2
No files found.
freeradius_utils/auth.py
View file @
6e20c134
...
...
@@ -38,6 +38,7 @@ Inspiré du travail de Daniel Stan au Crans
import
os
import
sys
import
logging
import
traceback
import
radiusd
# Module magique freeradius (radiusd.py is dummy)
from
django.core.wsgi
import
get_wsgi_application
...
...
@@ -76,7 +77,7 @@ class RadiusdHandler(logging.Handler):
rad_sig
=
radiusd
.
L_INFO
else
:
rad_sig
=
radiusd
.
L_DBG
radiusd
.
radlog
(
rad_sig
,
record
.
msg
)
radiusd
.
radlog
(
rad_sig
,
record
.
msg
.
encode
(
'utf-8'
)
)
# Initialisation d'un logger (pour logguer unifié)
...
...
@@ -117,6 +118,7 @@ def radius_event(fun):
return
fun
(
data
)
except
Exception
as
err
:
logger
.
error
(
'Failed
%
r on data
%
r'
%
(
err
,
auth_data
))
logger
.
debug
(
'Function
%
r, Traceback:
%
s'
%
(
fun
,
repr
(
traceback
.
format_stack
())))
return
radiusd
.
RLM_MODULE_FAIL
return
new_f
...
...
@@ -398,7 +400,7 @@ def decide_vlan_switch(nas_machine, nas_type, port_number,
DECISION_VLAN
=
int
(
port_profile
.
vlan_untagged
.
vlan_id
)
extra_log
=
u"Force sur vlan "
+
str
(
DECISION_VLAN
)
else
:
DECISION_VLAN
=
RadiusOption
.
get_cached_value
(
'vlan_decision_ok'
)
DECISION_VLAN
=
RadiusOption
.
get_cached_value
(
'vlan_decision_ok'
)
.
vlan_id
# Si le port est désactivé, on rejette la connexion
if
not
port
.
state
:
...
...
Write
Preview
Markdown
is supported
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