Fix "-bP smtp_receive_timeout". Bug 2384

[exim.git] / test / src / client.c

diff --git a/test/src/client.c b/test/src/client.c
index be8b1cc0db8de0a3c84070f6bd689062b012f150..64b8203bf5bbf997c5f85e94ded9220ff098271f 100644 (file)
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -36,6 +36,9 @@ ripped from the openssl ocsp and s_client utilities. */
 #include <unistd.h>
 #include <utime.h>
 
 #include <unistd.h>
 #include <utime.h>
 

+/* Set to TRUE to enable debug output */
+#define DEBUG if (FALSE)
+

 #ifdef AF_INET6
 #define HAVE_IPV6 1
 #endif
 #ifdef AF_INET6
 #define HAVE_IPV6 1
 #endif


@@ -224,7 +227,7 @@ if(!(bs = OCSP_response_get1_basic(rsp)))
   }
 
 
   }
 
 

-if (!(sk = chain_from_pem_file(ocsp_stapling)))
+if (!(sk = chain_from_pem_file((const uschar *)ocsp_stapling)))

   {
   BIO_printf(arg, "error in cert setup\n");
   return 0;
   {
   BIO_printf(arg, "error in cert setup\n");
   return 0;


@@ -429,7 +432,7 @@ if (certificate != NULL)
   {
   rc = gnutls_certificate_set_x509_key_file(x509_cred, CS certificate,
     CS privatekey, GNUTLS_X509_FMT_PEM);
   {
   rc = gnutls_certificate_set_x509_key_file(x509_cred, CS certificate,
     CS privatekey, GNUTLS_X509_FMT_PEM);

-  if (rc < 0) gnutls_error("gnutls_certificate", rc);
+  if (rc < 0) gnutls_error(US"gnutls_certificate", rc);

   }
 
 /* Associate the parameters with the x509 credentials structure. */
   }
 
 /* Associate the parameters with the x509 credentials structure. */


@@ -553,36 +556,84 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
   /* Expect incoming */
 
   if (  strncmp(CS outbuffer, "???", 3) == 0
   /* Expect incoming */
 
   if (  strncmp(CS outbuffer, "???", 3) == 0

-     && (outbuffer[3] == ' ' || outbuffer[3] == '*')
+     && (outbuffer[3] == ' ' || outbuffer[3] == '*' || outbuffer[3] == '?')

      )
     {
     unsigned char *lineptr;
     unsigned exp_eof = outbuffer[3] == '*';
      )
     {
     unsigned char *lineptr;
     unsigned exp_eof = outbuffer[3] == '*';

+    unsigned resp_optional = outbuffer[3] == '?';

 
     printf("%s\n", outbuffer);
     n = unescape_buf(outbuffer, n);
 
 
     printf("%s\n", outbuffer);
     n = unescape_buf(outbuffer, n);
 

+nextinput:

     if (*inptr == 0)   /* Refill input buffer */
       {
     if (*inptr == 0)   /* Refill input buffer */
       {

+      alarm(timeout);

       if (srv->tls_active)
         {
       if (srv->tls_active)
         {

-        #ifdef HAVE_OPENSSL
-        rc = SSL_read (srv->ssl, inbuffer, bsiz - 1);
-        #endif
-        #ifdef HAVE_GNUTLS
+#ifdef HAVE_OPENSSL
+       int error;
+       DEBUG { printf("call SSL_read\n"); fflush(stdout); }
+        rc = SSL_read(srv->ssl, inbuffer, bsiz - 1);
+       DEBUG { printf("SSL_read: %d\n", rc); fflush(stdout); }
+       if (rc <= 0)
+          switch (error = SSL_get_error(srv->ssl, rc))
+           {
+           case SSL_ERROR_ZERO_RETURN:
+             break;
+           case SSL_ERROR_SYSCALL:
+             printf("%s\n", ERR_error_string(ERR_get_error(), NULL));
+             rc = -1;
+             break;
+           case SSL_ERROR_SSL:
+             printf("%s\nTLS terminated\n", ERR_error_string(ERR_get_error(), NULL));
+             SSL_shutdown(srv->ssl);
+             SSL_free(srv->ssl);
+             srv->tls_active = FALSE;
+             { /* OpenSSL leaves it in restartsys mode */
+             struct sigaction act = {.sa_handler = sigalrm_handler_flag, .sa_flags = 0};
+             sigalrm_seen = 1;
+             sigaction(SIGALRM, &act, NULL);
+             }
+             *inptr = 0;
+             DEBUG { printf("go round\n"); fflush(stdout); }
+             goto nextinput;
+           default:
+             printf("SSL error code %d\n", error);
+           }
+#endif
+#ifdef HAVE_GNUTLS
+      retry1:
+       DEBUG { printf("call gnutls_record_recv\n"); fflush(stdout); }

         rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
         rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);

-        #endif
+       if (rc < 0)
+         {
+         DEBUG { printf("gnutls_record_recv: %s\n", gnutls_strerror(rc)); fflush(stdout); }
+         if (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN)
+           goto retry1;
+         printf("%s\n", gnutls_strerror(rc));
+         srv->tls_active = FALSE;
+         *inptr = 0;
+         DEBUG { printf("go round\n"); fflush(stdout); }
+         goto nextinput;
+         }
+       DEBUG { printf("gnutls_record_recv: %d\n", rc); fflush(stdout); }
+#endif

         }
       else
         }
       else

-        {
-        alarm(timeout);
-        rc = read(srv->sock, inbuffer, bsiz);
-        alarm(0);
-        }
+       {
+       DEBUG { printf("call read\n"); fflush(stdout); }
+       rc = read(srv->sock, inbuffer, bsiz);
+       DEBUG { printf("read: %d\n", rc); fflush(stdout); }
+       }
+      alarm(0);

 
       if (rc < 0)
        {
 
       if (rc < 0)
        {

-        printf("Read error %s\n", strerror(errno));
+       if (errno == EINTR && sigalrm_seen && resp_optional)
+         continue;     /* next scriptline */
+        printf("Read error: %s\n", strerror(errno));

         exit(81);
        }
       else if (rc == 0)
         exit(81);
        }
       else if (rc == 0)


@@ -591,6 +642,8 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
           printf("Expected EOF read\n");
          continue;
          }
           printf("Expected EOF read\n");
          continue;
          }

+       else if (resp_optional)
+         continue;     /* next scriptline */

        else
          {
          printf("Unexpected EOF read\n");
        else
          {
          printf("Unexpected EOF read\n");


@@ -609,6 +662,7 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
         inptr = inbuffer;
         }
       }
         inptr = inbuffer;
         }
       }

+    DEBUG { printf("read: '%s'\n", inptr); fflush(stdout); }

 
     lineptr = inptr;
     while (*inptr != 0 && *inptr != '\r' && *inptr != '\n') inptr++;
 
     lineptr = inptr;
     while (*inptr != 0 && *inptr != '\r' && *inptr != '\n') inptr++;


@@ -618,19 +672,38 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
       if (*inptr == '\n') inptr++;
       }
 
       if (*inptr == '\n') inptr++;
       }
 

-    printf("<<< %s\n", lineptr);

     if (strncmp(CS lineptr, CS outbuffer + 4, n - 4) != 0)
     if (strncmp(CS lineptr, CS outbuffer + 4, n - 4) != 0)

-      {
-      printf("\n******** Input mismatch ********\n");
-      exit(79);
-      }
+      if (resp_optional)
+       {
+       inptr = lineptr;        /* consume scriptline, not inputline */
+       continue;
+       }
+      else
+       {
+       printf("<<< %s\n", lineptr);
+       printf("\n******** Input mismatch ********\n");
+       exit(79);
+       }
+
+    /* Input matched script.  Output the inputline, unless optional  */
+    DEBUG { printf("read matched\n"); fflush(stdout); }
+
+    if (!resp_optional)
+       printf("<<< %s\n", lineptr);
+    else
+
+    /* If there is further input after this line, consume inputline but not
+    scriptline in case there are several matching.  Nonmatches are dealt with
+    above. */
+
+       if (*inptr != 0)
+         goto nextinput;

 
     #ifdef HAVE_TLS
     if (srv->sent_starttls)
       {
       if (lineptr[0] == '2')
         {
 
     #ifdef HAVE_TLS
     if (srv->sent_starttls)
       {
       if (lineptr[0] == '2')
         {

-int rc;

        unsigned int verify;
 
         printf("Attempting to start TLS\n");
        unsigned int verify;
 
         printf("Attempting to start TLS\n");


@@ -643,6 +716,9 @@ int rc;
         #ifdef HAVE_GNUTLS
          {
          int rc;
         #ifdef HAVE_GNUTLS
          {
          int rc;

+         fd_set rfd;
+         struct timeval tv = { 0, 2000 };
+

          sigalrm_seen = FALSE;
          alarm(timeout);
          do {
          sigalrm_seen = FALSE;
          alarm(timeout);
          do {


@@ -652,6 +728,25 @@ int rc;
          alarm(0);
 
          if (!srv->tls_active) printf("%s\n", gnutls_strerror(rc));
          alarm(0);
 
          if (!srv->tls_active) printf("%s\n", gnutls_strerror(rc));

+
+         /* look for an error on the TLS conn */
+         FD_ZERO(&rfd);
+         FD_SET(srv->sock, &rfd);
+         if (select(srv->sock+1, &rfd, NULL, NULL, &tv) > 0)
+           {
+         retry2:
+           DEBUG { printf("call gnutls_record_recv\n"); fflush(stdout); }
+           rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
+           if (rc < 0)
+             {
+             DEBUG { printf("gnutls_record_recv: %s\n", gnutls_strerror(rc)); fflush(stdout); }
+             if (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN)
+               goto retry2;
+             printf("%s\n", gnutls_strerror(rc));
+             srv->tls_active = FALSE;
+             }
+           DEBUG { printf("gnutls_record_recv: %d\n", rc); fflush(stdout); }
+           }

          }
         #endif
 
          }
         #endif
 


@@ -720,7 +815,7 @@ int rc;
   else if (strncmp(CS outbuffer, "<<< ", 4) == 0)
     {
     FILE * new_f;
   else if (strncmp(CS outbuffer, "<<< ", 4) == 0)
     {
     FILE * new_f;

-    if (!(new_f = fopen(outbuffer+4 , "r")))
+    if (!(new_f = fopen((const char *)outbuffer+4 , "r")))

       {
       printf("Unable to open '%s': %s", inptr, strerror(errno));
       exit(74);
       {
       printf("Unable to open '%s': %s", inptr, strerror(errno));
       exit(74);


@@ -1157,7 +1252,7 @@ SSL_CTX_set_info_callback(srv.ctx, (void (*)())info_callback);
 #ifdef HAVE_GNUTLS
 if (certfile != NULL) printf("Certificate file = %s\n", certfile);
 if (keyfile != NULL) printf("Key file = %s\n", keyfile);
 #ifdef HAVE_GNUTLS
 if (certfile != NULL) printf("Certificate file = %s\n", certfile);
 if (keyfile != NULL) printf("Key file = %s\n", keyfile);

-tls_init(certfile, keyfile);
+tls_init(US certfile, US keyfile);

 tls_session = tls_session_init();
 #ifdef HAVE_OCSP
 if (ocsp_stapling)
 tls_session = tls_session_init();
 #ifdef HAVE_OCSP
 if (ocsp_stapling)


@@ -1219,7 +1314,8 @@ do_file(&srv, stdin, timeout, inbuffer, sizeof(inbuffer), inptr);
 
 printf("End of script\n");
 shutdown(srv.sock, SHUT_WR);
 
 printf("End of script\n");
 shutdown(srv.sock, SHUT_WR);

-while (read(srv.sock, inbuffer, sizeof(inbuffer)) > 0) ;
+if (fcntl(srv.sock, F_SETFL, O_NONBLOCK) == 0)
+  while (read(srv.sock, inbuffer, sizeof(inbuffer)) > 0) ;

 close(srv.sock);
 
 exit(0);
 close(srv.sock);
 
 exit(0);