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

tests: Add torture_setup_sshd_servers

Browse Source 
Starts a second sshd. This enables to test proxyjump through
multiple servers.

Signed-off-by: Norbert Pocs <norbertpocs0@gmail.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Norbert Pocs
2024-11-05 15:35:47 +01:00
parent dd6a711354
commit e01c32f41e
2 changed files with 238 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

375
tests/torture.c
View File

@@ -53,13 +53,19 @@
#endif #endif
#define TORTURE_SSHD_SRV_IPV4 "127.0.0.10" #define TORTURE_SSHD_SRV_IPV4 "127.0.0.10"
#define TORTURE_SSHD_SRV1_IPV4 "127.0.0.11"
/* socket wrapper IPv6 prefix fd00::5357:5fxx */ /* socket wrapper IPv6 prefix fd00::5357:5fxx */
#define TORTURE_SSHD_SRV_IPV6 "fd00::5357:5f0a" #define TORTURE_SSHD_SRV_IPV6 "fd00::5357:5f0a"
#define TORTURE_SSHD_SRV1_IPV6 "fd00::5357:5f0b"
#define TORTURE_SSHD_SRV_PORT 22 #define TORTURE_SSHD_SRV_PORT 22
#define TORTURE_SSHD_SRV_IFACE "10"
#define TORTURE_SSHD_SRV1_IFACE "11"
#define TORTURE_SOCKET_DIR "/tmp/test_socket_wrapper_XXXXXX" #define TORTURE_SOCKET_DIR "/tmp/test_socket_wrapper_XXXXXX"
#define TORTURE_SSHD_PIDFILE "sshd/sshd.pid" #define TORTURE_SSHD_PIDFILE "sshd/sshd.pid"
#define TORTURE_SSHD_CONFIG "sshd/sshd_config" #define TORTURE_SSHD_CONFIG "sshd/sshd_config"
#define TORTURE_SSHD1_PIDFILE "sshd1/sshd.pid"
#define TORTURE_SSHD1_CONFIG "sshd1/sshd_config"
#define TORTURE_PCAP_FILE "socket_trace.pcap" #define TORTURE_PCAP_FILE "socket_trace.pcap"
static const char torture_rsa_certauth_pub[]= static const char torture_rsa_certauth_pub[]=
@@ -560,6 +566,20 @@ const char *torture_server_address(int family)
return NULL; return NULL;
} }
const char *torture_server1_address(int family)
{
switch (family) {
case AF_INET:
return TORTURE_SSHD_SRV1_IPV4;
case AF_INET6:
return TORTURE_SSHD_SRV1_IPV6;
default:
return NULL;
}
return NULL;
}
void torture_setup_socket_dir(void **state) void torture_setup_socket_dir(void **state)
{ {
struct torture_state *s; struct torture_state *s;
@@ -629,6 +649,32 @@ void torture_setup_socket_dir(void **state)
*state = s; *state = s;
} }
static void torture_setup_second_sshd_dir(void **state)
{
struct torture_state *s = *state;
size_t len;
/* pid file */
len = strlen(s->socket_dir) + 1 + strlen(TORTURE_SSHD1_PIDFILE) + 1;
s->srv1_pidfile = malloc(len);
assert_non_null(s->srv1_pidfile);
snprintf(s->srv1_pidfile,
len,
"%s/%s",
s->socket_dir,
TORTURE_SSHD1_PIDFILE);
/* config file */
len = strlen(s->socket_dir) + 1 + strlen(TORTURE_SSHD1_CONFIG) + 1;
s->srv1_config = malloc(len);
assert_non_null(s->srv1_config);
snprintf(s->srv1_config, len, "%s/%s", s->socket_dir, TORTURE_SSHD1_CONFIG);
}
/** /**
* @brief Create a libssh server configuration file * @brief Create a libssh server configuration file
* *
@@ -654,16 +700,16 @@ void torture_setup_create_libssh_config(void **state)
"LogLevel DEBUG3\n" "LogLevel DEBUG3\n"
"Port 22\n" "Port 22\n"
"ListenAddress 127.0.0.10\n" "ListenAddress 127.0.0.10\n"
"%s %s\n" "HostKey %s\n"
"%s %s\n" "HostKey %s\n"
"%s %s\n" "HostKey %s\n"
"%s\n"; /* The space for test-specific options */ "%s\n"; /* The space for test-specific options */
const char fips_config_string[] = const char fips_config_string[] =
"LogLevel DEBUG3\n" "LogLevel DEBUG3\n"
"Port 22\n" "Port 22\n"
"ListenAddress 127.0.0.10\n" "ListenAddress 127.0.0.10\n"
"%s %s\n" "HostKey %s\n"
"%s %s\n" "HostKey %s\n"
"%s\n"; /* The space for test-specific options */ "%s\n"; /* The space for test-specific options */
bool written = false; bool written = false;
int rc; int rc;
@@ -716,20 +762,15 @@ void torture_setup_create_libssh_config(void **state)
snprintf(sshd_config, snprintf(sshd_config,
sizeof(sshd_config), sizeof(sshd_config),
fips_config_string, fips_config_string,
"HostKey",
rsa_hostkey, rsa_hostkey,
"HostKey",
ecdsa_hostkey, ecdsa_hostkey,
additional_config); additional_config);
} else { } else {
snprintf(sshd_config, snprintf(sshd_config,
sizeof(sshd_config), sizeof(sshd_config),
config_string, config_string,
"HostKey",
ed25519_hostkey, ed25519_hostkey,
"HostKey",
rsa_hostkey, rsa_hostkey,
"HostKey",
ecdsa_hostkey, ecdsa_hostkey,
additional_config); additional_config);
} }
@@ -738,7 +779,8 @@ void torture_setup_create_libssh_config(void **state)
} }
#ifdef SSHD_EXECUTABLE #ifdef SSHD_EXECUTABLE
static void torture_setup_create_sshd_config(void **state, bool pam) static void
torture_setup_create_sshd_config(void **state, bool pam, bool second_sshd)
{ {
struct torture_state *s = *state; struct torture_state *s = *state;
char ed25519_hostkey[1024] = {0}; char ed25519_hostkey[1024] = {0};
@@ -756,96 +798,98 @@ static void torture_setup_create_sshd_config(void **state, bool pam)
"/usr/libexec/openssh/sftp-server", "/usr/libexec/openssh/sftp-server",
"/usr/lib/openssh/sftp-server", /* Debian */ "/usr/lib/openssh/sftp-server", /* Debian */
}; };
const char config_string[]= const char config_string[] =
"Port 22\n" "Port 22\n"
"ListenAddress 127.0.0.10\n" "ListenAddress %s\n"
"ListenAddress fd00::5357:5f0a\n" "ListenAddress %s\n"
"%s %s\n" /* ed25519 HostKey */ "HostKey %s\n" /* ed25519 HostKey */
"%s %s\n" /* RSA HostKey */ "HostKey %s\n" /* RSA HostKey */
"%s %s\n" /* ECDSA HostKey */ "HostKey %s\n" /* ECDSA HostKey */
"\n" "\n"
"TrustedUserCAKeys %s\n" "TrustedUserCAKeys %s\n"
"\n" "\n"
"LogLevel DEBUG3\n" "LogLevel DEBUG3\n"
"Subsystem sftp %s -l DEBUG2\n" "Subsystem sftp %s -l DEBUG2\n"
"\n" "\n"
"PasswordAuthentication yes\n" "PasswordAuthentication yes\n"
"PubkeyAuthentication yes\n" "PubkeyAuthentication yes\n"
"\n" "\n"
"StrictModes no\n" "StrictModes no\n"
"\n" "\n"
"%s\n" /* Here comes UsePam */ "%s\n" /* Here comes UsePam */
"%s" /* The space for test-specific options */ "%s" /* The space for test-specific options */
"\n" "\n"
/* add all supported algorithms */ /* add all supported algorithms */
"HostKeyAlgorithms " OPENSSH_KEYS "\n" "HostKeyAlgorithms " OPENSSH_KEYS "\n"
#if OPENSSH_VERSION_MAJOR == 8 && OPENSSH_VERSION_MINOR >= 2 #if OPENSSH_VERSION_MAJOR == 8 && OPENSSH_VERSION_MINOR >= 2
"CASignatureAlgorithms " OPENSSH_KEYS "\n" "CASignatureAlgorithms " OPENSSH_KEYS "\n"
#endif #endif
#if (OPENSSH_VERSION_MAJOR == 9 && OPENSSH_VERSION_MINOR >= 8) || OPENSSH_VERSION_MAJOR > 9 #if (OPENSSH_VERSION_MAJOR == 9 && OPENSSH_VERSION_MINOR >= 8) || OPENSSH_VERSION_MAJOR > 9
"PerSourcePenaltyExemptList 127.0.0.21\n" "PerSourcePenaltyExemptList 127.0.0.21\n"
#endif #endif
"Ciphers " OPENSSH_CIPHERS "\n" "Ciphers " OPENSSH_CIPHERS "\n"
"KexAlgorithms " OPENSSH_KEX "\n" "KexAlgorithms " OPENSSH_KEX "\n"
"MACs " OPENSSH_MACS "\n" "MACs " OPENSSH_MACS "\n"
"\n" "\n"
"AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES\n" "AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY "
"AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT\n" "LC_MESSAGES\n"
"AcceptEnv LC_IDENTIFICATION LC_ALL LC_LIBSSH\n" "AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT\n"
"\n" "AcceptEnv LC_IDENTIFICATION LC_ALL LC_LIBSSH\n"
"PidFile %s\n"; "\n"
"PidFile %s\n";
/* FIPS config */ /* FIPS config */
const char fips_config_string[]= const char fips_config_string[] =
"Port 22\n" "Port 22\n"
"ListenAddress 127.0.0.10\n" "ListenAddress %s\n"
"ListenAddress fd00::5357:5f0a\n" "ListenAddress %s\n"
"%s %s\n" /* RSA HostKey */ "HostKey %s\n" /* RSA HostKey */
"%s %s\n" /* ECDSA HostKey */ "HostKey %s\n" /* ECDSA HostKey */
"\n" "\n"
"TrustedUserCAKeys %s\n" /* Trusted CA */ "TrustedUserCAKeys %s\n" /* Trusted CA */
"\n" "\n"
"LogLevel DEBUG3\n" "LogLevel DEBUG3\n"
"Subsystem sftp %s -l DEBUG2\n" /* SFTP server */ "Subsystem sftp %s -l DEBUG2\n" /* SFTP server */
"\n" "\n"
"PasswordAuthentication yes\n" "PasswordAuthentication yes\n"
"PubkeyAuthentication yes\n" "PubkeyAuthentication yes\n"
"\n" "\n"
"StrictModes no\n" "StrictModes no\n"
"\n" "\n"
"%s\n" /* Here comes UsePam */ "%s\n" /* Here comes UsePam */
"%s" /* The space for test-specific options */ "%s" /* The space for test-specific options */
"\n" "\n"
#if (OPENSSH_VERSION_MAJOR == 9 && OPENSSH_VERSION_MINOR >= 8) || OPENSSH_VERSION_MAJOR > 9 #if (OPENSSH_VERSION_MAJOR == 9 && OPENSSH_VERSION_MINOR >= 8) || OPENSSH_VERSION_MAJOR > 9
"PerSourcePenaltyExemptList 127.0.0.21\n" "PerSourcePenaltyExemptList 127.0.0.21\n"
#endif #endif
"Ciphers " "Ciphers "
"aes256-gcm@openssh.com,aes256-ctr,aes256-cbc," "aes256-gcm@openssh.com,aes256-ctr,aes256-cbc,"
"aes128-gcm@openssh.com,aes128-ctr,aes128-cbc" "aes128-gcm@openssh.com,aes128-ctr,aes128-cbc"
"\n" "\n"
"MACs " "MACs "
"hmac-sha2-256-etm@openssh.com,hmac-sha1-etm@openssh.com," "hmac-sha2-256-etm@openssh.com,hmac-sha1-etm@openssh.com,"
"hmac-sha2-512-etm@openssh.com,hmac-sha2-256," "hmac-sha2-512-etm@openssh.com,hmac-sha2-256,"
"hmac-sha1,hmac-sha2-512" "hmac-sha1,hmac-sha2-512"
"\n" "\n"
"GSSAPIKeyExchange no\n" "GSSAPIKeyExchange no\n"
"KexAlgorithms " "KexAlgorithms "
"ecdh-sha2-nistp256,ecdh-sha2-nistp384," "ecdh-sha2-nistp256,ecdh-sha2-nistp384,"
"ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256," "ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,"
"diffie-hellman-group14-sha256,diffie-hellman-group16-sha512," "diffie-hellman-group14-sha256,diffie-hellman-group16-sha512,"
"diffie-hellman-group18-sha512" "diffie-hellman-group18-sha512"
"\n" "\n"
"PubkeyAcceptedKeyTypes " "PubkeyAcceptedKeyTypes "
"rsa-sha2-256,rsa-sha2-256-cert-v01@openssh.com," "rsa-sha2-256,rsa-sha2-256-cert-v01@openssh.com,"
"ecdsa-sha2-nistp256,ecdsa-sha2-nistp256-cert-v01@openssh.com," "ecdsa-sha2-nistp256,ecdsa-sha2-nistp256-cert-v01@openssh.com,"
"ecdsa-sha2-nistp384,ecdsa-sha2-nistp384-cert-v01@openssh.com," "ecdsa-sha2-nistp384,ecdsa-sha2-nistp384-cert-v01@openssh.com,"
"rsa-sha2-512,rsa-sha2-512-cert-v01@openssh.com," "rsa-sha2-512,rsa-sha2-512-cert-v01@openssh.com,"
"ecdsa-sha2-nistp521,ecdsa-sha2-nistp521-cert-v01@openssh.com" "ecdsa-sha2-nistp521,ecdsa-sha2-nistp521-cert-v01@openssh.com"
"\n" "\n"
"AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES\n" "AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY "
"AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT\n" "LC_MESSAGES\n"
"AcceptEnv LC_IDENTIFICATION LC_ALL LC_LIBSSH\n" "AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT\n"
"\n" "AcceptEnv LC_IDENTIFICATION LC_ALL LC_LIBSSH\n"
"PidFile %s\n"; /* PID file */ "\n"
"PidFile %s\n"; /* PID file */
const char usepam_yes[] = const char usepam_yes[] =
"UsePAM yes\n" "UsePAM yes\n"
"KbdInteractiveAuthentication yes\n"; "KbdInteractiveAuthentication yes\n";
@@ -869,8 +913,9 @@ static void torture_setup_create_sshd_config(void **state, bool pam)
snprintf(sshd_path, snprintf(sshd_path,
sizeof(sshd_path), sizeof(sshd_path),
"%s/sshd", "%s/sshd%s",
s->socket_dir); s->socket_dir,
second_sshd ? "1" : "");
rc = lstat(sshd_path, &sb); rc = lstat(sshd_path, &sb);
if (rc == 0 ) { /* The directory is already in place */ if (rc == 0 ) { /* The directory is already in place */
@@ -882,25 +927,29 @@ static void torture_setup_create_sshd_config(void **state, bool pam)
assert_return_code(rc, errno); assert_return_code(rc, errno);
} }
snprintf(ed25519_hostkey, rc = snprintf(ed25519_hostkey,
sizeof(ed25519_hostkey), sizeof(ed25519_hostkey),
"%s/sshd/ssh_host_ed25519_key", "%s/ssh_host_ed25519_key",
s->socket_dir); sshd_path);
assert_true(rc >= 0);
snprintf(rsa_hostkey, rc = snprintf(rsa_hostkey,
sizeof(rsa_hostkey), sizeof(rsa_hostkey),
"%s/sshd/ssh_host_rsa_key", "%s/ssh_host_rsa_key",
s->socket_dir); sshd_path);
assert_true(rc >= 0);
snprintf(ecdsa_hostkey, rc = snprintf(ecdsa_hostkey,
sizeof(ecdsa_hostkey), sizeof(ecdsa_hostkey),
"%s/sshd/ssh_host_ecdsa_key", "%s/ssh_host_ecdsa_key",
s->socket_dir); sshd_path);
assert_true(rc >= 0);
snprintf(trusted_ca_pubkey, rc = snprintf(trusted_ca_pubkey,
sizeof(trusted_ca_pubkey), sizeof(trusted_ca_pubkey),
"%s/sshd/user_ca.pub", "%s/user_ca.pub",
s->socket_dir); sshd_path);
assert_true(rc >= 0);
if (!written) { if (!written) {
torture_write_file(ed25519_hostkey, torture_write_file(ed25519_hostkey,
@@ -928,29 +977,39 @@ static void torture_setup_create_sshd_config(void **state, bool pam)
s->srv_additional_config : ""); s->srv_additional_config : "");
if (ssh_fips_mode()) { if (ssh_fips_mode()) {
snprintf(sshd_config, sizeof(sshd_config), snprintf(sshd_config,
fips_config_string, sizeof(sshd_config),
"HostKey", rsa_hostkey, fips_config_string,
"HostKey", ecdsa_hostkey, second_sshd ? TORTURE_SSHD_SRV1_IPV4 : TORTURE_SSHD_SRV_IPV4,
trusted_ca_pubkey, second_sshd ? TORTURE_SSHD_SRV1_IPV6 : TORTURE_SSHD_SRV_IPV6,
sftp_server, rsa_hostkey,
usepam, ecdsa_hostkey,
additional_config, trusted_ca_pubkey,
s->srv_pidfile); sftp_server,
usepam,
additional_config,
second_sshd ? s->srv1_pidfile : s->srv_pidfile);
} else { } else {
snprintf(sshd_config, sizeof(sshd_config), snprintf(sshd_config,
config_string, sizeof(sshd_config),
"HostKey", ed25519_hostkey, config_string,
"HostKey", rsa_hostkey, second_sshd ? TORTURE_SSHD_SRV1_IPV4 : TORTURE_SSHD_SRV_IPV4,
"HostKey", ecdsa_hostkey, second_sshd ? TORTURE_SSHD_SRV1_IPV6 : TORTURE_SSHD_SRV_IPV6,
trusted_ca_pubkey, ed25519_hostkey,
sftp_server, rsa_hostkey,
usepam, ecdsa_hostkey,
additional_config, trusted_ca_pubkey,
s->srv_pidfile); sftp_server,
usepam,
additional_config,
second_sshd ? s->srv1_pidfile : s->srv_pidfile);
} }
torture_write_file(s->srv_config, sshd_config); if (second_sshd) {
torture_write_file(s->srv1_config, sshd_config);
} else {
torture_write_file(s->srv_config, sshd_config);
}
} }
int torture_wait_for_daemon(unsigned int seconds) int torture_wait_for_daemon(unsigned int seconds)
@@ -1172,15 +1231,18 @@ void torture_setup_libssh_server(void **state, const char *server_path)
} }
} }
static int torture_start_sshd_server(void **state) static int torture_start_sshd_server(void **state, bool second_sshd)
{ {
struct torture_state *s = *state; struct torture_state *s = *state;
char sshd_start_cmd[1024]; char sshd_start_cmd[1024];
int rc; int rc;
char kdc_env[255] = {0}; char kdc_env[255] = {0};
/* Set the default interface for the server */ /* Set the default interface for the server
setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "10", 1); * default is 10 */
setenv("SOCKET_WRAPPER_DEFAULT_IFACE",
second_sshd ? TORTURE_SSHD_SRV_IFACE : TORTURE_SSHD_SRV_IFACE,
1);
setenv("PAM_WRAPPER", "1", 1); setenv("PAM_WRAPPER", "1", 1);
#ifdef WITH_GSSAPI #ifdef WITH_GSSAPI
@@ -1190,11 +1252,13 @@ static int torture_start_sshd_server(void **state)
rc = snprintf(sshd_start_cmd, rc = snprintf(sshd_start_cmd,
sizeof(sshd_start_cmd), sizeof(sshd_start_cmd),
"%s " SSHD_EXECUTABLE "%s " SSHD_EXECUTABLE
" -r -f %s -E %s/sshd/daemon.log 2> %s/sshd/cwrap.log", " -r -f %s -E %s/sshd%s/daemon.log 2> %s/sshd%s/cwrap.log",
kdc_env, kdc_env,
s->srv_config, second_sshd ? s->srv1_config : s->srv_config,
s->socket_dir, s->socket_dir,
s->socket_dir); second_sshd ? "1" : "",
s->socket_dir,
second_sshd ? "1" : "");
if (rc < 0 || rc >= (int)sizeof(sshd_start_cmd)) { if (rc < 0 || rc >= (int)sizeof(sshd_start_cmd)) {
fail_msg("snprintf failed"); fail_msg("snprintf failed");
} }
@@ -1218,9 +1282,22 @@ void torture_setup_sshd_server(void **state, bool pam)
int rc; int rc;
torture_setup_socket_dir(state); torture_setup_socket_dir(state);
torture_setup_create_sshd_config(state, pam); torture_setup_create_sshd_config(state, pam, false);
rc = torture_start_sshd_server(state); rc = torture_start_sshd_server(state, false);
assert_int_equal(rc, 0);
}
/* Create an another sshd instance in the same SOCKET_WRAPPER_DIR
* Param state has to be initialized with torture_setup_sshd_server */
void torture_setup_sshd_servers(void **state, bool pam)
{
int rc;
torture_setup_second_sshd_dir(state);
torture_setup_create_sshd_config(state, pam, true);
rc = torture_start_sshd_server(state, true);
assert_int_equal(rc, 0); assert_int_equal(rc, 0);
} }
@@ -1314,6 +1391,7 @@ torture_teardown_kdc_server(void **state)
void torture_free_state(struct torture_state *s) void torture_free_state(struct torture_state *s)
{ {
free(s->srv_config); free(s->srv_config);
free(s->srv1_config);
free(s->socket_dir); free(s->socket_dir);
#ifdef WITH_GSSAPI #ifdef WITH_GSSAPI
free(s->gss_dir); free(s->gss_dir);
@@ -1321,6 +1399,7 @@ void torture_free_state(struct torture_state *s)
free(s->pcap_file); free(s->pcap_file);
free(s->log_file); free(s->log_file);
free(s->srv_pidfile); free(s->srv_pidfile);
free(s->srv1_pidfile);
free(s->srv_additional_config); free(s->srv_additional_config);
free(s); free(s);
} }
@@ -1360,7 +1439,7 @@ torture_reload_sshd_server(void **state)
rc = torture_terminate_process(s->srv_pidfile); rc = torture_terminate_process(s->srv_pidfile);
assert_return_code(rc, errno); assert_return_code(rc, errno);
return torture_start_sshd_server(state); return torture_start_sshd_server(state, false);
} }
/* @brief: Updates SSHD server configuration with more options and /* @brief: Updates SSHD server configuration with more options and
@@ -1380,7 +1459,7 @@ torture_update_sshd_config(void **state, const char *config)
assert_non_null(s->srv_additional_config); assert_non_null(s->srv_additional_config);
/* Rewrite the configuration file */ /* Rewrite the configuration file */
torture_setup_create_sshd_config(state, s->srv_pam); torture_setup_create_sshd_config(state, s->srv_pam, false);
/* Reload the server */ /* Reload the server */
rc = torture_reload_sshd_server(state); rc = torture_reload_sshd_server(state);
@@ -1395,8 +1474,20 @@ void torture_teardown_sshd_server(void **state)
struct torture_state *s = *state; struct torture_state *s = *state;
torture_terminate_process(s->srv_pidfile); torture_terminate_process(s->srv_pidfile);
if (s->srv1_pidfile != NULL) {
torture_terminate_process(s->srv1_pidfile);
}
torture_teardown_socket_dir(state); torture_teardown_socket_dir(state);
} }
void torture_teardown_sshd_server1(void **state)
{
struct torture_state *s = *state;
torture_terminate_process(s->srv1_pidfile);
SAFE_FREE(s->srv1_pidfile);
SAFE_FREE(s->srv1_config);
}
#endif /* SSHD_EXECUTABLE */ #endif /* SSHD_EXECUTABLE */
#ifdef WITH_PKCS11_URI #ifdef WITH_PKCS11_URI

