Commit d5e75cc6 authored by Xavier Guimard's avatar Xavier Guimard

Merge branch 'llng-2.0-improvements' into 'master'

Llng 2.0 improvements

See merge request lemonldap-ng/lemonldap-ng!32
parents 251f8986 017c6ae1
......@@ -66,7 +66,7 @@ Comment: Downloaded from http://www.iconspedia.com/
Files: lemonldap-ng-portal/site/htdocs/static/common/modules/WebID.png
Copyright: unknown
License: W3C
Comment: downloaded from
Comment: Downloaded from
http://www.w3.org/2005/Incubator/webid/wiki/Main_Page#Other_resources
.
Author is unknown and license may be W3C or public-domain
......@@ -74,7 +74,7 @@ Comment: downloaded from
Files: lemonldap-ng-portal/site/htdocs/static/common/modules/LinkedIn.png
Copyright: Public Domain
License: Simple-Geo
Comment: downloaded from
Comment: Downloaded from
https://commons.wikimedia.org/wiki/File:LinkedIn_logo_initials.png
.
Author is unknown and license may be W3C or public-domain
......@@ -82,12 +82,17 @@ Comment: downloaded from
Files: lemonldap-ng-portal/site/htdocs/static/bootstrap/u2f.png
Copyright: Bautsch <https://commons.wikimedia.org/wiki/User:Bautsch>
License: CC0-1.0
Comment: dowloaded from http://commons.wikimedia.org
Comment: Downloaded from http://commons.wikimedia.org
Files: lemonldap-ng-portal/site/htdocs/static/common/icons/2FManagment.png
Copyright: Freepik <https://www.flaticon.com/free-icon/photo-contrast-symbol_44324>
License: Flaticon Basic
Comment: Downloaded from https://www.flaticon.com
Files: lemonldap-ng-portal/site/htdocs/static/common/backgrounds/*
Copyright: Various artists
License: CC-BY-NC-ND-3.0 or GFDL-1.3
Comment: dowloaded from http://commons.wikimedia.org
Comment: Downloaded from http://commons.wikimedia.org
Files: lemonldap-ng-manager/site/htdocs/static/bwr/angular*
Copyright: 2010-2017, Google, Inc. http://angularjs.org
......@@ -891,3 +896,10 @@ License: BSD-3-clause
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
License: Flaticon Basic
FREE LICENSE (WITH ATTRIBUTION):
.
This license allows you to use for free any of Flaticon's contents for
your projects as long as they are attributed to their author in the
definitive project.
......@@ -37,6 +37,7 @@ useRedirectOnError = 0
[manager]
enabledModules = conf, sessions, notifications, 2ndFA
protection = manager
staticPrefix = /static
languages = fr, en, vi, ar
......
......@@ -52,7 +52,7 @@ sub init {
return 0;
}
$self->{enabledModules} ||= "conf, sessions, notifications";
$self->{enabledModules} ||= "conf, sessions, notifications, 2ndFA";
my @links;
my @enabledModules =
map { push @links, $_; "Lemonldap::NG::Manager::" . ucfirst($_) }
......@@ -254,7 +254,7 @@ you can also fix them in $opts hash ref passed as argument to run() or new()).
; Lemonldap::NG::Handler::PSGI::Router doc.
protection = manager
;enabledModules: Modules to display. Default to `conf, sessions, notifications`
;enabledModules: Modules to display. Default to `conf, sessions, notifications, 2ndFA`
enabledModules = conf, sessions, notifications, 2ndFA
;logLevel: choose one of error, warn, notice, info, debug
......
......@@ -27,7 +27,7 @@ sub types {
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval "$s $val";
my $err = join(
......@@ -662,7 +662,7 @@ sub attributes {
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval "$s $val";
my $err = join(
......@@ -1026,7 +1026,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval $s;
my $err = join(
......@@ -1111,7 +1111,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval "$s $val";
my $err = join(
......@@ -1134,7 +1134,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval "$s $val";
my $err = join(
......@@ -1489,7 +1489,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval $s;
my $err = join(
......@@ -1526,7 +1526,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval "$s $val";
my $err = join(
......@@ -1885,7 +1885,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval "$s $val";
my $err = join(
......@@ -2222,7 +2222,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval "$s $val";
my $err = join(
......@@ -2925,7 +2925,7 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
BEGIN {
${^WARNING_BITS} =
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x01";
}
eval "$s $val";
my $err = join(
......@@ -3004,19 +3004,19 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'default' => 0,
'select' => [
{
'k' => 0,
'k' => '0',
'v' => 'unsecuredCookie'
},
{
'k' => 1,
'k' => '1',
'v' => 'securedCookie'
},
{
'k' => 2,
'k' => '2',
'v' => 'doubleCookie'
},
{
'k' => 3,
'k' => '3',
'v' => 'doubleCookieForSingleSession'
}
],
......
// Generated by CoffeeScript 1.9.3
// Generated by CoffeeScript 1.10.0
/*
* 2ndFA Session explorer
......
// Generated by CoffeeScript 1.9.3
// Generated by CoffeeScript 1.10.0
/*
LemonLDAP::NG Manager client
......
// Generated by CoffeeScript 1.9.3
// Generated by CoffeeScript 1.10.0
/*
* LemonLDAP::NG Notifications Explorer client
......
......@@ -219,6 +219,7 @@ site/htdocs/static/common/backgrounds/Aletschgletscher_mit_Pinus_cembra1.jpg
site/htdocs/static/common/en.png
site/htdocs/static/common/favicon.ico
site/htdocs/static/common/fr.png
site/htdocs/static/common/icons/2FManagment.png
site/htdocs/static/common/icons/application_cascade.png
site/htdocs/static/common/icons/arrow_refresh.png
site/htdocs/static/common/icons/calendar.png
......@@ -277,6 +278,12 @@ site/htdocs/static/languages/nl.json
site/htdocs/static/languages/pt.json
site/htdocs/static/languages/ro.json
site/htdocs/static/languages/vi.json
site/htdocs/static/materialize/css/materialize.css
site/htdocs/static/materialize/css/materialize.min.css
site/htdocs/static/materialize/js/materialize.js
site/htdocs/static/materialize/js/materialize.min.js
site/htdocs/static/materialize/LICENSE
site/htdocs/static/materialize/README.md
site/templates/bootstrap/2fchoice.tpl
site/templates/bootstrap/2fregisters.tpl
site/templates/bootstrap/casBack2Url.tpl
......@@ -344,6 +351,54 @@ site/templates/common/oidc_checksession.tpl
site/templates/common/redirect.tpl
site/templates/common/registerBrowser.tpl
site/templates/common/script.tpl
site/templates/materialize/2fchoice.tpl
site/templates/materialize/2fregisters.tpl
site/templates/materialize/casBack2Url.tpl
site/templates/materialize/checklogins.tpl
site/templates/materialize/confirm.tpl
site/templates/materialize/customfooter.tpl
site/templates/materialize/customhead.tpl
site/templates/materialize/customheader.tpl
site/templates/materialize/error.tpl
site/templates/materialize/ext2fcheck.tpl
site/templates/materialize/footer.tpl
site/templates/materialize/header.tpl
site/templates/materialize/info.tpl
site/templates/materialize/ldapPpGrace.tpl
site/templates/materialize/login.tpl
site/templates/materialize/mail.tpl
site/templates/materialize/menu.tpl
site/templates/materialize/noHistory.tpl
site/templates/materialize/notification.tpl
site/templates/materialize/oidcConsents.tpl
site/templates/materialize/oidcGiveConsent.tpl
site/templates/materialize/oidcLogout.tpl
site/templates/materialize/openid.tpl
site/templates/materialize/openidform.tpl
site/templates/materialize/openIdPol.tpl
site/templates/materialize/openIdTrust.tpl
site/templates/materialize/password.tpl
site/templates/materialize/public/test.tpl
site/templates/materialize/pwdWillExpire.tpl
site/templates/materialize/redirect.tpl
site/templates/materialize/register.tpl
site/templates/materialize/removeOther.tpl
site/templates/materialize/samlRedirectToIdp.tpl
site/templates/materialize/samlSpLogout.tpl
site/templates/materialize/samlSpsLogout.tpl
site/templates/materialize/samlSpSoapLogout.tpl
site/templates/materialize/sessionArray.tpl
site/templates/materialize/simpleInfo.tpl
site/templates/materialize/sslform.tpl
site/templates/materialize/standardform.tpl
site/templates/materialize/totp2fcheck.tpl
site/templates/materialize/totp2fregister.tpl
site/templates/materialize/u2fcheck.tpl
site/templates/materialize/u2fregister.tpl
site/templates/materialize/upgradesession.tpl
site/templates/materialize/utotp2fcheck.tpl
site/templates/materialize/yubikey2fregister.tpl
site/templates/materialize/yubikeyform.tpl
t/01-AuthDemo.t
t/02-Password-Demo.t
t/03-XSS-protection.t
......
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