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

fix: tests under OpenSUSE (fping raw sockets)

Browse source
This commit is contained in:
Stéphane Lesimple 2021-12-10 09:00:14 +00:00 • committed by Stéphane Lesimple
parent cbf1bd6645
commit 373f4907de
3 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bin/plugin/open/alive
View file

@ -57,11 +57,15 @@ push @command, $host;
while (1) { while (1) {
$fnret = OVH::Bastion::execute(cmd => \@command, noisy_stdout => 1, noisy_stderr => 1); $fnret = OVH::Bastion::execute(cmd => \@command, noisy_stdout => 1, noisy_stderr => 1);
if ($fnret->err eq 'ERR_EXEC_FAILED') { if ($fnret->err eq 'ERR_EXEC_FAILED') {
osh_exit $fnret if $command[0] eq 'ping'; if ($isFping) {
@command = qw{ ping -c 1 -w 1 -- };
push @command, $host; # maybe fping doesn't work, fallback to ping
$isFping = 0; @command = qw{ ping -c 1 -w 1 -- };
next; push @command, $host;
$isFping = 0;
next;
}
osh_exit $fnret; # we tried both ping and fping :(
} }
$fnret or osh_exit $fnret; $fnret or osh_exit $fnret;
if ($fnret->value->{'sysret'} == 0) { if ($fnret->value->{'sysret'} == 0) {

1
docker/Dockerfile.opensuse15
View file

@ -5,6 +5,7 @@ LABEL maintainer="stephane.lesimple+bastion@ovhcloud.com"
COPY bin/admin/install-ttyrec.sh bin/admin/install-yubico-piv-checker.sh bin/admin/packages-check.sh /opt/bastion/bin/admin/ COPY bin/admin/install-ttyrec.sh bin/admin/install-yubico-piv-checker.sh bin/admin/packages-check.sh /opt/bastion/bin/admin/
COPY lib/shell /opt/bastion/lib/shell/ COPY lib/shell /opt/bastion/lib/shell/
RUN ["/opt/bastion/bin/admin/packages-check.sh","-i","-d","-s"] RUN ["/opt/bastion/bin/admin/packages-check.sh","-i","-d","-s"]
RUN ["/usr/bin/chmod","u+s","/usr/bin/ping","/usr/sbin/fping"]
RUN ["/opt/bastion/bin/admin/install-ttyrec.sh","-r"] RUN ["/opt/bastion/bin/admin/install-ttyrec.sh","-r"]
RUN ["/opt/bastion/bin/admin/install-yubico-piv-checker.sh","-r"] RUN ["/opt/bastion/bin/admin/install-yubico-piv-checker.sh","-r"]

28
tests/functional/tests.d/360-plugins.sh
View file

@ -7,7 +7,7 @@
testsuite_plugins() testsuite_plugins()
{ {
success withHost $a0 --osh ping -w 2 --host 127.0.0.1 -c 2 success ping_withHost $a0 --osh ping -w 2 --host 127.0.0.1 -c 2
json .command ping .error_code OK json .command ping .error_code OK
# in some tests environments, ping is not allowed... # in some tests environments, ping is not allowed...
_sysret=$(get_json | $jq .value.sysret) _sysret=$(get_json | $jq .value.sysret)
@ -20,7 +20,7 @@ testsuite_plugins()
fi fi
unset _sysret unset _sysret
success withoutHost $a0 --osh ping -c 1 127.0.0.1 -w 1 success ping_withoutHost $a0 --osh ping -c 1 127.0.0.1 -w 1
json .command ping .error_code OK json .command ping .error_code OK
_sysret=$(get_json | $jq .value.sysret) _sysret=$(get_json | $jq .value.sysret)
if [ "$_sysret" = 0 ]; then if [ "$_sysret" = 0 ]; then
@ -32,7 +32,7 @@ testsuite_plugins()
fi fi
unset _sysret unset _sysret
success loss $a0 --osh ping 192.0.2.1 -w 1 -c 1 success ping_loss $a0 --osh ping 192.0.2.1 -w 1 -c 1
json .command ping .error_code OK json .command ping .error_code OK
_sysret=$(get_json | $jq .value.sysret) _sysret=$(get_json | $jq .value.sysret)
if [ "$_sysret" = 1 ]; then if [ "$_sysret" = 1 ]; then
@ -44,7 +44,7 @@ testsuite_plugins()
fi fi
unset _sysret unset _sysret
success withHost $a0 --osh nc --port 22 --host 127.0.0.1 --timeout 1 success nc_withHost $a0 --osh nc --port 22 --host 127.0.0.1 --timeout 1
json $(cat <<EOS json $(cat <<EOS
.command nc .command nc
.error_code OK .error_code OK
@ -55,7 +55,7 @@ testsuite_plugins()
EOS EOS
) )
success withoutHost $a0 --osh nc 127.0.0.1 22 --timeout 1 success nc_withoutHost $a0 --osh nc 127.0.0.1 22 --timeout 1
json $(cat <<EOS json $(cat <<EOS
.command nc .command nc
.error_code OK .error_code OK
@ -66,7 +66,7 @@ EOS
EOS EOS
) )
success closed $a0 --osh nc 127.0.0.1 1 --timeout 1 success nc_closed $a0 --osh nc 127.0.0.1 1 --timeout 1
json $(cat <<EOS json $(cat <<EOS
.command nc .command nc
.error_code OK .error_code OK
@ -77,7 +77,7 @@ EOS
EOS EOS
) )
success timeout $a0 --osh nc --timeout 1 192.0.2.1 22 success nc_timeout $a0 --osh nc --timeout 1 192.0.2.1 22
json $(cat <<EOS json $(cat <<EOS
.command nc .command nc
.error_code OK .error_code OK
@ -88,17 +88,11 @@ EOS
EOS EOS
) )
# tests can fail under e.g. OpenSUSE + docker because of raw sockets: ignore those cases success alive_withHost $a0 --osh alive --host 127.0.0.1
success withHost $a0 --osh alive --host 127.0.0.1 json .command alive .error_code OK .value.waited_for 0
if ! get_stdout | grep -q "can't create raw socket"; then
json .command alive .error_code OK .value.waited_for 0 success alive_withoutHost $a0 --osh alive 127.0.0.1
fi
success withoutHost $a0 --osh alive 127.0.0.1
json .command alive .error_code OK .value.waited_for 0 json .command alive .error_code OK .value.waited_for 0
if ! get_stdout | grep -q "can't create raw socket"; then
json .command alive .error_code OK .value.waited_for 0
fi
} }
testsuite_plugins testsuite_plugins