Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
smradius
smradius
Commits
478e69da
Commit
478e69da
authored
Sep 24, 2016
by
Nigel Kukard
Browse files
BUGFIX: Check event_timezone before we accept packets
parent
c0f73d5e
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/smradius/daemon.pm
View file @
478e69da
...
...
@@ -590,7 +590,10 @@ sub process_request {
my
$request
=
smradius::daemon::
request
->
new
(
$self
);
$request
->
setTimeZone
(
$self
->
{'
smradius
'}
->
{'
event_timezone
'});
if
(
!
$request
->
setTimezone
(
$self
->
{'
smradius
'}
->
{'
event_timezone
'}))
{
$self
->
log
(
LOG_ERR
,"
[SMRADIUS] Setting event_timezone to '%s' failed
",
$self
->
{'
smradius
'}
->
{'
event_timezone
'});
return
;
}
$request
->
parsePacket
(
$self
->
{'
radius
'}
->
{'
dictionary
'},
$rawPacket
);
...
...
lib/smradius/daemon/request.pm
View file @
478e69da
...
...
@@ -25,6 +25,10 @@ use warnings;
use
base
qw{AWITPT::Object}
;
use
DateTime
;
use
DateTime::
TimeZone
;
use
Try::
Tiny
;
use
smradius::Radius::
Packet
;
...
...
@@ -83,7 +87,7 @@ sub setTimestamp
# Grab real event timestamp in local time uzing the time zone
my
$eventTimestamp
=
DateTime
->
from_epoch
(
epoch
=>
$self
->
{'
user
'}
->
{'
_Internal
'}
->
{'
Timestamp-Unix
'},
time_zone
=>
$self
->
{'
time
Z
one
'},
time_zone
=>
$self
->
{'
time
z
one
'},
);
# Set the timestamp (not in unix)
$self
->
{'
user
'}
->
{'
_Internal
'}
->
{'
Timestamp
'}
=
$eventTimestamp
->
strftime
('
%Y-%m-%d %H:%M:%S
');
...
...
@@ -94,12 +98,20 @@ sub setTimestamp
# Set internal time zone
sub
setTime
Z
one
sub
setTime
z
one
{
my
(
$self
,
$timeZone
)
=
@_
;
my
(
$self
,
$timezone
)
=
@_
;
my
$timezone_obj
;
try
{
$timezone_obj
=
DateTime::
TimeZone
->
new
('
name
'
=>
$timezone
);
};
# Retrun if we don't have a value, this means we failed
return
if
(
!
defined
(
$timezone_obj
));
$self
->
{'
time
Z
one
'}
=
$time
Z
one
;
$self
->
{'
time
z
one
'}
=
$time
z
one
_obj
;
return
$self
;
}
...
...
@@ -147,7 +159,7 @@ sub _init
$self
->
{'
logLine
'}
=
[
];
$self
->
{'
logLineParams
'}
=
[
];
$self
->
{'
time
Z
one
'}
=
"
UTC
";
$self
->
{'
time
z
one
'}
=
"
UTC
";
# Initialize user
$self
->
{'
user
'}
=
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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