From 5dd4f7604f8007df1a11ff0cab55423a622342bc Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 3 Jun 2010 12:36:00 +0200 Subject: tests: Move client tests to a seperate directory. Tests which require a running sshd should go to tests/client. --- DefineOptions.cmake | 2 +- tests/CMakeLists.txt | 3 + tests/client/CMakeLists.txt | 4 + tests/client/torture_algorithms.c | 144 +++++++++++++++++++++++++++++++++++ tests/client/torture_auth.c | 113 +++++++++++++++++++++++++++ tests/unittests/CMakeLists.txt | 2 - tests/unittests/torture_algorithms.c | 144 ----------------------------------- tests/unittests/torture_auth.c | 113 --------------------------- 8 files changed, 265 insertions(+), 260 deletions(-) create mode 100644 tests/client/CMakeLists.txt create mode 100644 tests/client/torture_algorithms.c create mode 100644 tests/client/torture_auth.c delete mode 100644 tests/unittests/torture_algorithms.c delete mode 100644 tests/unittests/torture_auth.c diff --git a/DefineOptions.cmake b/DefineOptions.cmake index f7a52442..3d9dc642 100644 --- a/DefineOptions.cmake +++ b/DefineOptions.cmake @@ -9,7 +9,7 @@ option(WITH_GCRYPT "Compile against libgcrypt" OFF) option(WITH_PCAP "Compile with Pcap generation support" ON) option(WITH_INTERNAL_DOC "Compile doxygen internal documentation" OFF) option(WITH_TESTING "Build with unit tests" OFF) +option(WITH_CLIENT_TESTING "Build with client tests; requires a running sshd" OFF) if (WITH_TESTING) set(WITH_STATIC_LIB ON) endif (WITH_TESTING) - diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 817d3a73..29986631 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,3 +17,6 @@ target_link_libraries(${TORTURE_LIBRARY} ${CHECK_LIBRARIES} ${LIBSSH_STATIC_LIBR set(TEST_TARGET_LIBRARIES ${SUPPORT_LIBRARY} ${LIBSSH_LINK_LIBRARIES}) add_subdirectory(unittests) +if (WITH_CLIENT_TESTING) + add_subdirectory(client) +endif (WITH_CLIENT_TESTING) diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt new file mode 100644 index 00000000..b92f08e6 --- /dev/null +++ b/tests/client/CMakeLists.txt @@ -0,0 +1,4 @@ +project(clienttests C) + +add_check_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY}) +add_check_test(torture_auth torture_auth.c ${TORTURE_LIBRARY}) diff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c new file mode 100644 index 00000000..300fe054 --- /dev/null +++ b/tests/client/torture_algorithms.c @@ -0,0 +1,144 @@ +/* + * This file is part of the SSH Library + * + * Copyright (c) 2010 by Aris Adamantiadis + * + * The SSH Library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * The SSH Library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with the SSH Library; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + */ + +#define LIBSSH_STATIC + +#include "torture.h" +#include "libssh/libssh.h" +#include "libssh/priv.h" + +ssh_session session; + +static void setup(void) { + session = ssh_new(); +} + +static void teardown(void) { + ssh_free(session); +} + +static void test_algorithm(const char *algo) { + int rc; + ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); + rc=ssh_options_set(session,SSH_OPTIONS_CIPHERS_C_S,algo); + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + rc=ssh_options_set(session,SSH_OPTIONS_CIPHERS_S_C,algo); + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + rc=ssh_connect(session); + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + rc=ssh_userauth_none(session,NULL); + if(rc != SSH_OK){ + rc=ssh_get_error_code(session); + ck_assert_msg(rc==SSH_REQUEST_DENIED,ssh_get_error(session)); + } + ssh_disconnect(session); +} + +START_TEST (torture_algorithms_aes128_cbc) +{ + test_algorithm("aes128-cbc"); +} +END_TEST + +START_TEST (torture_algorithms_aes192_cbc) +{ + test_algorithm("aes192-cbc"); +} +END_TEST + +START_TEST (torture_algorithms_aes256_cbc) +{ + test_algorithm("aes256-cbc"); +} +END_TEST + +START_TEST (torture_algorithms_aes128_ctr) +{ + test_algorithm("aes128-ctr"); +} +END_TEST + +START_TEST (torture_algorithms_aes192_ctr) +{ + test_algorithm("aes192-ctr"); +} +END_TEST + +START_TEST (torture_algorithms_aes256_ctr) +{ + test_algorithm("aes256-ctr"); +} +END_TEST + +START_TEST (torture_algorithms_3des_cbc) +{ + test_algorithm("3des-cbc"); +} +END_TEST + +START_TEST (torture_algorithms_blowfish_cbc) +{ + test_algorithm("blowfish-cbc"); +} +END_TEST + +START_TEST (torture_algorithms_zlib) +{ + int rc; + ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); + rc=ssh_options_set(session,SSH_OPTIONS_COMPRESSION_C_S,"zlib"); + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + rc=ssh_options_set(session,SSH_OPTIONS_COMPRESSION_S_C,"zlib"); + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + rc=ssh_connect(session); + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + rc=ssh_userauth_none(session,NULL); + if(rc != SSH_OK){ + rc=ssh_get_error_code(session); + ck_assert_msg(rc==SSH_REQUEST_DENIED,ssh_get_error(session)); + } + ssh_disconnect(session); +} +END_TEST + +Suite *torture_make_suite(void) { + Suite *s = suite_create("libssh_algorithms"); + + torture_create_case_fixture(s, "torture_algorithms_aes128-cbc", + torture_algorithms_aes128_cbc, setup, teardown); + torture_create_case_fixture(s, "torture_algorithms_aes192-cbc", + torture_algorithms_aes192_cbc, setup, teardown); + torture_create_case_fixture(s, "torture_algorithms_aes256-cbc", + torture_algorithms_aes256_cbc, setup, teardown); + torture_create_case_fixture(s, "torture_algorithms_aes128-ctr", + torture_algorithms_aes128_ctr, setup, teardown); + torture_create_case_fixture(s, "torture_algorithms_aes192-ctr", + torture_algorithms_aes192_ctr, setup, teardown); + torture_create_case_fixture(s, "torture_algorithms_aes256-ctr", + torture_algorithms_aes256_ctr, setup, teardown); + torture_create_case_fixture(s, "torture_algorithms_3des-cbc", + torture_algorithms_3des_cbc, setup, teardown); + torture_create_case_fixture(s, "torture_algorithms_blowfish-cbc", + torture_algorithms_blowfish_cbc, setup, teardown); + torture_create_case_fixture(s, "torture_algorithms_zlib", + torture_algorithms_zlib, setup, teardown); + return s; +} diff --git a/tests/client/torture_auth.c b/tests/client/torture_auth.c new file mode 100644 index 00000000..2381d8a9 --- /dev/null +++ b/tests/client/torture_auth.c @@ -0,0 +1,113 @@ +/* + * This file is part of the SSH Library + * + * Copyright (c) 2010 by Aris Adamantiadis + * + * The SSH Library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * The SSH Library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with the SSH Library; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + */ + +#define LIBSSH_STATIC + +#include "torture.h" +#include "libssh/libssh.h" +#include "libssh/priv.h" +#include "libssh/session.h" +ssh_session session; + +static void setup(void) { + int verbosity=torture_libssh_verbosity(); + session = ssh_new(); + ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); + ssh_options_set(session,SSH_OPTIONS_LOG_VERBOSITY,&verbosity); +} + +static void teardown(void) { + ssh_disconnect(session); + ssh_free(session); +} + +START_TEST (torture_auth_kbdint) +{ + int rc; + char *user=getenv("TORTURE_USER"); + char *password=getenv("TORTURE_PASSWORD"); + ck_assert_msg(user != NULL, "Please set the environment variable TORTURE_USER" + " to enable this test"); + ck_assert_msg(password != NULL, "Please set the environment variable " + "TORTURE_PASSWORD to enable this test"); + ssh_options_set(session,SSH_OPTIONS_USER,user); + rc=ssh_connect(session); + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + + rc=ssh_userauth_none(session,NULL); + /* This request should return a SSH_REQUEST_DENIED error */ + if(rc == SSH_ERROR){ + ck_assert_msg(ssh_get_error_code(session)==SSH_REQUEST_DENIED, + ssh_get_error(session)); + } + ck_assert_msg(ssh_auth_list(session) & SSH_AUTH_METHOD_INTERACTIVE, + "SSH server doesn't allow keyboard-interactive"); + rc=ssh_userauth_kbdint(session,NULL,NULL); + ck_assert_msg(rc==SSH_AUTH_INFO,ssh_get_error(session)); + ck_assert_int_eq(ssh_userauth_kbdint_getnprompts(session),1); + ssh_userauth_kbdint_setanswer(session,0,password); + rc=ssh_userauth_kbdint(session,NULL,NULL); + /* Sometimes, SSH server send an empty query at the end of exchange */ + if(rc==SSH_AUTH_INFO){ + ck_assert_int_eq(ssh_userauth_kbdint_getnprompts(session),0); + rc=ssh_userauth_kbdint(session,NULL,NULL); + } + ck_assert_msg(rc==SSH_AUTH_SUCCESS,ssh_get_error(session)); + +} +END_TEST + +START_TEST (torture_auth_password) +{ + int rc; + char *user=getenv("TORTURE_USER"); + char *password=getenv("TORTURE_PASSWORD"); + ck_assert_msg(user != NULL, "Please set the environment variable TORTURE_USER" + " to enable this test"); + ck_assert_msg(password != NULL, "Please set the environment variable " + "TORTURE_PASSWORD to enable this test"); + ssh_options_set(session,SSH_OPTIONS_USER,user); + rc=ssh_connect(session); + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + + rc=ssh_userauth_none(session,NULL); + /* This request should return a SSH_REQUEST_DENIED error */ + if(rc == SSH_ERROR){ + ck_assert_msg(ssh_get_error_code(session)==SSH_REQUEST_DENIED, + ssh_get_error(session)); + } + ck_assert_msg(ssh_auth_list(session) & SSH_AUTH_METHOD_PASSWORD, + "SSH server doesn't allow password authentication"); + rc=ssh_userauth_password(session,NULL,password); + ck_assert_msg(rc==SSH_AUTH_SUCCESS,ssh_get_error(session)); +} +END_TEST + +Suite *torture_make_suite(void) { + Suite *s = suite_create("libssh_auth"); + + torture_create_case_fixture(s, "torture_auth_kbint", + torture_auth_kbdint, setup, teardown); + torture_create_case_fixture(s, "torture_auth_password", + torture_auth_password, setup, teardown); + return s; +} + diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt index 3ac043cf..8eb7d296 100644 --- a/tests/unittests/CMakeLists.txt +++ b/tests/unittests/CMakeLists.txt @@ -1,10 +1,8 @@ project(unittests C) -add_check_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY}) add_check_test(torture_init torture_init.c ${TORTURE_LIBRARY}) add_check_test(torture_list torture_list.c ${TORTURE_LIBRARY}) add_check_test(torture_misc torture_misc.c ${TORTURE_LIBRARY}) -add_check_test(torture_auth torture_auth.c ${TORTURE_LIBRARY}) add_check_test(torture_keyfiles torture_keyfiles.c ${TORTURE_LIBRARY}) add_check_test(torture_options torture_options.c ${TORTURE_LIBRARY}) add_check_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY}) diff --git a/tests/unittests/torture_algorithms.c b/tests/unittests/torture_algorithms.c deleted file mode 100644 index 300fe054..00000000 --- a/tests/unittests/torture_algorithms.c +++ /dev/null @@ -1,144 +0,0 @@ -/* - * This file is part of the SSH Library - * - * Copyright (c) 2010 by Aris Adamantiadis - * - * The SSH Library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or (at your - * option) any later version. - * - * The SSH Library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with the SSH Library; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - */ - -#define LIBSSH_STATIC - -#include "torture.h" -#include "libssh/libssh.h" -#include "libssh/priv.h" - -ssh_session session; - -static void setup(void) { - session = ssh_new(); -} - -static void teardown(void) { - ssh_free(session); -} - -static void test_algorithm(const char *algo) { - int rc; - ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); - rc=ssh_options_set(session,SSH_OPTIONS_CIPHERS_C_S,algo); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - rc=ssh_options_set(session,SSH_OPTIONS_CIPHERS_S_C,algo); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - rc=ssh_connect(session); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - rc=ssh_userauth_none(session,NULL); - if(rc != SSH_OK){ - rc=ssh_get_error_code(session); - ck_assert_msg(rc==SSH_REQUEST_DENIED,ssh_get_error(session)); - } - ssh_disconnect(session); -} - -START_TEST (torture_algorithms_aes128_cbc) -{ - test_algorithm("aes128-cbc"); -} -END_TEST - -START_TEST (torture_algorithms_aes192_cbc) -{ - test_algorithm("aes192-cbc"); -} -END_TEST - -START_TEST (torture_algorithms_aes256_cbc) -{ - test_algorithm("aes256-cbc"); -} -END_TEST - -START_TEST (torture_algorithms_aes128_ctr) -{ - test_algorithm("aes128-ctr"); -} -END_TEST - -START_TEST (torture_algorithms_aes192_ctr) -{ - test_algorithm("aes192-ctr"); -} -END_TEST - -START_TEST (torture_algorithms_aes256_ctr) -{ - test_algorithm("aes256-ctr"); -} -END_TEST - -START_TEST (torture_algorithms_3des_cbc) -{ - test_algorithm("3des-cbc"); -} -END_TEST - -START_TEST (torture_algorithms_blowfish_cbc) -{ - test_algorithm("blowfish-cbc"); -} -END_TEST - -START_TEST (torture_algorithms_zlib) -{ - int rc; - ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); - rc=ssh_options_set(session,SSH_OPTIONS_COMPRESSION_C_S,"zlib"); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - rc=ssh_options_set(session,SSH_OPTIONS_COMPRESSION_S_C,"zlib"); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - rc=ssh_connect(session); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - rc=ssh_userauth_none(session,NULL); - if(rc != SSH_OK){ - rc=ssh_get_error_code(session); - ck_assert_msg(rc==SSH_REQUEST_DENIED,ssh_get_error(session)); - } - ssh_disconnect(session); -} -END_TEST - -Suite *torture_make_suite(void) { - Suite *s = suite_create("libssh_algorithms"); - - torture_create_case_fixture(s, "torture_algorithms_aes128-cbc", - torture_algorithms_aes128_cbc, setup, teardown); - torture_create_case_fixture(s, "torture_algorithms_aes192-cbc", - torture_algorithms_aes192_cbc, setup, teardown); - torture_create_case_fixture(s, "torture_algorithms_aes256-cbc", - torture_algorithms_aes256_cbc, setup, teardown); - torture_create_case_fixture(s, "torture_algorithms_aes128-ctr", - torture_algorithms_aes128_ctr, setup, teardown); - torture_create_case_fixture(s, "torture_algorithms_aes192-ctr", - torture_algorithms_aes192_ctr, setup, teardown); - torture_create_case_fixture(s, "torture_algorithms_aes256-ctr", - torture_algorithms_aes256_ctr, setup, teardown); - torture_create_case_fixture(s, "torture_algorithms_3des-cbc", - torture_algorithms_3des_cbc, setup, teardown); - torture_create_case_fixture(s, "torture_algorithms_blowfish-cbc", - torture_algorithms_blowfish_cbc, setup, teardown); - torture_create_case_fixture(s, "torture_algorithms_zlib", - torture_algorithms_zlib, setup, teardown); - return s; -} diff --git a/tests/unittests/torture_auth.c b/tests/unittests/torture_auth.c deleted file mode 100644 index 2381d8a9..00000000 --- a/tests/unittests/torture_auth.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * This file is part of the SSH Library - * - * Copyright (c) 2010 by Aris Adamantiadis - * - * The SSH Library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or (at your - * option) any later version. - * - * The SSH Library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with the SSH Library; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - */ - -#define LIBSSH_STATIC - -#include "torture.h" -#include "libssh/libssh.h" -#include "libssh/priv.h" -#include "libssh/session.h" -ssh_session session; - -static void setup(void) { - int verbosity=torture_libssh_verbosity(); - session = ssh_new(); - ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); - ssh_options_set(session,SSH_OPTIONS_LOG_VERBOSITY,&verbosity); -} - -static void teardown(void) { - ssh_disconnect(session); - ssh_free(session); -} - -START_TEST (torture_auth_kbdint) -{ - int rc; - char *user=getenv("TORTURE_USER"); - char *password=getenv("TORTURE_PASSWORD"); - ck_assert_msg(user != NULL, "Please set the environment variable TORTURE_USER" - " to enable this test"); - ck_assert_msg(password != NULL, "Please set the environment variable " - "TORTURE_PASSWORD to enable this test"); - ssh_options_set(session,SSH_OPTIONS_USER,user); - rc=ssh_connect(session); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - - rc=ssh_userauth_none(session,NULL); - /* This request should return a SSH_REQUEST_DENIED error */ - if(rc == SSH_ERROR){ - ck_assert_msg(ssh_get_error_code(session)==SSH_REQUEST_DENIED, - ssh_get_error(session)); - } - ck_assert_msg(ssh_auth_list(session) & SSH_AUTH_METHOD_INTERACTIVE, - "SSH server doesn't allow keyboard-interactive"); - rc=ssh_userauth_kbdint(session,NULL,NULL); - ck_assert_msg(rc==SSH_AUTH_INFO,ssh_get_error(session)); - ck_assert_int_eq(ssh_userauth_kbdint_getnprompts(session),1); - ssh_userauth_kbdint_setanswer(session,0,password); - rc=ssh_userauth_kbdint(session,NULL,NULL); - /* Sometimes, SSH server send an empty query at the end of exchange */ - if(rc==SSH_AUTH_INFO){ - ck_assert_int_eq(ssh_userauth_kbdint_getnprompts(session),0); - rc=ssh_userauth_kbdint(session,NULL,NULL); - } - ck_assert_msg(rc==SSH_AUTH_SUCCESS,ssh_get_error(session)); - -} -END_TEST - -START_TEST (torture_auth_password) -{ - int rc; - char *user=getenv("TORTURE_USER"); - char *password=getenv("TORTURE_PASSWORD"); - ck_assert_msg(user != NULL, "Please set the environment variable TORTURE_USER" - " to enable this test"); - ck_assert_msg(password != NULL, "Please set the environment variable " - "TORTURE_PASSWORD to enable this test"); - ssh_options_set(session,SSH_OPTIONS_USER,user); - rc=ssh_connect(session); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - - rc=ssh_userauth_none(session,NULL); - /* This request should return a SSH_REQUEST_DENIED error */ - if(rc == SSH_ERROR){ - ck_assert_msg(ssh_get_error_code(session)==SSH_REQUEST_DENIED, - ssh_get_error(session)); - } - ck_assert_msg(ssh_auth_list(session) & SSH_AUTH_METHOD_PASSWORD, - "SSH server doesn't allow password authentication"); - rc=ssh_userauth_password(session,NULL,password); - ck_assert_msg(rc==SSH_AUTH_SUCCESS,ssh_get_error(session)); -} -END_TEST - -Suite *torture_make_suite(void) { - Suite *s = suite_create("libssh_auth"); - - torture_create_case_fixture(s, "torture_auth_kbint", - torture_auth_kbdint, setup, teardown); - torture_create_case_fixture(s, "torture_auth_password", - torture_auth_password, setup, teardown); - return s; -} - -- cgit