pkgsrc-bugs: pkg/26806: spamass-milter bugfix

Subject: pkg/26806: spamass-milter bugfix
To: None <gnats-bugs@gnats.netbsd.org>
From: None <toku@tokugawa.org>
List: pkgsrc-bugs
Date: 08/30/2004 13:48:36
>Number:         26806
>Category:       pkg
>Synopsis:       spamass-milter dies with a NULL body spam mail
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Aug 30 05:06:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Yoshitaka Tokugawa
>Release:        NetBSD 1.6.2_STABLE
>Organization:
WIDE Project
>Environment:
System: NetBSD tish.tokugawa.org 1.6.2_STABLE NetBSD 1.6.2_STABLE (NETBSD) #34: Thu Jul 29 18:50:43 JST 2004 toku@tish.tokugawa.org:/var/src/src/sys/arch/i386/compile/NETBSD i386
Architecture: i386
Machine: i386
>Description:
	1. The spamass-milter dies with a NULL body spam mail due to
	   incorrect BOB(Beginning Of Body) handling in 'assassinate()'.
	2. The spamass-milter does not detach from the controlling terminal.
	   So, it starts but quits soon by SIGHUP unexpectedly if I started
	   it from the /etc/rc script. Adding 'setsid()' solves this problem.
	3. The spamass-milter creates a faked "Received:" Header
	   to SA(SpamAssassin) makes happy. But due to incomplete work,
	   it does not recognized by SA as a Received Header.
>How-To-Repeat:
	Described above.
>Fix:
	I did my work based on spamass-milter-0.2.0 though the
	pkgsrc version is based on 0.1.3a. Here is my fix and
	complete tarball-kit for the pkgsrc/mail/spamass-milter.

--- spamass-milter.cpp.orig	Fri Jun 27 00:10:44 2003
+++ spamass-milter.cpp	Mon Aug 30 12:05:36 2004
@@ -273,6 +273,7 @@
 				exit(errno);
 				break;
 			case 0: /* Child */
+				(void) setsid();
 				break;
 			default: /* Parent */
 				exit(0);
@@ -351,6 +352,10 @@
   string::size_type eoh = ( eoh1 < eoh2 ? eoh1 : eoh2 );
   string::size_type bob = assassin->d().find_first_not_of("\r\n", eoh);
 
+  // In case of NULL body message
+  if (bob == string::npos)
+  	bob = assassin->d().size();
+
   update_or_insert(assassin, ctx, assassin->spam_flag(), &SpamAssassin::set_spam_flag, "X-Spam-Flag");
   update_or_insert(assassin, ctx, assassin->spam_status(), &SpamAssassin::set_spam_status, "X-Spam-Status");
 
@@ -686,14 +691,19 @@
 				(envelope-from $g)$.
 		   
 		*/
-		const char *macro_b, *macro_s;
+		const char *macro_b, *macro_s, *macro_r;
+		char date[32];	/* sizeof("Mon, 23 Aug 2004 18:28:43 +0900") */
+		time_t tval;
 
-		/* If the user did not enable the {b} macro in sendmail.cf
-		   just make it blank. Without this date SA can't do
-		   future/past validation on the Date: header */
+		/* Without this date SA can't do future/past validation
+		   on the Date: header */
 		macro_b = smfi_getsymval(ctx, "b");
 		if (!macro_b)
-			macro_b = "";
+		{
+			(void) time(&tval);
+			(void) strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", localtime(&tval));
+			macro_b = date;
+		}
 			
 		/* Sendmail currently cannot pass us the {s} macro, but
 		   I do not know why.  Leave this in for the day sendmail is
@@ -705,10 +715,18 @@
 			macro_s = sctx->helo;
 		if (!macro_s)
 			macro_s = "nohelo";
+		/* Get mailer info. */
+		macro_r = smfi_getsymval(ctx, "r");
+		if (!macro_r)
+			macro_r = "SMTP"; /* Assuming it as SMTP */
 
 		assassin->output((string)"X-Envelope-From: "+assassin->from()+"\r\n");
 		assassin->output((string)"X-Envelope-To: "+assassin->rcpt()+"\r\n");
-		assassin->output((string)"Received: from "+macro_s+" ("+smfi_getsymval(ctx,"_")+") by "+smfi_getsymval(ctx,"j")+"; "+macro_b+"\r\n");
+		assassin->output((string)"Received: from "+macro_s
+			+" ("+smfi_getsymval(ctx,"_")+")\n\tby "
+			+smfi_getsymval(ctx,"j")
+			+" ("+PACKAGE_NAME+"/"+PACKAGE_VERSION
+			+") with "+macro_r+";\n\t"+macro_b+"\r\n");
 
 	} else
 	{


begin 644 spamass-milter.tar.gz
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
/@`(*^#;P?]+-2`<`>```
`
end
>Release-Note:
>Audit-Trail:
>Unformatted: