dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new session API in UpdateCookie Handler (#671)

Browse Source
This commit is contained in:
Clément Oudot 2014-04-15 14:02:39 +00:00
parent 33b201bd98
commit e3eacb3814
2 changed files with 54 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SpecificHandlers/UpdateCookie.pm
View File

@ -13,8 +13,9 @@ use Lemonldap::NG::Handler::DefaultHandler qw(:all);
use base qw(Lemonldap::NG::Handler::DefaultHandler); use base qw(Lemonldap::NG::Handler::DefaultHandler);
use Lemonldap::NG::Handler::Main::Headers; use Lemonldap::NG::Handler::Main::Headers;
use Lemonldap::NG::Handler::Main::Logger; use Lemonldap::NG::Handler::Main::Logger;
use Lemonldap::NG::Common::Session;
our $VERSION = '1.0.0'; our $VERSION = '1.4.0';
## @rmethod int run(Apache2::RequestRec apacheRequest) ## @rmethod int run(Apache2::RequestRec apacheRequest)
# Main method used to control access. # Main method used to control access.
@ -38,21 +39,40 @@ sub run {
my $utime; my $utime;
if ( $utime = $class->fetchUTime ) { if ( $utime = $class->fetchUTime ) {
my $clear = 0; my $clear = 0;
my $apacheSession = Lemonldap::NG::Common::Session->new(
{
storageModule => $tsv->{globalStorage},
storageModuleOptions => $tsv->{globalStorageOptions},
cacheModule => $tsv->{localSessionStorage},
cacheModuleOptions => $tsv->{localSessionStorageOptions},
id => $id,
kind => "SSO",
}
);
# Check process data
if ( $id eq $datas->{_session_id} and $datas->{_utime} lt $utime ) { if ( $id eq $datas->{_session_id} and $datas->{_utime} lt $utime ) {
$datas->{_session_id} = 0; $datas->{_session_id} = 0;
$clear = 1; $clear = 1;
} }
elsif ( $tsv->{refLocalStorage}
and my $ldatas = $tsv->{refLocalStorage}->get($id) ) # Get session
{ else {
if ( $ldatas->{_utime} lt $utime ) { unless ( $apacheSession->data ) {
$clear = 1; Lemonldap::NG::Handler::Main::Logger->lmLog(
"Session $id can't be retrieved", 'info' );
}
else {
$clear = 1 if ( $apacheSession->data->{_utime} lt $utime );
} }
} }
# Clear cache if needed
if ($clear) { if ($clear) {
Lemonldap::NG::Handler::Main::Logger->lmLog( Lemonldap::NG::Handler::Main::Logger->lmLog(
"$class: remove $id from local cache", 'debug' ); "$class: remove $id from local cache", 'debug' );
$tsv->{refLocalStorage}->remove($id); $apacheSession->cacheUpdate();
} }
} }

34
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/UpdateCookie.pm
View File

@ -14,8 +14,9 @@ use Lemonldap::NG::Handler::DefaultHandler qw(:all);
use base qw(Lemonldap::NG::Handler::DefaultHandler); use base qw(Lemonldap::NG::Handler::DefaultHandler);
use Lemonldap::NG::Handler::Main::Headers; use Lemonldap::NG::Handler::Main::Headers;
use Lemonldap::NG::Handler::Main::Logger; use Lemonldap::NG::Handler::Main::Logger;
use Lemonldap::NG::Common::Session;
our $VERSION = '1.0.0'; our $VERSION = '1.4.0';
## @rmethod int run(Apache2::RequestRec apacheRequest) ## @rmethod int run(Apache2::RequestRec apacheRequest)
# Main method used to control access. # Main method used to control access.
@ -39,21 +40,40 @@ sub run {
my $utime; my $utime;
if ( $utime = $class->fetchUTime ) { if ( $utime = $class->fetchUTime ) {
my $clear = 0; my $clear = 0;
my $apacheSession = Lemonldap::NG::Common::Session->new(
{
storageModule => $tsv->{globalStorage},
storageModuleOptions => $tsv->{globalStorageOptions},
cacheModule => $tsv->{localSessionStorage},
cacheModuleOptions => $tsv->{localSessionStorageOptions},
id => $id,
kind => "SSO",
}
);
# Check process data
if ( $id eq $datas->{_session_id} and $datas->{_utime} lt $utime ) { if ( $id eq $datas->{_session_id} and $datas->{_utime} lt $utime ) {
$datas->{_session_id} = 0; $datas->{_session_id} = 0;
$clear = 1; $clear = 1;
} }
elsif ( $tsv->{refLocalStorage}
and my $ldatas = $tsv->{refLocalStorage}->get($id) ) # Get session
{ else {
if ( $ldatas->{_utime} lt $utime ) { unless ( $apacheSession->data ) {
$clear = 1; Lemonldap::NG::Handler::Main::Logger->lmLog(
"Session $id can't be retrieved", 'info' );
}
else {
$clear = 1 if ( $apacheSession->data->{_utime} lt $utime );
} }
} }
# Clear cache if needed
if ($clear) { if ($clear) {
Lemonldap::NG::Handler::Main::Logger->lmLog( Lemonldap::NG::Handler::Main::Logger->lmLog(
"$class: remove $id from local cache", 'debug' ); "$class: remove $id from local cache", 'debug' );
$tsv->{refLocalStorage}->remove($id); $apacheSession->cacheUpdate();
} }
} }