"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/lib-smtp/test-smtp-server-errors.c" between
dovecot-2.3.16.tar.gz and dovecot-2.3.17.tar.gz

About: Dovecot is an IMAP and POP3 server, written with security primarily in mind.

[ To the main dovecot source changes report ]

test-smtp-server-errors.c  (dovecot-2.3.16):test-smtp-server-errors.c  (dovecot-2.3.17)
skipping to change at line 2576 skipping to change at line 2576
static void test_bad_pipelined_data(void) static void test_bad_pipelined_data(void)
{ {
struct smtp_server_settings smtp_server_set; struct smtp_server_settings smtp_server_set;
test_server_defaults(&smtp_server_set); test_server_defaults(&smtp_server_set);
smtp_server_set.capabilities = smtp_server_set.capabilities =
SMTP_CAPABILITY_BINARYMIME | SMTP_CAPABILITY_CHUNKING; SMTP_CAPABILITY_BINARYMIME | SMTP_CAPABILITY_CHUNKING;
smtp_server_set.max_client_idle_time_msecs = 1000; smtp_server_set.max_client_idle_time_msecs = 1000;
smtp_server_set.max_recipients = 10; smtp_server_set.max_recipients = 10;
smtp_server_set.max_pipelined_commands = 16;
test_begin("Bad pipelined DATA"); test_begin("Bad pipelined DATA");
test_run_client_server(&smtp_server_set, test_run_client_server(&smtp_server_set,
test_server_bad_pipelined_data, test_server_bad_pipelined_data,
test_client_bad_pipelined_data, 1); test_client_bad_pipelined_data, 1);
test_end(); test_end();
} }
/* /*
* Bad pipelined DATA #2
*/
/* client */
static void test_bad_pipelined_data2_connected(struct client_connection *conn)
{
o_stream_nsend_str(conn->conn.output,
"MAIL FROM:<frop@example.com>\r\n"
"DATA\r\n"
"DATA\r\n"
"RCPT TO:<frop@example.com>\r\n"
"BDAT 0\r\n");
}
static void test_client_bad_pipelined_data2(unsigned int index)
{
test_client_connected = test_bad_pipelined_data2_connected;
test_client_run(index);
}
/* server */
struct _bad_pipelined_data2 {
struct istream *payload_input;
struct io *io;
};
static void
test_server_bad_pipelined_data2_trans_free(
void *conn_ctx ATTR_UNUSED, struct smtp_server_transaction *trans)
{
struct _bad_pipelined_data2 *ctx = trans->context;
i_free(ctx);
io_loop_stop(ioloop);
}
static int
test_server_bad_pipelined_data2_rcpt(
void *conn_ctx ATTR_UNUSED, struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
struct smtp_server_recipient *rcpt)
{
if (debug) {
i_debug("RCPT TO:%s",
smtp_address_encode(rcpt->path));
}
return 1;
}
static int
test_server_bad_pipelined_data2_data_begin(
void *conn_ctx ATTR_UNUSED, struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
struct smtp_server_transaction *trans, struct istream *data_input)
{
struct _bad_pipelined_data2 *ctx;
if (debug)
i_debug("DATA");
ctx = i_new(struct _bad_pipelined_data2, 1);
trans->context = ctx;
ctx->payload_input = data_input;
return 0;
}
static int
test_server_bad_pipelined_data2_data_continue(
void *conn_ctx ATTR_UNUSED, struct smtp_server_cmd_ctx *cmd,
struct smtp_server_transaction *trans ATTR_UNUSED)
{
struct _bad_pipelined_data2 *ctx = trans->context;
size_t size;
ssize_t ret;
while ((ret = i_stream_read(ctx->payload_input)) > 0 || ret == -2) {
size = i_stream_get_data_size(ctx->payload_input);
i_stream_skip(ctx->payload_input, size);
}
if (ret == 0)
return 0;
if (ret < 0 && ctx->payload_input->stream_errno != 0) {
/* Client probably disconnected */
return -1;
}
smtp_server_reply_all(cmd, 250, "2.0.0", "Accepted");
return 1;
}
static void
test_server_bad_pipelined_data2(const struct smtp_server_settings *server_set)
{
server_callbacks.conn_trans_free =
test_server_bad_pipelined_data2_trans_free;
server_callbacks.conn_cmd_rcpt =
test_server_bad_pipelined_data2_rcpt;
server_callbacks.conn_cmd_data_begin =
test_server_bad_pipelined_data2_data_begin;
server_callbacks.conn_cmd_data_continue =
test_server_bad_pipelined_data2_data_continue;
test_server_run(server_set);
}
/* test */
static void test_bad_pipelined_data2(void)
{
struct smtp_server_settings smtp_server_set;
test_server_defaults(&smtp_server_set);
smtp_server_set.capabilities =
SMTP_CAPABILITY_BINARYMIME | SMTP_CAPABILITY_CHUNKING;
smtp_server_set.max_client_idle_time_msecs = 1000;
smtp_server_set.max_recipients = 10;
smtp_server_set.max_pipelined_commands = 16;
test_begin("Bad pipelined DATA #2");
test_run_client_server(&smtp_server_set,
test_server_bad_pipelined_data2,
test_client_bad_pipelined_data2, 1);
test_end();
}
/*
* DATA with BINARYMIME * DATA with BINARYMIME
*/ */
/* client */ /* client */
static void test_data_binarymime_connected(struct client_connection *conn) static void test_data_binarymime_connected(struct client_connection *conn)
{ {
o_stream_nsend_str(conn->conn.output, o_stream_nsend_str(conn->conn.output,
"EHLO frop\r\n" "EHLO frop\r\n"
"MAIL FROM:<sender@example.com> BODY=BINARYMIME\r\n" "MAIL FROM:<sender@example.com> BODY=BINARYMIME\r\n"
skipping to change at line 2907 skipping to change at line 3035
smtp_server_set.max_client_idle_time_msecs = 1000; smtp_server_set.max_client_idle_time_msecs = 1000;
test_begin("MAIL broken path"); test_begin("MAIL broken path");
test_run_client_server(&smtp_server_set, test_run_client_server(&smtp_server_set,
test_server_mail_broken_path, test_server_mail_broken_path,
test_client_mail_broken_path, 18); test_client_mail_broken_path, 18);
test_end(); test_end();
} }
/* /*
* Bad pipelined MAIL
*/
/* client */
static void test_bad_pipelined_mail_connected(struct client_connection *conn)
{
o_stream_nsend_str(conn->conn.output,
"MAIL FROM:<user1@example.com>\r\n"
"RCPT TO:<user2@example.com>\r\n"
"RCPT TO:<user3@example.com>\r\n"
"MAIL FROM:<user4@example.com>\r\n"
"DATA\r\n"
"FROP!\r\n"
".\r\n"
"QUIT\r\n");
}
static void test_client_bad_pipelined_mail(unsigned int index)
{
test_client_connected = test_bad_pipelined_mail_connected;
test_client_run(index);
}
/* server */
struct _bad_pipelined_mail {
struct istream *payload_input;
struct io *io;
};
static void
test_server_bad_pipelined_mail_trans_free(
void *conn_ctx ATTR_UNUSED, struct smtp_server_transaction *trans)
{
struct _bad_pipelined_mail *ctx = trans->context;
i_free(ctx);
io_loop_stop(ioloop);
}
static int
test_server_bad_pipelined_mail_rcpt(
void *conn_ctx ATTR_UNUSED, struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
struct smtp_server_recipient *rcpt)
{
if (debug) {
i_debug("RCPT TO:%s",
smtp_address_encode(rcpt->path));
}
return 1;
}
static int
test_server_bad_pipelined_mail_data_begin(
void *conn_ctx ATTR_UNUSED, struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
struct smtp_server_transaction *trans, struct istream *data_input)
{
struct _bad_pipelined_mail *ctx;
if (debug)
i_debug("DATA");
ctx = i_new(struct _bad_pipelined_mail, 1);
trans->context = ctx;
ctx->payload_input = data_input;
return 0;
}
static int
test_server_bad_pipelined_mail_data_continue(
void *conn_ctx ATTR_UNUSED, struct smtp_server_cmd_ctx *cmd,
struct smtp_server_transaction *trans ATTR_UNUSED)
{
struct _bad_pipelined_mail *ctx = trans->context;
size_t size;
ssize_t ret;
while ((ret = i_stream_read(ctx->payload_input)) > 0 || ret == -2) {
size = i_stream_get_data_size(ctx->payload_input);
i_stream_skip(ctx->payload_input, size);
}
if (ret == 0)
return 0;
if (ret < 0 && ctx->payload_input->stream_errno != 0) {
/* Client probably disconnected */
return -1;
}
smtp_server_reply_all(cmd, 250, "2.0.0", "Accepted");
return 1;
}
static void
test_server_bad_pipelined_mail(const struct smtp_server_settings *server_set)
{
server_callbacks.conn_trans_free =
test_server_bad_pipelined_mail_trans_free;
server_callbacks.conn_cmd_rcpt =
test_server_bad_pipelined_mail_rcpt;
server_callbacks.conn_cmd_data_begin =
test_server_bad_pipelined_mail_data_begin;
server_callbacks.conn_cmd_data_continue =
test_server_bad_pipelined_mail_data_continue;
test_server_run(server_set);
}
/* test */
static void test_bad_pipelined_mail(void)
{
struct smtp_server_settings smtp_server_set;
test_server_defaults(&smtp_server_set);
smtp_server_set.capabilities =
SMTP_CAPABILITY_BINARYMIME | SMTP_CAPABILITY_CHUNKING;
smtp_server_set.max_client_idle_time_msecs = 1000;
smtp_server_set.max_recipients = 10;
smtp_server_set.max_pipelined_commands = 16;
test_begin("Bad pipelined MAIL");
test_run_client_server(&smtp_server_set,
test_server_bad_pipelined_mail,
test_client_bad_pipelined_mail, 1);
test_end();
}
/*
* All tests * All tests
*/ */
static void (*const test_functions[])(void) = { static void (*const test_functions[])(void) = {
test_slow_server, test_slow_server,
test_slow_client, test_slow_client,
test_hanging_command_payload, test_hanging_command_payload,
test_bad_command, test_bad_command,
test_many_bad_commands, test_many_bad_commands,
test_long_command, test_long_command,
skipping to change at line 2929 skipping to change at line 3187
test_bad_mail, test_bad_mail,
test_bad_rcpt, test_bad_rcpt,
test_bad_vrfy, test_bad_vrfy,
test_bad_noop, test_bad_noop,
test_mail_workarounds, test_mail_workarounds,
test_rcpt_workarounds, test_rcpt_workarounds,
test_too_many_recipients, test_too_many_recipients,
test_data_no_mail, test_data_no_mail,
test_data_no_rcpt, test_data_no_rcpt,
test_bad_pipelined_data, test_bad_pipelined_data,
test_bad_pipelined_data2,
test_data_binarymime, test_data_binarymime,
test_mail_broken_path, test_mail_broken_path,
test_bad_pipelined_mail,
NULL NULL
}; };
/* /*
* Test client * Test client
*/ */
/* client connection */ /* client connection */
static void client_connection_input(struct connection *_conn) static void client_connection_input(struct connection *_conn)
 End of changes. 5 change blocks. 
0 lines changed or deleted 260 lines changed or added
To the C Programs section of the dovecot source changes report or the top of this page
Mainly generated by pkgdiff using rfcdiff
Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)