mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-06 16:40:47 +00:00
tftpd: Clean up the tests.
MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44955
This commit is contained in:
Dag-Erling Smørgrav
parent
1ed44fcc44
commit
7ab7ecfcfe
|
|
@ -144,10 +144,10 @@ send_data(uint16_t blocknum, const char* contents, size_t contents_len)
|
|||
* @param cmd Command to send, as a const string
|
||||
* (terminating NUL will be ignored)
|
||||
*/
|
||||
#define SEND_STR(cmd) ATF_REQUIRE_EQ( \
|
||||
sendto(s, (cmd), sizeof(cmd) - 1, 0, (struct sockaddr*)(&addr), \
|
||||
addr.ss_len), \
|
||||
sizeof(cmd) - 1)
|
||||
#define SEND_STR(cmd) \
|
||||
ATF_REQUIRE_EQ(sizeof(cmd) - 1, \
|
||||
sendto(s, (cmd), sizeof(cmd) - 1, 0, \
|
||||
(struct sockaddr *)(&addr), addr.ss_len))
|
||||
|
||||
/*
|
||||
* Acknowledge block blocknum
|
||||
|
|
@ -162,7 +162,6 @@ send_ack(uint16_t blocknum)
|
|||
};
|
||||
|
||||
send_bytes(packet, sizeof(packet));
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -175,24 +174,28 @@ send_ack(uint16_t blocknum)
|
|||
* @param filename filename as a string, absolute or relative
|
||||
* @param mode either "octet" or "netascii"
|
||||
*/
|
||||
#define SEND_RRQ(filename, mode) SEND_STR("\0\001" filename "\0" mode "\0")
|
||||
#define SEND_RRQ(filename, mode) \
|
||||
SEND_STR("\0\001" filename "\0" mode "\0")
|
||||
|
||||
/*
|
||||
* send a read request with options
|
||||
*/
|
||||
#define SEND_RRQ_OPT(filename, mode, options) SEND_STR("\0\001" filename "\0" mode "\000" options)
|
||||
#define SEND_RRQ_OPT(filename, mode, options) \
|
||||
SEND_STR("\0\001" filename "\0" mode "\000" options)
|
||||
|
||||
/*
|
||||
* send a write request to tftpd.
|
||||
* @param filename filename as a string, absolute or relative
|
||||
* @param mode either "octet" or "netascii"
|
||||
*/
|
||||
#define SEND_WRQ(filename, mode) SEND_STR("\0\002" filename "\0" mode "\0")
|
||||
#define SEND_WRQ(filename, mode) \
|
||||
SEND_STR("\0\002" filename "\0" mode "\0")
|
||||
|
||||
/*
|
||||
* send a write request with options
|
||||
*/
|
||||
#define SEND_WRQ_OPT(filename, mode, options) SEND_STR("\0\002" filename "\0" mode "\000" options)
|
||||
#define SEND_WRQ_OPT(filename, mode, options) \
|
||||
SEND_STR("\0\002" filename "\0" mode "\000" options)
|
||||
|
||||
/* Define a test case, for both IPv4 and IPv6 */
|
||||
#define TFTPD_TC_DEFINE(name, head, ...) \
|
||||
|
|
@ -236,8 +239,7 @@ static void \
|
|||
name ## _body(void)
|
||||
|
||||
/* Add the IPv4 and IPv6 versions of a test case */
|
||||
#define TFTPD_TC_ADD(tp, name ) \
|
||||
do { \
|
||||
#define TFTPD_TC_ADD(tp, name) do { \
|
||||
ATF_TP_ADD_TC(tp, name ## _v4); \
|
||||
ATF_TP_ADD_TC(tp, name ## _v6); \
|
||||
} while (0)
|
||||
|
|
@ -262,15 +264,15 @@ cleanup(void)
|
|||
|
||||
/* Assert that two binary buffers are identical */
|
||||
static void
|
||||
require_bufeq(const char *expected, size_t expected_len, const char *actual,
|
||||
size_t len)
|
||||
require_bufeq(const char *expected, size_t expected_len,
|
||||
const char *actual, size_t len)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
ATF_REQUIRE_EQ_MSG(expected_len, len,
|
||||
"Expected %zu bytes but got %zu", expected_len, len);
|
||||
for (i = 0; i < len; i++) {
|
||||
ATF_REQUIRE_EQ_MSG(actual[i], expected[i],
|
||||
ATF_REQUIRE_EQ_MSG(expected[i], actual[i],
|
||||
"Expected %#hhx at position %zu; got %hhx instead",
|
||||
expected[i], i, actual[i]);
|
||||
}
|
||||
|
|
@ -314,7 +316,7 @@ setup(struct sockaddr_storage *to, uint16_t idx)
|
|||
server_addr = (struct sockaddr *)&addr6;
|
||||
}
|
||||
|
||||
ATF_REQUIRE_EQ(getcwd(pwd, sizeof(pwd)), pwd);
|
||||
ATF_REQUIRE_EQ(pwd, getcwd(pwd, sizeof(pwd)));
|
||||
|
||||
/* Must bind(2) pre-fork so it happens before the client's send(2) */
|
||||
server_s = socket(protocol, SOCK_DGRAM, 0);
|
||||
|
|
@ -324,7 +326,7 @@ setup(struct sockaddr_storage *to, uint16_t idx)
|
|||
}
|
||||
ATF_REQUIRE_MSG(server_s >= 0,
|
||||
"socket failed with error %s", strerror(errno));
|
||||
ATF_REQUIRE_EQ_MSG(bind(server_s, server_addr, len), 0,
|
||||
ATF_REQUIRE_EQ_MSG(0, bind(server_s, server_addr, len),
|
||||
"bind failed with error %s", strerror(errno));
|
||||
|
||||
pid = fork();
|
||||
|
|
@ -337,8 +339,8 @@ setup(struct sockaddr_storage *to, uint16_t idx)
|
|||
pfh = pidfile_open(pidfile, 0644, NULL);
|
||||
ATF_REQUIRE_MSG(pfh != NULL,
|
||||
"pidfile_open: %s", strerror(errno));
|
||||
ATF_REQUIRE_EQ(pidfile_write(pfh), 0);
|
||||
ATF_REQUIRE_EQ(pidfile_close(pfh), 0);
|
||||
ATF_REQUIRE_EQ(0, pidfile_write(pfh));
|
||||
ATF_REQUIRE_EQ(0, pidfile_close(pfh));
|
||||
|
||||
bzero(argv, sizeof(argv));
|
||||
argv[0] = execname;
|
||||
|
|
@ -348,9 +350,9 @@ setup(struct sockaddr_storage *to, uint16_t idx)
|
|||
if (s_flag)
|
||||
argv[argv_idx++] = s_flag_str;
|
||||
argv[argv_idx++] = pwd;
|
||||
ATF_REQUIRE_EQ(dup2(server_s, STDOUT_FILENO), STDOUT_FILENO);
|
||||
ATF_REQUIRE_EQ(dup2(server_s, STDIN_FILENO), STDIN_FILENO);
|
||||
ATF_REQUIRE_EQ(dup2(server_s, STDERR_FILENO), STDERR_FILENO);
|
||||
ATF_REQUIRE_EQ(STDOUT_FILENO, dup2(server_s, STDOUT_FILENO));
|
||||
ATF_REQUIRE_EQ(STDIN_FILENO, dup2(server_s, STDIN_FILENO));
|
||||
ATF_REQUIRE_EQ(STDERR_FILENO, dup2(server_s, STDERR_FILENO));
|
||||
execv(execname, argv);
|
||||
atf_tc_fail("exec failed");
|
||||
break;
|
||||
|
|
@ -433,13 +435,13 @@ TFTPD_TC_DEFINE(abspath,)
|
|||
*/
|
||||
TFTPD_TC_DEFINE(dotdot,)
|
||||
{
|
||||
ATF_REQUIRE_EQ(mkdir("subdir", 0777), 0);
|
||||
ATF_REQUIRE_EQ(0, mkdir("subdir", 0777));
|
||||
SEND_RRQ("../disallowed.txt", "octet");
|
||||
RECV_ERROR(2, "Access violation");
|
||||
s = setup(&addr, __COUNTER__); \
|
||||
s = setup(&addr, __COUNTER__);
|
||||
SEND_RRQ("subdir/../../disallowed.txt", "octet");
|
||||
RECV_ERROR(2, "Access violation");
|
||||
s = setup(&addr, __COUNTER__); \
|
||||
s = setup(&addr, __COUNTER__);
|
||||
SEND_RRQ("/etc/passwd", "octet");
|
||||
RECV_ERROR(2, "Access violation");
|
||||
}
|
||||
|
|
@ -447,7 +449,8 @@ TFTPD_TC_DEFINE(dotdot,)
|
|||
/*
|
||||
* With "-s", tftpd should chroot to the specified directory
|
||||
*/
|
||||
TFTPD_TC_DEFINE(s_flag, atf_tc_set_md_var(tc, "require.user", "root");,
|
||||
TFTPD_TC_DEFINE(s_flag,
|
||||
atf_tc_set_md_var(tc, "require.user", "root");,
|
||||
s_flag = true)
|
||||
{
|
||||
int fd;
|
||||
|
|
@ -764,13 +767,13 @@ TFTPD_TC_DEFINE(unknown_modes,)
|
|||
{
|
||||
SEND_RRQ("foo.txt", "ascii"); /* Misspelling of "ascii" */
|
||||
RECV_ERROR(4, "Illegal TFTP operation");
|
||||
s = setup(&addr, __COUNTER__); \
|
||||
s = setup(&addr, __COUNTER__);
|
||||
SEND_RRQ("foo.txt", "binary"); /* Obsolete. Use "octet" instead */
|
||||
RECV_ERROR(4, "Illegal TFTP operation");
|
||||
s = setup(&addr, __COUNTER__); \
|
||||
s = setup(&addr, __COUNTER__);
|
||||
SEND_RRQ("foo.txt", "en_US.UTF-8");
|
||||
RECV_ERROR(4, "Illegal TFTP operation");
|
||||
s = setup(&addr, __COUNTER__); \
|
||||
s = setup(&addr, __COUNTER__);
|
||||
SEND_RRQ("foo.txt", "mail"); /* Obsolete in RFC-1350 */
|
||||
RECV_ERROR(4, "Illegal TFTP operation");
|
||||
}
|
||||
|
|
@ -1107,8 +1110,8 @@ TFTPD_TC_DEFINE(wrq_truncate,)
|
|||
send_data(1, NULL, 0);
|
||||
recv_ack(1);
|
||||
|
||||
ATF_REQUIRE_EQ(stat("small.txt", &sb), 0);
|
||||
ATF_REQUIRE_EQ(sb.st_size, 0);
|
||||
ATF_REQUIRE_EQ(0, stat("small.txt", &sb));
|
||||
ATF_REQUIRE_EQ(0, sb.st_size);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue