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

Rename _loginHistory (#1169)

This commit is contained in:
Xavier Guimard 2017-03-21 21:00:37 +00:00
parent 99ddfbfe25
commit ca2e9be0e5
10 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemonldap-ng-handler/t/test-psgi-lib.pm
View File

@ -53,7 +53,7 @@ sub init {
. $now
. ',"uid":"dwho","_issuerDB":"Null","_session_id":"f5eec18ebb9bc96352595e2d8ce962e8ecf7af7c9a98cb9a43f9cd181cf4b545","authenticationLevel":1,"_whatToTrace":"dwho","_auth":"Demo","_utime":'
. $now
. ',"loginHistory":{"successLogin":[{"ipAddr":"127.0.0.1","_utime":'
. ',"_loginHistory":{"successLogin":[{"ipAddr":"127.0.0.1","_utime":'
. $now
. '}]},"cn":"Doctor Who","mail":"dwho@badwolf.org"}';
close F;

12
lemonldap-ng-manager/site/coffee/sessions.coffee
View File

@ -217,21 +217,21 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
_insert '^notification_(.+)', '__notificationsDone__'
# 4. Add session history if exists
if session.loginHistory
if session._loginHistory
tmp = []
if session.loginHistory.successLogin
for l in session.loginHistory.successLogin
if session._loginHistory.successLogin
for l in session._loginHistory.successLogin
tmp.push
t: l._utime
title: $scope.localeDate l._utime
value: "Success (IP #{l.ipAddr})"
if session.loginHistory.failedLogin
for l in session.loginHistory.failedLogin
if session._loginHistory.failedLogin
for l in session._loginHistory.failedLogin
tmp.push
t: l._utime
title: $scope.localeDate l._utime
value: "#{l.error} (IP #{l.ipAddr})"
delete session.loginHistory
delete session._loginHistory
tmp.sort (a,b) ->
a.t - b.t
res.push

12
lemonldap-ng-manager/site/htdocs/static/js/sessions.js
View File

@ -254,10 +254,10 @@
}
_insert('^openid', 'OpenID');
_insert('^notification_(.+)', '__notificationsDone__');
if (session.loginHistory) {
if (session._loginHistory) {
tmp = [];
if (session.loginHistory.successLogin) {
ref = session.loginHistory.successLogin;
if (session._loginHistory.successLogin) {
ref = session._loginHistory.successLogin;
for (j = 0, len1 = ref.length; j < len1; j++) {
l = ref[j];
tmp.push({
@ -267,8 +267,8 @@
});
}
}
if (session.loginHistory.failedLogin) {
ref1 = session.loginHistory.failedLogin;
if (session._loginHistory.failedLogin) {
ref1 = session._loginHistory.failedLogin;
for (k = 0, len2 = ref1.length; k < len2; k++) {
l = ref1[k];
tmp.push({
@ -278,7 +278,7 @@
});
}
}
delete session.loginHistory;
delete session._loginHistory;
tmp.sort(function(a, b) {
return a.t - b.t;
});

2
lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
lemonldap-ng-manager/site/htdocs/static/languages/en.json
View File

@ -10,6 +10,7 @@
"_lassoSessionDump": "Lasso session dump",
"_lastAuthnUTime": "Authentication timestamp",
"_lastSeen": "Last activity timestamp",
"_loginHistory": "Login history",
"_oidc_access_token": "Access Token",
"_oidc_id_token": "ID Token",
"_oidc_OP": "Provider key",

1
lemonldap-ng-manager/site/htdocs/static/languages/fr.json
View File

@ -10,6 +10,7 @@
"_lassoSessionDump": " Dump session Lasso ",
"_lastAuthnUTime": "Tampon d'authentification ",
"_lastSeen": "Tampon de dernière activité",
"_loginHistory": "Historique des connexions",
"_oidc_access_token": "Jeton d'accès",
"_oidc_id_token": "Jeton d'identité",
"_oidc_OP": "Clef du fournisseur",

4
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm
View File

@ -116,11 +116,11 @@ sub displayModules {
elsif ( $module->[0] eq 'LoginHistory' ) {
$moduleHash->{'SUCCESS_LOGIN'} =
$self->p->mkSessionArray(
$req->{sessionInfo}->{loginHistory}->{successLogin},
$req->{sessionInfo}->{_loginHistory}->{successLogin},
"", 0, 0 );
$moduleHash->{'FAILED_LOGIN'} =
$self->p->mkSessionArray(
$req->{sessionInfo}->{loginHistory}->{failedLogin},
$req->{sessionInfo}->{_loginHistory}->{failedLogin},
"", 0, 1 );
}
push @$displayModules, $moduleHash;

4
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
View File

@ -775,7 +775,7 @@ sub registerLogin {
return
unless ( $self->conf->{loginHistoryEnabled}
and defined $req->authResult );
my $history = $req->sessionInfo->{loginHistory} ||= {};
my $history = $req->sessionInfo->{_loginHistory} ||= {};
my $type = ( $req->authResult > 0 ? 'failed' : 'success' ) . 'Login';
$history->{$type} ||= [];
$self->logger->debug("Current login saved into $type");
@ -793,7 +793,7 @@ sub registerLogin {
if ( scalar @{ $history->{$type} } > $self->conf->{ $type . "Number" } );
# Save into persistent session
$self->updatePersistentSession( $req, { loginHistory => $history, } );
$self->updatePersistentSession( $req, { _loginHistory => $history, } );
}
# put main session data into a hash ref

8
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/History.pm
View File

@ -19,16 +19,16 @@ sub run {
$self->logger->debug('History asked');
$req->info(
(
$req->sessionInfo->{loginHistory}->{successLogin}
$req->sessionInfo->{_loginHistory}->{successLogin}
? $self->mkSessionArray(
$req->sessionInfo->{loginHistory}->{successLogin},
$req->sessionInfo->{_loginHistory}->{successLogin},
'lastLogins', 0, 0 )
: ""
)
. (
$req->sessionInfo->{loginHistory}->{failedLogin}
$req->sessionInfo->{_loginHistory}->{failedLogin}
? $self->mkSessionArray(
$req->sessionInfo->{loginHistory}->{failedLogin},
$req->sessionInfo->{_loginHistory}->{failedLogin},
'lastFailedLogins', 0, 1 )
: ""
)

2
lemonldap-ng-portal/t/sessions2/6e30af4ffa5689b3e49a104d1b160d316db2b2161a0f45776994eed19dbdc101
View File

@ -1 +1 @@
{"authenticationLevel":0,"_auth":"Demo","_whatToTrace":"dwho","_session_kind":"SSO","_user":"dwho","hGroups":{},"cn":"Doctor Who","_lastAuthnUTime":1464295296,"_session_id":"6e30af4ffa5689b3e49a104d1b160d316db2b2161a0f45776994eed19dbdc101","_passwordDB":"Demo","_issuerDB":"Null","_updateTime":"20160526224136","UA":"Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0","uid":"dwho","groups":"","_utime":1464295296,"_timezone":"2","_url":"http://manager.example.com:19876/","loginHistory":{"successLogin":[{"ipAddr":"127.0.0.1","_utime":1464295296}]},"ipAddr":"127.0.0.1","mail":"dwho@badwolf.org","_startTime":"20160526224136","_userDB":"Demo"}
{"authenticationLevel":0,"_auth":"Demo","_whatToTrace":"dwho","_session_kind":"SSO","_user":"dwho","hGroups":{},"cn":"Doctor Who","_lastAuthnUTime":1464295296,"_session_id":"6e30af4ffa5689b3e49a104d1b160d316db2b2161a0f45776994eed19dbdc101","_passwordDB":"Demo","_issuerDB":"Null","_updateTime":"20160526224136","UA":"Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0","uid":"dwho","groups":"","_utime":1464295296,"_timezone":"2","_url":"http://manager.example.com:19876/","_loginHistory":{"successLogin":[{"ipAddr":"127.0.0.1","_utime":1464295296}]},"ipAddr":"127.0.0.1","mail":"dwho@badwolf.org","_startTime":"20160526224136","_userDB":"Demo"}