 @@ -1,31 +1,79 @@
-$NetBSD: patch-aa,v 1.3 2010/04/17 21:11:18 tez Exp $
+$NetBSD: patch-aa,v 1.4 2010/09/10 23:33:42 gdt Exp $
 Added CVE-2010-1132 patch from:
- https://bugzilla.redhat.com/attachment.cgi?id=401011
+This patch has hunks for three separate reasons:
---- spamass-milter.cpp.orig	2010-04-17 16:04:59.724786300 -0500
+) Ancient fix to avoid going beyond s2.
 +++ spamass-milter.cpp	2010-04-17 16:05:04.755469800 -0500
-@@ -171,10 +171,6 @@
+) Added CVE-2010-1132 patch from:
   https://bugzilla.redhat.com/attachment.cgi?id=401011
 ) (Most of, some in .h) patch to add option to not scan mail from
 authenticated users, from:
   http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2006-November/106024.html
 --- spamass-milter.cpp.orig	2010-09-10 15:50:58.000000000 +0000
 +++ spamass-milter.cpp
@@ -170,10 +170,7 @@ char *spambucket;
  bool flag_full_email = false;		/* pass full email address to spamc */
  bool flag_expand = false;	/* alias/virtusertable expansion */
  bool warnedmacro = false;	/* have we logged that we couldn't fetch a macro? */
+-
 -#if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
 -static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;
 -#endif
 +bool auth = false;		/* don't scan authenticated users */
  // {{{ main()
- int
+@@ -181,7 +178,7 @@ int
-@@ -461,59 +457,24 @@
+ main(int argc, char* argv[])
+ {
     int c, err = 0;
 -   const char *args = "fd:mMp:P:r:u:D:i:b:B:e:x";
 +   const char *args = "fd:mMp:P:r:u:D:i:b:B:e:xa";
     char *sock = NULL;
     bool dofork = false;
     char *pidfilename = NULL;
@@ -196,6 +193,9 @@ main(int argc, char* argv[])
  	/* Process command line options */
  	while ((c = getopt(argc, argv, args)) != -1) {
  		switch (c) {
 +			case 'a':
 +				auth = true;
 +				break;
  			case 'f':
  				dofork = true;
  				break;
@@ -281,7 +281,7 @@ main(int argc, char* argv[])
        cout << "SpamAssassin Sendmail Milter Plugin" << endl;
        cout << "Usage: spamass-milter -p socket [-b|-B bucket] [-d xx[,yy...]] [-D host]" << endl;
        cout << "                      [-e defaultdomain] [-f] [-i networks] [-m] [-M]" << endl;
 -      cout << "                      [-P pidfile] [-r nn] [-u defaultuser] [-x]" << endl;
 +      cout << "                      [-P pidfile] [-r nn] [-u defaultuser] [-x] [-a]" << endl;
        cout << "                      [-- spamc args ]" << endl;
        cout << "   -p socket: path to create socket" << endl;
        cout << "   -b bucket: redirect spam to this mail address.  The orignal" << endl;
@@ -302,6 +302,7 @@ main(int argc, char* argv[])
        cout << "   -u defaultuser: pass the recipient's username to spamc.\n"
                "          Uses 'defaultuser' if there are multiple recipients." << endl;
        cout << "   -x: pass email address through alias and virtusertable expansion." << endl;
 +      cout << "   -a: don't scan messages over an authenticated connection." << endl;
        cout << "   -- spamc args: pass the remaining flags to spamc." << endl;
        exit(EX_USAGE);
@@ -461,59 +462,24 @@ assassinate(SMFICTX* ctx, SpamAssassin*
  			   send another copy.  The milter API will not let you send the
  			   message AND return a failure code to the sender, so this is
  			   the only way to do it. */
 -#if defined(__FreeBSD__)
 -			int rv;
 -#endif
+-
 -#if defined(HAVE_ASPRINTF)
 -			char *buf;
 -#else
 -			char buf[1024];
 -#endif
 -			char *fmt="%s \"%s\"";
 @@ -74,94 +122,110 @@ Added CVE-2010-1132 patch from:
 -			rv = pthread_mutex_unlock(&popen_mutex);
 -			if (rv)
 -			{
 -				debug(D_ALWAYS, "Could not unlock popen mutex: %s", strerror(rv));
 -				abort();
 -			}
 -#endif
 -#if defined(HAVE_ASPRINTF)
 -			free(buf);
 -#endif
+ 		}
  		return SMFIS_REJECT;
+ 	}
-@@ -842,30 +803,19 @@
+@@ -783,6 +749,15 @@ mlfi_envfrom(SMFICTX* ctx, char** envfro
+   }
    /* debug(D_ALWAYS, "ZZZ got private context %p", sctx); */
 +  if (auth) {
 +    const char *auth_type = smfi_getsymval(ctx, "{auth_type}");
++
 +    if (auth_type) {
 +      debug(D_MISC, "auth_type=%s", auth_type);
 +      return SMFIS_ACCEPT;
 +    }
 +  }
++
    debug(D_FUNC, "mlfi_envfrom: enter");
    try {
      // launch new SpamAssassin
@@ -842,30 +817,19 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp
  		/* open a pipe to sendmail so we can do address expansion */
  		char buf[1024];
 -		char *fmt="%s -bv \"%s\" 2>&1";
+-
 -#if defined(HAVE_SNPRINTF)
 -		snprintf(buf, sizeof(buf)-1, fmt, SENDMAIL, envrcpt[0]);
 -#else
 -		/* XXX possible buffer overflow here */
 -		sprintf(buf, fmt, SENDMAIL, envrcpt[0]);
 -#endif
+-
 -		debug(D_RCPT, "calling %s", buf);
 +		char *popen_argv[4];
++
 +		popen_argv[0] = SENDMAIL;
 +		popen_argv[1] = "-bv";
 +		popen_argv[2] = envrcpt[0];
 +		popen_argv[3] = NULL;
 -		debug(D_RCPT, "calling %s", buf);
 +		debug(D_RCPT, "calling %s -bv %s", SENDMAIL, envrcpt[0]);
 -#if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
 -		rv = pthread_mutex_lock(&popen_mutex);
 -		if (rv)
 -		{
 -			debug(D_ALWAYS, "Could not lock popen mutex: %s", strerror(rv));
 -			abort();
 -		}
 -#endif
 +		debug(D_RCPT, "calling %s -bv %s", SENDMAIL, envrcpt[0]);
 -		p = popen(buf, "r");
 +		p = popenv(popen_argv, "r");
  		if (!p)
+ 		{
 -			debug(D_RCPT, "popen failed(%s).  Will not expand aliases", strerror(errno));
 +			debug(D_RCPT, "popenv failed(%s).  Will not expand aliases", strerror(errno));
  			assassin->expandedrcpt.push_back(envrcpt[0]);
  		} else
+ 		{
-@@ -890,16 +840,8 @@
+@@ -890,16 +854,8 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp
  					assassin->expandedrcpt.push_back(p+7);
+ 				}
+ 			}
 -			pclose(p); p = NULL;
 +			fclose(p); p = NULL;
+ 		}
 -#if defined(__FreeBSD__)
 -		rv = pthread_mutex_unlock(&popen_mutex);
 -		if (rv)
 -		{
 -			debug(D_ALWAYS, "Could not unlock popen mutex: %s", strerror(rv));
 -			abort();
 -		}
 -#endif
  	} else
