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: osh.pl: replace harcoded selfMFASetupPassword logic by configuration

Browse source
This commit is contained in:
Stéphane Lesimple 2020-11-17 11:28:05 +01:00
parent ee81bd4070
commit 60cea897f8
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/plugin/open/selfMFASetupPassword.json
View file

@ -3,5 +3,6 @@
"selfMFASetupPassword" , {"pr" : ["<enter>"]}
],
"master_only": true,
"execution_mode_on_freebsd": "system",
"terminal_mode": "noecho"
}

40
bin/shell/osh.pl
View file

@ -901,29 +901,27 @@ if ($osh_command) {
}
OVH::Bastion::set_terminal_mode_for_plugin(plugin => $osh_command, action => 'set');
if (OVH::Bastion::is_bsd() && $osh_command eq 'selfMFASetupPassword') {
system(@cmd);
$fnret = R('OK', value => {sysret => $?});
}
else {
# some plugins need to be called with system() instead of ::execute
my $is_binary;
my $system;
# get the execution mode required by the plugin
my $is_binary;
my $system;
$fnret = OVH::Bastion::plugin_config(plugin => $osh_command, key => "execution_mode_on_$^O");
if (!$fnret || !$fnret->value) {
$fnret = OVH::Bastion::plugin_config(plugin => $osh_command, key => "execution_mode");
if ($fnret && $fnret->value) {
$system = 1 if $fnret->value eq 'system';
$is_binary = 1 if $fnret->value eq 'binary';
}
$ENV{'OSH_IP_FROM'} = $ipfrom; # used in some plugins for is_access_granted()
$fnret = OVH::Bastion::execute(
cmd => \@cmd,
noisy_stdout => 1,
noisy_stderr => 1,
expects_stdin => 1,
system => $system,
is_binary => $is_binary,
);
}
if ($fnret && $fnret->value) {
$system = 1 if $fnret->value eq 'system';
$is_binary = 1 if $fnret->value eq 'binary';
}
$ENV{'OSH_IP_FROM'} = $ipfrom; # used in some plugins for is_access_granted()
$fnret = OVH::Bastion::execute(
cmd => \@cmd,
noisy_stdout => 1,
noisy_stderr => 1,
expects_stdin => 1,
system => $system,
is_binary => $is_binary,
);
OVH::Bastion::set_terminal_mode_for_plugin(plugin => $osh_command, action => 'restore');
if (defined $log_insert_id and defined $log_db_name) {