ports/libssh
ports/libssh
1
1
Форкнуть 0
Код Релизы 1 Активность

tests: Migrate torture_knownhosts to new cwrap test

Просмотр исходного кода 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Этот коммит содержится в:
Andreas Schneider 2015-09-10 15:40:00 +02:00
родитель c1fb948397
Коммит b65dcb3a35
2 изменённых файлов: 185 добавлений и 100 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
tests/client/CMakeLists.txt
Просмотреть файл

@ -2,7 +2,6 @@ project(clienttests C)
find_package(socket_wrapper) find_package(socket_wrapper)
add_cmocka_test(torture_knownhosts torture_knownhosts.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_request_env torture_request_env.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_request_env torture_request_env.c ${TORTURE_LIBRARY})
@ -16,7 +15,8 @@ set(LIBSSH_CLIENT_TESTS
torture_algorithms torture_algorithms
torture_connect torture_connect
torture_auth torture_auth
torture_forward) torture_forward
torture_knownhosts)
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})

281
tests/client/torture_knownhosts.c
Просмотреть файл

@ -22,10 +22,15 @@
#define LIBSSH_STATIC #define LIBSSH_STATIC
#include "torture.h" #include "torture.h"
#include <sys/types.h>
#include <pwd.h>
#include "session.c" #include "session.c"
#include "known_hosts.c" #include "known_hosts.c"
#define KNOWNHOSTFILES "libssh_torture_knownhosts" #define TORTURE_KNOWN_HOSTS_FILE "libssh_torture_knownhosts"
#define BADRSA "AAAAB3NzaC1yc2EAAAADAQABAAABAQChm5" \ #define BADRSA "AAAAB3NzaC1yc2EAAAADAQABAAABAQChm5" \
"a6Av65O8cKtx5YXOnui3wJnYE6A6J/I4kZSAibbn14Jcl+34VJQwv96f25AxNmo" \ "a6Av65O8cKtx5YXOnui3wJnYE6A6J/I4kZSAibbn14Jcl+34VJQwv96f25AxNmo" \
"NwoiZV93IzdypQmiuieh6s6wB9WhYjU9K/6CkIpNhpCxswA90b3ePjS7LnR9B9J" \ "NwoiZV93IzdypQmiuieh6s6wB9WhYjU9K/6CkIpNhpCxswA90b3ePjS7LnR9B9J" \
@ -44,150 +49,202 @@
"h0dSi8VJXI1wes5HTyLsv9VBmU1uCXUUvufoQKfF/OcSH0ufcCpnd62g1/adZcy2" \ "h0dSi8VJXI1wes5HTyLsv9VBmU1uCXUUvufoQKfF/OcSH0ufcCpnd62g1/adZcy2" \
"WJg==" "WJg=="
static int setup(void **state) { static int sshd_setup(void **state)
int verbosity=torture_libssh_verbosity(); {
ssh_session session = ssh_new(); torture_setup_sshd_server(state);
ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
*state = session;
return 0; return 0;
} }
static int teardown(void **state) { static int sshd_teardown(void **state) {
ssh_session session = *state; torture_teardown_sshd_server(state);
ssh_disconnect(session);
ssh_free(session);
unlink(KNOWNHOSTFILES);
return 0; return 0;
} }
static int session_setup(void **state)
{
struct torture_state *s = *state;
int verbosity = torture_libssh_verbosity();
struct passwd *pwd;
pwd = getpwnam("bob");
assert_non_null(pwd);
setuid(pwd->pw_uid);
s->ssh.session = ssh_new();
assert_non_null(s->ssh.session);
ssh_options_set(s->ssh.session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
ssh_options_set(s->ssh.session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);
ssh_options_set(s->ssh.session, SSH_OPTIONS_USER, TORTURE_SSH_USER_ALICE);
return 0;
}
static int session_teardown(void **state)
{
struct torture_state *s = *state;
char known_hosts_file[1024];
snprintf(known_hosts_file,
sizeof(known_hosts_file),
"%s/%s",
s->socket_dir,
TORTURE_KNOWN_HOSTS_FILE);
ssh_disconnect(s->ssh.session);
ssh_free(s->ssh.session);
unlink(known_hosts_file);
return 0;
}
static void torture_knownhosts_port(void **state) { static void torture_knownhosts_port(void **state) {
ssh_session session = *state; struct torture_state *s = *state;
ssh_session session = s->ssh.session;
char known_hosts_file[1024];
char buffer[200]; char buffer[200];
char *p; char *p;
FILE *file; FILE *file;
int rc; int rc;
/* Connect to localhost:22, force the port to 1234 and then write snprintf(known_hosts_file,
* the known hosts file. Then check that the entry written is sizeof(known_hosts_file),
* [localhost]:1234 "%s/%s",
*/ s->socket_dir,
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); TORTURE_KNOWN_HOSTS_FILE);
assert_true(rc == SSH_OK);
rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, KNOWNHOSTFILES); rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_true(rc==SSH_OK); assert_int_equal(rc, SSH_OK);
session->opts.port = 1234; session->opts.port = 1234;
rc = ssh_write_knownhost(session); rc = ssh_write_knownhost(session);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
file = fopen(KNOWNHOSTFILES, "r"); file = fopen(known_hosts_file, "r");
assert_true(file != NULL); assert_true(file != NULL);
p = fgets(buffer, sizeof(buffer), file); p = fgets(buffer, sizeof(buffer), file);
assert_false(p == NULL); assert_false(p == NULL);
fclose(file); fclose(file);
buffer[sizeof(buffer) - 1] = '\0'; buffer[sizeof(buffer) - 1] = '\0';
assert_true(strstr(buffer,"[localhost]:1234 ") != NULL); assert_true(strstr(buffer,"[127.0.0.10]:1234 ") != NULL);
ssh_disconnect(session); ssh_disconnect(session);
ssh_free(session); ssh_free(session);
/* Now, connect back to the ssh server and verify the known host line */ /* Now, connect back to the ssh server and verify the known host line */
*state = session = ssh_new(); s->ssh.session = session = ssh_new();
ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);
ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, KNOWNHOSTFILES); ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
session->opts.port = 1234; session->opts.port = 1234;
rc = ssh_is_server_known(session); rc = ssh_is_server_known(session);
assert_true(rc == SSH_SERVER_KNOWN_OK); assert_int_equal(rc, SSH_SERVER_KNOWN_OK);
} }
static void torture_knownhosts_fail(void **state) { static void torture_knownhosts_fail(void **state) {
ssh_session session = *state; struct torture_state *s = *state;
ssh_session session = s->ssh.session;
char known_hosts_file[1024];
FILE *file; FILE *file;
int rc; int rc;
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); snprintf(known_hosts_file,
assert_true(rc == SSH_OK); sizeof(known_hosts_file),
"%s/%s",
s->socket_dir,
TORTURE_KNOWN_HOSTS_FILE);
rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, KNOWNHOSTFILES); rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-rsa"); rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-rsa");
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
file = fopen(KNOWNHOSTFILES, "w"); file = fopen(known_hosts_file, "w");
assert_true(file != NULL); assert_non_null(file);
fprintf(file, "localhost ssh-rsa %s\n", BADRSA);
fprintf(file, "127.0.0.10 ssh-rsa %s\n", BADRSA);
fclose(file); fclose(file);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_true(rc==SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_is_server_known(session); rc = ssh_is_server_known(session);
assert_true(rc == SSH_SERVER_KNOWN_CHANGED); assert_int_equal(rc, SSH_SERVER_KNOWN_CHANGED);
} }
static void torture_knownhosts_other(void **state) { static void torture_knownhosts_other(void **state) {
ssh_session session = *state; struct torture_state *s = *state;
ssh_session session = s->ssh.session;
char known_hosts_file[1024];
FILE *file; FILE *file;
int rc; int rc;
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); snprintf(known_hosts_file,
assert_true(rc == SSH_OK); sizeof(known_hosts_file),
"%s/%s",
s->socket_dir,
TORTURE_KNOWN_HOSTS_FILE);
rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, KNOWNHOSTFILES); rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-dss"); rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-dss");
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
file = fopen(KNOWNHOSTFILES, "w"); file = fopen(known_hosts_file, "w");
assert_true(file != NULL); assert_non_null(file);
fprintf(file, "localhost ssh-rsa %s\n", BADRSA); fprintf(file, "127.0.0.10 ssh-rsa %s\n", BADRSA);
fclose(file); fclose(file);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_true(rc==SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_is_server_known(session); rc = ssh_is_server_known(session);
assert_true(rc == SSH_SERVER_FOUND_OTHER); assert_int_equal(rc, SSH_SERVER_FOUND_OTHER);
} }
static void torture_knownhosts_other_auto(void **state) { static void torture_knownhosts_other_auto(void **state) {
ssh_session session = *state; struct torture_state *s = *state;
ssh_session session = s->ssh.session;
char known_hosts_file[1024];
int rc; int rc;
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); snprintf(known_hosts_file,
assert_true(rc == SSH_OK); sizeof(known_hosts_file),
"%s/%s",
s->socket_dir,
TORTURE_KNOWN_HOSTS_FILE);
rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, KNOWNHOSTFILES); rc = ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);
assert_int_equal(rc, SSH_OK);
rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-dss"); rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-dss");
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_true(rc==SSH_OK); assert_true(rc==SSH_OK);
rc = ssh_is_server_known(session); rc = ssh_is_server_known(session);
assert_true(rc == SSH_SERVER_NOT_KNOWN); assert_int_equal(rc, SSH_SERVER_NOT_KNOWN);
rc = ssh_write_knownhost(session); rc = ssh_write_knownhost(session);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
ssh_disconnect(session); ssh_disconnect(session);
ssh_free(session); ssh_free(session);
@ -195,45 +252,53 @@ static void torture_knownhosts_other_auto(void **state) {
/* connect again and check host key */ /* connect again and check host key */
*state = session = ssh_new(); *state = session = ssh_new();
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); rc = ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, KNOWNHOSTFILES); rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_true(rc==SSH_OK); assert_true(rc==SSH_OK);
/* ssh-rsa is the default but libssh should try ssh-dss instead */ /* ssh-rsa is the default but libssh should try ssh-dss instead */
rc = ssh_is_server_known(session); rc = ssh_is_server_known(session);
assert_true(rc == SSH_SERVER_KNOWN_OK); assert_int_equal(rc, SSH_SERVER_KNOWN_OK);
} }
static void torture_knownhosts_conflict(void **state) { static void torture_knownhosts_conflict(void **state) {
ssh_session session = *state; struct torture_state *s = *state;
ssh_session session = s->ssh.session;
char known_hosts_file[1024];
FILE *file; FILE *file;
int rc; int rc;
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); snprintf(known_hosts_file,
assert_true(rc == SSH_OK); sizeof(known_hosts_file),
"%s/%s",
s->socket_dir,
TORTURE_KNOWN_HOSTS_FILE);
rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, KNOWNHOSTFILES); rc = ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);
assert_int_equal(rc, SSH_OK);
rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-rsa"); rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-rsa");
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
file = fopen(KNOWNHOSTFILES, "w"); file = fopen(known_hosts_file, "w");
assert_true(file != NULL); assert_true(file != NULL);
fprintf(file, "localhost ssh-rsa %s\n", BADRSA); fprintf(file, "127.0.0.10 ssh-rsa %s\n", BADRSA);
fprintf(file, "localhost ssh-dss %s\n", BADDSA); fprintf(file, "127.0.0.10 ssh-dss %s\n", BADDSA);
fclose(file); fclose(file);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_true(rc==SSH_OK); assert_true(rc==SSH_OK);
rc = ssh_is_server_known(session); rc = ssh_is_server_known(session);
assert_true(rc == SSH_SERVER_KNOWN_CHANGED); assert_int_equal(rc, SSH_SERVER_KNOWN_CHANGED);
rc = ssh_write_knownhost(session); rc = ssh_write_knownhost(session);
assert_true(rc==SSH_OK); assert_true(rc==SSH_OK);
@ -244,34 +309,42 @@ static void torture_knownhosts_conflict(void **state) {
/* connect again and check host key */ /* connect again and check host key */
*state = session = ssh_new(); *state = session = ssh_new();
ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);
ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, KNOWNHOSTFILES); ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);
rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-rsa"); rc = ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "ssh-rsa");
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
rc = ssh_is_server_known(session); rc = ssh_is_server_known(session);
assert_true(rc == SSH_SERVER_KNOWN_OK); assert_int_equal(rc, SSH_SERVER_KNOWN_OK);
} }
static void torture_knownhosts_precheck(void **state) { static void torture_knownhosts_precheck(void **state) {
ssh_session session = *state; struct torture_state *s = *state;
ssh_session session = s->ssh.session;
char known_hosts_file[1024];
FILE *file; FILE *file;
int rc; int rc;
char **kex; char **kex;
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); snprintf(known_hosts_file,
assert_true(rc == SSH_OK); sizeof(known_hosts_file),
"%s/%s",
s->socket_dir,
TORTURE_KNOWN_HOSTS_FILE);
rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, KNOWNHOSTFILES); rc = ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);
assert_true(rc == SSH_OK); assert_int_equal(rc, SSH_OK);
file = fopen(KNOWNHOSTFILES, "w"); rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file);
assert_int_equal(rc, SSH_OK);
file = fopen(known_hosts_file, "w");
assert_true(file != NULL); assert_true(file != NULL);
fprintf(file, "localhost ssh-rsa %s\n", BADRSA); fprintf(file, "127.0.0.10 ssh-rsa %s\n", BADRSA);
fprintf(file, "localhost ssh-dss %s\n", BADDSA); fprintf(file, "127.0.0.10 ssh-dss %s\n", BADDSA);
fclose(file); fclose(file);
kex = ssh_knownhosts_algorithms(session); kex = ssh_knownhosts_algorithms(session);
@ -287,18 +360,30 @@ static void torture_knownhosts_precheck(void **state) {
int torture_run_tests(void) { int torture_run_tests(void) {
int rc; int rc;
struct CMUnitTest tests[] = { struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(torture_knownhosts_port, setup, teardown), cmocka_unit_test_setup_teardown(torture_knownhosts_port,
cmocka_unit_test_setup_teardown(torture_knownhosts_fail, setup, teardown), session_setup,
cmocka_unit_test_setup_teardown(torture_knownhosts_other, setup, teardown), session_teardown),
cmocka_unit_test_setup_teardown(torture_knownhosts_other_auto, setup, teardown), cmocka_unit_test_setup_teardown(torture_knownhosts_fail,
cmocka_unit_test_setup_teardown(torture_knownhosts_conflict, setup, teardown), session_setup,
cmocka_unit_test_setup_teardown(torture_knownhosts_precheck, setup, teardown) session_teardown),
cmocka_unit_test_setup_teardown(torture_knownhosts_other,
session_setup,
session_teardown),
cmocka_unit_test_setup_teardown(torture_knownhosts_other_auto,
session_setup,
session_teardown),
cmocka_unit_test_setup_teardown(torture_knownhosts_conflict,
session_setup,
session_teardown),
cmocka_unit_test_setup_teardown(torture_knownhosts_precheck,
session_setup,
session_teardown),
}; };
ssh_init(); ssh_init();
torture_filter_tests(tests); torture_filter_tests(tests);
rc = cmocka_run_group_tests(tests, NULL, NULL); rc = cmocka_run_group_tests(tests, sshd_setup, sshd_teardown);
ssh_finalize(); ssh_finalize();
return rc; return rc;