X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/57233af5f91cdca9a0232a71fab2d12a538cb1a6..e37f8a84f5374b0d03676a65018b00e972ed47c6:/test/src/client.c diff --git a/test/src/client.c b/test/src/client.c index 3b782f3fd..2bd640205 100644 --- a/test/src/client.c +++ b/test/src/client.c @@ -1,8 +1,8 @@ /* A little hacked up program that makes a TCP/IP call and reads a script to drive it, for testing Exim server code running as a daemon. It's got a bit messy with the addition of support for either OpenSSL or GnuTLS. The code for -those was hacked out of Exim itself, then code for OCSP stapling was ripped -from the openssl ocsp and s_client utilities. */ +those was hacked out of Exim itself, then code for OpenSSL OCSP stapling was +ripped from the openssl ocsp and s_client utilities. */ /* ANSI C standard includes */ @@ -58,39 +58,51 @@ static int sigalrm_seen = 0; /* TLS support can be optionally included, either for OpenSSL or GnuTLS. The latter needs a whole pile of tables. */ - #ifdef HAVE_OPENSSL -#define HAVE_TLS -#include -#include -#include -#include -#include -#include -#include - -char * ocsp_stapling = NULL; +# define HAVE_TLS +# include +# include +# include +# include +# include +# include + +# if OPENSSL_VERSION_NUMBER < 0x0090806fL && !defined(DISABLE_OCSP) && !defined(OPENSSL_NO_TLSEXT) +# warning "OpenSSL library version too old; define DISABLE_OCSP in Makefile" +# define DISABLE_OCSP +# endif +# ifndef DISABLE_OCSP +# include +# endif #endif #ifdef HAVE_GNUTLS -#define HAVE_TLS -#include -#include - -#define DH_BITS 768 +# define HAVE_TLS +# include +# include +# if GNUTLS_VERSION_NUMBER >= 0x030103 +# define HAVE_OCSP +# include +# endif +# ifndef GNUTLS_NO_EXTENSIONS +# define GNUTLS_NO_EXTENSIONS 0 +# endif + +# define DH_BITS 768 /* Local static variables for GNUTLS */ -static gnutls_dh_params dh_params = NULL; +static gnutls_dh_params_t dh_params = NULL; static gnutls_certificate_credentials_t x509_cred = NULL; -static gnutls_session tls_session = NULL; +static gnutls_session_t tls_session = NULL; static int ssl_session_timeout = 200; /* Priorities for TLS algorithms to use. */ +#if GNUTLS_VERSION_NUMBER < 0x030400 static const int protocol_priority[16] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 }; static const int kx_priority[16] = { @@ -112,13 +124,17 @@ static const int mac_priority[16] = { 0 }; static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 }; -static const int cert_type_priority[16] = { GNUTLS_CRT_X509, 0 }; - #endif +#endif /*HAVE_GNUTLS*/ +#ifdef HAVE_TLS +char * ocsp_stapling = NULL; +#endif + + /************************************************* * SIGALRM handler - crash out * *************************************************/ @@ -182,6 +198,7 @@ setup_verify(BIO *bp, char *CAfile, char *CApath) } +#ifndef DISABLE_OCSP static int tls_client_stapling_cb(SSL *s, void *arg) { @@ -232,30 +249,34 @@ else X509_STORE_free(store); return ret; } +#endif /************************************************* * Start an OpenSSL TLS session * *************************************************/ -int tls_start(int sock, SSL **ssl, SSL_CTX *ctx) +int +tls_start(int sock, SSL **ssl, SSL_CTX *ctx) { int rc; -static const char *sid_ctx = "exim"; +static const unsigned char *sid_ctx = US"exim"; RAND_load_file("client.c", -1); /* Not *very* random! */ *ssl = SSL_new (ctx); -SSL_set_session_id_context(*ssl, sid_ctx, strlen(sid_ctx)); +SSL_set_session_id_context(*ssl, sid_ctx, strlen(CS sid_ctx)); SSL_set_fd (*ssl, sock); SSL_set_connect_state(*ssl); +#ifndef DISABLE_OCSP if (ocsp_stapling) { SSL_CTX_set_tlsext_status_cb(ctx, tls_client_stapling_cb); SSL_CTX_set_tlsext_status_arg(ctx, BIO_new_fp(stdout, BIO_NOCLOSE)); SSL_set_tlsext_status_type(*ssl, TLSEXT_STATUSTYPE_ocsp); } +#endif signal(SIGALRM, sigalrm_handler_flag); sigalrm_seen = 0; @@ -319,7 +340,7 @@ gnutls_error(uschar *prefix, int err) fprintf(stderr, "GnuTLS connection error: %s:", prefix); if (err != 0) fprintf(stderr, " %s", gnutls_strerror(err)); fprintf(stderr, "\n"); -exit(1); +exit(98); } @@ -336,7 +357,7 @@ init_dh(void) { int fd; int ret; -gnutls_datum m; +gnutls_datum_t m; uschar filename[200]; struct stat statbuf; @@ -352,7 +373,7 @@ fd = open("aux-fixed/gnutls-params", O_RDONLY, 0); if (fd < 0) { fprintf(stderr, "Failed to open spool/gnutls-params: %s\n", strerror(errno)); - exit(1); + exit(97); } if (fstat(fd, &statbuf) < 0) @@ -416,6 +437,11 @@ if (certificate != NULL) /* Associate the parameters with the x509 credentials structure. */ gnutls_certificate_set_dh_params(x509_cred, dh_params); + +/* set the CA info for server-cert verify */ +if (ocsp_stapling) + gnutls_certificate_set_x509_trust_file(x509_cred, ocsp_stapling, + GNUTLS_X509_FMT_PEM); } @@ -424,13 +450,14 @@ gnutls_certificate_set_dh_params(x509_cred, dh_params); * Initialize a single GNUTLS session * *************************************************/ -static gnutls_session +static gnutls_session_t tls_session_init(void) { -gnutls_session session; +gnutls_session_t session; -gnutls_init(&session, GNUTLS_CLIENT); +gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_NO_EXTENSIONS); +#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); @@ -438,6 +465,10 @@ 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); +gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); +#endif gnutls_dh_set_prime_bits(session, DH_BITS); gnutls_db_set_cache_expiration(session, ssl_session_timeout); @@ -458,7 +489,14 @@ return session; *************************************************/ const char * const HELP_MESSAGE = "\n\ -Usage: client\n\ +Usage: client\n" +#ifdef HAVE_TLS +"\ + [-tls-on-connect]\n\ + [-ocsp]\n" +#endif +"\ + [-tn] n seconds timeout\n\ \n\ \n\ []\n\ @@ -477,7 +515,7 @@ char *keyfile = NULL; char *end = NULL; int argi = 1; int host_af, port, s_len, rc, sock, save_errno; -int timeout = 1; +int timeout = 5; int tls_active = 0; int sent_starttls = 0; int tls_on_connect = 0; @@ -506,7 +544,7 @@ while (argc >= argi + 1 && argv[argi][0] == '-') strcmp(argv[argi], "--help") == 0 || strcmp(argv[argi], "-h") == 0) { - printf(HELP_MESSAGE); + puts(HELP_MESSAGE); exit(0); } if (strcmp(argv[argi], "-tls-on-connect") == 0) @@ -514,16 +552,17 @@ while (argc >= argi + 1 && argv[argi][0] == '-') tls_on_connect = 1; argi++; } -#ifdef HAVE_OPENSSL +#ifdef HAVE_TLS else if (strcmp(argv[argi], "-ocsp") == 0) { if (argc < ++argi + 1) { fprintf(stderr, "Missing required certificate file for ocsp option\n"); - exit(1); + exit(96); } ocsp_stapling = argv[argi++]; } + #endif else if (argv[argi][1] == 't' && isdigit(argv[argi][2])) { @@ -532,18 +571,18 @@ while (argc >= argi + 1 && argv[argi][0] == '-') { fprintf(stderr, "Failed to parse seconds from option <%s>\n", argv[argi]); - exit(1); + exit(95); } if (tmplong > 10000L) { - fprintf(stderr, "Unreasonably long wait of %d seconds requested\n", + fprintf(stderr, "Unreasonably long wait of %ld seconds requested\n", tmplong); - exit(1); + exit(94); } if (tmplong < 0L) { - fprintf(stderr, "Timeout must not be negative (%d)\n", tmplong); - exit(1); + fprintf(stderr, "Timeout must not be negative (%ld)\n", tmplong); + exit(93); } timeout = (int) tmplong; argi++; @@ -551,7 +590,7 @@ while (argc >= argi + 1 && argv[argi][0] == '-') else { fprintf(stderr, "Unrecognized option %s\n", argv[argi]); - exit(1); + exit(92); } } @@ -560,7 +599,7 @@ while (argc >= argi + 1 && argv[argi][0] == '-') if (argc < argi+1) { fprintf(stderr, "No IP address given\n"); - exit(1); + exit(91); } address = argv[argi++]; @@ -571,7 +610,7 @@ host_af = (strchr(address, ':') != NULL)? AF_INET6 : AF_INET; if (argc < argi+1) { fprintf(stderr, "No port number given\n"); - exit(1); + exit(90); } port = atoi(argv[argi++]); @@ -613,7 +652,7 @@ sock = socket(host_af, SOCK_STREAM, 0); if (sock < 0) { printf("socket creation failed: %s\n", strerror(errno)); - exit(1); + exit(89); } /* Bind to a specific interface if requested. On an IPv6 system, this has @@ -638,7 +677,7 @@ if (interface != NULL) if (inet_pton(AF_INET6, interface, &s_in6.sin6_addr) != 1) { printf("Unable to parse \"%s\"", interface); - exit(1); + exit(88); } } else @@ -659,7 +698,7 @@ if (interface != NULL) { printf("Unable to bind outgoing SMTP call to %s: %s", interface, strerror(errno)); - exit(1); + exit(87); } } } @@ -675,7 +714,7 @@ if (host_af == AF_INET6) if (inet_pton(host_af, address, &s_in6.sin6_addr) != 1) { printf("Unable to parse \"%s\"", address); - exit(1); + exit(86); } } else @@ -704,8 +743,8 @@ an externally applied timeout if the signal handler has been run. */ if (rc < 0) { close(sock); - printf("failed: %s\n", strerror(save_errno)); - exit(1); + printf("connect failed: %s\n", strerror(save_errno)); + exit(85); } printf("connected\n"); @@ -721,7 +760,7 @@ ctx = SSL_CTX_new(SSLv23_method()); if (ctx == NULL) { printf ("SSL_CTX_new failed\n"); - exit(1); + exit(84); } if (certfile != NULL) @@ -729,7 +768,7 @@ if (certfile != NULL) if (!SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM)) { printf("SSL_CTX_use_certificate_file failed\n"); - exit(1); + exit(83); } printf("Certificate file = %s\n", certfile); } @@ -739,7 +778,7 @@ if (keyfile != NULL) if (!SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM)) { printf("SSL_CTX_use_PrivateKey_file failed\n"); - exit(1); + exit(82); } printf("Key file = %s\n", keyfile); } @@ -757,7 +796,11 @@ if (certfile != NULL) printf("Certificate file = %s\n", certfile); if (keyfile != NULL) printf("Key file = %s\n", keyfile); tls_init(certfile, keyfile); tls_session = tls_session_init(); -gnutls_transport_set_ptr(tls_session, (gnutls_transport_ptr)sock); +#ifdef HAVE_OCSP +if (ocsp_stapling) + gnutls_ocsp_status_request_enable_client(tls_session, NULL, 0, NULL); +#endif +gnutls_transport_set_ptr(tls_session, (gnutls_transport_ptr_t)(intptr_t)sock); /* When the server asks for a certificate and the client does not have one, there is a SIGPIPE error in the gnutls_handshake() function for some reason @@ -778,33 +821,47 @@ if (tls_on_connect) { printf("Attempting to start TLS\n"); - #ifdef HAVE_OPENSSL +#ifdef HAVE_OPENSSL tls_active = tls_start(sock, &ssl, ctx); - #endif +#endif - #ifdef HAVE_GNUTLS +#ifdef HAVE_GNUTLS + { + int rc; sigalrm_seen = FALSE; alarm(timeout); - tls_active = gnutls_handshake(tls_session) >= 0; + do { + rc = gnutls_handshake(tls_session); + } while (rc < 0 && gnutls_error_is_fatal(rc) == 0); + tls_active = rc >= 0; alarm(0); - #endif + + if (!tls_active) printf("%s\n", gnutls_strerror(rc)); + } +#endif if (!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"); +#endif else printf("Succeeded in starting TLS\n"); } #endif -while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) +while (fgets(CS outbuffer, sizeof(outbuffer), stdin) != NULL) { - int n = (int)strlen(outbuffer); - while (n > 0 && isspace(outbuffer[n-1])) n--; - outbuffer[n] = 0; + int n = (int)strlen(CS outbuffer); + + /* Strip trailing newline */ + if (outbuffer[n-1] == '\n') outbuffer[--n] = 0; /* Expect incoming */ - if (strncmp(outbuffer, "??? ", 4) == 0) + if (strncmp(CS outbuffer, "??? ", 4) == 0) { unsigned char *lineptr; printf("%s\n", outbuffer); @@ -830,13 +887,13 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) if (rc < 0) { printf("Read error %s\n", strerror(errno)); - exit(1) ; + exit(81) ; } else if (rc == 0) { printf("Unexpected EOF read\n"); close(sock); - exit(1); + exit(80); } else { @@ -854,10 +911,10 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) } printf("<<< %s\n", lineptr); - if (strncmp(lineptr, outbuffer + 4, (int)strlen(outbuffer) - 4) != 0) + if (strncmp(CS lineptr, CS outbuffer + 4, (int)strlen(CS outbuffer) - 4) != 0) { printf("\n******** Input mismatch ********\n"); - exit(1); + exit(79); } #ifdef HAVE_TLS @@ -865,6 +922,9 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) { if (lineptr[0] == '2') { +int rc; + unsigned int verify; + printf("Attempting to start TLS\n"); fflush(stdout); @@ -873,10 +933,18 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) #endif #ifdef HAVE_GNUTLS - sigalrm_seen = FALSE; - alarm(timeout); - tls_active = gnutls_handshake(tls_session) >= 0; - alarm(0); + { + int rc; + sigalrm_seen = FALSE; + alarm(timeout); + do { + rc = gnutls_handshake(tls_session); + } while (rc < 0 && gnutls_error_is_fatal(rc) == 0); + tls_active = rc >= 0; + alarm(0); + + if (!tls_active) printf("%s\n", gnutls_strerror(rc)); + } #endif if (!tls_active) @@ -884,6 +952,44 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) printf("Failed to start TLS\n"); fflush(stdout); } + #ifdef HAVE_GNUTLS + else if (ocsp_stapling) + { + if ((rc= gnutls_certificate_verify_peers2(tls_session, &verify)) < 0) + { + printf("Failed to verify certificate: %s\n", gnutls_strerror(rc)); + fflush(stdout); + } + else if (verify & (GNUTLS_CERT_INVALID|GNUTLS_CERT_REVOKED)) + { + printf("Bad certificate\n"); + fflush(stdout); + } + #ifdef HAVE_OCSP + else if (gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0) + { + printf("Failed to verify certificate status\n"); + { + gnutls_datum_t stapling; + gnutls_ocsp_resp_t resp; + gnutls_datum_t printed; + if ( (rc= gnutls_ocsp_status_request_get(tls_session, &stapling)) == 0 + && (rc= gnutls_ocsp_resp_init(&resp)) == 0 + && (rc= gnutls_ocsp_resp_import(resp, &stapling)) == 0 + && (rc= gnutls_ocsp_resp_print(resp, GNUTLS_OCSP_PRINT_FULL, &printed)) == 0 + ) + { + fprintf(stderr, "%.4096s", printed.data); + gnutls_free(printed.data); + } + else + (void) fprintf(stderr,"ocsp decode: %s", gnutls_strerror(rc)); + } + fflush(stdout); + } + #endif + } + #endif else printf("Succeeded in starting TLS\n"); } @@ -895,10 +1001,10 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) /* Wait for a bit before proceeding */ - else if (strncmp(outbuffer, "+++ ", 4) == 0) + else if (strncmp(CS outbuffer, "+++ ", 4) == 0) { printf("%s\n", outbuffer); - sleep(atoi(outbuffer + 4)); + sleep(atoi(CS outbuffer + 4)); } /* Send outgoing, but barf if unconsumed incoming */ @@ -911,20 +1017,20 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) { printf("Unconsumed input: %s", inptr); printf(" About to send: %s\n", outbuffer); - exit(1); + exit(78); } #ifdef HAVE_TLS /* Shutdown TLS */ - if (strcmp(outbuffer, "stoptls") == 0 || - strcmp(outbuffer, "STOPTLS") == 0) + if (strcmp(CS outbuffer, "stoptls") == 0 || + strcmp(CS outbuffer, "STOPTLS") == 0) { if (!tls_active) { printf("STOPTLS read when TLS not active\n"); - exit(1); + exit(77); } printf("Shutting down TLS encryption\n"); @@ -946,14 +1052,14 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) /* Remember that we sent STARTTLS */ - sent_starttls = (strcmp(outbuffer, "starttls") == 0 || - strcmp(outbuffer, "STARTTLS") == 0); + sent_starttls = (strcmp(CS outbuffer, "starttls") == 0 || + strcmp(CS outbuffer, "STARTTLS") == 0); /* Fudge: if the command is "starttls_wait", we send the starttls bit, but we haven't set the flag, so that there is no negotiation. This is for testing the server's timeout. */ - if (strcmp(outbuffer, "starttls_wait") == 0) + if (strcmp(CS outbuffer, "starttls_wait") == 0) { outbuffer[8] = 0; n = 8; @@ -961,18 +1067,18 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) #endif printf(">>> %s\n", outbuffer); - strcpy(outbuffer + n, "\r\n"); + strcpy(CS outbuffer + n, "\r\n"); /* Turn "\n" and "\r" into the relevant characters. This is a hack. */ - while ((escape = strstr(outbuffer, "\\r")) != NULL) + while ((escape = US strstr(CS outbuffer, "\\r")) != NULL) { *escape = '\r'; memmove(escape + 1, escape + 2, (n + 2) - (escape - outbuffer) - 2); n--; } - while ((escape = strstr(outbuffer, "\\n")) != NULL) + while ((escape = US strstr(CS outbuffer, "\\n")) != NULL) { *escape = '\n'; memmove(escape + 1, escape + 2, (n + 2) - (escape - outbuffer) - 2); @@ -992,7 +1098,7 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) if (rc < 0) { printf("GnuTLS write error: %s\n", gnutls_strerror(rc)); - exit(1); + exit(76); } #endif } @@ -1005,7 +1111,7 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL) if (rc < 0) { printf("Write error: %s\n", strerror(errno)); - exit(1); + exit(75); } } }