a4dc74064c
Summary: Hello, this is a resend for a quick memory leak fix for one of the unit tests, originally sent to the mailing list here: * https://www.libssh.org/archive/libssh/2017-07/0000017.html Test Plan: * Before the fix and running the test with valgrind: ``` [simonsj@simonsj-lx5 : unittests] valgrind --leak-check=full ./torture_options >/dev/null ==93134== Memcheck, a memory error detector ==93134== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al. ==93134== Using Valgrind-3.10.0 and LibVEX; rerun with -h for copyright info ==93134== Command: ./torture_options ==93134== [ PASSED ] 10 test(s). [ PASSED ] 1 test(s). ==93134== ==93134== HEAP SUMMARY: ==93134== in use at exit: 80 bytes in 1 blocks ==93134== total heap usage: 977 allocs, 976 frees, 75,029 bytes allocated ==93134== ==93134== 80 bytes in 1 blocks are definitely lost in loss record 1 of 1 ==93134== at 0x4C28C20: malloc (vg_replace_malloc.c:296) ==93134== by 0x41BAB0: ssh_key_new (pki.c:107) ==93134== by 0x40DF90: torture_bind_options_import_key (torture_options.c:222) ==93134== by 0x4E3AA3A: cmocka_run_one_test_or_fixture (cmocka.c:2304) ==93134== by 0x4E3ACEA: cmocka_run_one_tests (cmocka.c:2412) ==93134== by 0x4E3B036: _cmocka_run_group_tests (cmocka.c:2517) ==93134== by 0x40E9E3: torture_run_tests (torture_options.c:276) ==93134== by 0x40DE68: main (torture.c:1100) ==93134== ==93134== LEAK SUMMARY: ==93134== definitely lost: 80 bytes in 1 blocks ==93134== indirectly lost: 0 bytes in 0 blocks ==93134== possibly lost: 0 bytes in 0 blocks ==93134== still reachable: 0 bytes in 0 blocks ==93134== suppressed: 0 bytes in 0 blocks ==93134== ==93134== For counts of detected and suppressed errors, rerun with: -v ==93134== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0) ``` * And after: ``` [simonsj@simonsj-lx5 : unittests] valgrind --leak-check=full ./torture_options >/dev/null ==93294== Memcheck, a memory error detector ==93294== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al. ==93294== Using Valgrind-3.10.0 and LibVEX; rerun with -h for copyright info ==93294== Command: ./torture_options ==93294== [ PASSED ] 10 test(s). [ PASSED ] 1 test(s). ==93294== ==93294== HEAP SUMMARY: ==93294== in use at exit: 0 bytes in 0 blocks ==93294== total heap usage: 977 allocs, 977 frees, 75,029 bytes allocated ==93294== ==93294== All heap blocks were freed -- no leaks are possible ==93294== ==93294== For counts of detected and suppressed errors, rerun with: -v ==93294== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) ``` Reviewers: asn Reviewed By: asn Differential Revision: https://bugs.libssh.org/D3
282 строки
8.2 KiB
C
282 строки
8.2 KiB
C
#define LIBSSH_STATIC
|
|
|
|
#ifndef _WIN32
|
|
#define _POSIX_PTHREAD_SEMANTICS
|
|
# include <pwd.h>
|
|
#endif
|
|
|
|
#include "torture.h"
|
|
#include <libssh/session.h>
|
|
#include <libssh/misc.h>
|
|
|
|
static int setup(void **state)
|
|
{
|
|
ssh_session session = ssh_new();
|
|
*state = session;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int teardown(void **state)
|
|
{
|
|
ssh_free(*state);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void torture_options_set_host(void **state) {
|
|
ssh_session session = *state;
|
|
int rc;
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost");
|
|
assert_true(rc == 0);
|
|
assert_string_equal(session->opts.host, "localhost");
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "guru@meditation");
|
|
assert_true(rc == 0);
|
|
assert_string_equal(session->opts.host, "meditation");
|
|
assert_string_equal(session->opts.username, "guru");
|
|
}
|
|
|
|
static void torture_options_get_host(void **state) {
|
|
ssh_session session = *state;
|
|
int rc;
|
|
char* host = NULL;
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost");
|
|
assert_true(rc == 0);
|
|
assert_string_equal(session->opts.host, "localhost");
|
|
|
|
assert_false(ssh_options_get(session, SSH_OPTIONS_HOST, &host));
|
|
|
|
assert_string_equal(host, "localhost");
|
|
free(host);
|
|
}
|
|
|
|
static void torture_options_set_port(void **state) {
|
|
ssh_session session = *state;
|
|
int rc;
|
|
unsigned int port = 42;
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_PORT, &port);
|
|
assert_true(rc == 0);
|
|
assert_true(session->opts.port == port);
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_PORT_STR, "23");
|
|
assert_true(rc == 0);
|
|
assert_true(session->opts.port == 23);
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_PORT_STR, "five");
|
|
assert_true(rc == -1);
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_PORT, NULL);
|
|
assert_true(rc == -1);
|
|
}
|
|
|
|
static void torture_options_get_port(void **state) {
|
|
ssh_session session = *state;
|
|
unsigned int given_port = 1234;
|
|
unsigned int port_container;
|
|
int rc;
|
|
rc = ssh_options_set(session, SSH_OPTIONS_PORT, &given_port);
|
|
assert_true(rc == 0);
|
|
rc = ssh_options_get_port(session, &port_container);
|
|
assert_true(rc == 0);
|
|
assert_int_equal(port_container, 1234);
|
|
}
|
|
|
|
static void torture_options_get_user(void **state) {
|
|
ssh_session session = *state;
|
|
char* user = NULL;
|
|
int rc;
|
|
rc = ssh_options_set(session, SSH_OPTIONS_USER, "magicaltrevor");
|
|
assert_true(rc == SSH_OK);
|
|
rc = ssh_options_get(session, SSH_OPTIONS_USER, &user);
|
|
assert_string_equal(user, "magicaltrevor");
|
|
free(user);
|
|
}
|
|
|
|
static void torture_options_set_fd(void **state) {
|
|
ssh_session session = *state;
|
|
socket_t fd = 42;
|
|
int rc;
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_FD, &fd);
|
|
assert_true(rc == 0);
|
|
assert_true(session->opts.fd == fd);
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_FD, NULL);
|
|
assert_true(rc == SSH_ERROR);
|
|
assert_true(session->opts.fd == SSH_INVALID_SOCKET);
|
|
}
|
|
|
|
static void torture_options_set_user(void **state) {
|
|
ssh_session session = *state;
|
|
int rc;
|
|
#ifndef _WIN32
|
|
# ifndef NSS_BUFLEN_PASSWD
|
|
# define NSS_BUFLEN_PASSWD 4096
|
|
# endif /* NSS_BUFLEN_PASSWD */
|
|
struct passwd pwd;
|
|
struct passwd *pwdbuf;
|
|
char buf[NSS_BUFLEN_PASSWD];
|
|
|
|
/* get local username */
|
|
rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
|
|
assert_true(rc == 0);
|
|
#endif /* _WIN32 */
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_USER, "guru");
|
|
assert_true(rc == 0);
|
|
assert_string_equal(session->opts.username, "guru");
|
|
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_USER, NULL);
|
|
assert_true(rc == 0);
|
|
|
|
#ifndef _WIN32
|
|
assert_string_equal(session->opts.username, pwd.pw_name);
|
|
#endif
|
|
}
|
|
|
|
/* TODO */
|
|
#if 0
|
|
static voidtorture_options_set_sshdir)
|
|
{
|
|
}
|
|
END_TEST
|
|
#endif
|
|
|
|
static void torture_options_set_identity(void **state) {
|
|
ssh_session session = *state;
|
|
int rc;
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_ADD_IDENTITY, "identity1");
|
|
assert_true(rc == 0);
|
|
assert_string_equal(session->opts.identity->root->data, "identity1");
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_IDENTITY, "identity2");
|
|
assert_true(rc == 0);
|
|
assert_string_equal(session->opts.identity->root->data, "identity2");
|
|
assert_string_equal(session->opts.identity->root->next->data, "identity1");
|
|
}
|
|
|
|
static void torture_options_get_identity(void **state) {
|
|
ssh_session session = *state;
|
|
char *identity = NULL;
|
|
int rc;
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_ADD_IDENTITY, "identity1");
|
|
assert_true(rc == 0);
|
|
rc = ssh_options_get(session, SSH_OPTIONS_IDENTITY, &identity);
|
|
assert_true(rc == SSH_OK);
|
|
assert_string_equal(identity, "identity1");
|
|
SAFE_FREE(identity);
|
|
|
|
rc = ssh_options_set(session, SSH_OPTIONS_IDENTITY, "identity2");
|
|
assert_true(rc == 0);
|
|
assert_string_equal(session->opts.identity->root->data, "identity2");
|
|
rc = ssh_options_get(session, SSH_OPTIONS_IDENTITY, &identity);
|
|
assert_true(rc == SSH_OK);
|
|
assert_string_equal(identity, "identity2");
|
|
free(identity);
|
|
}
|
|
|
|
static void torture_options_proxycommand(void **state) {
|
|
ssh_session session = *state;
|
|
int rc;
|
|
|
|
/* Enable ProxyCommand */
|
|
rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "ssh -q -A -X -W %h:%p JUMPHOST");
|
|
assert_int_equal(rc, 0);
|
|
|
|
assert_string_equal(session->opts.ProxyCommand, "ssh -q -A -X -W %h:%p JUMPHOST");
|
|
|
|
/* Disable ProxyCommand */
|
|
rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "none");
|
|
assert_int_equal(rc, 0);
|
|
|
|
assert_null(session->opts.ProxyCommand);
|
|
}
|
|
|
|
|
|
#ifdef WITH_SERVER
|
|
/* sshbind options */
|
|
static int sshbind_setup(void **state)
|
|
{
|
|
ssh_bind bind = ssh_bind_new();
|
|
*state = bind;
|
|
return 0;
|
|
}
|
|
|
|
static int sshbind_teardown(void **state)
|
|
{
|
|
ssh_bind_free(*state);
|
|
return 0;
|
|
}
|
|
|
|
static void torture_bind_options_import_key(void **state)
|
|
{
|
|
ssh_bind bind = *state;
|
|
int rc;
|
|
const char *base64_key;
|
|
ssh_key key = ssh_key_new();
|
|
|
|
/* set null */
|
|
rc = ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, NULL);
|
|
assert_int_equal(rc, -1);
|
|
/* set invalid key */
|
|
rc = ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, key);
|
|
assert_int_equal(rc, -1);
|
|
ssh_key_free(key);
|
|
|
|
/* set rsa key */
|
|
base64_key = torture_get_testkey(SSH_KEYTYPE_RSA, 0, 0);
|
|
ssh_pki_import_privkey_base64(base64_key, NULL, NULL, NULL, &key);
|
|
rc = ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, key);
|
|
assert_int_equal(rc, 0);
|
|
/* set dsa key */
|
|
base64_key = torture_get_testkey(SSH_KEYTYPE_DSS, 0, 0);
|
|
ssh_pki_import_privkey_base64(base64_key, NULL, NULL, NULL, &key);
|
|
rc = ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, key);
|
|
assert_int_equal(rc, 0);
|
|
/* set ecdsa key */
|
|
base64_key = torture_get_testkey(SSH_KEYTYPE_ECDSA, 512, 0);
|
|
ssh_pki_import_privkey_base64(base64_key, NULL, NULL, NULL, &key);
|
|
rc = ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, key);
|
|
assert_int_equal(rc, 0);
|
|
}
|
|
#endif /* WITH_SERVER */
|
|
|
|
|
|
int torture_run_tests(void) {
|
|
int rc;
|
|
struct CMUnitTest tests[] = {
|
|
cmocka_unit_test_setup_teardown(torture_options_set_host, setup, teardown),
|
|
cmocka_unit_test_setup_teardown(torture_options_get_host, setup, teardown),
|
|
cmocka_unit_test_setup_teardown(torture_options_set_port, setup, teardown),
|
|
cmocka_unit_test_setup_teardown(torture_options_get_port, setup, teardown),
|
|
cmocka_unit_test_setup_teardown(torture_options_set_fd, setup, teardown),
|
|
cmocka_unit_test_setup_teardown(torture_options_set_user, setup, teardown),
|
|
cmocka_unit_test_setup_teardown(torture_options_get_user, setup, teardown),
|
|
cmocka_unit_test_setup_teardown(torture_options_set_identity, setup, teardown),
|
|
cmocka_unit_test_setup_teardown(torture_options_get_identity, setup, teardown),
|
|
cmocka_unit_test_setup_teardown(torture_options_proxycommand, setup, teardown),
|
|
};
|
|
|
|
#ifdef WITH_SERVER
|
|
struct CMUnitTest sshbind_tests[] = {
|
|
cmocka_unit_test_setup_teardown(torture_bind_options_import_key, sshbind_setup, sshbind_teardown),
|
|
};
|
|
#endif /* WITH_SERVER */
|
|
|
|
ssh_init();
|
|
torture_filter_tests(tests);
|
|
rc = cmocka_run_group_tests(tests, NULL, NULL);
|
|
#ifdef WITH_SERVER
|
|
rc += cmocka_run_group_tests(sshbind_tests, NULL, NULL);
|
|
#endif /* WITH_SERVER */
|
|
ssh_finalize();
|
|
return rc;
|
|
}
|