tidying

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

diff --git a/test/src/client.c b/test/src/client.c
index de36ef0651ee9bae0b524fb217ffaef3d52ef796..2544ec84a198c4436e519af669e8cf03fef26a1b 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


@@ -83,7 +86,7 @@ latter needs a whole pile of tables. */
 # include <gnutls/gnutls.h>
 # include <gnutls/x509.h>
 # if GNUTLS_VERSION_NUMBER >= 0x030103
 # include <gnutls/gnutls.h>
 # include <gnutls/x509.h>
 # if GNUTLS_VERSION_NUMBER >= 0x030103

-#  define HAVE_OCSP
+#  define HAVE_GNUTLS_OCSP

 #  include <gnutls/ocsp.h>
 # endif
 # ifndef GNUTLS_NO_EXTENSIONS
 #  include <gnutls/ocsp.h>
 # endif
 # ifndef GNUTLS_NO_EXTENSIONS


@@ -134,6 +137,7 @@ static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
 #ifdef HAVE_TLS
 char * ocsp_stapling = NULL;
 char * pri_string = NULL;
 #ifdef HAVE_TLS
 char * ocsp_stapling = NULL;
 char * pri_string = NULL;

+int tls_quiet = 0;

 #endif
 
 
 #endif
 
 


@@ -208,18 +212,18 @@ len = SSL_get_tlsext_status_ocsp_resp(s, &p);
 /*BIO_printf(arg, "OCSP response: ");*/
 if (!p)
        {
 /*BIO_printf(arg, "OCSP response: ");*/
 if (!p)
        {

-       BIO_printf(arg, "no response received\n");
+       BIO_printf(arg, "no OCSP response received\n");

        return 1;
        }
 if(!(rsp = d2i_OCSP_RESPONSE(NULL, &p, len)))
        {
        return 1;
        }
 if(!(rsp = d2i_OCSP_RESPONSE(NULL, &p, len)))
        {

-       BIO_printf(arg, "response parse error\n");
+       BIO_printf(arg, "OCSP response parse error\n");

        BIO_dump_indent(arg, (char *)p, len, 4);
        return 0;
        }
 if(!(bs = OCSP_response_get1_basic(rsp)))
   {
        BIO_dump_indent(arg, (char *)p, len, 4);
        return 0;
        }
 if(!(bs = OCSP_response_get1_basic(rsp)))
   {

-  BIO_printf(arg, "error parsing response\n");
+  BIO_printf(arg, "error parsing OCSP response\n");

   return 0;
   }
 
   return 0;
   }
 


@@ -237,12 +241,12 @@ when OCSP_NOVERIFY is set.  The content from the wire
 
 if(OCSP_basic_verify(bs, sk, NULL, OCSP_NOVERIFY) <= 0)
   {
 
 if(OCSP_basic_verify(bs, sk, NULL, OCSP_NOVERIFY) <= 0)
   {

-  BIO_printf(arg, "Response Verify Failure\n");
+  BIO_printf(arg, "OCSP status response verify failure\n");

   ERR_print_errors(arg);
   ret = 0;
   }
 else
   ERR_print_errors(arg);
   ret = 0;
   }
 else

-  BIO_printf(arg, "Response verify OK\n");
+  BIO_printf(arg, "OCSP status response: good signature\n");

 
 cert_stack_free(sk);
 return ret;
 
 cert_stack_free(sk);
 return ret;


@@ -294,7 +298,7 @@ if (rc <= 0)
   return 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;
 }
 
 return 1;
 }
 


@@ -566,42 +570,86 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
 nextinput:
     if (*inptr == 0)   /* Refill input buffer */
       {
 nextinput:
     if (*inptr == 0)   /* Refill input buffer */
       {

+      unsigned char *inbufferp = inbuffer;
+

       alarm(timeout);
       alarm(timeout);

-      if (srv->tls_active)
-        {
+      for (;;)
+       {
+       if (srv->tls_active)
+         {

 #ifdef HAVE_OPENSSL
 #ifdef HAVE_OPENSSL

-       int error;
-        rc = SSL_read(srv->ssl, inbuffer, bsiz - 1);
-       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)); break;
-             rc = -1;
-           case SSL_ERROR_SSL:
-             printf("%s\n", ERR_error_string(ERR_get_error(), NULL)); break;
-             SSL_shutdown(srv->ssl);
-             SSL_free(srv->ssl);
-             srv->tls_active = FALSE;
-             goto nextinput;
-           default:
-             printf("SSL error code %d\n", error);
-           }
-
+         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
 #endif
 #ifdef HAVE_GNUTLS

-        rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
+       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
 #endif

-        }
-      else
-        rc = read(srv->sock, inbuffer, bsiz);
+         }
+       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)
        {
       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)
         exit(81);
        }
       else if (rc == 0)


