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

Fix #1282: conf parser didn't check unopened combModules node

Browse Source
This commit is contained in:
Xavier Guimard 2017-07-30 08:20:15 +00:00
parent 0fc127dbe0
commit 6827b4e485
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm
View File

@ -712,25 +712,6 @@ sub _scanNodes {
next;
}
# combModules: just to replace "over" key
elsif ( $name eq 'combModules' ) {
hdebug('combModules');
$self->newConf->{$name} = {};
foreach my $node ( @{ $leaf->{nodes} } ) {
my $tmp;
$tmp->{$_} = $node->{data}->{$_} foreach (qw(type for));
$tmp->{over} = {};
foreach ( @{ $node->{data}->{over} } ) {
$tmp->{over}->{ $_->[0] } = $_->[1];
}
$self->newConf->{$name}->{ $node->{title} } = $tmp;
}
# TODO: check changes
$self->confChanged(1);
next;
}
####################
# Other hash nodes #
####################
@ -746,6 +727,26 @@ sub _scanNodes {
}
else {
hdebug(' opened');
# combModules: just to replace "over" key
if ( $name eq 'combModules' ) {
hdebug(' combModules');
$self->newConf->{$name} = {};
foreach my $node ( @{ $leaf->{nodes} } ) {
my $tmp;
$tmp->{$_} = $node->{data}->{$_} foreach (qw(type for));
$tmp->{over} = {};
foreach ( @{ $node->{data}->{over} } ) {
$tmp->{over}->{ $_->[0] } = $_->[1];
}
$self->newConf->{$name}->{ $node->{title} } = $tmp;
}
# TODO: check changes
$self->confChanged(1);
next;
}
$subNodes //= [];
my $count = 0;
my @old = (

3
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Combination.pm
View File

@ -225,7 +225,8 @@ sub loadPlugin {
}
return 0
unless ( $obj = $self->p->loadModule( "$plugin", $nc ) );
$obj = $self->p->findEP( $plugin, $obj );
return 0
unless $obj = $self->p->findEP( $plugin, $obj );
$obj->{userLogger} = $self->wrapUserLogger;
weaken $obj->{userLogger};
return $obj;