Escape funny characters when logging DN=

[user/henk/code/exim.git] / src / src / receive.c

diff --git a/src/src/receive.c b/src/src/receive.c
index e4c82d2fa7e7087e31fdaf6e822f7e78f3f24f1f..651121956b0326f71e57f8b10f9050794cf9f145 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/receive.c,v 1.37 2007/04/16 10:31:58 ph10 Exp $ */
+/* $Cambridge: exim/src/src/receive.c,v 1.41 2007/08/22 14:20:28 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -178,7 +178,7 @@ else
     }
   }
 
     }
   }
 

-/* We now have the patch; do the business */
+/* We now have the path; do the business */

 
 memset(&statbuf, 0, sizeof(statbuf));
 
 
 memset(&statbuf, 0, sizeof(statbuf));
 


@@ -283,12 +283,14 @@ that case is done by setting a flag to cause the log functions to call this
 function if there is an ultimate disaster. That is why it is globally
 accessible.
 
 function if there is an ultimate disaster. That is why it is globally
 accessible.
 

-Arguments:   SMTP response to give if in an SMTP session
+Arguments:
+  reason     text reason to pass to the not-quit ACL
+  msg        default SMTP response to give if in an SMTP session

 Returns:     it doesn't
 */
 
 void
 Returns:     it doesn't
 */
 
 void

-receive_bomb_out(uschar *msg)
+receive_bomb_out(uschar *reason, uschar *msg)

 {
 /* If spool_name is set, it contains the name of the data file that is being
 written. Unlink it before closing so that it cannot be picked up by a delivery
 {
 /* If spool_name is set, it contains the name of the data file that is being
 written. Unlink it before closing so that it cannot be picked up by a delivery


@@ -306,20 +308,16 @@ if (spool_name[0] != 0)
 if (data_file != NULL) (void)fclose(data_file);
   else if (data_fd >= 0) (void)close(data_fd);
 
 if (data_file != NULL) (void)fclose(data_file);
   else if (data_fd >= 0) (void)close(data_fd);
 

-/* Attempt to close down an SMTP connection tidily. */
+/* Attempt to close down an SMTP connection tidily. For non-batched SMTP, call
+smtp_notquit_exit(), which runs the NOTQUIT ACL, if present, and handles the
+SMTP response. */

 
 if (smtp_input)
   {
 
 if (smtp_input)
   {

-  if (!smtp_batched_input)
-    {
-    smtp_printf("421 %s %s - closing connection.\r\n", smtp_active_hostname,
-      msg);
-    mac_smtp_fflush();
-    }
-
-  /* Control does not return from moan_smtp_batch(). */
-
-  else moan_smtp_batch(NULL, "421 %s - message abandoned", msg);
+  if (smtp_batched_input)
+    moan_smtp_batch(NULL, "421 %s - message abandoned", msg);  /* No return */
+  smtp_notquit_exit(reason, US"421", US"%s %s - closing connection.",
+    smtp_active_hostname, msg);

   }
 
 /* Exit from the program (non-BSMTP cases) */
   }
 
 /* Exit from the program (non-BSMTP cases) */


@@ -362,7 +360,7 @@ else
             LOG_MAIN, "timed out while reading local message");
   }
 
             LOG_MAIN, "timed out while reading local message");
   }
 

-receive_bomb_out(msg);   /* Does not return */
+receive_bomb_out(US"data-timeout", msg);   /* Does not return */

 }
 
 
 }
 
 


@@ -384,7 +382,8 @@ local_scan_timeout_handler(int sig)
 sig = sig;    /* Keep picky compilers happy */
 log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() function timed out - "
   "message temporarily rejected (size %d)", message_size);
 sig = sig;    /* Keep picky compilers happy */
 log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() function timed out - "
   "message temporarily rejected (size %d)", message_size);

-receive_bomb_out(US"local verification problem");   /* Does not return */
+/* Does not return */
+receive_bomb_out(US"local-scan-timeout", US"local verification problem");

 }
 
 
 }
 
 


@@ -405,7 +404,8 @@ local_scan_crash_handler(int sig)
 {
 log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() function crashed with "
   "signal %d - message temporarily rejected (size %d)", sig, message_size);
 {
 log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() function crashed with "
   "signal %d - message temporarily rejected (size %d)", sig, message_size);

-receive_bomb_out(US"local verification problem");   /* Does not return */
+/* Does not return */
+receive_bomb_out(US"local-scan-error", US"local verification problem");

 }
 
 
 }
 
 


@@ -442,7 +442,7 @@ else
     }
   }
 
     }
   }
 

-receive_bomb_out(msg);    /* Does not return */
+receive_bomb_out(US"signal-exit", msg);    /* Does not return */

 }
 
 
 }
 
 


