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

Refactor attribute handling in OIDC manager api (#2347)

Browse Source
This commit is contained in:
Maxime Besson 2020-12-28 14:50:45 +01:00
parent 667e7f09c4
commit 6f25d43bdf
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Common.pm
View File

@ -99,6 +99,30 @@ sub _translateOptionConfToApi {
return $optionName;
}
sub _translateValueConfToApi {
my ( $self, $optionName, $optionValue ) = @_;
if ( $optionName eq "oidcRPMetaDataOptionsRedirectUris" ) {
return [ split( /\s+/, $optionValue, ) ];
}
else {
return $optionValue;
}
}
sub _translateValueApiToConf {
my ( $self, $optionName, $optionValue ) = @_;
# redirectUris is handled as an array
if ( $optionName eq 'redirectUris' ) {
die "redirectUris is not an array"
unless ( ref($optionValue) eq "ARRAY" );
return join( ' ', @{$optionValue} );
}
else {
return $optionValue;
}
}
sub _getRegexpFromPattern {
my ( $self, $pattern ) = @_;
return unless ( $pattern =~ /[\w\.\-\*]+/ );

42
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Providers/OidcRp.pm
View File

@ -301,22 +301,10 @@ sub _getOidcRpByConfKey {
for
my $configOption ( keys %{ $conf->{oidcRPMetaDataOptions}->{$confKey} } )
{
# redirectUris is handled as an array
if ( $configOption eq "oidcRPMetaDataOptionsRedirectUris" ) {
$redirectUris = [
split(
/\s+/,
$conf->{oidcRPMetaDataOptions}->{$confKey}->{$configOption}
)
];
$options->{ $self->_translateOptionConfToApi($configOption) } =
$redirectUris;
}
else {
$options->{ $self->_translateOptionConfToApi($configOption) } =
$conf->{oidcRPMetaDataOptions}->{$confKey}->{$configOption};
}
my $apiName = $self->_translateOptionConfToApi($configOption);
my $apiValue = $self->_translateValueConfToApi( $configOption,
$conf->{oidcRPMetaDataOptions}->{$confKey}->{$configOption} );
$options->{$apiName} = $apiValue;
}
return {
@ -377,21 +365,17 @@ sub _pushOidcRp {
foreach ( keys %{ $push->{options} } ) {
# redirectUris is handled as an array
if ( $_ eq 'redirectUris' ) {
my $option = $push->{options}->{$_};
my $optionName = $self->_translateOptionApiToConf( $_, 'oidcRP' );
eval {
my $optionValue =
$self->_translateValueApiToConf( $_, $push->{options}->{$_} );
$translatedOptions->{$optionName} = $optionValue;
};
if ($@) {
return {
res => 'ko',
msg => "Invalid input: redirectUris is not an array"
}
unless ( ref($option) eq "ARRAY" );
$translatedOptions->{ $self->_translateOptionApiToConf( $_,
'oidcRP' ) } = join( ' ', @{ $push->{options}->{$_} } );
}
else {
$translatedOptions->{ $self->_translateOptionApiToConf( $_,
'oidcRP' ) } = $push->{options}->{$_};
msg => "Invalid input: $@",
};
}
}