@@ -1,3 +1,9 @@

+Mon Feb 16 23:56:34 EET 2009 (edwin)

+------------------------------------

+ * clamd/clamd.c, clamd/server-th.c, unit_tests/check_clamd.c,

+ unit_tests/check_clamd.sh: fix typo.  add another stress test.

+ Don't leak file descriptors.  Fix IDSESSION delimiter handling.

+

 Mon Feb 16 20:53:45 EET 2009 (edwin)

 ------------------------------------

  * clamd/thrmgr.c: fix valgrind warning about locking order

@@ -289,7 +289,7 @@ int main(int argc, char **argv)

     min_port = optget(opts, "StreamMinPort")->numarg;

     max_port = optget(opts, "StreamMaxPort")->numarg;

     if (min_port < 1024 || min_port > max_port || max_port > 65535) {

-	logg("!Invalid StreaMinPort/StreamMaxPort: %d, %d\n", min_port, max_port);

+	logg("!Invalid StreamMinPort/StreamMaxPort: %d, %d\n", min_port, max_port);

 	ret = 1;

 	break;

     }

@@ -256,7 +256,7 @@ static const char *get_cmd(struct fd_buf *buf, size_t off, size_t *len, char *te

     }

     *term = '\n';

-    switch (buf->buffer[0]) {

+    switch (buf->buffer[off]) {

 	/* commands terminated by delimiters */

 	case 'z':

 	    *term = '\0';

@@ -953,6 +953,10 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 		    }

 		    conn.id++;

 		}

+		if (conn.scanfd != -1 && conn.scanfd != buf->dumpfd) {

+		    logg("*Unclaimed file descriptor received, closing: %d\n", conn.scanfd);

+		    close(conn.scanfd);

+		}

 		buf->mode = conn.mode;

 		buf->id = conn.id;

 		buf->group = conn.group;

@@ -95,6 +95,8 @@ static void commands_teardown(void)

     fail_unless_fmt(rc != -1, "Failed to unlink access denied testfile: %s\n", strerror(errno));

 }

+#define VERSION_REPLY "ClamAV "REPO_VERSION""VERSION_SUFFIX

+

 static struct basic_test {

     const char *command;

     const char *extra;

@@ -102,7 +104,7 @@ static struct basic_test {

 } basic_tests[] = {

     {"PING", NULL, "PONG"},

     {"RELOAD", NULL, "RELOADING"},

-    {"VERSION", NULL, "ClamAV "REPO_VERSION""VERSION_SUFFIX},

+    {"VERSION", NULL, VERSION_REPLY},

     {"SCAN "SCANFILE, NULL, FOUNDREPLY},

     {"SCAN "CLEANFILE, NULL, CLEANREPLY},

     {"CONTSCAN "SCANFILE, NULL, FOUNDREPLY},

@@ -130,7 +132,7 @@ static struct basic_test {

     {"FILDES", "X", "No file descriptor received. ERROR"}, /* FILDES w/o ancillary data */

 };

-static void *recvfull(int sd, size_t *len)

+static void *recvpartial(int sd, size_t *len, int partial)

 {

     char *buf = NULL;

     size_t off = 0;

@@ -147,12 +149,17 @@ static void *recvfull(int sd, size_t *len)

 	rc = recv(sd, buf + off, BUFSIZ, 0);

 	fail_unless_fmt(rc != -1, "recv() failed: %s\n", strerror(errno));

 	off += rc;

-    } while (rc);

+    } while (rc && (!partial || !memchr(buf, '\0', off)));

     *len = off;

     buf[*len] = '\0';

     return buf;

 }

+static void *recvfull(int sd, size_t *len)

+{

+    return recvpartial(sd, len, 0);

+}

+

 static void test_command(const char *cmd, size_t len, const char *extra, const char *expect, size_t expect_len)

 {

     void *recvdata;

@@ -464,6 +471,45 @@ START_TEST (test_fildes_many)

 }

 END_TEST

+START_TEST (test_fildes_unwanted)

