Fix some mistakes & display sessions with U2F key registered only
This commit is contained in:
parent
9fccff7469
commit
10f640753b
|
@ -231,8 +231,8 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
|
||||||
session[key] = $scope.localeDate value
|
session[key] = $scope.localeDate value
|
||||||
else if key.match /^(_startTime|_updateTime)$/
|
else if key.match /^(_startTime|_updateTime)$/
|
||||||
session[key] = _stToStr value
|
session[key] = _stToStr value
|
||||||
#else if key.match /^(_u2fKeyHandle|_u2fUserKey)$/
|
else if key.match /^(_u2fKeyHandle|_u2fUserKey)$/
|
||||||
# session[key] = '########'
|
session[key] = '########'
|
||||||
res = []
|
res = []
|
||||||
|
|
||||||
# 2. Push session keys in result, grouped by categories
|
# 2. Push session keys in result, grouped by categories
|
||||||
|
|
|
@ -260,6 +260,8 @@
|
||||||
session[key] = $scope.localeDate(value);
|
session[key] = $scope.localeDate(value);
|
||||||
} else if (key.match(/^(_startTime|_updateTime)$/)) {
|
} else if (key.match(/^(_startTime|_updateTime)$/)) {
|
||||||
session[key] = _stToStr(value);
|
session[key] = _stToStr(value);
|
||||||
|
} else if (key.match(/^(_u2fKeyHandle|_u2fUserKey)$/)) {
|
||||||
|
session[key] = '########';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -729,6 +729,7 @@
|
||||||
"u2fActivation":"تفعيل",
|
"u2fActivation":"تفعيل",
|
||||||
"u2fAuthnLevel":"U2F مستوى إثبات الهوية",
|
"u2fAuthnLevel":"U2F مستوى إثبات الهوية",
|
||||||
"u2fSelfRegistration":"التسجيل الذاتي",
|
"u2fSelfRegistration":"التسجيل الذاتي",
|
||||||
|
"u2fSessions":"U2F sessions explorer",
|
||||||
"uid":"المعرف",
|
"uid":"المعرف",
|
||||||
"unknownAttrOrMacro":"سمة غير معروفة أو ماكرو",
|
"unknownAttrOrMacro":"سمة غير معروفة أو ماكرو",
|
||||||
"unknownError":"خطأ غير معروف",
|
"unknownError":"خطأ غير معروف",
|
||||||
|
|
|
@ -729,6 +729,7 @@
|
||||||
"u2fActivation":"Activation",
|
"u2fActivation":"Activation",
|
||||||
"u2fAuthnLevel":"U2F authentication level",
|
"u2fAuthnLevel":"U2F authentication level",
|
||||||
"u2fSelfRegistration":"Self registration",
|
"u2fSelfRegistration":"Self registration",
|
||||||
|
"u2fSessions":"U2F sessions explorer",
|
||||||
"uid":"Identifier",
|
"uid":"Identifier",
|
||||||
"unknownAttrOrMacro":"Unknown attribute or macro",
|
"unknownAttrOrMacro":"Unknown attribute or macro",
|
||||||
"unknownError":"Unknown error",
|
"unknownError":"Unknown error",
|
||||||
|
|
|
@ -729,6 +729,7 @@
|
||||||
"u2fActivation":"Activation",
|
"u2fActivation":"Activation",
|
||||||
"u2fAuthnLevel":"Niveau d'authentification U2F",
|
"u2fAuthnLevel":"Niveau d'authentification U2F",
|
||||||
"u2fSelfRegistration":"Auto-enregistrement",
|
"u2fSelfRegistration":"Auto-enregistrement",
|
||||||
|
"u2fSessions":"Explorateur de sessions U2F",
|
||||||
"uid":"Identifiant",
|
"uid":"Identifiant",
|
||||||
"unknownAttrOrMacro":"Attribut ou macro inconnu",
|
"unknownAttrOrMacro":"Attribut ou macro inconnu",
|
||||||
"unknownError":"Erreur inconnue",
|
"unknownError":"Erreur inconnue",
|
||||||
|
|
|
@ -729,6 +729,7 @@
|
||||||
"u2fActivation":"Attivazione",
|
"u2fActivation":"Attivazione",
|
||||||
"u2fAuthnLevel":"Livello di autenticazione U2F",
|
"u2fAuthnLevel":"Livello di autenticazione U2F",
|
||||||
"u2fSelfRegistration":"Auto-registrazione",
|
"u2fSelfRegistration":"Auto-registrazione",
|
||||||
|
"u2fSessions":"U2F sessions explorer",
|
||||||
"uid":"Identificatore",
|
"uid":"Identificatore",
|
||||||
"unknownAttrOrMacro":"Attributo o macro sconosciuti",
|
"unknownAttrOrMacro":"Attributo o macro sconosciuti",
|
||||||
"unknownError":"Errore sconosciuto",
|
"unknownError":"Errore sconosciuto",
|
||||||
|
|
|
@ -729,6 +729,7 @@
|
||||||
"u2fActivation":"Kích hoạt",
|
"u2fActivation":"Kích hoạt",
|
||||||
"u2fAuthnLevel":"Mức xác thực U2F",
|
"u2fAuthnLevel":"Mức xác thực U2F",
|
||||||
"u2fSelfRegistration":"Tự đăng ký ",
|
"u2fSelfRegistration":"Tự đăng ký ",
|
||||||
|
"u2fSessions":"U2F sessions explorer",
|
||||||
"uid":"Trình định danh",
|
"uid":"Trình định danh",
|
||||||
"unknownAttrOrMacro":"Thuộc tính hoặc macro chưa xác định",
|
"unknownAttrOrMacro":"Thuộc tính hoặc macro chưa xác định",
|
||||||
"unknownError":"Lỗi không xác định",
|
"unknownError":"Lỗi không xác định",
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
<div class="navbar navbar-default">
|
<div class="navbar navbar-default">
|
||||||
<div class="navbar-collapse">
|
<div class="navbar-collapse">
|
||||||
<ul class="nav navbar-nav" role="grid">
|
<ul class="nav navbar-nav" role="grid">
|
||||||
<li><a id="a-persistent" href="#/persistent" role="row"><i class="glyphicon glyphicon-exclamation-sign"></i> {{translate('persistentSessions')}}</a></li>
|
<li><a id="a-persistent" href="#/persistent" role="row"><i class="glyphicon glyphicon-exclamation-sign"></i> {{translate('u2fSessions')}}</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -41,9 +41,12 @@
|
||||||
<div class="lmmenu navbar navbar-default" ng-class="{'hidden-xs':!showM}">
|
<div class="lmmenu navbar navbar-default" ng-class="{'hidden-xs':!showM}">
|
||||||
<div class="navbar-collapse" ng-class="{'collapse':!showM}" id="formmenu">
|
<div class="navbar-collapse" ng-class="{'collapse':!showM}" id="formmenu">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
|
<!--
|
||||||
<li ng-if="currentSession" ng-repeat="button in menu.addU2FKey" ng-include="'menubutton.html'"></li>
|
<li ng-if="currentSession" ng-repeat="button in menu.addU2FKey" ng-include="'menubutton.html'"></li>
|
||||||
<li ng-if="currentSession" ng-repeat="button in menu.verifyU2FKey" ng-include="'menubutton.html'"></li>
|
<li ng-if="currentSession" ng-repeat="button in menu.verifyU2FKey" ng-include="'menubutton.html'"></li>
|
||||||
|
-->
|
||||||
<li ng-if="currentSession" ng-repeat="button in menu.delU2FKey" ng-include="'menubutton.html'"></li>
|
<li ng-if="currentSession" ng-repeat="button in menu.delU2FKey" ng-include="'menubutton.html'"></li>
|
||||||
|
|
||||||
<li ng-if="currentSession===null" ng-repeat="button in menu.home" ng-include="'menubutton.html'"></li>
|
<li ng-if="currentSession===null" ng-repeat="button in menu.home" ng-include="'menubutton.html'"></li>
|
||||||
<li uib-dropdown class="visible-xs">
|
<li uib-dropdown class="visible-xs">
|
||||||
<a id="langmenu" name="menu" uib-dropdown-toggle data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Menu <span class="caret"></span></a>
|
<a id="langmenu" name="menu" uib-dropdown-toggle data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Menu <span class="caret"></span></a>
|
||||||
|
|
|
@ -116,7 +116,7 @@ sub run {
|
||||||
elsif ( $err == 0 ) {
|
elsif ( $err == 0 ) {
|
||||||
return $self->p->sendError( $req, "noU2FKeyFound" );
|
return $self->p->sendError( $req, "noU2FKeyFound" );
|
||||||
}
|
}
|
||||||
my $challenge = $req->data->{crypter}->authenticationChallenge;
|
my $challenge = $req->datas->{crypter}->authenticationChallenge;
|
||||||
return [ 200, [ 'Content-Type' => 'application/json' ], [$challenge] ];
|
return [ 200, [ 'Content-Type' => 'application/json' ], [$challenge] ];
|
||||||
}
|
}
|
||||||
if ( $action eq 'signature' ) {
|
if ( $action eq 'signature' ) {
|
||||||
|
@ -133,7 +133,7 @@ sub run {
|
||||||
return $self->p->sendError( $req, "noU2FKeyFound" );
|
return $self->p->sendError( $req, "noU2FKeyFound" );
|
||||||
}
|
}
|
||||||
my $res =
|
my $res =
|
||||||
( $req->data->{crypter}->authenticationVerify($resp) ? 1 : 0 );
|
( $req->datas->{crypter}->authenticationVerify($resp) ? 1 : 0 );
|
||||||
return [
|
return [
|
||||||
200, [ 'Content-Type' => 'application/json' ],
|
200, [ 'Content-Type' => 'application/json' ],
|
||||||
[qq'{"result":$res}']
|
[qq'{"result":$res}']
|
||||||
|
@ -150,11 +150,11 @@ sub loadUser {
|
||||||
unless ( $kh and $uk ) {
|
unless ( $kh and $uk ) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
$req->data->{crypter} = $self->crypter(
|
$req->datas->{crypter} = $self->crypter(
|
||||||
keyHandle => $self->decode_base64url($kh),
|
keyHandle => $self->decode_base64url($kh),
|
||||||
publicKey => $self->decode_base64url($uk)
|
publicKey => $self->decode_base64url($uk)
|
||||||
);
|
);
|
||||||
unless ( $req->data->{crypter} ) {
|
unless ( $req->datas->{crypter} ) {
|
||||||
my $error = Crypt::U2F::Server::Simple::lastError();
|
my $error = Crypt::U2F::Server::Simple::lastError();
|
||||||
return ( -1, $error );
|
return ( -1, $error );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user