X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fmalware.c;h=948aedea18f5880ce691c661dec03b8f99aee00f;hb=ecce6d9ac4fa63cc7e011c21a033f5b6c54a3995;hp=27bcc92255c6a94afb87b4017fed585dcceec7ad;hpb=e5ba8aa79be1a0abc55e5265f0195d43711f0aac;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/malware.c b/src/src/malware.c
index 27bcc9225..948aedea1 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -4,7 +4,7 @@
 
 /* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
  * License: GPL
- * Copyright (c) The Exim Maintainers 2017 - 2018
+ * Copyright (c) The Exim Maintainers 2015 - 2018
  */
 
 /* Code for calling virus (malware) scanners. Called from acl.c. */
@@ -70,8 +70,9 @@ static struct scan
 void
 features_malware(void)
 {
-struct scan * sc;
-uschar * s, * t;
+const struct scan * sc;
+const uschar * s;
+uschar * t;
 uschar buf[64];
 
 spf(buf, sizeof(buf), US"_HAVE_MALWARE_");
@@ -1276,7 +1277,7 @@ badseek:  err = errno;
       sep = pclose(scanner_out);
       signal(SIGCHLD,eximsigchld); signal(SIGPIPE,eximsigpipe);
       if (sep != 0)
-	  return m_errlog_defer(scanent, NULL, 
+	  return m_errlog_defer(scanent, NULL,
 	      sep == -1
 	      ? string_sprintf("running scanner failed: %s", strerror(sep))
 	      : string_sprintf("scanner returned error code: %d", sep));
@@ -1431,13 +1432,13 @@ badseek:  err = errno;
 	  sublist = scanner_options;
 	  if (!(cd->hostspec = string_nextinlist(&sublist, &subsep, NULL, 0)))
 	    {
-	    (void) m_errlog_defer(scanent, NULL, 
+	    (void) m_errlog_defer(scanent, NULL,
 		      string_sprintf("missing address: '%s'", scanner_options));
 	    continue;
 	    }
 	  if (!(s = string_nextinlist(&sublist, &subsep, NULL, 0)))
 	    {
-	    (void) m_errlog_defer(scanent, NULL, 
+	    (void) m_errlog_defer(scanent, NULL,
 		      string_sprintf("missing port: '%s'", scanner_options));
 	    continue;
 	    }
@@ -1892,6 +1893,7 @@ b_seek:   err = errno;
       uschar * scanrequest;
       enum {AVA_HELO, AVA_OPT, AVA_RSP, AVA_DONE} avast_stage;
       int nread;
+      int more_data;
 
       /* According to Martin Tuma @avast the protocol uses "escaped
       whitespace", that is, every embedded whitespace is backslash
@@ -1901,7 +1903,9 @@ b_seek:   err = errno;
       [+] - not infected
       [L] - infected
       [E] - some error occured
-      Such marker follows the first non-escaped TAB.  */
+      Such marker follows the first non-escaped TAB.  For more information
+      see avast-protocol(5)
+      */
       if (  (  !ava_re_clean
             && !(ava_re_clean = m_pcre_compile(ava_re_clean_str, &errstr)))
 	 || (  !ava_re_virus
@@ -1917,17 +1921,25 @@ b_seek:   err = errno;
 	int slen = Ustrlen(buf);
 	if (slen >= 1)
 	  {
-	  DEBUG(D_acl) debug_printf_indent("got from avast: %s\n", buf);
+
+          /* Multi line responses are bracketed between 210 … and nnn … */
+          if (Ustrncmp(buf, "210", 3) == 0)
+            {
+            more_data = 1;
+            continue;
+            }
+          else if (more_data && isdigit(buf[0])) more_data = 0;
+
 	  switch (avast_stage)
 	    {
 	    case AVA_HELO:
+              if (more_data) continue;
 	      if (Ustrncmp(buf, "220", 3) != 0)
 		goto endloop;			/* require a 220 */
 	      goto sendreq;
 
 	    case AVA_OPT:
-	      if (Ustrncmp(buf, "210", 3) == 0)
-		break;				/* ignore 210 responses */
+              if (more_data) continue;
 	      if (Ustrncmp(buf, "200", 3) != 0)
 		goto endloop;			/* require a 200 */
 
@@ -1940,11 +1952,13 @@ b_seek:   err = errno;
 		{
 		scanrequest = string_sprintf("%s\n", scanrequest);
 		avast_stage = AVA_OPT;		/* just sent option */
+		DEBUG(D_acl) debug_printf_indent("send to avast OPTION: %s", scanrequest);
 		}
 	      else
 		{
 		scanrequest = string_sprintf("SCAN %s\n", eml_dir);
 		avast_stage = AVA_RSP;		/* just sent command */
+		DEBUG(D_acl) debug_printf_indent("send to avast REQUEST: SCAN %s\n", eml_dir);
 		}
 
 	      /* send config-cmd or scan-request to socket */
@@ -1960,41 +1974,42 @@ b_seek:   err = errno;
 	      }
 
 	    case AVA_RSP:
-	      if (Ustrncmp(buf, "210", 3) == 0)
-		break;  /* ignore the "210 SCAN DATA" message */
+
+	      if (Ustrncmp(buf, "200", 3) == 0)
+		{ /* we're done finally */
+		if (send(sock, "QUIT\n", 5, 0) < 0) /* courtesy */
+		  return m_errlog_defer_3(scanent, CUS callout_address,
+			  string_sprintf(
+			      "unable to send quit request to socket (%s): %s",
+			      scanner_options, strerror(errno)),
+			      sock);
+
+		avast_stage = AVA_DONE;
+                goto endloop;
+		}
+
+              if (malware_name) break;  /* found malware already, nothing to do anymore */
 
 	      if (pcre_exec(ava_re_clean, NULL, CS buf, slen,
 		    0, 0, ovector, nelem(ovector)) > 0)
 		break;
 
-	      if ((malware_name = m_pcre_exec(ava_re_virus, buf)))
+	      if (malware_name = m_pcre_exec(ava_re_virus, buf))
 		{ /* remove backslash in front of [whitespace|backslash] */
 		uschar * p, * p0;
 		for (p = malware_name; *p; ++p)
 		  if (*p == '\\' && (isspace(p[1]) || p[1] == '\\'))
 		    for (p0 = p; *p0; ++p0) *p0 = p0[1];
 
-		avast_stage = AVA_DONE;
-		goto endloop;
-		}
-
-	      if (Ustrncmp(buf, "200 SCAN OK", 11) == 0)
-		{ /* we're done finally */
-		if (send(sock, "QUIT\n", 5, 0) < 0) /* courtesy */
-		  return m_errlog_defer_3(scanent, CUS callout_address,
-			  string_sprintf(
-			      "unable to send quit request to socket (%s): %s",
-			      scanner_options, strerror(errno)),
-			      sock);
-		malware_name = NULL;
-		avast_stage = AVA_DONE;
-		goto endloop;
+		DEBUG(D_acl)
+		  debug_printf_indent("unescaped malware name: '%s'\n", malware_name);
+		break;
 		}
 
-	      /* here for any unexpected response from the scanner */
+	      /* here also for any unexpected response from the scanner */
 	      goto endloop;
 
-	    case AVA_DONE:	log_write(0, LOG_PANIC, "%s:%d:%s: should not happen",
+	    default:	log_write(0, LOG_PANIC, "%s:%d:%s: should not happen",
 			    __FILE__, __LINE__, __FUNCTION__);
 	    }
 	  }