...
 
Commits (2)
LemonLDAP::NG Core team:
* Maxime BESSON
* David COUTADEUR
* Xavier GUIMARD
* Christophe MAUDOUX
......@@ -9,17 +10,21 @@ Past and present contributors:
* Casimir ANTUNES
* Sébastien BAHLOUL
* Oliver BOIREAU
* Sandro CAZZANIGA
* Jean-Thomas CHECCO
* Sandro CAZZANIGA
* Thomas CHEMINEAU
* François-Xavier DELTOMBE
* Sebastien DIAZ
* Hubert GAULTIER
* Soisik FROGIER
* Gaultier HUBERT
* Eric GERMAN
* Mounir GZADY
* Jérémy KESPITE
* Erwan LEGALL
* Pascal PEJAC
* Daniel RIVIERE
* Antoine ROSIER
* Mame Dieynaba SENE
* Habib ZITOUNI
See http://lemonldap-ng.org/contact#the_team
......@@ -4,18 +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
Files: *
Copyright: 2005-2019, Xavier Guimard <yadd@debian.org>
2006-2019, Clement Oudot <clem.oudot@gmail.com>
Copyright: 2005-2020, Xavier Guimard <yadd@debian.org>
2006-2020, Clement Oudot <clem.oudot@gmail.com>
2008, Mikael Ates <mikael.ates@univ-st-etienne.fr>
2008-2011, Thomas Chemineau <thomas.chemineau@gmail.com>
2012-2013, Sandro Cazzaniga <cazzaniga.sandro@gmail.com>
2012-2015, François-Xavier Deltombe <fxdeltombe@gmail.com>
2012-2015, David Coutadeur <david.coutadeur@gmail.com>
2018-2019, Christophe Maudoux <chrmdx@gmail.com>
2005-2019, Gendarmerie nationale <https://www.gendarmerie.interieur.gouv.fr>
2006-2015, LINAGORA <info@linagora.com>
2012-2019, David Coutadeur <david.coutadeur@gmail.com>
2018-2020, Christophe Maudoux <chrmdx@gmail.com>
2019-2020, Maxime Besson <maxime.besson@worteks.com>
2019, Soisik Frogier <soisik.froger@worteks.com>
2019, Mame Dieynaba Sene <msene@linagora.com>
2019, Antoine Rosier <lemonldap@mon-refuge.fr>
2005-2020, Gendarmerie nationale <https://www.gendarmerie.interieur.gouv.fr>
2006-2019, LINAGORA <info@linagora.com>
2015-2018, Savoir-faire Linux <contact@savoirfairelinux.com>
2018-2019, Worteks <info@worteks.com>
2018-2020, Worteks <info@worteks.com>
License: GPL-2+
Files: lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/PAM.pm
......
......@@ -7,7 +7,7 @@ use Lemonldap::NG::Portal::Main::Constants qw(
PE_OK
);
our $VERSION = '2.0.3';
our $VERSION = '2.0.8';
extends 'Lemonldap::NG::Common::Module';
......@@ -60,7 +60,7 @@ sub changeUrldc {
$self->logger->debug( "CDA redirection to " . $req->{urldc} );
}
PE_OK;
return PE_OK;
}
1;
......@@ -22,23 +22,22 @@ sub init {
return 0;
}
$self->addUnauthRoute( checkstate => 'check', ['GET'] );
$self->addAuthRoute( checkstate => 'check', ['GET'] );
$self->addAuthRoute( checkstate => 'check', ['GET'] );
return 1;
}
sub check {
my ( $self, $req ) = @_;
my @rep;
unless ($req->param('secret')
and $req->param('secret') eq $self->conf->{checkStateSecret} )
{
return $self->p->sendError( $req, 'Bad secret' );
}
return $self->p->sendError( $req, 'Bad secret' )
unless ( $req->param('secret')
and $req->param('secret') eq $self->conf->{checkStateSecret} );
$req->steps( [ 'controlUrl', @{ $self->p->beforeAuth } ] );
my $res = $self->p->process($req);
if ( $res > 0 ) {
push @rep, "Bad result before auth: $res";
}
if ( my $user = $req->param('user') and my $pwd = $req->param('password') )
{
$req->user($user);
......@@ -59,12 +58,9 @@ sub check {
}
$self->p->deleteSession($req);
}
if (@rep) {
return $self->p->sendError( $req, join( ",\n", @rep ), 500 );
}
else {
return $self->p->sendJSONresponse( $req, { result => 1 } );
}
return $self->p->sendError( $req, join( ",\n", @rep ), 500 ) if (@rep);
return $self->p->sendJSONresponse( $req, { result => 1 } );
}
1;
......@@ -81,7 +81,7 @@ sub display {
sub run {
my ( $self, $req ) = @_;
my ( $msg, $decryptedValue ) = ( '', '' );
my $msg = my $decryptedValue = '';
# Check access rules
unless ( $self->rule->( $req, $req->userData ) ) {
......
......@@ -4,7 +4,7 @@ use strict;
use Mouse;
use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_MUSTAUTHN);
our $VERSION = '2.0.0';
our $VERSION = '2.0.8';
extends 'Lemonldap::NG::Portal::Main::Plugin';
......@@ -21,12 +21,12 @@ sub run {
if ( $req->env->{HTTP_HOST}
and $self->conf->{portal} =~ /\Q$req->{env}->{HTTP_HOST}/ )
{
my $delta = time() - $req->{sessionInfo}->{_utime};
my $delta = time - $req->{sessionInfo}->{_utime};
$self->logger->debug( "Delta with last Authn -> " . $delta );
$delta <= $self->conf->{portalForceAuthnInterval}
? return PE_OK
: return PE_MUSTAUTHN;
return $delta <= $self->conf->{portalForceAuthnInterval}
? PE_OK
: PE_MUSTAUTHN;
}
}
......
......@@ -4,7 +4,7 @@ use strict;
use Mouse;
use Lemonldap::NG::Portal::Main::Constants qw(PE_INFO PE_OK);
our $VERSION = '2.0.0';
our $VERSION = '2.0.8';
extends 'Lemonldap::NG::Portal::Main::Plugin',
'Lemonldap::NG::Portal::Lib::OtherSessions';
......@@ -37,9 +37,8 @@ sub run {
: ""
)
);
unless ( $req->info ) {
$req->info( $self->loadTemplate( $req, 'noHistory' ) );
}
$req->info( $self->loadTemplate( $req, 'noHistory' ) )
unless ( $req->info );
return PE_INFO;
}
return PE_OK;
......
......@@ -4,7 +4,7 @@ use strict;
use Mouse;
use Lemonldap::NG::Portal::Main::Constants qw(PE_OK);
our $VERSION = '2.0.5';
our $VERSION = '2.0.8';
extends 'Lemonldap::NG::Portal::Main::Plugin',
'Lemonldap::NG::Portal::Lib::OtherSessions';
......@@ -77,7 +77,7 @@ sub run {
. $self->_mkRemoveOtherLink($req) )
if ( $self->conf->{notifyOther} and @$otherSessions );
PE_OK;
return PE_OK;
}
# Build the removeOther link
......
......@@ -11,7 +11,7 @@ use JSON qw(from_json);
use MIME::Base64;
use IO::Socket::INET;
our $VERSION = '2.0.0';
our $VERSION = '2.0.8';
extends 'Lemonldap::NG::Portal::Main::Plugin';
......@@ -20,7 +20,7 @@ extends 'Lemonldap::NG::Portal::Main::Plugin';
sub init {
my ($self) = @_;
$self->addUnauthRoute( portalStatus => 'status', ['GET'] );
$self->addAuthRoute( portalStatus => 'status', ['GET'] );
$self->addAuthRoute( portalStatus => 'status', ['GET'] );
return 1;
}
......@@ -41,9 +41,8 @@ sub status {
}
}
}
unless ($out) {
return $self->p->sendError( $req, 'No status connection' );
}
return $self->p->sendError( $req, 'No status connection' )
unless ($out);
$p->print("STATUS json=1$args\n");
while ( $_ = $out->getline ) {
......