shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 18:04:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Assorted changes to make the torture_forward test pass

Browse Source 
Cherry-picked from the following commit:
be25b58380
This commit is contained in:
Jakub Jelen
2018-10-02 19:04:29 +02:00
committed by Andreas Schneider
parent 3d70d4f08d
commit f8007d7147
2 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/client/CMakeLists.txt
View File

@@ -4,7 +4,6 @@ add_cmocka_test(torture_auth torture_auth.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_connect torture_connect.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_connect torture_connect.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_proxycommand torture_proxycommand.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_proxycommand torture_proxycommand.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_session torture_session.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_session torture_session.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_forward torture_forward.c ${TORTURE_LIBRARY})
if (WITH_SFTP) if (WITH_SFTP)
add_cmocka_test(torture_sftp_static torture_sftp_static.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_sftp_static torture_sftp_static.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_sftp_dir torture_sftp_dir.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_sftp_dir torture_sftp_dir.c ${TORTURE_LIBRARY})
@@ -14,7 +13,8 @@ endif (WITH_SFTP)
set(LIBSSH_CLIENT_TESTS set(LIBSSH_CLIENT_TESTS
torture_algorithms torture_algorithms
torture_knownhosts torture_knownhosts
torture_request_env) torture_request_env
torture_forward)
foreach(_CLI_TEST ${LIBSSH_CLIENT_TESTS}) foreach(_CLI_TEST ${LIBSSH_CLIENT_TESTS})
add_cmocka_test(${_CLI_TEST} ${_CLI_TEST}.c ${TORTURE_LIBRARY}) add_cmocka_test(${_CLI_TEST} ${_CLI_TEST}.c ${TORTURE_LIBRARY})

53
tests/client/torture_forward.c
View File

@@ -24,24 +24,42 @@
#include "torture.h" #include "torture.h"
#include <libssh/libssh.h> #include <libssh/libssh.h>
#include <errno.h>
#include <sys/types.h>
#include <pwd.h>
static int sshd_setup(void **state)
{
torture_setup_sshd_server(state);
return 0;
}
static int sshd_teardown(void **state) {
torture_teardown_sshd_server(state);
return 0;
}
static void setup(void **state) static void setup(void **state)
{ {
ssh_session session; ssh_session session;
const char *host; struct passwd *pwd;
const char *user; int rc;
const char *password;
host = getenv("TORTURE_HOST"); pwd = getpwnam("bob");
if (host == NULL) { assert_non_null(pwd);
host = "localhost";
}
user = getenv("TORTURE_USER"); rc = setuid(pwd->pw_uid);
password = getenv("TORTURE_PASSWORD"); assert_return_code(rc, errno);
session = torture_ssh_session(host, NULL, user, password); session = torture_ssh_session(TORTURE_SSH_SERVER,
NULL,
TORTURE_SSH_USER_ALICE,
NULL);
assert_non_null(session); assert_non_null(session);
*state = session; *state = session;
} }
@@ -60,26 +78,25 @@ static void teardown(void **state)
static void torture_ssh_forward(void **state) static void torture_ssh_forward(void **state)
{ {
ssh_session session = (ssh_session) *state; ssh_session session = (ssh_session) *state;
#if 0
ssh_channel c; ssh_channel c;
#endif int dport;
int bound_port; int bound_port;
int rc; int rc;
rc = ssh_channel_listen_forward(session, "127.0.0.1", 8080, &bound_port); rc = ssh_channel_listen_forward(session, "127.0.0.21", 8080, &bound_port);
assert_int_equal(rc, SSH_OK); assert_int_equal(rc, SSH_OK);
#if 0 c = ssh_channel_accept_forward(session, 10, &dport);
c = ssh_forward_accept(session, 60000); /* We do not get a listener and run into the timeout here */
assert_non_null(c); assert_null(c);
ssh_channel_send_eof(c); ssh_channel_send_eof(c);
ssh_channel_close(c); ssh_channel_close(c);
#endif
} }
int torture_run_tests(void) { int torture_run_tests(void) {
int rc; int rc;
struct torture_state *s = NULL;
UnitTest tests[] = { UnitTest tests[] = {
unit_test_setup_teardown(torture_ssh_forward, setup, teardown), unit_test_setup_teardown(torture_ssh_forward, setup, teardown),
@@ -88,7 +105,9 @@ int torture_run_tests(void) {
ssh_init(); ssh_init();
torture_filter_tests(tests); torture_filter_tests(tests);
sshd_setup((void **)&s);
rc = run_tests(tests); rc = run_tests(tests);
sshd_teardown((void **)&s);
ssh_finalize(); ssh_finalize();
return rc; return rc;