+ 	{
  		assassin->expandedrcpt.push_back(envrcpt[0]);
-@@ -2033,7 +1975,7 @@
+@@ -2033,7 +1989,7 @@ cmp_nocase_partial(const string& s, cons
    string::const_iterator p=s.begin();
    string::const_iterator p2=s2.begin();
 -  while ( p != s.end() && p2 <= s2.end() ) {
 +  while ( p != s.end() ) {
      if (toupper(*p) != toupper(*p2))
+     {
        debug(D_STR, "c_nc_p: <%s><%s> : miss", s.c_str(), s2.c_str());
-@@ -2157,5 +2099,71 @@
+@@ -2157,5 +2113,71 @@ void warnmacro(char *macro, char *scope)
  	warnedmacro = true;
+ }
 +/*
 +   untrusted-argument-safe popen function - only supports "r" and "w" modes
 +   for simplicity, and always reads stdout and stderr in "r" mode.  Call
 +   fclose to close the FILE.
 +*/
 +FILE *popenv(char *const argv[], const char *type)
 +{
 +	FILE *iop;
 +	int pdes[2];
 +	int save_errno;

 @@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.9 2010/06/05 13:45:12 gdt Exp $
+$NetBSD: distinfo,v 1.10 2010/09/10 23:33:42 gdt Exp $
 SHA1 (spamass-milter-0.3.1.tar.gz) = dd488eb9ab1f230440fba8a729bee80550f2fbff
 RMD160 (spamass-milter-0.3.1.tar.gz) = 5db6af6b31de1bf83eafbd9713d81cdc957b5033
 Size (spamass-milter-0.3.1.tar.gz) = 141144 bytes
 SHA1 (spamass-milter-001.patch) = d37227f95808479dc4d6ba5c76ddd2413b4530d3
 RMD160 (spamass-milter-001.patch) = eef17cb4506e6f5c0908b6872b7fb5dcd8bc2e16
 Size (spamass-milter-001.patch) = 2435 bytes
-SHA1 (patch-aa) = c69afbafaba72ec59f77f024e2421b2df077a2ee
+SHA1 (patch-aa) = 13ba0413c28d14cd1a18d42a0b09ca26b358d913
-SHA1 (patch-ab) = 5e7188cc212cc0b06671853fb13921e2e0f38c8c
+SHA1 (patch-ab) = 03f7d4abc24e950fd44a4adbb708f3433d111643
 SHA1 (patch-ac) = 851cbceab64b1a391cfe0aad0ba5a86c88218eb0

 @@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2010/04/17 21:11:18 tez Exp $
+$NetBSD: patch-ab,v 1.2 2010/09/10 23:33:42 gdt Exp $
 CVE-2010-1132 patch from https://bugzilla.redhat.com/attachment.cgi?id=401011
---- spamass-milter.h	7 Apr 2005 02:04:24 -0000	1.23
+--- spamass-milter.h.orig	2006-03-23 22:07:55.000000000 +0000
-+++ spamass-milter.h	10 Mar 2010 18:52:22 -0000
++++ spamass-milter.h
-@@ -186,5 +186,6 @@
+@@ -186,5 +186,6 @@ int ip_in_networklist(struct in_addr ip,
  void parse_debuglevel(char* string);
  char *strlwr(char *str);
  void warnmacro(char *macro, char *scope);
 +FILE *popenv(char *const argv[], const char *type);
  #endif