ovh/the-bastion
1
1
Fork 0
mirror of https://github.com/ovh/the-bastion.git synced 2025-02-28 17:44:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

chore: check for spurious args in all helpers

Browse source
This commit is contained in:
Stéphane Lesimple 2021-12-15 17:11:03 +00:00 committed by Stéphane Lesimple
parent 90dbe04dde
commit 7cc350b40d
29 changed files with 66 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/helper/osh-accountAddGroupServer
View file

@ -39,6 +39,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $action or not $ip or not $account or not $group) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'action' or 'ip' or 'account' or 'group'");
}

2
bin/helper/osh-accountCreate
View file

@ -40,6 +40,8 @@ eval {
};
if ($@) { die $@ }
OVH::Bastion::Helper::check_spurious_args();
if (!$result) {
local $" = ", ";
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");

2
bin/helper/osh-accountDelete
View file

@ -35,6 +35,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$account || !$type) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account' or 'type'");
}

2
bin/helper/osh-accountGeneratePassword
View file

@ -33,6 +33,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $size or not $account) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'size' or 'account'");
}

2
bin/helper/osh-accountGetPasswordInfo
View file

@ -33,6 +33,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$account && !$all) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account' or 'all'");
}

2
bin/helper/osh-accountListEgressKeys
View file

@ -29,6 +29,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$account) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account'");
}

2
bin/helper/osh-accountListIngressKeys
View file

@ -32,6 +32,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$account) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account'");
}

2
bin/helper/osh-accountListPasswords
View file

@ -29,6 +29,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$account) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account'");
}

2
bin/helper/osh-accountMFAResetPassword
View file

@ -30,6 +30,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $account) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account'");
}

2
bin/helper/osh-accountMFAResetTOTP
View file

@ -30,6 +30,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $account) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account'");
}

2
bin/helper/osh-accountModify
View file

@ -34,6 +34,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$account || !@modify) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account' or 'modify'");
}

2
bin/helper/osh-accountModifyCommand
View file

@ -37,6 +37,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $account or not $command or not $action) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account', 'command' or 'action'");
}

2
bin/helper/osh-accountModifyPersonalAccess
View file

@ -50,6 +50,8 @@ eval {
};
if ($@) { die $@ }
OVH::Bastion::Helper::check_spurious_args();
if (!$result) {
local $" = ", ";
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");

2
bin/helper/osh-accountPIV
View file

@ -37,6 +37,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$account || !$policy || !$step) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account' or 'modify' or 'step'");
}

2
bin/helper/osh-accountUnexpire
View file

@ -29,6 +29,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$account) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account'");
}

2
bin/helper/osh-adminMaintenance
View file

@ -32,6 +32,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $action) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'action'");
}

2
bin/helper/osh-groupAddServer
View file

@ -42,6 +42,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $ip or not $group or not $action) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'ip' or 'group' or 'action'");
}

2
bin/helper/osh-groupAddSymlinkToAccount
View file

@ -33,6 +33,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $account or not $group or not $action) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account', 'group' or 'action'");
}

2
bin/helper/osh-groupCreate
View file

@ -39,6 +39,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$group || !$owner) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'group' or 'owner'");
}

2
bin/helper/osh-groupDelEgressKey
View file

@ -33,6 +33,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$group || !$id) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'group' or 'id'");
}

2
bin/helper/osh-groupDelete
View file

@ -32,6 +32,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$group) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'group'");
}

2
bin/helper/osh-groupGenerateEgressKey
View file

@ -35,6 +35,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$size || !$algo || !$group) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'size', 'algo' or 'group'");
}

2
bin/helper/osh-groupGeneratePassword
View file

@ -33,6 +33,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $size or not $group) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'size' or 'group'");
}

2
bin/helper/osh-groupModify
View file

@ -34,6 +34,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$group) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'group'");
}

2
bin/helper/osh-groupSetRole
View file

@ -44,6 +44,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
osh_debug("groupSetRole: checking preconditions");
$fnret = OVH::Bastion::Plugin::groupSetRole::preconditions(self => $self, account => $account, group => $group, action => $action, type => $type, sudo => 1, silentoverride => 1);
osh_debug("groupSetRole: checking preconditions result: $fnret");

2
bin/helper/osh-selfMFASetupPassword
View file

@ -31,6 +31,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (!$account || !defined $step) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account' or 'step'");
}

2
bin/helper/osh-selfMFASetupTOTP
View file

@ -29,6 +29,8 @@ if (!$result) {
HEXIT('ERR_BAD_OPTIONS', msg => "Error parsing options: @optwarns");
}
OVH::Bastion::Helper::check_spurious_args();
if (not $account) {
HEXIT('ERR_MISSING_PARAMETER', msg => "Missing argument 'account'");
}

6
bin/plugin/restricted/accountCreate
View file

@ -134,9 +134,9 @@ push @command, "--type", "normal";
push @command, "--account", $account;
push @command, "--pubKey", $pubKey if !$noKey;
push @command, "--always-active" if $alwaysActive;
push @command, "--comment", $comment if $comment;
push @command, "--uid", $uid if defined $uid;
push @command, "--osh-only", $oshOnly if $oshOnly;
push @command, "--comment", $comment if $comment;
push @command, "--uid", $uid if defined $uid;
push @command, "--osh-only", if $oshOnly;
push @command, "--max-inactive-days", $maxInactiveDays if defined $maxInactiveDays;
push @command, "--uid-auto" if $uidAuto;
push @command, "--immutable-key" if $immutableKey;

9
lib/perl/OVH/Bastion/Helper.pm
View file

@ -37,6 +37,15 @@ sub HEXIT { ## no critic (ArgUnpacking)
exit 0;
}
# Used after Getopt::Long::GetOptions() in each helper, to ensure there are no unparsed/spurious args
sub check_spurious_args {
if (@ARGV) {
local $" = ", ";
warn_syslog("Spurious arguments on command line: @ARGV");
HEXIT('ERR_BAD_OPTIONS', msg => "Spurious arguments on command line: @ARGV");
}
}
#
# This code has to be ran for all helpers before they attempt to do anything useful,
# and as we're only use'd by helpers, we include it here directly on top-level.