X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/ba86e143c7aeb0d70ea4c9d73a617a98f06f6baa..cdee8a5f76cc013de5622112cd04e42d0dcf333b:/test/src/client.c?ds=sidebyside

diff --git a/test/src/client.c b/test/src/client.c
index be8b1cc0d..9190af068 100644
--- 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>
 
+/* Set to TRUE to enable debug output */
+#define DEBUG if (FALSE)
+
 #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;
@@ -294,7 +297,7 @@ if (rc <= 0)
   return 0;
   }
 
-printf("SSL connection using %s\n", SSL_get_cipher (*ssl));
+/* printf("SSL connection using %s\n", SSL_get_cipher (*ssl)); */
 return 1;
 }
 
@@ -429,7 +432,7 @@ if (certificate != NULL)
   {
   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. */
@@ -553,36 +556,99 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
   /* 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 resp_optional = outbuffer[3] == '?';
 
     printf("%s\n", outbuffer);
     n = unescape_buf(outbuffer, n);
 
+nextinput:
     if (*inptr == 0)   /* Refill input buffer */
       {
-      if (srv->tls_active)
-        {
-        #ifdef HAVE_OPENSSL
-        rc = SSL_read (srv->ssl, inbuffer, bsiz - 1);
-        #endif
-        #ifdef HAVE_GNUTLS
-        rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
-        #endif
-        }
-      else
-        {
-        alarm(timeout);
-        rc = read(srv->sock, inbuffer, bsiz);
-        alarm(0);
-        }
+      unsigned char *inbufferp = inbuffer;
+
+      alarm(timeout);
+      for (;;)
+	{
+	if (srv->tls_active)
+	  {
+#ifdef HAVE_OPENSSL
+	  int error;
+	  DEBUG { printf("call SSL_read\n"); fflush(stdout); }
+	  rc = SSL_read(srv->ssl, inbufferp, bsiz - (inbufferp - inbuffer) - 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 inbufferp, bsiz - (inbufferp - inbuffer) - 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 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
+	  {
+	  DEBUG { printf("call read\n"); fflush(stdout); }
+	  rc = read(srv->sock, inbufferp, bsiz - (inbufferp - inbuffer) - 1);
+	  DEBUG { printf("read: %d\n", rc); fflush(stdout); }
+	  }
+
+	  if (rc > 0) inbufferp[rc] = '\0';
+	  if (rc <= 0 || strchr(inbufferp, '\n')) break;
+	  inbufferp += rc;
+	  if (inbufferp >= inbuffer + bsiz)
+	    {
+	    printf("Input buffer overrun, need more than %d bytes input buffer\n", bsiz);
+	    exit(73);
+	    }
+	  DEBUG { printf("read more\n"); }
+	}
+      alarm(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)
@@ -591,6 +657,8 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
           printf("Expected EOF read\n");
 	  continue;
 	  }
+	else if (resp_optional)
+	  continue;	/* next scriptline */
 	else
 	  {
 	  printf("Unexpected EOF read\n");
@@ -604,11 +672,9 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
         exit(74);
         }
       else
-        {
-        inbuffer[rc] = 0;
         inptr = inbuffer;
-        }
       }
+    DEBUG { printf("read: '%s'\n", inptr); fflush(stdout); }
 
     lineptr = inptr;
     while (*inptr != 0 && *inptr != '\r' && *inptr != '\n') inptr++;
@@ -618,19 +684,38 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
       if (*inptr == '\n') inptr++;
       }
 
-    printf("<<< %s\n", lineptr);
     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')
         {
-int rc;
 	unsigned int verify;
 
         printf("Attempting to start TLS\n");
@@ -643,6 +728,9 @@ int rc;
         #ifdef HAVE_GNUTLS
 	  {
 	  int rc;
+	  fd_set rfd;
+	  struct timeval tv = { 0, 2000 };
+
 	  sigalrm_seen = FALSE;
 	  alarm(timeout);
 	  do {
@@ -652,6 +740,25 @@ int 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
 
@@ -720,7 +827,7 @@ int rc;
   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);
@@ -882,7 +989,7 @@ struct sockaddr_in6 s_in6;
 
 srv_ctx srv;
 
-unsigned char inbuffer[10240];
+unsigned char inbuffer[100 * 1024];
 unsigned char *inptr = inbuffer;
 
 *inptr = 0;   /* Buffer empty */
@@ -1072,14 +1179,30 @@ if (interface != NULL)
 #if HAVE_IPV6
 if (host_af == AF_INET6)
   {
+# ifdef HAVE_GETADDRINFO
+  struct addrinfo hints, *res;
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET6;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_flags = AI_NUMERICHOST;
+  if ((rc = getaddrinfo(address, NULL, &hints, &res)) != 0 || res == NULL)
+    {
+    printf("unable to parse \"%s\" as an IP address: %s\n", address,
+      rc == 0 ? "NULL result returned" : gai_strerror(rc));
+    exit(86);
+    }
+  memcpy(&s_in6, res->ai_addr, res->ai_addrlen);
+  freeaddrinfo(res);
+# else
   memset(&s_in6, 0, sizeof(s_in6));
   s_in6.sin6_family = AF_INET6;
-  s_in6.sin6_port = htons(port);
   if (inet_pton(host_af, address, &s_in6.sin6_addr) != 1)
     {
     printf("Unable to parse \"%s\"", address);
     exit(86);
     }
+# endif
+  s_in6.sin6_port = htons(port);
   }
 else
 #endif
@@ -1157,7 +1280,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);
-tls_init(certfile, keyfile);
+tls_init(US certfile, US keyfile);
 tls_session = tls_session_init();
 #ifdef HAVE_OCSP
 if (ocsp_stapling)
@@ -1219,7 +1342,8 @@ do_file(&srv, stdin, timeout, inbuffer, sizeof(inbuffer), inptr);
 
 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);