X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d5c0d8c9374623620844d539d4810da63e9abca1..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/src/client.c?ds=sidebyside diff --git a/test/src/client.c b/test/src/client.c index 4ac130df2..2544ec84a 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 #include +/* Set to TRUE to enable debug output */ +#define DEBUG if (FALSE) + #ifdef AF_INET6 #define HAVE_IPV6 1 #endif @@ -83,7 +86,7 @@ latter needs a whole pile of tables. */ # include # include # if GNUTLS_VERSION_NUMBER >= 0x030103 -# define HAVE_OCSP +# define HAVE_GNUTLS_OCSP # include # endif # ifndef GNUTLS_NO_EXTENSIONS @@ -103,7 +106,7 @@ static int ssl_session_timeout = 200; /* Priorities for TLS algorithms to use. */ -#if GNUTLS_VERSION_NUMBER < 0x030400 +# if GNUTLS_VERSION_NUMBER < 0x030400 static const int protocol_priority[16] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 }; static const int kx_priority[16] = { @@ -125,7 +128,7 @@ static const int mac_priority[16] = { 0 }; static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 }; -#endif +# endif #endif /*HAVE_GNUTLS*/ @@ -133,6 +136,8 @@ static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 }; #ifdef HAVE_TLS char * ocsp_stapling = NULL; +char * pri_string = NULL; +int tls_quiet = 0; #endif @@ -207,23 +212,23 @@ len = SSL_get_tlsext_status_ocsp_resp(s, &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))) { - 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_printf(arg, "error parsing response\n"); + BIO_printf(arg, "error parsing OCSP response\n"); return 0; } -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; @@ -236,12 +241,12 @@ when OCSP_NOVERIFY is set. The content from the wire 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 - BIO_printf(arg, "Response verify OK\n"); + BIO_printf(arg, "OCSP status response: good signature\n"); cert_stack_free(sk); return ret; @@ -293,7 +298,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; } @@ -428,7 +433,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. */ @@ -454,7 +459,7 @@ gnutls_session_t session; gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_NO_EXTENSIONS); -#if GNUTLS_VERSION_NUMBER < 0x030400 +# if GNUTLS_VERSION_NUMBER < 0x030400 gnutls_cipher_set_priority(session, default_cipher_priority); gnutls_compression_set_priority(session, comp_priority); gnutls_kx_set_priority(session, kx_priority); @@ -462,10 +467,19 @@ gnutls_protocol_set_priority(session, protocol_priority); gnutls_mac_set_priority(session, mac_priority); gnutls_cred_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); -#else -gnutls_set_default_priority(session); +# else +if (pri_string) + { + gnutls_priority_t priority_cache; + const char * errpos; + + gnutls_priority_init(&priority_cache, pri_string, &errpos); + gnutls_priority_set(session, priority_cache); + } +else + gnutls_set_default_priority(session); gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); -#endif +# endif gnutls_dh_set_prime_bits(session, DH_BITS); gnutls_db_set_cache_expiration(session, ssl_session_timeout); @@ -543,36 +557,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) @@ -581,6 +658,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"); @@ -594,11 +673,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++; @@ -608,31 +685,53 @@ 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); + } - #ifdef HAVE_TLS + /* 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"); fflush(stdout); - #ifdef HAVE_OPENSSL +# ifdef HAVE_OPENSSL srv->tls_active = tls_start(srv->sock, &srv->ssl, srv->ctx); - #endif +# endif - #ifdef HAVE_GNUTLS +# ifdef HAVE_GNUTLS { int rc; + fd_set rfd; + struct timeval tv = { 0, 2000 }; + sigalrm_seen = FALSE; alarm(timeout); do { @@ -641,16 +740,42 @@ int rc; 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) @@ -663,7 +788,7 @@ int rc; 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"); @@ -685,13 +810,20 @@ int rc; } 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("Abandoning TLS start attempt\n"); + else + printf("Abandoning TLS start attempt\n"); } srv->sent_starttls = 0; #endif @@ -710,7 +842,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); @@ -835,7 +967,12 @@ Usage: client\n" #ifdef HAVE_TLS "\ [-tls-on-connect]\n\ + [-tls-quiet]\n\ [-ocsp]\n" +# ifdef HAVE_GNUTLS +"\ + [-p priority-string]\n" +# endif #endif "\ [-tn] n seconds timeout\n\ @@ -868,7 +1005,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 */ @@ -886,12 +1023,17 @@ while (argc >= argi + 1 && argv[argi][0] == '-') puts(HELP_MESSAGE); exit(0); } +#ifdef HAVE_TLS 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) @@ -901,7 +1043,17 @@ while (argc >= argi + 1 && argv[argi][0] == '-') } ocsp_stapling = argv[argi++]; } - +# ifdef HAVE_GNUTLS + else if (strcmp(argv[argi], "-p") == 0) + { + if (argc < ++argi + 1) + { + fprintf(stderr, "Missing priority string\n"); + exit(96); + } + pri_string = argv[argi++]; + } +# endif #endif else if (argv[argi][1] == 't' && isdigit(argv[argi][2])) { @@ -1047,14 +1199,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 @@ -1086,6 +1254,13 @@ if (rc < 0) exit(85); } +#ifdef TCP_QUICKACK + { + int off = 0; + (void) setsockopt(srv.sock, IPPROTO_TCP, TCP_QUICKACK, US &off, sizeof(off)); + } +#endif + printf("connected\n"); @@ -1132,9 +1307,9 @@ 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 +#ifdef HAVE_GNUTLS_OCSP if (ocsp_stapling) gnutls_ocsp_status_request_enable_client(tls_session, NULL, 0, NULL); #endif @@ -1178,15 +1353,16 @@ if (tls_on_connect) } #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 - else - printf("Succeeded in starting TLS\n"); + else + printf("Succeeded in starting TLS%s\n", ocsp_stapling ? " (with OCSP)":""); } #endif @@ -1194,7 +1370,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);