ovh/the-bastion
1
1
Fork 0
mirror of https://github.com/ovh/the-bastion.git synced 2024-09-20 15:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

enh: get_group_keys: return the keyhome to avoid hardcoding it on several places

Browse source
This commit is contained in:
Stéphane Lesimple 2021-02-15 11:20:15 +00:00 committed by Stéphane Lesimple
parent 02b76d301a
commit c88be2def1
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/perl/OVH/Bastion/allowdeny.inc
View file

@ -46,9 +46,10 @@ sub get_group_keys {
$fnret or return $fnret;
$group = $fnret->value->{'group'}; # untainted version
my $shortGroup = $fnret->value->{'shortGroup'};
my $keyhome = $fnret->value->{'keyhome'};
$fnret = _get_pub_keys_from_directory(
dir => '/home/keykeeper/' . $group,
dir => $keyhome,
pattern => qr/^id_([a-z0-9]+)_\Q$shortGroup\E/,
listOnly => $listOnly,
forceKey => $forceKey,

2
lib/perl/OVH/Bastion/allowkeeper.inc
View file

@ -55,7 +55,7 @@ sub is_group_existing {
my ($groupname, $passwd, $gid, $members) = @{$_cache_getgrnam{$group}};
if ($groupname) {
my (undef, $shortGroup) = $group =~ m{^(key)?(.+)};
return R('OK', value => {group => $group, shortGroup => $shortGroup, gid => $gid, members => [split(/ /, $members)]});
return R('OK', value => {group => $group, shortGroup => $shortGroup, gid => $gid, keyhome => "/home/keykeeper/$group", members => [split(/ /, $members)]});
}
return R('KO_GROUP_NOT_FOUND', msg => "Group '$group' doesn't exist");
}