@@ -625,11 +673,9 @@ nextinput:
         exit(74);
         }
       else
         exit(74);
         }
       else

-        {
-        inbuffer[rc] = 0;

         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++;


@@ -652,14 +698,21 @@ nextinput:
        exit(79);
        }
 
        exit(79);
        }
 

-    /* input matched script */
+    /* Input matched script.  Output the inputline, unless optional  */
+    DEBUG { printf("read matched\n"); fflush(stdout); }

 
 

-    if (resp_optional)
-      goto nextinput;          /* consume inputline, not scriptline */
+    if (!resp_optional)
+       printf("<<< %s\n", lineptr);
+    else

 
 

-    printf("<<< %s\n", lineptr);
+    /* If there is further input after this line, consume inputline but not
+    scriptline in case there are several matching.  Nonmatches are dealt with
+    above. */

 
 

-    #ifdef HAVE_TLS
+       if (*inptr != 0)
+         goto nextinput;
+
+#ifdef HAVE_TLS

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


@@ -669,13 +722,16 @@ nextinput:
         printf("Attempting to start TLS\n");
         fflush(stdout);
 
         printf("Attempting to start TLS\n");
         fflush(stdout);
 

-        #ifdef HAVE_OPENSSL
+# ifdef HAVE_OPENSSL

         srv->tls_active = tls_start(srv->sock, &srv->ssl, srv->ctx);
         srv->tls_active = tls_start(srv->sock, &srv->ssl, srv->ctx);

-        #endif
+# endif

 
 

-        #ifdef HAVE_GNUTLS
+# ifdef HAVE_GNUTLS

          {
          int rc;
          {
          int rc;

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

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


@@ -684,16 +740,42 @@ nextinput:
          srv->tls_active = rc >= 0;
          alarm(0);
 
          srv->tls_active = rc >= 0;
          alarm(0);
 

-         if (!srv->tls_active) printf("%s\n", gnutls_strerror(rc));
+         if (!srv->tls_active && !tls_quiet) printf("gnutls_handshake: %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;
+             if (!tls_quiet) printf("gnutls_record_recv: %s\n", gnutls_strerror(rc));
+             srv->tls_active = FALSE;
+             }
+           DEBUG { printf("gnutls_record_recv: %d\n", rc); fflush(stdout); }
+           }

          }
          }

-        #endif
+# endif        /*HAVE_GNUTLS*/
+
+        if (!tls_quiet)
+          if (!srv->tls_active)
+            {
+            printf("Failed to start TLS\n");
+            fflush(stdout);
+            }
+
+# ifdef HAVE_OPENSSL
+         else if (ocsp_stapling)
+           printf("Succeeded in starting TLS (with OCSP)\n");
+# endif

 
 

-        if (!srv->tls_active)
-          {
-          printf("Failed to start TLS\n");
-          fflush(stdout);
-          }
-       #ifdef HAVE_GNUTLS
+# ifdef HAVE_GNUTLS

        else if (ocsp_stapling)
          {
          if ((rc= gnutls_certificate_verify_peers2(tls_session, &verify)) < 0)
        else if (ocsp_stapling)
          {
          if ((rc= gnutls_certificate_verify_peers2(tls_session, &verify)) < 0)


@@ -706,7 +788,7 @@ nextinput:
            printf("Bad certificate\n");
            fflush(stdout);
            }
            printf("Bad certificate\n");
            fflush(stdout);
            }

-         #ifdef HAVE_OCSP
+#  ifdef HAVE_GNUTLS_OCSP

          else if (gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0)
            {
            printf("Failed to verify certificate status\n");
          else if (gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0)
            {
            printf("Failed to verify certificate status\n");


@@ -728,13 +810,20 @@ nextinput:
              }
            fflush(stdout);
            }
              }
            fflush(stdout);
            }

-         #endif
+           else
+             {
+             printf("OCSP status response: good signature\n");
+             printf("Succeeded in starting TLS (with OCSP)\n");
+             }
+# endif        /*HAVE_GNUTLS_OCSP*/

          }
          }

-       #endif
+# endif        /*HAVE_GNUTLS*/
+

         else
           printf("Succeeded in starting TLS\n");
         }
         else
           printf("Succeeded in starting TLS\n");
         }

-      else printf("Abandoning TLS start attempt\n");
+      else
+        printf("Abandoning TLS start attempt\n");

       }
     srv->sent_starttls = 0;
     #endif
       }
     srv->sent_starttls = 0;
     #endif


