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

May close the bug revealed in LEMONLDAP-615#comment-01-oct-13

Browse Source
This commit is contained in:
Xavier Guimard 2013-10-02 11:42:57 +00:00
parent e57503869e
commit 8869b04cde
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthGoogle.pm
View File

@ -128,7 +128,6 @@ sub checkGoogleSession {
$gs->{$1} = $h->{$1} = $self->param($k); $gs->{$1} = $h->{$1} = $self->param($k);
} }
} }
untie %$h;
} }
# Now store datas in session # Now store datas in session
@ -139,11 +138,28 @@ sub checkGoogleSession {
# Value (ie AX attribute) must be one of: # Value (ie AX attribute) must be one of:
if ( $v =~ /^(?:(?:la(?:nguag|stnam)|firstnam)e|country|email)$/ ) { if ( $v =~ /^(?:(?:la(?:nguag|stnam)|firstnam)e|country|email)$/ ) {
# One value is missing -> retry # One value is missing:
unless ( exists( $gs->{$v} ) ) { unless ( exists( $gs->{$v} ) ) {
$self->lmLog( "$attr required attribute is missing, retrying",
'info' ); # Case 1: value was asked but not returned, set an empty value
return 0; # in persistent session (so that it's defined)
if ( $self->{_AXNS} ) {
$self->lmLog(
"$attr required attribute is missing in Google response, storing ''",
'info'
);
$h->{$v} = $gs->{$v} = '';
}
# Case 2: value is not stored, probably configuration has
# changed and this value was never asked
else {
$self->lmLog(
"$attr required attribute is missing in persistent session, let's ask it",
'info'
);
return 0;
}
} }
$self->{sessionInfo}->{$attr} = $gs->{$v}; $self->{sessionInfo}->{$attr} = $gs->{$v};
} }
@ -156,6 +172,7 @@ sub checkGoogleSession {
); );
} }
} }
untie %$h if ($h);
return $self->{user}; return $self->{user};
} }