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

Merge branch 'v2.0'

Browse Source
This commit is contained in:
Xavier Guimard 2019-02-13 22:36:01 +01:00
commit 4e0113ddd6
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
COPYING
View File

@ -4,22 +4,22 @@ Upstream-Contact: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues
Source: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/tags?sort=updated_desc Source: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/tags?sort=updated_desc
Files: * Files: *
Copyright: 2005-2018, Xavier Guimard <yadd@debian.org> Copyright: 2005-2019, Xavier Guimard <yadd@debian.org>
2006-2018, Clement Oudot <clem.oudot@gmail.com> 2006-2019, Clement Oudot <clem.oudot@gmail.com>
2008, Mikael Ates <mikael.ates@univ-st-etienne.fr> 2008, Mikael Ates <mikael.ates@univ-st-etienne.fr>
2008-2011, Thomas Chemineau <thomas.chemineau@gmail.com> 2008-2011, Thomas Chemineau <thomas.chemineau@gmail.com>
2012-2013, Sandro Cazzaniga <cazzaniga.sandro@gmail.com> 2012-2013, Sandro Cazzaniga <cazzaniga.sandro@gmail.com>
2012-2015, François-Xavier Deltombe <fxdeltombe@gmail.com> 2012-2015, François-Xavier Deltombe <fxdeltombe@gmail.com>
2012-2015, David Coutadeur <david.coutadeur@gmail.com> 2012-2015, David Coutadeur <david.coutadeur@gmail.com>
2018, Christophe Maudoux <chrmdx@gmail.com> 2018-2019, Christophe Maudoux <chrmdx@gmail.com>
2005-2018, Gendarmerie nationale <https://www.gendarmerie.interieur.gouv.fr> 2005-2019, Gendarmerie nationale <https://www.gendarmerie.interieur.gouv.fr>
2006-2015, LINAGORA <info@linagora.com> 2006-2015, LINAGORA <info@linagora.com>
2015-2018, Savoir-faire Linux <contact@savoirfairelinux.com> 2015-2018, Savoir-faire Linux <contact@savoirfairelinux.com>
2018, Worteks <info@worteks.com> 2018-2019, Worteks <info@worteks.com>
License: GPL-2+ License: GPL-2+
Files: lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/PAM.pm Files: lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/PAM.pm
Copyright: 2017-2018, Xavier Guimard <x.guimard@free.fr> Copyright: 2017-2019, Xavier Guimard <x.guimard@free.fr>
License: GPL-2+ License: GPL-2+
Comment: idea taken from Authen::Simple::PAM (copyright Christian Hansen Comment: idea taken from Authen::Simple::PAM (copyright Christian Hansen
<chansen@cpan.org> <chansen@cpan.org>
@ -29,15 +29,17 @@ Copyright: 2011, Tatsuhiko Miyagawa <miyagawa@bulknews.net>
License: Artistic or GPL-1+ License: Artistic or GPL-1+
Files: *.js Files: *.js
Copyright: 2005-2018, Xavier Guimard <yadd@debian.org> Copyright: 2005-2019, Xavier Guimard <yadd@debian.org>
2006-2018, Clement Oudot <clem.oudot@gmail.com> 2006-2019, Clement Oudot <clem.oudot@gmail.com>
2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com> 2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com>
2018-2019, Christophe Maudoux <chrmdx@gmail.com>
License: GPL-2+ License: GPL-2+
Files: lemonldap-ng-portal/site/htdocs/static/common/js/portal.js Files: lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
Copyright: 2005-2018, Xavier Guimard <yadd@debian.org> Copyright: 2005-2019, Xavier Guimard <yadd@debian.org>
2006-2018, Clement Oudot <clem.oudot@gmail.com> 2006-2019, Clement Oudot <clem.oudot@gmail.com>
2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com> 2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com>
2018-2019, Christophe Maudoux <chrmdx@gmail.com>
License: GPL-2+ License: GPL-2+
Comment: a little part of it comes from JQuery-UI examples Comment: a little part of it comes from JQuery-UI examples
(https://snipplr.com/view/29434/) (https://snipplr.com/view/29434/)
@ -202,7 +204,7 @@ Copyright: 2004, Entr'ouvert <https://www.entrouvert.com/>
License: GPL-2+ License: GPL-2+
Files: debian/* Files: debian/*
Copyright: 2005-2018, Xavier Guimard <yadd@debian.org> Copyright: 2005-2019, Xavier Guimard <yadd@debian.org>
License: GPL-2+ License: GPL-2+
License: Apache-2.0 License: Apache-2.0

24
debian/copyright vendored
View File

@ -4,22 +4,22 @@ Upstream-Contact: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues
Source: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/tags?sort=updated_desc Source: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/tags?sort=updated_desc
Files: * Files: *
Copyright: 2005-2018, Xavier Guimard <yadd@debian.org> Copyright: 2005-2019, Xavier Guimard <yadd@debian.org>
2006-2018, Clement Oudot <clem.oudot@gmail.com> 2006-2019, Clement Oudot <clem.oudot@gmail.com>
2008, Mikael Ates <mikael.ates@univ-st-etienne.fr> 2008, Mikael Ates <mikael.ates@univ-st-etienne.fr>
2008-2011, Thomas Chemineau <thomas.chemineau@gmail.com> 2008-2011, Thomas Chemineau <thomas.chemineau@gmail.com>
2012-2013, Sandro Cazzaniga <cazzaniga.sandro@gmail.com> 2012-2013, Sandro Cazzaniga <cazzaniga.sandro@gmail.com>
2012-2015, François-Xavier Deltombe <fxdeltombe@gmail.com> 2012-2015, François-Xavier Deltombe <fxdeltombe@gmail.com>
2012-2015, David Coutadeur <david.coutadeur@gmail.com> 2012-2015, David Coutadeur <david.coutadeur@gmail.com>
2018, Christophe Maudoux <chrmdx@gmail.com> 2018-2019, Christophe Maudoux <chrmdx@gmail.com>
2005-2018, Gendarmerie nationale <https://www.gendarmerie.interieur.gouv.fr> 2005-2019, Gendarmerie nationale <https://www.gendarmerie.interieur.gouv.fr>
2006-2015, LINAGORA <info@linagora.com> 2006-2015, LINAGORA <info@linagora.com>
2015-2018, Savoir-faire Linux <contact@savoirfairelinux.com> 2015-2018, Savoir-faire Linux <contact@savoirfairelinux.com>
2018, Worteks <info@worteks.com> 2018-2019, Worteks <info@worteks.com>
License: GPL-2+ License: GPL-2+
Files: lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/PAM.pm Files: lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/PAM.pm
Copyright: 2017-2018, Xavier Guimard <x.guimard@free.fr> Copyright: 2017-2019, Xavier Guimard <x.guimard@free.fr>
License: GPL-2+ License: GPL-2+
Comment: idea taken from Authen::Simple::PAM (copyright Christian Hansen Comment: idea taken from Authen::Simple::PAM (copyright Christian Hansen
<chansen@cpan.org> <chansen@cpan.org>
@ -29,15 +29,17 @@ Copyright: 2011, Tatsuhiko Miyagawa <miyagawa@bulknews.net>
License: Artistic or GPL-1+ License: Artistic or GPL-1+
Files: *.js Files: *.js
Copyright: 2005-2018, Xavier Guimard <yadd@debian.org> Copyright: 2005-2019, Xavier Guimard <yadd@debian.org>
2006-2018, Clement Oudot <clem.oudot@gmail.com> 2006-2019, Clement Oudot <clem.oudot@gmail.com>
2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com> 2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com>
2018-2019, Christophe Maudoux <chrmdx@gmail.com>
License: GPL-2+ License: GPL-2+
Files: lemonldap-ng-portal/site/htdocs/static/common/js/portal.js Files: lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
Copyright: 2005-2018, Xavier Guimard <yadd@debian.org> Copyright: 2005-2019, Xavier Guimard <yadd@debian.org>
2006-2018, Clement Oudot <clem.oudot@gmail.com> 2006-2019, Clement Oudot <clem.oudot@gmail.com>
2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com> 2008-2012, Thomas Chemineau <thomas.chemineau@gmail.com>
2018-2019, Christophe Maudoux <chrmdx@gmail.com>
License: GPL-2+ License: GPL-2+
Comment: a little part of it comes from JQuery-UI examples Comment: a little part of it comes from JQuery-UI examples
(https://snipplr.com/view/29434/) (https://snipplr.com/view/29434/)
@ -202,7 +204,7 @@ Copyright: 2004, Entr'ouvert <https://www.entrouvert.com/>
License: GPL-2+ License: GPL-2+
Files: debian/* Files: debian/*
Copyright: 2005-2018, Xavier Guimard <yadd@debian.org> Copyright: 2005-2019, Xavier Guimard <yadd@debian.org>
License: GPL-2+ License: GPL-2+
License: Apache-2.0 License: Apache-2.0

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

@ -732,7 +732,10 @@ sub sendHtml {
my $res = $self->SUPER::sendHtml( $req, $template, %args ); my $res = $self->SUPER::sendHtml( $req, $template, %args );
push @{ $res->[1] }, push @{ $res->[1] },
'X-XSS-Protection' => '1; mode=block', 'X-XSS-Protection' => '1; mode=block',
'X-Content-Type-Options' => 'nosniff'; 'X-Content-Type-Options' => 'nosniff',
'Cache-Control' => 'no-cache, no-store, must-revalidate',# HTTP 1.1
'Pragma' => 'no-cache', # HTTP 1.0
'Expires' => '0'; # Proxies
# Set authorized URL for POST # Set authorized URL for POST
my $csp = $self->csp . "form-action " . $self->conf->{cspFormAction}; my $csp = $self->csp . "form-action " . $self->conf->{cspFormAction};

4
lemonldap-ng-portal/site/templates/bootstrap/header.tpl
View File

@ -4,7 +4,9 @@
<title trspan="authPortal">Authentication portal</title> <title trspan="authPortal">Authentication portal</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Script-Type" content="text/javascript" /> <meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta http-equiv="cache-control" content="no-cache" /> <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- //if:usedebianlibs <!-- //if:usedebianlibs
<link rel="stylesheet" type="text/css" href="/javascript/bootstrap4/css/bootstrap.min.css" /> <link rel="stylesheet" type="text/css" href="/javascript/bootstrap4/css/bootstrap.min.css" />