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

Merge branch 'master' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng

Browse Source
This commit is contained in:
Xavier Guimard 2018-07-26 06:50:06 +02:00
commit b6a5622ae4
16 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm
View File

@ -77,7 +77,7 @@ sub deleteOIDCConsent {
my $epoch = $params->{epoch}
or return $self->sendError( $req, 'OIDC Consent Epoch is missing', 400 );
# Try to load 2F Device(s) from session
# Try to load OIDC Consents from session
$self->logger->debug("Looking for OIDC Consent(s) ...");
my $_oidcConsents;
if ( $session->data->{_oidcConsents} ) {

9
lemonldap-ng-common/scripts/convertConfig
View File

@ -95,13 +95,13 @@ __END__
=encoding utf8
convertConfig - tool used to change Lemonldap::NG configuration database.
convertConfig - A tool to convert Lemonldap::NG configuration database.
=head1 SYNOPSIS
convertConfig --current=/current/lemonldap-ng.ini --new=/new/lemonldap-ng.ini
# Convert only latest (loose history)
# Convert only the latest config (configuration history is lost)
convertConfig --latest --current=... --new=...
# Continue even if an error occurs
@ -110,8 +110,9 @@ convertConfig - tool used to change Lemonldap::NG configuration database.
=head1 DESCRIPTION
convertConfig is a command line toot that can be used to do initialize a new
Lemonldap::NG configuration database keeping current configuration and history.
convertConfig is a command line tool to convert all configurations stored
in database and initialize a new Lemonldap::NG configuration based on
current configuration.
=head1 SEE ALSO

6
lemonldap-ng-common/scripts/lemonldap-ng-cli
View File

@ -78,9 +78,9 @@ lemonldap-ng-cli - Command-line manager for Lemonldap::NG web-SSO system.
=head1 DESCRIPTION
lemonldap-ng-cli is a command line client that can be used to do some actions
on Lemonldap::NG configuration. Commands are detailed in
L<Lemonldap::NG::Manager::Cli> and L<Lemonldap::NG::Common::CLi>
lemonldap-ng-cli is a command line interface to interact with Lemonldap::NG
configuration. Commands are described in L<Lemonldap::NG::Manager::Cli>
and L<Lemonldap::NG::Common::CLi>
=head1 SEE ALSO

9
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
View File

@ -700,7 +700,8 @@ sub attributes {
'type' => 'text'
},
'casSrvMetaDataOptionsGateway' => {
'type' => 'bool'
'default' => 0,
'type' => 'bool'
},
'casSrvMetaDataOptionsIcon' => {
'type' => 'text'
@ -711,7 +712,8 @@ sub attributes {
'type' => 'keyTextContainer'
},
'casSrvMetaDataOptionsRenew' => {
'type' => 'bool'
'default' => 0,
'type' => 'bool'
},
'casSrvMetaDataOptionsUrl' => {
'msgFail' => '__badUrl__',
@ -1852,7 +1854,8 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
'type' => 'select'
},
'oidcRPMetaDataOptionsLogoutSessionRequired' => {
'type' => 'bool'
'default' => 0,
'type' => 'bool'
},
'oidcRPMetaDataOptionsLogoutType' => {
'default' => 'front',

5
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
View File

@ -2510,13 +2510,13 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
type => 'subContainer',
documentation => 'Root of CAS server options',
},
casSrvMetaDataOptionsGateway => { type => 'bool', },
casSrvMetaDataOptionsGateway => { type => 'bool', default => 0 },
casSrvMetaDataOptionsProxiedServices => {
type => 'keyTextContainer',
keyTest => qr/^\w/,
keyMsgFail => '__badCasProxyId__',
},
casSrvMetaDataOptionsRenew => { type => 'bool', },
casSrvMetaDataOptionsRenew => { type => 'bool', default => 0 },
casSrvMetaDataOptionsUrl => {
type => 'text',
test => $url,
@ -3145,6 +3145,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
},
oidcRPMetaDataOptionsLogoutSessionRequired => {
type => 'bool',
default => 0,
documentation => 'Session required for logout',
},
};

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm
View File

@ -218,6 +218,7 @@ sub cTrees {
casSrvMetaDataNode => [
{
title => 'casSrvMetaDataOptions',
form => 'simpleInputContainer',
nodes => [
'casSrvMetaDataOptionsUrl',
'casSrvMetaDataOptionsRenew',
@ -232,6 +233,7 @@ sub cTrees {
casAppMetaDataNode => [
{
title => 'casAppMetaDataOptions',
form => 'simpleInputContainer',
nodes => [
'casAppMetaDataOptionsService',
'casAppMetaDataOptionsRule'

3
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
View File

@ -93,6 +93,7 @@ sub tree {
{
title => 'portalCaptcha',
help => 'captcha.html',
form => 'simpleInputContainer',
nodes => [
'captcha_login_enabled',
'captcha_mail_enabled',
@ -418,6 +419,7 @@ sub tree {
{
title => 'issuerDBCAS',
help => 'idpcas.html',
form => 'simpleInputContainer',
nodes => [
'issuerDBCASActivation', 'issuerDBCASPath',
'issuerDBCASRule',
@ -458,6 +460,7 @@ sub tree {
{
title => 'issuerDBOpenIDConnect',
help => 'idpopenidconnect.html',
form => 'simpleInputContainer',
nodes => [
'issuerDBOpenIDConnectActivation',
'issuerDBOpenIDConnectPath',

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

@ -262,7 +262,7 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
title: title
value: name
epoch: epoch
td: "1"
td: "2"
delete session[attr]
else if session[attr].toString().match(/\w+/)
subres.push

9
lemonldap-ng-manager/site/htdocs/static/js/conftree.js
View File

@ -24,7 +24,8 @@ function templates(tpl,key) {
}
],
"id" : "casAppMetaDataOptions",
"title" : "casAppMetaDataOptions"
"title" : "casAppMetaDataOptions",
"type" : "simpleInputContainer"
},
{
"cnodes" : tpl+"s/"+key+"/"+"casAppMetaDataExportedVars",
@ -64,12 +65,14 @@ function templates(tpl,key) {
"title" : "casSrvMetaDataOptionsUrl"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsRenew",
"id" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsRenew",
"title" : "casSrvMetaDataOptionsRenew",
"type" : "bool"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsGateway",
"id" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsGateway",
"title" : "casSrvMetaDataOptionsGateway",
@ -87,7 +90,8 @@ function templates(tpl,key) {
}
],
"id" : "casSrvMetaDataOptions",
"title" : "casSrvMetaDataOptions"
"title" : "casSrvMetaDataOptions",
"type" : "simpleInputContainer"
},
{
"cnodes" : tpl+"s/"+key+"/"+"casSrvMetaDataExportedVars",
@ -497,6 +501,7 @@ function templates(tpl,key) {
"type" : "select"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsLogoutSessionRequired",
"id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsLogoutSessionRequired",
"title" : "oidcRPMetaDataOptionsLogoutSessionRequired",

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

File diff suppressed because one or more lines are too long

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

@ -311,7 +311,7 @@
title: title,
value: name,
epoch: epoch,
td: "1"
td: "2"
});
}
delete session[attr];

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

2
lemonldap-ng-manager/site/htdocs/static/struct.json
View File

File diff suppressed because one or more lines are too long

6
lemonldap-ng-manager/site/templates/sessions.tpl
View File

@ -91,14 +91,14 @@
</table>
</div>
<div ng-if="!node.nodes">
<th ng-if="node.td!='1'">{{translate(node.title)}}</th>
<td class="data-{{node.epoch}}" ng-if="node.td=='1'">{{node.title}}</td>
<th ng-if="node.td!='1' && node.td!='2'">{{translate(node.title)}}</th>
<td class="data-{{node.epoch}}" ng-if="node.td>='1'">{{node.title}}</td>
<th ng-if="node.title=='type' || node.title=='rp'">{{translate(node.value)}}</th>
<td class="col-md-3 data-{{node.epoch}}" ng-if="node.title!='type' && node.title!='rp'" >{{node.value}}</td>
<th ng-if="node.title=='type' || node.title=='rp'">{{translate(node.epoch)}}</th>
<td class="col-md-3 data-{{node.epoch}}" ng-if="node.epoch > 1500000000">{{localeDate(node.epoch)}}</td>
<td class="data-{{node.epoch}}">
<span ng-if="node.td=='1'" class="link text-danger glyphicon glyphicon-minus-sign" ng-click="deleteOIDCConsent(node.title, node.epoch)"></span>
<span ng-if="node.td=='2'" class="link text-danger glyphicon glyphicon-minus-sign" ng-click="deleteOIDCConsent(node.title, node.epoch)"></span>
<!--
<span ng-if="$last && ( node.title=='TOTP' || node.title=='UBK' || node.title=='U2F' )" class="link text-success glyphicon glyphicon-plus-sign" ng-click="menuClick({title:'newRule'})"></span>
-->

4
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth.pod
View File

@ -54,7 +54,7 @@ Lemonldap:NG::Portal::Auth - Writing authentication modules for LemonLDAP::NG.
Lemonldap::NG::Portal::Main::Auth must be used to build Lemonldap::NG authentication
modules. Authentication modules are independent objects that are instantiated
by Lemonldap::NG portal. They must provides methods described below.
by Lemonldap::NG portal. They must provide methods described below.
=head1 METHODS
@ -78,7 +78,7 @@ by Lemonldap::NG portal. They must provides methods described below.
=head3 "Routes" management
Like any module that inherits from Lemonldap::NG::Portal::Plugin,
Like each module that inherits from Lemonldap::NG::Portal::Plugin,
Lemonldap::NG::Portal::Main::Auth provides URI path functions:
=over

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB.pod
View File

@ -42,7 +42,7 @@ Lemonldap:NG::Portal::UserDB - Writing authentication modules for LemonLDAP::NG.
UserDB modules are used to search a user in user database. UserDB modules are
independent objects that are instantiated by Lemonldap::NG portal. They must
provides methods described below.
provide methods described below.
=head1 METHODS