Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kill child process after SSH connection failure #753

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/wolfsshd/test/run_all_sshd_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ run_test "sshd_exec_test.sh"
run_test "sshd_term_size_test.sh"
run_test "sshd_large_sftp_test.sh"
run_test "sshd_bad_sftp_test.sh"
run_test "sshd_term_close_test.sh"

#Github actions needs resolved for these test cases
#run_test "error_return.sh"
Expand Down
57 changes: 57 additions & 0 deletions apps/wolfsshd/test/sshd_term_close_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#!/bin/sh

# sshd local test

ROOT_PWD=$(pwd)
cd ../../..

TEST_CLIENT="./examples/client/client"
PRIVATE_KEY="./keys/hansel-key-ecc.der"
PUBLIC_KEY="./keys/hansel-key-ecc.pub"

if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
echo "expecting host and port as arguments"
echo "$0 127.0.0.1 22222 $USER"
exit 1
fi

# get the current wolfsshd pid count to compare with
WOLFSSHD_PID_COUNT=$(pgrep wolfsshd | wc -l)

timeout 3 $TEST_CLIENT -p $2 -i $PRIVATE_KEY -j $PUBLIC_KEY -h $1 -c '/bin/sleep 10' -u $3 &
sleep 1
WOLFSSHD_PID_COUNT_AFTER=$(pgrep wolfsshd | wc -l)
if [ "$WOLFSSHD_PID_COUNT" = "$WOLFSSHD_PID_COUNT_AFTER" ]; then
echo "Expecting another wolfSSHd pid after connection"
echo "PID count before = $WOLFSSHD_PID_COUNT"
echo "PID count after = $WOLFSSHD_PID_COUNT_AFTER"
exit 1
fi

netstat -nt | grep ESTABLISHED
RESULT=$?
if [ "$RESULT" != "0" ]; then
echo "Expecting to find the TCP connection established"
exit 1
fi

sleep 2

netstat -nt | grep CLOSE_WAIT
RESULT=$?
if [ "$RESULT" = "0" ]; then
echo "Found close wait and was not expecting it"
exit 1
fi

netstat -nt | grep TIME_WAIT
RESULT=$?
if [ "$RESULT" != "0" ]; then
echo "Did not find timed wait for TCP close down"
exit 1
fi

cd "$ROOT_PWD"
exit 0


2 changes: 2 additions & 0 deletions apps/wolfsshd/wolfsshd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1498,6 +1498,8 @@ static int SHELL_Subsystem(WOLFSSHD_CONNECTION* conn, WOLFSSH* ssh,
continue;
}
else if (rc != WS_WANT_READ) {
/* unexpected error, kill off child process */
kill(childPid, SIGKILL);
break;
}
}
Expand Down