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

Fix Sessions Explorer: use new tsv variables (#630)

Browse Source
This commit is contained in:
Clément Oudot 2014-12-09 12:50:13 +00:00
parent fe2c0719e2
commit bc5a3f71d4
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Sessions.pm
View File

@ -25,7 +25,7 @@ use utf8;
#our $whatToTrace; #our $whatToTrace;
#*whatToTrace = \$Lemonldap::NG::Handler::_CGI::whatToTrace; #*whatToTrace = \$Lemonldap::NG::Handler::_CGI::whatToTrace;
our $VERSION = '1.4.1'; our $VERSION = '2.00';
our @ISA = qw( our @ISA = qw(
Lemonldap::NG::Handler::CGI Lemonldap::NG::Handler::CGI
@ -133,10 +133,12 @@ sub list {
my $self = shift; my $self = shift;
my ( $byUid, $count, $res ); my ( $byUid, $count, $res );
$count = 0; $count = 0;
use Data::Dumper;
print STDERR Dumper($tsv);
# Parse all sessions to store first letter # Parse all sessions to store first letter
my $moduleOptions = $tsv->{globalStorageOptions} || {}; my $moduleOptions = $tsv->{sessionStorageOptions} || {};
$moduleOptions->{backend} = $tsv->{globalStorage}; $moduleOptions->{backend} = $tsv->{sessionStorageModule};
my $module = "Lemonldap::NG::Common::Apache::Session"; my $module = "Lemonldap::NG::Common::Apache::Session";
$res = $res =
$module->get_key_from_all_sessions( $moduleOptions, $module->get_key_from_all_sessions( $moduleOptions,
@ -188,8 +190,8 @@ sub doubleIp {
my ( $byUid, $byIp, $res, $count ); my ( $byUid, $byIp, $res, $count );
# Parse all sessions # Parse all sessions
my $moduleOptions = $tsv->{globalStorageOptions} || {}; my $moduleOptions = $tsv->{sessionStorageOptions} || {};
$moduleOptions->{backend} = $tsv->{globalStorage}; $moduleOptions->{backend} = $tsv->{sessionStorageModule};
my $module = "Lemonldap::NG::Common::Apache::Session"; my $module = "Lemonldap::NG::Common::Apache::Session";
$res = $module->get_key_from_all_sessions( $res = $module->get_key_from_all_sessions(
$moduleOptions, $moduleOptions,
@ -256,8 +258,8 @@ sub fullip {
my ( $byUid, $res ); my ( $byUid, $res );
# Parse sessions and store only if IP match regexp # Parse sessions and store only if IP match regexp
my $moduleOptions = $tsv->{globalStorageOptions} || {}; my $moduleOptions = $tsv->{sessionStorageOptions} || {};
$moduleOptions->{backend} = $tsv->{globalStorage}; $moduleOptions->{backend} = $tsv->{sessionStorageModule};
my $module = "Lemonldap::NG::Common::Apache::Session"; my $module = "Lemonldap::NG::Common::Apache::Session";
$res = $res =
$module->searchOnExpr( $moduleOptions, $self->{ipField}, $req, $module->searchOnExpr( $moduleOptions, $self->{ipField}, $req,
@ -302,8 +304,8 @@ sub fulluid {
my ( $byUid, $res ); my ( $byUid, $res );
# Parse sessions to find user that match regexp # Parse sessions to find user that match regexp
my $moduleOptions = $tsv->{globalStorageOptions} || {}; my $moduleOptions = $tsv->{sessionStorageOptions} || {};
$moduleOptions->{backend} = $tsv->{globalStorage}; $moduleOptions->{backend} = $tsv->{sessionStorageModule};
my $module = "Lemonldap::NG::Common::Apache::Session"; my $module = "Lemonldap::NG::Common::Apache::Session";
$res = $module->searchOnExpr( $res = $module->searchOnExpr(
$moduleOptions, $tsv->{whatToTrace}, $moduleOptions, $tsv->{whatToTrace},
@ -359,10 +361,10 @@ sub delete {
# Try to read session # Try to read session
my $apacheSession = Lemonldap::NG::Common::Session->new( my $apacheSession = Lemonldap::NG::Common::Session->new(
{ {
storageModule => $tsv->{globalStorage}, storageModule => $tsv->{sessionStorageModule},
storageModuleOptions => $tsv->{globalStorageOptions}, storageModuleOptions => $tsv->{sessionStorageOptions},
cacheModule => $tsv->{localSessionStorage}, cacheModule => $tsv->{sessionCacheModule},
cacheModuleOptions => $tsv->{localSessionStorageOptions}, cacheModuleOptions => $tsv->{sessionCacheOptions},
id => $id, id => $id,
kind => "SSO", kind => "SSO",
} }
@ -384,10 +386,10 @@ sub delete {
if ( my $id2 = $apacheSession->data->{_httpSession} ) { if ( my $id2 = $apacheSession->data->{_httpSession} ) {
my $apacheSession2 = Lemonldap::NG::Common::Session->new( my $apacheSession2 = Lemonldap::NG::Common::Session->new(
{ {
storageModule => $tsv->{globalStorage}, storageModule => $tsv->{sessionStorageModule},
storageModuleOptions => $tsv->{globalStorageOptions}, storageModuleOptions => $tsv->{sessionStorageOptions},
cacheModule => $tsv->{localSessionStorage}, cacheModule => $tsv->{sessionCacheModule},
cacheModuleOptions => $tsv->{localSessionStorageOptions}, cacheModuleOptions => $tsv->{sessionCacheOptions},
id => $id2, id => $id2,
kind => "SSO", kind => "SSO",
} }
@ -433,10 +435,10 @@ sub session {
# Try to read session # Try to read session
my $apacheSession = Lemonldap::NG::Common::Session->new( my $apacheSession = Lemonldap::NG::Common::Session->new(
{ {
storageModule => $tsv->{globalStorage}, storageModule => $tsv->{sessionStorageModule},
storageModuleOptions => $tsv->{globalStorageOptions}, storageModuleOptions => $tsv->{sessionStorageOptions},
cacheModule => $tsv->{localSessionStorage}, cacheModule => $tsv->{sessionCacheModule},
cacheModuleOptions => $tsv->{localSessionStorageOptions}, cacheModuleOptions => $tsv->{sessionCacheOptions},
id => $id, id => $id,
kind => "SSO", kind => "SSO",
} }
@ -703,8 +705,8 @@ sub uidByIp {
my ( $self, $ip ) = splice @_; my ( $self, $ip ) = splice @_;
my ( $byUser, $res ); my ( $byUser, $res );
my $moduleOptions = $tsv->{globalStorageOptions} || {}; my $moduleOptions = $tsv->{sessionStorageOptions} || {};
$moduleOptions->{backend} = $tsv->{globalStorage}; $moduleOptions->{backend} = $tsv->{sessionStorageModule};
my $module = "Lemonldap::NG::Common::Apache::Session"; my $module = "Lemonldap::NG::Common::Apache::Session";
$res = $res =
$module->searchOn( $moduleOptions, $self->{ipField}, $ip, $module->searchOn( $moduleOptions, $self->{ipField}, $ip,
@ -740,8 +742,8 @@ sub uid {
my ( $self, $uid ) = splice @_; my ( $self, $uid ) = splice @_;
my ( $byIp, $res ); my ( $byIp, $res );
my $moduleOptions = $tsv->{globalStorageOptions} || {}; my $moduleOptions = $tsv->{sessionStorageOptions} || {};
$moduleOptions->{backend} = $tsv->{globalStorage}; $moduleOptions->{backend} = $tsv->{sessionStorageModule};
my $module = "Lemonldap::NG::Common::Apache::Session"; my $module = "Lemonldap::NG::Common::Apache::Session";
$res = $res =
$module->searchOn( $moduleOptions, $tsv->{whatToTrace}, $uid, $module->searchOn( $moduleOptions, $tsv->{whatToTrace}, $uid,
@ -779,8 +781,8 @@ sub letter {
my $letter = $self->param('letter'); my $letter = $self->param('letter');
my ( $byUid, $res ); my ( $byUid, $res );
my $moduleOptions = $tsv->{globalStorageOptions} || {}; my $moduleOptions = $tsv->{sessionStorageOptions} || {};
$moduleOptions->{backend} = $tsv->{globalStorage}; $moduleOptions->{backend} = $tsv->{sessionStorageModule};
my $module = "Lemonldap::NG::Common::Apache::Session"; my $module = "Lemonldap::NG::Common::Apache::Session";
$res = $module->searchOnExpr( $res = $module->searchOnExpr(
$moduleOptions, $tsv->{whatToTrace}, $moduleOptions, $tsv->{whatToTrace},
@ -831,8 +833,8 @@ sub _ipclasses {
my $repartial = quotemeta($partial); my $repartial = quotemeta($partial);
my ( $byIp, $count, $res ); my ( $byIp, $count, $res );
my $moduleOptions = $tsv->{globalStorageOptions} || {}; my $moduleOptions = $tsv->{sessionStorageOptions} || {};
$moduleOptions->{backend} = $tsv->{globalStorage}; $moduleOptions->{backend} = $tsv->{sessionStorageModule};
my $module = "Lemonldap::NG::Common::Apache::Session"; my $module = "Lemonldap::NG::Common::Apache::Session";
$res = $module->searchOnExpr( $res = $module->searchOnExpr(
$moduleOptions, $self->{ipField}, $moduleOptions, $self->{ipField},