Commit c90e91b9 authored by Clément OUDOT's avatar Clément OUDOT
Browse files

Set main identifier in persistent session (#495)

parent 14a29c54
......@@ -15,7 +15,7 @@ use constant AXSPECURL => 'http://openid.net/srv/ax/1.0';
use constant GOOGLEENDPOINT => 'https://www.google.com/accounts/o8/id';
our @ISA = (qw(Lemonldap::NG::Portal::_Browser));
our $VERSION = '1.4.0';
our $VERSION = '1.9.0';
our $googleEndPoint;
BEGIN {
......@@ -77,7 +77,7 @@ sub checkGoogleSession {
} $self->param();
# Look at persistent database
my $id = $self->_md5hash( $self->param('openid.claimed_id') );
my $id = $self->param('openid.claimed_id');
my $pSession = $self->getPersistentSession($id);
my $gs;
......
......@@ -915,13 +915,17 @@ sub getApacheSession {
return $apacheSession;
}
## @method protected hashref getPersistentSession(string id)
# Try to recover the persitent session corresponding to id and return session datas.
# If $id is set to undef, return a new session.
# @param id session reference
## @method protected hashref getPersistentSession(string uid)
# Try to recover the persistent session corresponding to uid and return session datas.
# @param uid main user identifier (whatToTrace)
# return Lemonldap::NG::Common::Session object
sub getPersistentSession {
my ( $self, $id ) = @_;
my ( $self, $uid ) = @_;
return unless defined $uid;
# Compute persistent identifier
my $pid = $self->_md5hash($uid);
my $persistentSession = Lemonldap::NG::Common::Session->new(
{
......@@ -929,7 +933,7 @@ sub getPersistentSession {
storageModuleOptions => $self->{persistentStorageOptions},
cacheModule => $self->{localSessionStorage},
cacheModuleOptions => $self->{localSessionStorageOptions},
id => $id,
id => $pid,
force => 1,
kind => "Persistent",
}
......@@ -939,6 +943,11 @@ sub getPersistentSession {
$self->lmLog( $persistentSession->error, 'debug' );
}
# Set _session_uid if not already present
unless ( defined $persistentSession->data->{_session_uid} ) {
$persistentSession->update( { '_session_uid' => $uid } );
}
return $persistentSession;
}
......@@ -971,8 +980,7 @@ sub updatePersistentSession {
$uid ||= $self->{sessionInfo}->{ $self->{whatToTrace} };
return () unless ($uid);
my $persistentSession =
$self->getPersistentSession( $self->_md5hash($uid) );
my $persistentSession = $self->getPersistentSession($uid);
$persistentSession->update($infos);
......@@ -2072,8 +2080,7 @@ sub setPersistentSessionInfo {
return PE_OK unless ( $key and length($key) );
my $persistentSession =
$self->getPersistentSession( $self->_md5hash($key) );
my $persistentSession = $self->getPersistentSession($key);
if ($persistentSession) {
$self->lmLog( "Persistent session found for $key", 'debug' );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment