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

Compact conf (may close #967)

Browse Source
This commit is contained in:
Xavier Guimard 2016-03-19 15:00:26 +00:00
parent dc8b8a4d91
commit 927fc64e1f
1 changed files with 60 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,12 +89,10 @@ sub hdebug {
sub check {
my $self = shift;
hdebug("# check()");
my $res;
unless ( $self->newConf ) {
$res = $self->scanTree;
return 0 unless ($res);
return 0 unless ( $self->scanTree );
}
$self->compactConf;
unless ( $self->testNewConf ) {
hdebug(" testNewConf() failed");
return 0;
@ -958,6 +956,64 @@ sub _globalTest {
return $result;
}
sub compactConf {
my $self = shift;
my $conf = $self->newConf or die("No new conf");
# Remove unused issuerDB parameters
foreach my $k ( keys %$issuerParameters ) {
unless ( $conf->{ $k . "Activation" } ) {
delete $conf->{$_} foreach ( @{ $issuerParameters->{$k} } );
}
}
# Remove unused auth parameters
my %keep;
foreach my $type (qw(authentication userDB passwordDB)) {
my $mod = $conf->{$type};
$mod =~ s/OpenIDConnect/oidc/i;
$mod = lc($mod);
$keep{$mod} = 1;
}
if ( $keep{multi} ) {
foreach my $prm (qw(multiAuthStack multiUserDBStack)) {
my @tmp = split /;\s*/, $conf->{$prm};
foreach (@tmp) {
s/^(\w+).*$/lc($1)/e;
s/OpenIDConnect/oidc/i;
$keep{$_} = 1;
}
}
}
if ( $keep{choice} ) {
foreach my $key ( values %{ $conf->{authChoiceModules} } ) {
my @tmp = split /[;|\|]/, $key;
foreach (@tmp) {
s/^(\w+).*$/lc($1)/e;
s/OpenIDConnect/oidc/i;
$keep{$_} = 1;
}
}
}
foreach my $key (%$authParameters) {
my $mod = $key;
$mod =~ s/Params$//;
unless ( $keep{$mod} ) {
delete $conf->{$_} foreach ( @{ $authParameters->{$key} } );
}
}
# Remove SAML service unless used
unless ( $keep{saml} or $conf->{issuerDBSAMLActivation} ) {
delete $conf->{$_} foreach (@$samlServiceParameters);
}
# Remove OpenIF-Connect service unless used
unless ( $keep{oidc} or $conf->{issuerDBOpenIDConnectActivation} ) {
delete $conf->{$_} foreach (@$oidcServiceParameters);
}
}
1;
__END__