5
tests/torture.h
View File

@@ -72,6 +72,8 @@ struct torture_state {
char *log_file; char *log_file;
char *srv_pidfile; char *srv_pidfile;
char *srv_config; char *srv_config;
char *srv1_pidfile;
char *srv1_config;
bool srv_pam; bool srv_pam;
char *srv_additional_config; char *srv_additional_config;
struct { struct {
@@ -121,6 +123,7 @@ void torture_write_file(const char *filename, const char *data);
void _torture_filter_tests(struct CMUnitTest *tests, size_t ntests); void _torture_filter_tests(struct CMUnitTest *tests, size_t ntests);
const char *torture_server_address(int domain); const char *torture_server_address(int domain);
const char *torture_server1_address(int domain);
int torture_server_port(void); int torture_server_port(void);
int torture_wait_for_daemon(unsigned int seconds); int torture_wait_for_daemon(unsigned int seconds);
@@ -128,9 +131,11 @@ int torture_wait_for_daemon(unsigned int seconds);
#ifdef SSHD_EXECUTABLE #ifdef SSHD_EXECUTABLE
void torture_setup_socket_dir(void **state); void torture_setup_socket_dir(void **state);
void torture_setup_sshd_server(void **state, bool pam); void torture_setup_sshd_server(void **state, bool pam);
void torture_setup_sshd_servers(void **state, bool pam);
void torture_teardown_socket_dir(void **state); void torture_teardown_socket_dir(void **state);
void torture_teardown_sshd_server(void **state); void torture_teardown_sshd_server(void **state);
void torture_teardown_sshd_server1(void **state);
int torture_update_sshd_config(void **state, const char *config); int torture_update_sshd_config(void **state, const char *config);
#endif /* SSHD_EXECUTABLE */ #endif /* SSHD_EXECUTABLE */