+{

+    char buf[BUFSIZ];

+    size_t i;

+    int dummyfd;

+    char *data, *p;

+    size_t len;

+

+    conn_setup();

+    dummyfd = open(SCANFILE, O_RDONLY);

+

+    fail_unless_fmt(send(sockd, "zIDSESSION", sizeof("zIDSESSION"), 0) == sizeof("zIDSESSION"),

+		    "send() failed: %s\n", strerror(errno));

+    for (i=0;i < 1024; i++) {

+	snprintf(buf, sizeof(buf), "%u", i+1);

+	/* send a 'zVERSION\0' including the ancillary data.

+	 * The \0 is from the extra char needed when sending ancillary data */

+	fail_unless_fmt(sendmsg_fd(sockd, "zVERSION", sizeof("zVERSION")-1, dummyfd, 1) != -1,

+			"sendmsg (%u) failed: %s\n", i, strerror(errno));

+/*	fail_unless(send(sockd, "zVERSION", sizeof("zVERSION"), 0) == sizeof("zVERSION"),

+		    "send failed: %s\n",strerror(errno));*/

+	data = recvpartial(sockd, &len, 1);

+	p = strchr(data, ':');

+	fail_unless_fmt(!!p, "wrong VERSION reply (%u): %s\n", i, data);

+	*p++ = '\0';

+	fail_unless_fmt(*p == ' ', "wrong VERSION reply (%u): %s\n", i, p);

+	*p++  = '\0';

+

+	fail_unless_fmt(!strcmp(p, VERSION_REPLY), "wrong VERSION reply: %s\n", data);

+	fail_unless_fmt(!strcmp(data, buf), "wrong IDSESSION id: %s\n", data);

+

+	free(data);

+    }

+

+    close(dummyfd);

+    conn_teardown();

+}

+END_TEST

+

 static Suite *test_clamd_suite(void)

 {

     Suite *s = suite_create("clamd");

@@ -481,6 +527,7 @@ static Suite *test_clamd_suite(void)

     tc_stress = tcase_create("clamd stress test");

     suite_add_tcase(s, tc_stress);

     tcase_add_test(tc_stress, test_fildes_many);

+    tcase_add_test(tc_stress, test_fildes_unwanted);

     return s;

 }

@@ -52,6 +52,10 @@ scan_failed() {

 start_clamd()

 {

 	rm -f clamd-test.log

+	$LTEXEC $CLAMD_WRAPPER $TOP/clamd/clamd -c $1 --help >clamd-test.log || 

+		{ error "Failed to start clamd --help!"; die 1; }

+	grep "Clam AntiVirus Daemon" clamd-test.log >/dev/null ||

+		{ error "Wrong --help reply from clamd!"; die 1; }

 	$LTEXEC $CLAMD_WRAPPER $TOP/clamd/clamd -c $1 || 

 		{ error "Failed to start clamd!"; die 1; }

 }

@@ -159,13 +163,15 @@ EOF

 rm -rf clamdtest$CLAMD_TEST_UNIQ1 clamdtest$CLAMD_TEST_UNIQ2

 mkdir clamdtest$CLAMD_TEST_UNIQ1 clamdtest$CLAMD_TEST_UNIQ2 || 

 	{ echo "Unable to create temporary directories!"; exit 1; }

-	

+

 # Prepare configuration for clamd #1 and #2

 (prepare_clamd $CLAMD_TEST_UNIQ1)

 (prepare_clamd $CLAMD_TEST_UNIQ2)

 # Add clamd #2 specific configuration

 echo "VirusEvent $abs_srcdir/virusaction-test.sh `pwd`/clamdtest$CLAMD_TEST_UNIQ2 \"Virus found: %v\"" >>clamdtest$CLAMD_TEST_UNIQ2/test-clamd.conf

 echo "HeuristicScanPrecedence yes" >>clamdtest$CLAMD_TEST_UNIQ2/test-clamd.conf

+grep -v LogFile clamdtest$CLAMD_TEST_UNIQ2/test-clamd.conf >tmp__

+mv tmp__ clamdtest$CLAMD_TEST_UNIQ2/test-clamd.conf

 # Start clamd #1 tests

 (cd clamdtest$CLAMD_TEST_UNIQ1