@@ -878,6 +967,7 @@ Usage: client\n"
 #ifdef HAVE_TLS
 "\
           [-tls-on-connect]\n\
 #ifdef HAVE_TLS
 "\
           [-tls-on-connect]\n\

+         [-tls-quiet]\n\

           [-ocsp]\n"
 # ifdef HAVE_GNUTLS
 "\
           [-ocsp]\n"
 # ifdef HAVE_GNUTLS
 "\


@@ -915,7 +1005,7 @@ struct sockaddr_in6 s_in6;
 
 srv_ctx srv;
 
 
 srv_ctx srv;
 

-unsigned char inbuffer[10240];
+unsigned char inbuffer[100 * 1024];

 unsigned char *inptr = inbuffer;
 
 *inptr = 0;   /* Buffer empty */
 unsigned char *inptr = inbuffer;
 
 *inptr = 0;   /* Buffer empty */


@@ -933,12 +1023,17 @@ while (argc >= argi + 1 && argv[argi][0] == '-')
     puts(HELP_MESSAGE);
     exit(0);
     }
     puts(HELP_MESSAGE);
     exit(0);
     }

+#ifdef HAVE_TLS

   if (strcmp(argv[argi], "-tls-on-connect") == 0)
     {
     tls_on_connect = 1;
     argi++;
     }
   if (strcmp(argv[argi], "-tls-on-connect") == 0)
     {
     tls_on_connect = 1;
     argi++;
     }

-#ifdef HAVE_TLS
+  else if (strcmp(argv[argi], "-tls-quiet") == 0)
+    {
+    tls_quiet = 1;
+    argi++;
+    }

   else if (strcmp(argv[argi], "-ocsp") == 0)
     {
     if (argc < ++argi + 1)
   else if (strcmp(argv[argi], "-ocsp") == 0)
     {
     if (argc < ++argi + 1)


@@ -958,8 +1053,7 @@ while (argc >= argi + 1 && argv[argi][0] == '-')
       }
     pri_string = argv[argi++];
     }
       }
     pri_string = argv[argi++];
     }

-#endif
-
+# endif

 #endif
   else if (argv[argi][1] == 't' && isdigit(argv[argi][2]))
     {
 #endif
   else if (argv[argi][1] == 't' && isdigit(argv[argi][2]))
     {


@@ -1105,14 +1199,30 @@ if (interface != NULL)
 #if HAVE_IPV6
 if (host_af == AF_INET6)
   {
 #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;
   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);
     }
   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
   }
 else
 #endif


@@ -1144,6 +1254,13 @@ if (rc < 0)
   exit(85);
   }
 
   exit(85);
   }
 

+#ifdef TCP_QUICKACK
+  {
+  int off = 0;
+  (void) setsockopt(srv.sock, IPPROTO_TCP, TCP_QUICKACK, US &off, sizeof(off));
+  }
+#endif
+

 printf("connected\n");
 
 
 printf("connected\n");
 
 


@@ -1192,7 +1309,7 @@ if (certfile != NULL) printf("Certificate file = %s\n", certfile);
 if (keyfile != NULL) printf("Key file = %s\n", keyfile);
 tls_init(US certfile, US keyfile);
 tls_session = tls_session_init();
 if (keyfile != NULL) printf("Key file = %s\n", keyfile);
 tls_init(US certfile, US keyfile);
 tls_session = tls_session_init();

-#ifdef HAVE_OCSP
+#ifdef HAVE_GNUTLS_OCSP

 if (ocsp_stapling)
   gnutls_ocsp_status_request_enable_client(tls_session, NULL, 0, NULL);
 #endif
 if (ocsp_stapling)
   gnutls_ocsp_status_request_enable_client(tls_session, NULL, 0, NULL);
 #endif


@@ -1236,15 +1353,16 @@ if (tls_on_connect)
   }
 #endif
 
   }
 #endif
 

-  if (!srv.tls_active)
-    printf("Failed to start TLS\n");
-#if defined(HAVE_GNUTLS) && defined(HAVE_OCSP)
-  else if (  ocsp_stapling
-         && gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0)
-    printf("Failed to verify certificate status\n");
+  if (!tls_quiet)
+    if (!srv.tls_active)
+      printf("Failed to start TLS\n");
+#if defined(HAVE_GNUTLS) && defined(HAVE_GNUTLS_OCSP)
+    else if (  ocsp_stapling
+           && gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0)
+      printf("Failed to verify certificate status\n");

 #endif
 #endif

-  else
-    printf("Succeeded in starting TLS\n");
+    else
+      printf("Succeeded in starting TLS%s\n", ocsp_stapling ? " (with OCSP)":"");

   }
 #endif
 
   }
 #endif