Merge pull request #36 from jcbf/jcbf/better-coverage

Better coverage.

run_tests.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
 for testfile in tests/* ; do
+	echo "#########################################"
+	echo "Running $testfile ..."
+	echo "#########################################"
 	miltertest -vv -s $testfile
 done

smf-spf-tests-q.conf

@@ -2,10 +2,11 @@ WhitelistIP     127.0.0.0/8
 RefuseFail      off     # (on|off)
 SoftFail       off      # (on|off)
 AcceptTempError off
-TagSubject      of      # (on|off)
+AddReceivedHeader on
+TagSubject      on      # (on|off)
 AddHeader       off     # (on|off)
 Quarantine      on      # (on|off)
-QuarantineBox   postmaster
+QuarantineBox 	postmaster
 TTL             60m
 User            nobody
 Socket          inet:2424@127.0.0.1

smf-spf-tests.conf

@@ -35,7 +35,7 @@ WhitelistFrom	friend2@mail.example.org
 # Performs a case insensitive substring match
 #
 WhitelistTo	postmaster@
-WhitelistTo	@example.com
+#WhitelistTo	@example.com
 WhitelistTo	spamlover@example.com
 
 # Refuse e-Mail messages at SPF Fail results (RFC-4408)

smf-spf.c

@@ -1054,19 +1054,19 @@ int main(int argc, char **argv) {
         syslog(LOG_INFO, "running as uid: %i, gid: %i", (int) pw->pw_uid, (int) pw->pw_gid);
     }
     if (smfi_setconn((char *)conf.sendmail_socket) != MI_SUCCESS) {
-	fprintf(stderr, "smfi_setconn failed: %s\n", conf.sendmail_socket);
+	fprintf(stderr, "smfi_setconn failed: %s\n", conf.sendmail_socket); // LCOV_EXCL_LINE
 	goto done;
     }
     if (smfi_register(smfilter) != MI_SUCCESS) {
-	fprintf(stderr, "smfi_register failed\n");
+	fprintf(stderr, "smfi_register failed\n"); // LCOV_EXCL_LINE
 	goto done;
     }
     if (!foreground && conf.daemonize && daemon(0, 0)) {
-	fprintf(stderr, "daemonize failed: %s\n", strerror(errno));
+	fprintf(stderr, "daemonize failed: %s\n", strerror(errno)); // LCOV_EXCL_LINE
 	goto done;
     }
     if (pthread_mutex_init(&cache_mutex, 0)) {
-	fprintf(stderr, "pthread_mutex_init failed\n");
+	fprintf(stderr, "pthread_mutex_init failed\n"); // LCOV_EXCL_LINE
 	goto done;
     }
     umask(0177);

tests/01-loadconfig-q.lua

@@ -0,0 +1,8 @@
+mt.startfilter("./smf-spf", "-f", "-c","./smf-spf-tests-q.conf")
+-- try to connect to it
+conn = mt.connect("inet:2424@127.0.0.1", 40, 0.25)
+if conn == nil then
+        error("mt.connect() failed")
+end
+
+print "Connect to Milter:  OK"

tests/01-loadconfig-refuse.lua

@@ -0,0 +1,8 @@
+mt.startfilter("./smf-spf", "-f", "-c","./smf-spf-tests-refuse.conf")
+-- try to connect to it
+conn = mt.connect("inet:2424@127.0.0.1", 40, 0.25)
+if conn == nil then
+        error("mt.connect() failed")
+end
+
+print "Connect to Milter:  OK"

tests/02-to-whitelisted.lua

@@ -0,0 +1,40 @@
+mt.echo("Ip address whitelisted")
+
+-- try to start the filter
+mt.startfilter("./smf-spf", "-f", "-c","./smf-spf-tests.conf")
+
+-- try to connect to it
+conn = mt.connect("inet:2424@127.0.0.1", 40, 0.25)
+if conn == nil then
+	error("mt.connect() failed")
+end
+
+-- send connection information
+
+mt.macro(conn, SMFIC_CONNECT, "j", "mta.name.local")
+if mt.conninfo(conn, "a.server.name.local", "10.0.0.1") ~= nil then
+	error("mt.conninfo() failed")
+end
+
+if mt.getreply(conn) ~= SMFIR_CONTINUE then
+        error("mt.conninfo() unexpected reply")
+end
+
+
+mt.macro(conn, SMFIC_MAIL, "i", "t-verify-malformed")
+if mt.mailfrom(conn, "<something@underspell.com>") ~= nil then
+        error("mt.mailfrom() failed")
+end
+if mt.getreply(conn) ~= SMFIR_CONTINUE then
+        error("mt.mailfrom() unexpected reply")
+end
+
+mt.macro(conn, SMFIC_RCPT, "i", "t-verify-malformed")
+if mt.rcptto(conn, "<spamlover@example.com>") ~= nil then
+        error("mt.mailfrom() failed")
+end
+if mt.getreply(conn) ~= SMFIR_ACCEPT then
+        error("mt.mailfrom() unexpected reply")
+end
+
+print ("Received SMFIR_ACCEPT");

tests/03-invalid-sender.lua

@@ -22,8 +22,8 @@ mt.macro(conn, SMFIC_MAIL, "i", "DEADBEAF")
 if mt.mailfrom(conn, "underspell.com") ~= nil then
         error("mt.mailfrom() failed")
 end
-if mt.getreply(conn) ~= SMFIR_REJECT then
+if mt.getreply(conn) ~= SMFIR_REPLYCODE then
         error("mt.mailfrom() unexpected reply")
 end
 
-print ("received SMFIR_REJECT ") 
+print ("received SMFIR_REPLYCODE ") 

tests/03-invalid-to.lua

@@ -29,8 +29,8 @@ mt.macro(conn, SMFIC_RCPT, "i", "t-verify-malformed")
 if mt.rcptto(conn, "user@underspell.com") ~= nil then
         error("mt.mailfrom() failed")
 end
-if mt.getreply(conn) ~= SMFIR_REJECT then
+if mt.getreply(conn) ~= SMFIR_REPLYCODE then
         error("mt.mailfrom() unexpected reply")
 end
 
-print ("received SMFIR_REJECT ") 
+print ("received SMFIR_REPLYCODE ") 

tests/04-fulltest-fail-tag.lua

@@ -0,0 +1,80 @@
+
+mt.echo("SPF fail  test")
+
+-- try to start the filter
+mt.startfilter("./smf-spf", "-f", "-c","./smf-spf-tests-q.conf")
+
+-- try to connect to it
+conn = mt.connect("inet:2424@127.0.0.1", 40, 0.25)
+if conn == nil then
+	error("mt.connect() failed")
+end
+
+-- send connection information
+-- mt.negotiate() is called implicitly
+mt.macro(conn, SMFIC_CONNECT, "j", "mta.name.local")
+if mt.conninfo(conn, "localhost", "10.11.12.13") ~= nil then
+	error("mt.conninfo() failed")
+end
+if mt.getreply(conn) ~= SMFIR_CONTINUE then
+	error("mt.conninfo() unexpected reply")
+end
+
+-- send envelope macros and sender data
+-- mt.helo() is called implicitly
+mt.macro(conn, SMFIC_MAIL, "i", "t-verify-malformed")
+if mt.mailfrom(conn, "<user@underspell.com>") ~= nil then
+	error("mt.mailfrom() failed")
+end
+if mt.getreply(conn) ~= SMFIR_CONTINUE then
+	error("mt.mailfrom() unexpected reply")
+end
+
+if mt.rcptto(conn, "<rcpt1@underspell.com>") ~= nil then
+	error("mt.rcptto(rcpt1@underspell.com) failed")
+end
+if mt.rcptto(conn, "<rcpt2@underspell.com>") ~= nil then
+	error("mt.rcptto(rcpt2@underspell.com) failed")
+end
+-- send headers
+-- mt.rcptto() is called implicitly
+if mt.header(conn, "From", "user") ~= nil then
+	error("mt.header(From) failed")
+end
+if mt.getreply(conn) ~= SMFIR_CONTINUE then
+	error("mt.header(From) unexpected reply")
+end
+if mt.header(conn, "Date", "Tue, 22 Dec 2009 13:04:12 -0800") ~= nil then
+	error("mt.header(Date) failed")
+end
+if mt.getreply(conn) ~= SMFIR_CONTINUE then
+	error("mt.header(Date) unexpected reply")
+end
+-- if mt.header(conn, "Subject", "Signing test") ~= nil then
+-- 	error("mt.header(Subject) failed")
+-- end
+-- if mt.getreply(conn) ~= SMFIR_CONTINUE then
+-- 	error("mt.header(Subject) unexpected reply")
+-- end
+
+-- end of message; let the filter react
+if mt.eom(conn) ~= nil then
+	error("mt.eom() failed")
+end
+
+-- verify that the right Authentication-Results header field got added
+if mt.eom_check(conn, MT_HDRCHANGE, "Subject") or
+   mt.eom_check(conn, MT_HDRADD, "Subject") or
+   mt.eom_check(conn, MT_HDRINSERT, "Subject") then
+	subject = mt.getheader(conn, "Subject", 0)
+	if subject ~= nil and 
+		string.find(subject, "SPF:fail", 1, true) == nil then
+		error("incorrect Subject")
+	else
+		mt.echo("Fail to find subject tag")
+	end
+else
+	error("missing Subject")
+end
+
+mt.disconnect(conn)

tests/04-fulltest-refusefail.lua

@@ -27,7 +27,7 @@ if mt.mailfrom(conn, "<user@underspell.com>") ~= nil then
 	error("mt.mailfrom() failed")
 end
 
-if mt.getreply(conn) ~= SMFIR_REPLYCODE then
+if mt.getreply(conn) ~= SMFIR_CONTINUE then
 	        error("mt.mailfrom() unexpected reply")
 end
 

tests/04-fulltest.lua

@@ -30,8 +30,11 @@ if mt.getreply(conn) ~= SMFIR_CONTINUE then
 	error("mt.mailfrom() unexpected reply")
 end
 
+mt.macro(conn, SMFIC_RCPT, "i", "t-verify-malformed")
+if mt.rcptto(conn, "<yada@bla.example.com>") ~= nil then
+        error("mt.mailfrom() failed")
+end
 -- send headers
--- mt.rcptto() is called implicitly
 if mt.header(conn, "From", "user") ~= nil then
 	error("mt.header(From) failed")
 end

tests/04-helo-pass.lua

@@ -67,7 +67,8 @@ end
 if mt.eom_check(conn, MT_HDRINSERT, "Authentication-Results") or
    mt.eom_check(conn, MT_HDRADD, "Authentication-Results") then
 	ar = mt.getheader(conn, "Authentication-Results", 0)
-	if string.find(ar, "spf=pass", 1, true) == nil then
+	if string.find(ar, "Authentication-Results", 1, true) == nil then
+--	if string.find(ar, "spf=pass", 1, true) == nil then
 		error("incorrect Authentication-Results field")
 	else
 		mt.echo("SPF pass ")