From ded5bf1250ba4590bc3f049fcd61af3e779f5ccf Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Wed, 2 May 2018 14:46:35 +0200 Subject: [PATCH 1/5] Update copyrights #1383 --- COPYING | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/COPYING b/COPYING index 669e2364d..d92894bde 100644 --- a/COPYING +++ b/COPYING @@ -84,6 +84,11 @@ Copyright: Bautsch License: CC0-1.0 Comment: dowloaded from http://commons.wikimedia.org +Files: lemonldap-ng-portal/site/htdocs/static/common/icons/2FManagment.png +Copyright: Freepik +License: Flaticon Basic +Comment: dowloaded 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 @@ -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. From 9a455f3f5283f20e267dbd2b77d4d66644423bb6 Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Wed, 2 May 2018 14:46:59 +0200 Subject: [PATCH 2/5] Update js --- .../lib/Lemonldap/NG/Manager/Attributes.pm | 28 +++++++++---------- .../site/htdocs/static/js/2ndfa.js | 2 +- .../site/htdocs/static/js/manager.js | 2 +- .../site/htdocs/static/js/notifications.js | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm index 0e002527c..f863d0923 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm @@ -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' } ], diff --git a/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js b/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js index 7d1c64ec5..5528418af 100644 --- a/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js +++ b/lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.9.3 +// Generated by CoffeeScript 1.10.0 /* * 2ndFA Session explorer diff --git a/lemonldap-ng-manager/site/htdocs/static/js/manager.js b/lemonldap-ng-manager/site/htdocs/static/js/manager.js index 12f9b880f..bca1556b6 100644 --- a/lemonldap-ng-manager/site/htdocs/static/js/manager.js +++ b/lemonldap-ng-manager/site/htdocs/static/js/manager.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.9.3 +// Generated by CoffeeScript 1.10.0 /* LemonLDAP::NG Manager client diff --git a/lemonldap-ng-manager/site/htdocs/static/js/notifications.js b/lemonldap-ng-manager/site/htdocs/static/js/notifications.js index 79fe3a2c6..720e669a4 100644 --- a/lemonldap-ng-manager/site/htdocs/static/js/notifications.js +++ b/lemonldap-ng-manager/site/htdocs/static/js/notifications.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.9.3 +// Generated by CoffeeScript 1.10.0 /* * LemonLDAP::NG Notifications Explorer client From fdd7f1265675616f778955982e29108a9557ccbf Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Wed, 2 May 2018 15:02:41 +0200 Subject: [PATCH 3/5] Append 2ndFA module as default enabled modules --- e2e-tests/lemonldap-ng.ini | 1 + lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e-tests/lemonldap-ng.ini b/e2e-tests/lemonldap-ng.ini index 339f8c7b2..280eed0ab 100644 --- a/e2e-tests/lemonldap-ng.ini +++ b/e2e-tests/lemonldap-ng.ini @@ -37,6 +37,7 @@ useRedirectOnError = 0 [manager] +enabledModules = conf, sessions, notifications, 2ndFA protection = manager staticPrefix = /static languages = fr, en, vi, ar diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm index a523e95e4..0c2469494 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm @@ -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($_) } From f52deaadc67c2e21049820f64b2e26bbe377b89b Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Wed, 2 May 2018 15:10:23 +0200 Subject: [PATCH 4/5] Update pod --- lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm index 0c2469494..e170f1e04 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm @@ -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 From c0f7a7f5757074a6c41d0a54f5b0a717f18cb67a Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Wed, 2 May 2018 15:29:35 +0200 Subject: [PATCH 5/5] Typo --- COPYING | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/COPYING b/COPYING index d92894bde..1700b06e7 100644 --- a/COPYING +++ b/COPYING @@ -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,17 +82,17 @@ Comment: downloaded from Files: lemonldap-ng-portal/site/htdocs/static/bootstrap/u2f.png Copyright: 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 License: Flaticon Basic -Comment: dowloaded from https://www.flaticon.com +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