@@ -564,6 +564,7 @@ read_message_data(FILE *fout)
 {
 int ch_state;
 register int ch;
 {
 int ch_state;
 register int ch;

+register int linelength = 0;

 
 /* Handle the case when only EOF terminates the message */
 
 
 /* Handle the case when only EOF terminates the message */
 


@@ -576,6 +577,9 @@ if (!dot_ends)
     if (ch == 0) body_zerocount++;
     if (last_ch == '\r' && ch != '\n')
       {
     if (ch == 0) body_zerocount++;
     if (last_ch == '\r' && ch != '\n')
       {

+      if (linelength > max_received_linelength)
+        max_received_linelength = linelength;
+      linelength = 0;

       if (fputc('\n', fout) == EOF) return END_WERROR;
       message_size++;
       body_linecount++;
       if (fputc('\n', fout) == EOF) return END_WERROR;
       message_size++;
       body_linecount++;


@@ -583,12 +587,21 @@ if (!dot_ends)
     if (ch == '\r') continue;
 
     if (fputc(ch, fout) == EOF) return END_WERROR;
     if (ch == '\r') continue;
 
     if (fputc(ch, fout) == EOF) return END_WERROR;

-    if (ch == '\n') body_linecount++;
+    if (ch == '\n')
+      {
+      if (linelength > max_received_linelength)
+        max_received_linelength = linelength;
+      linelength = 0;
+      body_linecount++;
+      }
+    else linelength++;

     if (++message_size > thismessage_size_limit) return END_SIZE;
     }
 
   if (last_ch != '\n')
     {
     if (++message_size > thismessage_size_limit) return END_SIZE;
     }
 
   if (last_ch != '\n')
     {

+    if (linelength > max_received_linelength)
+      max_received_linelength = linelength;

     if (fputc('\n', fout) == EOF) return END_WERROR;
     message_size++;
     body_linecount++;
     if (fputc('\n', fout) == EOF) return END_WERROR;
     message_size++;
     body_linecount++;


@@ -608,25 +621,37 @@ while ((ch = (RECEIVE_GETC)()) != EOF)
     {
     case 0:                         /* Normal state (previous char written) */
     if (ch == '\n')
     {
     case 0:                         /* Normal state (previous char written) */
     if (ch == '\n')

-      { body_linecount++; ch_state = 1; }
+      {
+      body_linecount++;
+      if (linelength > max_received_linelength)
+        max_received_linelength = linelength;
+      linelength = -1;
+      ch_state = 1;
+      }

     else if (ch == '\r')
       { ch_state = 2; continue; }
     break;
 
     case 1:                         /* After written "\n" */
     if (ch == '.') { ch_state = 3; continue; }
     else if (ch == '\r')
       { ch_state = 2; continue; }
     break;
 
     case 1:                         /* After written "\n" */
     if (ch == '.') { ch_state = 3; continue; }

-    if (ch != '\n') ch_state = 0;
+    if (ch != '\n') ch_state = 0; else linelength = -1;

     break;
 
     case 2:
     body_linecount++;               /* After unwritten "\r" */
     break;
 
     case 2:
     body_linecount++;               /* After unwritten "\r" */

+    if (linelength > max_received_linelength)
+      max_received_linelength = linelength;

     if (ch == '\n')
     if (ch == '\n')

-      { ch_state = 1; }
+      {
+      ch_state = 1;
+      linelength = -1;
+      }

     else
       {
       if (message_size++, fputc('\n', fout) == EOF) return END_WERROR;
       if (ch == '\r') continue;
       ch_state = 0;
     else
       {
       if (message_size++, fputc('\n', fout) == EOF) return END_WERROR;
       if (ch == '\r') continue;
       ch_state = 0;

+      linelength = 0;

       }
     break;
 
       }
     break;
 


@@ -634,6 +659,7 @@ while ((ch = (RECEIVE_GETC)()) != EOF)
     if (ch == '\n') return END_DOT;
     if (ch == '\r') { ch_state = 4; continue; }
     message_size++;
     if (ch == '\n') return END_DOT;
     if (ch == '\r') { ch_state = 4; continue; }
     message_size++;

+    linelength++;

     if (fputc('.', fout) == EOF) return END_WERROR;
     ch_state = 0;
     break;
     if (fputc('.', fout) == EOF) return END_WERROR;
     ch_state = 0;
     break;


@@ -648,6 +674,7 @@ while ((ch = (RECEIVE_GETC)()) != EOF)
     break;
     }
 
     break;
     }
 

+  linelength++;

   if (fputc(ch, fout) == EOF) return END_WERROR;
   if (++message_size > thismessage_size_limit) return END_SIZE;
   }
   if (fputc(ch, fout) == EOF) return END_WERROR;
   if (++message_size > thismessage_size_limit) return END_SIZE;
   }


@@ -701,6 +728,7 @@ read_message_data_smtp(FILE *fout)
 {
 int ch_state = 0;
 register int ch;
 {
 int ch_state = 0;
 register int ch;

+register int linelength = 0;

 
 while ((ch = (RECEIVE_GETC)()) != EOF)
   {
 
 while ((ch = (RECEIVE_GETC)()) != EOF)
   {


@@ -722,6 +750,9 @@ while ((ch = (RECEIVE_GETC)()) != EOF)
       {
       ch_state = 0;
       body_linecount++;
       {
       ch_state = 0;
       body_linecount++;

+      if (linelength > max_received_linelength)
+        max_received_linelength = linelength;
+      linelength = -1;

       }
     else if (ch == '\r')
       {
       }
     else if (ch == '\r')
       {


@@ -732,6 +763,9 @@ while ((ch = (RECEIVE_GETC)()) != EOF)
 
     case 2:                             /* After (unwritten) CR */
     body_linecount++;
 
     case 2:                             /* After (unwritten) CR */
     body_linecount++;

+    if (linelength > max_received_linelength)
+      max_received_linelength = linelength;
+    linelength = -1;

     if (ch == '\n')
       {
       ch_state = 0;
     if (ch == '\n')
       {
       ch_state = 0;


@@ -773,6 +807,7 @@ while ((ch = (RECEIVE_GETC)()) != EOF)
   next. */
 
   message_size++;
   next. */
 
   message_size++;

+  linelength++;

   if (fout != NULL)
     {
     if (fputc(ch, fout) == EOF) return END_WERROR;
   if (fout != NULL)
     {
     if (fputc(ch, fout) == EOF) return END_WERROR;


@@ -1263,6 +1298,7 @@ int  header_size = 256;
 int  start, end, domain, size, sptr;
 int  id_resolution;
 int  had_zero = 0;
 int  start, end, domain, size, sptr;
 int  id_resolution;
 int  had_zero = 0;

+int  prevlines_length = 0;

 
 register int ptr = 0;
 
 
 register int ptr = 0;
 


@@ -1343,13 +1379,14 @@ data_fd = -1;
 spool_name[0] = 0;
 message_size = 0;
 warning_count = 0;
 spool_name[0] = 0;
 message_size = 0;
 warning_count = 0;

-received_count = 1;     /* For the one we will add */
+received_count = 1;            /* For the one we will add */

 
 if (thismessage_size_limit <= 0) thismessage_size_limit = INT_MAX;
 
 /* While reading the message, the following counts are computed. */
 
 
 if (thismessage_size_limit <= 0) thismessage_size_limit = INT_MAX;
 
 /* While reading the message, the following counts are computed. */
 

-message_linecount = body_linecount = body_zerocount = 0;
+message_linecount = body_linecount = body_zerocount =
+  max_received_linelength = 0;

 
 #ifdef EXPERIMENTAL_DOMAINKEYS
 /* Call into DK to set up the context. Check if DK is to be run are carried out
 
 #ifdef EXPERIMENTAL_DOMAINKEYS
 /* Call into DK to set up the context. Check if DK is to be run are carried out


@@ -1585,6 +1622,12 @@ for (;;)
   receive_linecount++;
   message_linecount++;
 
   receive_linecount++;
   message_linecount++;
 

+  /* Keep track of maximum line length */
+
+  if (ptr - prevlines_length > max_received_linelength)
+    max_received_linelength = ptr - prevlines_length;
+  prevlines_length = ptr + 1;
+

   /* Now put in the terminating newline. There is always space for
   at least two more characters. */
 
   /* Now put in the terminating newline. There is always space for
   at least two more characters. */
 


@@ -1813,6 +1856,7 @@ for (;;)
   next->text = store_get(header_size);
   ptr = 0;
   had_zero = 0;
   next->text = store_get(header_size);
   ptr = 0;
   had_zero = 0;

+  prevlines_length = 0;

   }      /* Continue, starting to read the next header */
 
 /* At this point, we have read all the headers into a data structure in main
   }      /* Continue, starting to read the next header */
 
 /* At this point, we have read all the headers into a data structure in main


@@ -3322,7 +3366,8 @@ if ((log_extra_selector & LX_tls_certificate_verified) != 0 &&
   s = string_append(s, &size, &sptr, 2, US" CV=",
     tls_certificate_verified? "yes":"no");
 if ((log_extra_selector & LX_tls_peerdn) != 0 && tls_peerdn != NULL)
   s = string_append(s, &size, &sptr, 2, US" CV=",
     tls_certificate_verified? "yes":"no");
 if ((log_extra_selector & LX_tls_peerdn) != 0 && tls_peerdn != NULL)

-  s = string_append(s, &size, &sptr, 3, US" DN=\"", tls_peerdn, US"\"");
+  s = string_append(s, &size, &sptr, 3, US" DN=\"",
+    string_printing(tls_peerdn), US"\"");

 #endif
 
 if (sender_host_authenticated != NULL)
 #endif
 
 if (sender_host_authenticated != NULL)