environments/ppa-mbqj77/deployments/1
Xavier Guimard 9 years ago
parent 7de28b3912
commit aab84b0d6f
  1. 2
      lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm
  2. 4
      lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm
  3. 2
      lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-SharedConf.t
  4. 4
      lemonldap-ng-handler/t/60-Lemonldap-NG-Handler-PSGI.t
  5. 7
      lemonldap-ng-handler/t/61-Lemonldap-NG-Handler-PSGI-Server.t
  6. 10
      lemonldap-ng-handler/t/62-Lemonldap-NG-Handler-Nginx.t
  7. 3
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
  8. 6
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm

@ -68,7 +68,7 @@ sub serialize {
my $fields;
# Parse configuration
foreach my $k (keys %$conf ) {
foreach my $k ( keys %$conf ) {
my $v = $conf->{$k};
# 1.Hash ref

@ -137,8 +137,8 @@ sub _mustBeDefined {
}
sub init {
my($self,$args) = @_;
unless(ref $args) {
my ( $self, $args ) = @_;
unless ( ref $args ) {
$self->error('init argument must be a hashref');
return 0;
}

@ -84,7 +84,7 @@ ok( $h->run($apacheRequest),
ok(
"$ret" eq
'Location:http://auth.example.com/?url=aHR0cDovL3Rlc3QxLmV4YW1wbGUuY29tLw==',
'Location:http://auth.example.com/?url=aHR0cDovL3Rlc3QxLmV4YW1wbGUuY29tLw==',
'testing redirection URL from previous run'
) or print STDERR "Got: $ret\n";

@ -71,7 +71,9 @@ ok(
'Bad cookie'
);
ok( $res->[0] == 302, 'Code is 302' ) or explain( $res->[0], 302 );
unlink('t/sessions/lock/Apache-Session-e5eec18ebb9bc96352595e2d8ce962e8ecf7af7c9a98cb9a43f9cd181cf4b545.lock');
unlink(
't/sessions/lock/Apache-Session-e5eec18ebb9bc96352595e2d8ce962e8ecf7af7c9a98cb9a43f9cd181cf4b545.lock'
);
count(2);

@ -48,7 +48,8 @@ count(2);
# Check headers
%h = @{ $res->[1] };
ok($h{'Auth-User'} eq 'dwho','Header Auth-User is set to "dwho"') or explain($h,'Auth-User => "dwho"');
ok( $h{'Auth-User'} eq 'dwho', 'Header Auth-User is set to "dwho"' )
or explain( $h, 'Auth-User => "dwho"' );
count(1);
# Denied query
@ -76,7 +77,9 @@ ok(
'Bad cookie'
);
ok( $res->[0] == 302, 'Code is 302' ) or explain( $res->[0], 302 );
unlink('t/sessions/lock/Apache-Session-e5eec18ebb9bc96352595e2d8ce962e8ecf7af7c9a98cb9a43f9cd181cf4b545.lock');
unlink(
't/sessions/lock/Apache-Session-e5eec18ebb9bc96352595e2d8ce962e8ecf7af7c9a98cb9a43f9cd181cf4b545.lock'
);
count(2);

@ -48,8 +48,10 @@ count(2);
# Check headers
%h = @{ $res->[1] };
ok($h{'Headername1'} eq 'Auth-User','Headername1 is set to "Auth-User"') or explain($h,'Headername1 => "Auth-User"');
ok($h{'Headervalue1'} eq 'dwho','Headervalue1 is set to "dwho"') or explain($h,'Headervalue1 => "dwho"');
ok( $h{'Headername1'} eq 'Auth-User', 'Headername1 is set to "Auth-User"' )
or explain( $h, 'Headername1 => "Auth-User"' );
ok( $h{'Headervalue1'} eq 'dwho', 'Headervalue1 is set to "dwho"' )
or explain( $h, 'Headervalue1 => "dwho"' );
count(2);
# Denied query
@ -77,7 +79,9 @@ ok(
'Bad cookie'
);
ok( $res->[0] == 401, 'Code is 401' ) or explain( $res->[0], 401 );
unlink('t/sessions/lock/Apache-Session-e5eec18ebb9bc96352595e2d8ce962e8ecf7af7c9a98cb9a43f9cd181cf4b545.lock');
unlink(
't/sessions/lock/Apache-Session-e5eec18ebb9bc96352595e2d8ce962e8ecf7af7c9a98cb9a43f9cd181cf4b545.lock'
);
count(2);

@ -38,7 +38,8 @@ sub init {
# Manager needs to keep new Ajax behaviour
$args->{noAjaxHook} = 0;
return 0 unless ( $self->Lemonldap::NG::Handler::PSGI::Router::init($args) );
return 0
unless ( $self->Lemonldap::NG::Handler::PSGI::Router::init($args) );
# TODO: manage errors
unless ( -r $self->{templateDir} ) {

@ -101,8 +101,8 @@ sub tree {
title => 'authParams',
help =>
'start.html#authentication_users_and_password_databases',
form => 'authParams',
nodes => [ 'authentication', 'userDB', 'passwordDB' ],
form => 'authParams',
nodes => [ 'authentication', 'userDB', 'passwordDB' ],
nodes_cond => [
{
title => 'adParams',
@ -689,7 +689,7 @@ sub tree {
'samlServicePublicKeyEnc'
]
},
'samlServiceUseCertificateInResponse'
'samlServiceUseCertificateInResponse'
]
},
{

Loading…
Cancel
Save