X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=socket.c;h=58a8e15e807e4258a717933b5603da522c08473f;hb=53293ee30678d3db753e51820cc554c0b2b1bd97;hp=7d1a78e2830645131ddbe12f63434cac3c4fb373;hpb=71016036a4968abf7b055e779d390e8c8beab738;p=~andy%2Ffetchmail diff --git a/socket.c b/socket.c index 7d1a78e2..58a8e15e 100644 --- a/socket.c +++ b/socket.c @@ -9,10 +9,12 @@ #include #include #include +#include /* isspace() */ #ifdef HAVE_MEMORY_H #include #endif /* HAVE_MEMORY_H */ #include +#include #ifndef HAVE_NET_SOCKET_H #include #else @@ -35,11 +37,24 @@ #else #include #endif +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + #include "socket.h" #include "fetchmail.h" +#include "getaddrinfo.h" #include "i18n.h" +#include "sdump.h" -/* Defines to allow BeOS to play nice... */ +/* Defines to allow BeOS and Cygwin to play nice... */ #ifdef __BEOS__ static char peeked; #define fm_close(a) closesocket(a) @@ -50,29 +65,25 @@ static char peeked; #define fm_close(a) close(a) #define fm_write(a,b,c) write(a,b,c) #define fm_peek(a,b,c) recv(a,b,c, MSG_PEEK) +#ifdef __CYGWIN__ +#define fm_read(a,b,c) cygwin_read(a,b,c) +static ssize_t cygwin_read(int sock, void *buf, size_t count); +#else /* ! __CYGWIN__ */ #define fm_read(a,b,c) read(a,b,c) +#endif /* __CYGWIN__ */ #endif /* We need to define h_errno only if it is not already */ #ifndef h_errno - -#ifdef HAVE_RES_SEARCH -/* some versions of FreeBSD should declare this but don't */ +# if !HAVE_DECL_H_ERRNO extern int h_errno; -#else -/* pretend we have h_errno to avoid some #ifdef's later */ -static int h_errno; -#endif - +# endif #endif /* ndef h_errno */ -#if NET_SECURITY -#include -#endif /* NET_SECURITY */ - #ifdef HAVE_SOCKETPAIR -char *const *parse_plugin(const char *plugin, const char *host, const char *service) -{ const char **argvec; +static char *const *parse_plugin(const char *plugin, const char *host, const char *service) +{ + char **argvec; const char *c, *p; char *cp, *plugin_copy; unsigned int plugin_copy_len; @@ -83,7 +94,7 @@ char *const *parse_plugin(const char *plugin, const char *host, const char *serv unsigned int service_len = strlen(service); for (c = p = plugin; *c; c++) - { if (isspace(*c) && !isspace(*p)) + { if (isspace((unsigned char)*c) && !isspace((unsigned char)*p)) s += sizeof(char*); if (*p == '%' && *c == 'h') host_count++; @@ -93,10 +104,10 @@ char *const *parse_plugin(const char *plugin, const char *host, const char *serv } plugin_copy_len = plugin_len + host_len * host_count + service_len * service_count; - plugin_copy = malloc(plugin_copy_len + 1); + plugin_copy = (char *)malloc(plugin_copy_len + 1); if (!plugin_copy) { - report(stderr, _("fetchmail: malloc failed\n")); + report(stderr, GT_("fetchmail: malloc failed\n")); return NULL; } @@ -119,25 +130,26 @@ char *const *parse_plugin(const char *plugin, const char *host, const char *serv } plugin_copy[plugin_copy_len] = 0; - argvec = malloc(s); + argvec = (char **)malloc(s); if (!argvec) { - report(stderr, _("fetchmail: malloc failed\n")); + free(plugin_copy); + report(stderr, GT_("fetchmail: malloc failed\n")); return NULL; } memset(argvec, 0, s); - for (c = p = plugin_copy, i = 0; *c; c++) - { if ((!isspace(*c)) && (c == p ? 1 : isspace(*p))) { - argvec[i] = c; + for (p = cp = plugin_copy, i = 0; *cp; cp++) + { if ((!isspace((unsigned char)*cp)) && (cp == p ? 1 : isspace((unsigned char)*p))) { + argvec[i] = cp; i++; } - p = c; + p = cp; } for (cp = plugin_copy; *cp; cp++) - { if (isspace(*cp)) + { if (isspace((unsigned char)*cp)) *cp = 0; } - return (char *const*)argvec; + return argvec; } static int handle_plugin(const char *host, @@ -154,31 +166,32 @@ static int handle_plugin(const char *host, */ if (socketpair(AF_UNIX,SOCK_STREAM,0,fds)) { - report(stderr, _("fetchmail: socketpair failed\n")); + report(stderr, GT_("fetchmail: socketpair failed\n")); return -1; } switch (fork()) { case -1: /* error */ - report(stderr, _("fetchmail: fork failed\n")); + report(stderr, GT_("fetchmail: fork failed\n")); return -1; - break; case 0: /* child */ /* fds[1] is the parent's end; close it for proper EOF ** detection */ (void) close(fds[1]); if ( (dup2(fds[0],0) == -1) || (dup2(fds[0],1) == -1) ) { - report(stderr, _("dup2 failed\n")); - exit(1); + report(stderr, GT_("dup2 failed\n")); + _exit(EXIT_FAILURE); } /* fds[0] is now connected to 0 and 1; close it */ (void) close(fds[0]); if (outlevel >= O_VERBOSE) - report(stderr, _("running %s (host %s service %s)\n"), plugin, host, service); + report(stderr, GT_("running %s (host %s service %s)\n"), plugin, host, service); argvec = parse_plugin(plugin,host,service); + if (argvec == NULL) + _exit(EXIT_FAILURE); execvp(*argvec, argvec); - report(stderr, _("execvp(%s) failed\n"), *argvec); - exit(0); + report(stderr, GT_("execvp(%s) failed\n"), *argvec); + _exit(EXIT_FAILURE); break; default: /* parent */ /* NOP */ @@ -190,30 +203,11 @@ static int handle_plugin(const char *host, } #endif /* HAVE_SOCKETPAIR */ -#ifdef __UNUSED__ -#include - -int SockCheckOpen(int fd) -/* poll given socket; is it selectable? */ -{ - fd_set r, w, e; - int rt; - struct timeval tv; - - for (;;) - { - FD_ZERO(&r); FD_ZERO(&w); FD_ZERO(&e); - FD_SET(fd, &e); - - tv.tv_sec = 0; tv.tv_usec = 0; - rt = select(fd+1, &r, &w, &e, &tv); - if (rt == -1 && (errno != EAGAIN && errno != EINTR)) - return 0; - if (rt != -1) - return 1; - } +/** Set socket to SO_KEEPALIVE. \return 0 for success. */ +int SockKeepalive(int sock) { + int keepalive = 1; + return setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof keepalive); } -#endif /* __UNUSED__ */ int UnixOpen(const char *path) { @@ -229,193 +223,128 @@ int UnixOpen(const char *path) h_errno = 0; return -1; } + + /* Socket opened saved. Usefull if connect timeout + * because it can be closed. + */ + mailserver_socket_temp = sock; + if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) < 0) { int olderr = errno; fm_close(sock); /* don't use SockClose, no traffic yet */ h_errno = 0; errno = olderr; - return -1; + sock = -1; } + + /* No connect timeout, then no need to set mailserver_socket_temp */ + mailserver_socket_temp = -1; + return sock; } -#if INET6_ENABLE -int SockOpen(const char *host, const char *service, const char *options, - const char *plugin) +int SockOpen(const char *host, const char *service, + const char *plugin, struct addrinfo **ai0) { - struct addrinfo *ai, *ai0, req; - int i; -#if NET_SECURITY - void *request = NULL; - int requestlen; -#endif /* NET_SECURITY */ + struct addrinfo *ai, req; + int i, acterr = 0; + int ord; + char errbuf[8192] = ""; #ifdef HAVE_SOCKETPAIR if (plugin) return handle_plugin(host,service,plugin); #endif /* HAVE_SOCKETPAIR */ + memset(&req, 0, sizeof(struct addrinfo)); req.ai_socktype = SOCK_STREAM; +#ifdef AI_ADDRCONFIG + req.ai_flags = AI_ADDRCONFIG; +#endif - if (getaddrinfo(host, service, &req, &ai0)) { - report(stderr, _("fetchmail: getaddrinfo(%s.%s)\n"), host,service); + i = fm_getaddrinfo(host, service, &req, ai0); + if (i) { + report(stderr, GT_("getaddrinfo(\"%s\",\"%s\") error: %s\n"), + host, service, gai_strerror(i)); + if (i == EAI_SERVICE) + report(stderr, GT_("Try adding the --service option (see also FAQ item R12).\n")); return -1; } -#if NET_SECURITY - if (!options) - requestlen = 0; - else - if (net_security_strtorequest((char *)options, &request, &requestlen)) - goto ret; - - i = inner_connect(ai0, request, requestlen, NULL, NULL, "fetchmail", NULL); - if (request) - free(request); - - ret: -#else /* NET_SECURITY */ -#ifdef HAVE_INNER_CONNECT - i = inner_connect(ai0, NULL, 0, NULL, NULL, "fetchmail", NULL); - if (i >= 0) - break; -#else + /* NOTE a Linux bug here - getaddrinfo will happily return 127.0.0.1 + * twice if no IPv6 is configured */ i = -1; - for (ai = ai0; ai; ai = ai->ai_next) { - i = socket(ai->ai_family, ai->ai_socktype, 0); - if (i < 0) - continue; - if (connect(i, (struct sockaddr *) ai->ai_addr, ai->ai_addrlen) < 0) { - fm_close(i); - i = -1; + for (ord = 0, ai = *ai0; ai; ord++, ai = ai->ai_next) { + char buf[256]; /* hostname */ + char pb[256]; /* service name */ + int gnie; /* getnameinfo result code */ + + gnie = getnameinfo(ai->ai_addr, ai->ai_addrlen, buf, sizeof(buf), NULL, 0, NI_NUMERICHOST); + if (gnie) + snprintf(buf, sizeof(buf), GT_("unknown (%s)"), gai_strerror(gnie)); + gnie = getnameinfo(ai->ai_addr, ai->ai_addrlen, NULL, 0, pb, sizeof(pb), NI_NUMERICSERV); + if (gnie) + snprintf(pb, sizeof(pb), GT_("unknown (%s)"), gai_strerror(gnie)); + + if (outlevel >= O_VERBOSE) + report_build(stdout, GT_("Trying to connect to %s/%s..."), buf, pb); + i = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (i < 0) { + int e = errno; + /* mask EAFNOSUPPORT errors, they confuse users for + * multihomed hosts */ + if (errno != EAFNOSUPPORT) + acterr = errno; + if (outlevel >= O_VERBOSE) + report_complete(stdout, GT_("cannot create socket: %s\n"), strerror(e)); + snprintf(errbuf+strlen(errbuf), sizeof(errbuf)-strlen(errbuf),\ + GT_("name %d: cannot create socket family %d type %d: %s\n"), ord, ai->ai_family, ai->ai_socktype, strerror(e)); continue; } - break; - } -#endif -#endif /* NET_SECURITY */ - freeaddrinfo(ai0); + SockKeepalive(i); - return i; -} -#else /* INET6_ENABLE */ -#ifndef HAVE_INET_ATON -#ifndef INADDR_NONE -#ifdef INADDR_BROADCAST -#define INADDR_NONE INADDR_BROADCAST -#else -#define INADDR_NONE -1 -#endif -#endif -#endif /* HAVE_INET_ATON */ + /* Save socket descriptor. + * Used to close the socket after connect timeout. */ + mailserver_socket_temp = i; -int SockOpen(const char *host, int clientPort, const char *options, - const char *plugin) -{ - int sock = -1; /* pacify -Wall */ -#ifndef HAVE_INET_ATON - unsigned long inaddr; -#endif /* HAVE_INET_ATON */ - struct sockaddr_in ad, **pptr; - struct hostent *hp; + if (connect(i, (struct sockaddr *) ai->ai_addr, ai->ai_addrlen) < 0) { + int e = errno; -#ifdef HAVE_SOCKETPAIR - if (plugin) { - char buf[10]; - sprintf(buf,"%d",clientPort); - return handle_plugin(host,buf,plugin); - } -#endif /* HAVE_SOCKETPAIR */ + /* additionally, suppress IPv4 network unreach errors */ + if (e != EAFNOSUPPORT) + acterr = errno; - memset(&ad, 0, sizeof(ad)); - ad.sin_family = AF_INET; + if (outlevel >= O_VERBOSE) + report_complete(stdout, GT_("connection failed.\n")); + if (outlevel >= O_VERBOSE) + report(stderr, GT_("connection to %s:%s [%s/%s] failed: %s.\n"), host, service, buf, pb, strerror(e)); + snprintf(errbuf+strlen(errbuf), sizeof(errbuf)-strlen(errbuf), GT_("name %d: connection to %s:%s [%s/%s] failed: %s.\n"), ord, host, service, buf, pb, strerror(e)); + fm_close(i); + i = -1; + continue; + } else { + if (outlevel >= O_VERBOSE) + report_complete(stdout, GT_("connected.\n")); + } - /* we'll accept a quad address */ -#ifndef HAVE_INET_ATON - inaddr = inet_addr(host); - if (inaddr != INADDR_NONE) - { - memcpy(&ad.sin_addr, &inaddr, sizeof(inaddr)); -#else - if (inet_aton(host, &ad.sin_addr)) - { -#endif /* HAVE_INET_ATON */ - ad.sin_port = htons(clientPort); + /* No connect timeout, then no need to set mailserver_socket_temp */ + mailserver_socket_temp = -1; - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock < 0) - { - h_errno = 0; - return -1; - } - if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) < 0) - { - int olderr = errno; - fm_close(sock); /* don't use SockClose, no traffic yet */ - h_errno = 0; - errno = olderr; - return -1; - } -#ifndef HAVE_INET_ATON - } -#else + break; } -#endif /* HAVE_INET_ATON */ - else { - hp = gethostbyname(host); - if (hp == NULL) - { - errno = 0; - return -1; - } - /* - * Add a check to make sure the address has a valid IPv4 or IPv6 - * length. This prevents buffer spamming by a broken DNS. - */ - if(hp->h_length != 4 && hp->h_length != 8) - { - h_errno = errno = 0; - report(stderr, - _("fetchmail: illegal address length received for host %s\n"),host); - return -1; - } - /* - * Try all addresses of a possibly multihomed host until we get - * a successful connect or until we run out of addresses. - */ - pptr = (struct sockaddr_in **)hp->h_addr_list; - for(; *pptr != NULL; pptr++) - { - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock < 0) - { - h_errno = 0; - return -1; - } - ad.sin_port = htons(clientPort); - memcpy(&ad.sin_addr, *pptr, sizeof(struct in_addr)); - if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) == 0) - break; /* success */ - fm_close(sock); /* don't use SockClose, no traffic yet */ - memset(&ad, 0, sizeof(ad)); - ad.sin_family = AF_INET; - } - if(*pptr == NULL) - { - int olderr = errno; - fm_close(sock); /* don't use SockClose, no traffic yet */ - h_errno = 0; - errno = olderr; - return -1; - } + fm_freeaddrinfo(*ai0); + *ai0 = NULL; + + if (i == -1) { + report(stderr, GT_("Connection errors for this poll:\n%s"), errbuf); + errno = acterr; } - return(sock); + return i; } -#endif /* INET6_ENABLE */ #if defined(HAVE_STDARG_H) @@ -436,29 +365,40 @@ va_dcl { #else va_start(ap); #endif -#ifdef HAVE_VSNPRINTF vsnprintf(buf, sizeof(buf), format, ap); -#else - vsprintf(buf, format, ap); -#endif va_end(ap); return SockWrite(sock, buf, strlen(buf)); } #ifdef SSL_ENABLE -#include "openssl/ssl.h" -#include "openssl/err.h" -#include "openssl/pem.h" -#include "openssl/x509.h" +#include +#include +#include +#include +#include + +static void report_SSL_errors(FILE *stream) +{ + unsigned long err; + + while (0ul != (err = ERR_get_error())) { + char *errstr = ERR_error_string(err, NULL); + report(stream, GT_("OpenSSL reported: %s\n"), errstr); + } +} -static SSL_CTX *_ctx = NULL; +/* override ERR_print_errors_fp to our own implementation */ +#undef ERR_print_errors_fp +#define ERR_print_errors_fp(stream) report_SSL_errors((stream)) + +static SSL_CTX *_ctx[FD_SETSIZE]; static SSL *_ssl_context[FD_SETSIZE]; -SSL *SSLGetContext( int ); +static SSL *SSLGetContext( int ); #endif /* SSL_ENABLE */ -int SockWrite(int sock, char *buf, int len) +int SockWrite(int sock, const char *buf, int len) { int n, wrlen = 0; #ifdef SSL_ENABLE @@ -471,10 +411,8 @@ int SockWrite(int sock, char *buf, int len) if( NULL != ( ssl = SSLGetContext( sock ) ) ) n = SSL_write(ssl, buf, len); else - n = fm_write(sock, buf, len); -#else - n = fm_write(sock, buf, len); -#endif +#endif /* SSL_ENABLE */ + n = fm_write(sock, buf, len); if (n <= 0) return -1; len -= n; @@ -515,7 +453,7 @@ int SockRead(int sock, char *buf, int len) /* OK... SSL_peek works a little different from MSG_PEEK Problem is that SSL_peek can return 0 if there is no data currently available. If, on the other - hand, we loose the socket, we also get a zero, but + hand, we lose the socket, we also get a zero, but the SSL_read then SEGFAULTS! To deal with this, we'll check the error code any time we get a return of zero from SSL_peek. If we have an error, we bail. @@ -524,13 +462,14 @@ int SockRead(int sock, char *buf, int len) later change the behavior of SSL_peek to "fix" this problem... :-( */ if ((n = SSL_peek(ssl, bp, len)) < 0) { + (void)SSL_get_error(ssl, n); return(-1); } if( 0 == n ) { /* SSL_peek says no data... Does he mean no data or did the connection blow up? If we got an error then bail! */ - if( 0 != ( n = ERR_get_error() ) ) { + if (0 != SSL_get_error(ssl, n)) { return -1; } /* We didn't get an error so read at least one @@ -540,10 +479,15 @@ int SockRead(int sock, char *buf, int len) * We don't have a string to pass through * the strchr at this point yet */ newline = NULL; - } else if ((newline = memchr(bp, '\n', n)) != NULL) + } else if ((newline = (char *)memchr(bp, '\n', n)) != NULL) n = newline - bp + 1; - if ((n = SSL_read(ssl, bp, n)) == -1) { - return(-1); + /* Matthias Andree: SSL_read can return 0, in that case + * we must call SSL_get_error to figure if there was + * an error or just a "no data" condition */ + if ((n = SSL_read(ssl, bp, n)) <= 0) { + if ((n = SSL_get_error(ssl, n))) { + return(-1); + } } /* Check for case where our single character turned out to * be a newline... (It wasn't going to get caught by @@ -553,34 +497,30 @@ int SockRead(int sock, char *buf, int len) out of the loop now */ newline = bp; } - } else { - if ((n = fm_peek(sock, bp, len)) <= 0) - return(-1); - if ((newline = memchr(bp, '\n', n)) != NULL) - n = newline - bp + 1; - if ((n = fm_read(sock, bp, n)) == -1) - return(-1); } -#else + else +#endif /* SSL_ENABLE */ + { #ifdef __BEOS__ - if ((n = fm_read(sock, bp, 1)) <= 0) + if ((n = fm_read(sock, bp, 1)) <= 0) #else - if ((n = fm_peek(sock, bp, len)) <= 0) + if ((n = fm_peek(sock, bp, len)) <= 0) #endif - return (-1); - if ((newline = memchr(bp, '\n', n)) != NULL) - n = newline - bp + 1; + return (-1); + if ((newline = (char *)memchr(bp, '\n', n)) != NULL) + n = newline - bp + 1; #ifndef __BEOS__ - if ((n = fm_read(sock, bp, n)) == -1) - return(-1); + if ((n = fm_read(sock, bp, n)) == -1) + return(-1); #endif /* __BEOS__ */ -#endif + } bp += n; len -= n; } while (!newline && len); *bp = '\0'; + return bp - buf; } @@ -596,16 +536,20 @@ int SockPeek(int sock) #ifdef SSL_ENABLE if( NULL != ( ssl = SSLGetContext( sock ) ) ) { n = SSL_peek(ssl, &ch, 1); + if (n < 0) { + (void)SSL_get_error(ssl, n); + return -1; + } if( 0 == n ) { /* This code really needs to implement a "hold back" * to simulate a functioning SSL_peek()... sigh... * Has to be coordinated with the read code above. * Next on the list todo... */ - /* SSL_peek says no data... Does he mean no data + /* SSL_peek says 0... Does that mean no data or did the connection blow up? If we got an error then bail! */ - if( 0 != ( n = ERR_get_error() ) ) { + if(0 != SSL_get_error(ssl, n)) { return -1; } @@ -617,14 +561,10 @@ int SockPeek(int sock) return 0; /* Give him a '\0' character */ } - } else { - n = fm_peek(sock, &ch, 1); } -#else - - n = fm_peek(sock, &ch, 1); - + else #endif /* SSL_ENABLE */ + n = fm_peek(sock, &ch, 1); if (n == -1) return -1; @@ -637,153 +577,414 @@ int SockPeek(int sock) #ifdef SSL_ENABLE static char *_ssl_server_cname = NULL; +static int _check_fp; +static char *_check_digest; +static char *_server_label; +static int _depth0ck; +static int _firstrun; +static int _prev_err; +static int _verify_ok; SSL *SSLGetContext( int sock ) { - /* If SSLOpen has never initialized - just return NULL */ - if( NULL == _ctx ) + if( sock < 0 || (unsigned)sock > FD_SETSIZE ) return NULL; - - if( sock < 0 || sock > FD_SETSIZE ) + if( _ctx[sock] == NULL ) return NULL; return _ssl_context[sock]; } - -int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx ) +/* ok_return (preverify_ok) is 1 if this stage of certificate verification + passed, or 0 if it failed. This callback lets us display informative + errors, and perform additional validation (e.g. CN matches) */ +static int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict ) { - char buf[260]; - char cbuf[260]; - char ibuf[260]; - char *str_ptr; +#define SSLverbose (((outlevel) >= O_DEBUG) || ((outlevel) >= O_VERBOSE && (depth) == 0)) + char buf[257]; X509 *x509_cert; - int err, depth; + int err, depth, i; + unsigned char digest[EVP_MAX_MD_SIZE]; + char text[EVP_MAX_MD_SIZE * 3 + 1], *tp, *te; + const EVP_MD *digest_tp; + unsigned int dsz, esz; + X509_NAME *subj, *issuer; + char *tt; x509_cert = X509_STORE_CTX_get_current_cert(ctx); err = X509_STORE_CTX_get_error(ctx); depth = X509_STORE_CTX_get_error_depth(ctx); - X509_NAME_oneline(X509_get_subject_name(x509_cert), buf, 256); - X509_NAME_oneline(X509_get_issuer_name(x509_cert), ibuf, 256); + subj = X509_get_subject_name(x509_cert); + issuer = X509_get_issuer_name(x509_cert); + + if (outlevel >= O_VERBOSE) { + if (depth == 0 && SSLverbose) + report(stdout, GT_("Server certificate:\n")); + else { + if (_firstrun) { + _firstrun = 0; + if (SSLverbose) + report(stdout, GT_("Certificate chain, from root to peer, starting at depth %d:\n"), depth); + } else { + if (SSLverbose) + report(stdout, GT_("Certificate at depth %d:\n"), depth); + } + } - /* Just to be sure those buffers are terminated... I think the - X509 libraries do, but... */ - buf[256] = ibuf[256] = '\0'; + if (SSLverbose) { + if ((i = X509_NAME_get_text_by_NID(issuer, NID_organizationName, buf, sizeof(buf))) != -1) { + report(stdout, GT_("Issuer Organization: %s\n"), (tt = sdump(buf, i))); + xfree(tt); + if ((size_t)i >= sizeof(buf) - 1) + report(stdout, GT_("Warning: Issuer Organization Name too long (possibly truncated).\n")); + } else + report(stdout, GT_("Unknown Organization\n")); + if ((i = X509_NAME_get_text_by_NID(issuer, NID_commonName, buf, sizeof(buf))) != -1) { + report(stdout, GT_("Issuer CommonName: %s\n"), (tt = sdump(buf, i))); + xfree(tt); + if ((size_t)i >= sizeof(buf) - 1) + report(stdout, GT_("Warning: Issuer CommonName too long (possibly truncated).\n")); + } else + report(stdout, GT_("Unknown Issuer CommonName\n")); + } + } - if (depth == 0) { - if( ( str_ptr = strstr( ibuf, "/O=" ) ) ) { - str_ptr += 3; - strcpy( cbuf, str_ptr ); - if( ( str_ptr = strchr(cbuf, '/' ) ) ) { - *str_ptr = '\0'; - } - if (outlevel == O_VERBOSE) - report(stdout, _("Issuer Organization: %s\n"), cbuf ); - } else { - if (outlevel == O_VERBOSE) - report(stdout, _("Unknown Organization\n"), cbuf ); + if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) { + if (SSLverbose) { + report(stdout, GT_("Subject CommonName: %s\n"), (tt = sdump(buf, i))); + xfree(tt); + } + if ((size_t)i >= sizeof(buf) - 1) { + /* Possible truncation. In this case, this is a DNS name, so this + * is really bad. We do not tolerate this even in the non-strict case. */ + report(stderr, GT_("Bad certificate: Subject CommonName too long!\n")); + return (0); + } + if ((size_t)i > strlen(buf)) { + /* Name contains embedded NUL characters, so we complain. This is likely + * a certificate spoofing attack. */ + report(stderr, GT_("Bad certificate: Subject CommonName contains NUL, aborting!\n")); + return 0; + } + } + + if (depth == 0) { /* peer certificate */ + if (!_depth0ck) { + _depth0ck = 1; } - if( ( str_ptr = strstr( ibuf, "/CN=" ) ) ) { - str_ptr += 4; - strcpy( cbuf, str_ptr ); - if( ( str_ptr = strchr(cbuf, '/' ) ) ) { - *str_ptr = '\0'; + + if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) { + if (_ssl_server_cname != NULL) { + char *p1 = buf; + char *p2 = _ssl_server_cname; + int matched = 0; + STACK_OF(GENERAL_NAME) *gens; + + /* RFC 2595 section 2.4: find a matching name + * first find a match among alternative names */ + gens = (STACK_OF(GENERAL_NAME) *)X509_get_ext_d2i(x509_cert, NID_subject_alt_name, NULL, NULL); + if (gens) { + int j, r; + for (j = 0, r = sk_GENERAL_NAME_num(gens); j < r; ++j) { + const GENERAL_NAME *gn = sk_GENERAL_NAME_value(gens, j); + if (gn->type == GEN_DNS) { + char *pp1 = (char *)gn->d.ia5->data; + char *pp2 = _ssl_server_cname; + if (outlevel >= O_VERBOSE) { + report(stdout, GT_("Subject Alternative Name: %s\n"), (tt = sdump(pp1, (size_t)gn->d.ia5->length))); + xfree(tt); + } + /* Name contains embedded NUL characters, so we complain. This + * is likely a certificate spoofing attack. */ + if ((size_t)gn->d.ia5->length != strlen(pp1)) { + report(stderr, GT_("Bad certificate: Subject Alternative Name contains NUL, aborting!\n")); + sk_GENERAL_NAME_free(gens); + return 0; + } + if (name_match(pp1, pp2)) { + matched = 1; + } + } + } + GENERAL_NAMES_free(gens); + } + if (name_match(p1, p2)) { + matched = 1; + } + if (!matched) { + if (strict || SSLverbose) { + report(stderr, + GT_("Server CommonName mismatch: %s != %s\n"), + (tt = sdump(buf, i)), _ssl_server_cname ); + xfree(tt); + } + ok_return = 0; + } + } else if (ok_return) { + report(stderr, GT_("Server name not set, could not verify certificate!\n")); + if (strict) return (0); } - if (outlevel == O_VERBOSE) - report(stdout, _("Issuer CommonName: %s\n"), cbuf ); } else { - if (outlevel == O_VERBOSE) - report(stdout, _("Unknown Issuer CommonName\n"), cbuf ); + if (outlevel >= O_VERBOSE) + report(stdout, GT_("Unknown Server CommonName\n")); + if (ok_return && strict) { + report(stderr, GT_("Server name not specified in certificate!\n")); + return (0); + } } - if( ( str_ptr = strstr( buf, "/CN=" ) ) ) { - str_ptr += 4; - strcpy( cbuf, str_ptr ); - if( ( str_ptr = strchr(cbuf, '/' ) ) ) { - *str_ptr = '\0'; + /* Print the finger print. Note that on errors, we might print it more than once + * normally; we kluge around that by using a global variable. */ + if (_check_fp == 1) { + unsigned dp; + + _check_fp = -1; + digest_tp = EVP_md5(); + if (digest_tp == NULL) { + report(stderr, GT_("EVP_md5() failed!\n")); + return (0); } - if (outlevel == O_VERBOSE) - report(stdout, _("Server CommonName: %s\n"), cbuf); - - if (_ssl_server_cname != NULL) - { - char *p1 = cbuf; - char *p2 = _ssl_server_cname; - int n; - - if (*p1 == '*') - { - ++p1; - n = strlen(p2) - strlen(p1); - if (n >= 0) - p2 += n; - } - if ( 0 != strcasecmp( p1, p2 ) ) - report(stdout, - "Server CommonName mismatch: %s != %s\n", - cbuf, _ssl_server_cname ); - } - } else { - if (outlevel == O_VERBOSE) - report(stdout, _("Unknown Server CommonName\n"), cbuf ); + if (!X509_digest(x509_cert, digest_tp, digest, &dsz)) { + report(stderr, GT_("Out of memory!\n")); + return (0); + } + tp = text; + te = text + sizeof(text); + for (dp = 0; dp < dsz; dp++) { + esz = snprintf(tp, te - tp, dp > 0 ? ":%02X" : "%02X", digest[dp]); + if (esz >= (size_t)(te - tp)) { + report(stderr, GT_("Digest text buffer too small!\n")); + return (0); + } + tp += esz; + } + if (outlevel > O_NORMAL) + report(stdout, GT_("%s key fingerprint: %s\n"), _server_label, text); + if (_check_digest != NULL) { + if (strcasecmp(text, _check_digest) == 0) { + if (outlevel > O_NORMAL) + report(stdout, GT_("%s fingerprints match.\n"), _server_label); + } else { + report(stderr, GT_("%s fingerprints do not match!\n"), _server_label); + return (0); + } + } /* if (_check_digest != NULL) */ + } /* if (_check_fp) */ + } /* if (depth == 0 && !_depth0ck) */ + + if (err != X509_V_OK && err != _prev_err && !(_check_fp != 0 && _check_digest && !strict)) { + char *tmp; + int did_rep_err = 0; + _prev_err = err; + + report(stderr, GT_("Server certificate verification error: %s\n"), X509_verify_cert_error_string(err)); + /* We gave the error code, but maybe we can add some more details for debugging */ + + switch (err) { + /* actually we do not want to lump these together, but + * since OpenSSL flipped the meaning of these error + * codes in the past, and they do hardly make a + * practical difference because servers need not provide + * the root signing certificate, we don't bother telling + * users the difference: + */ + case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY: + case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: + X509_NAME_oneline(issuer, buf, sizeof(buf)); + buf[sizeof(buf) - 1] = '\0'; + report(stderr, GT_("Broken certification chain at: %s\n"), (tmp = sdump(buf, strlen(buf)))); + xfree(tmp); + report(stderr, GT_( "This could mean that the server did not provide the intermediate CA's certificate(s), " + "which is nothing fetchmail could do anything about. For details, " + "please see the README.SSL-SERVER document that ships with fetchmail.\n")); + did_rep_err = 1; + /* FALLTHROUGH */ + case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: + case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN: + if (!did_rep_err) { + X509_NAME_oneline(issuer, buf, sizeof(buf)); + buf[sizeof(buf) - 1] = '\0'; + report(stderr, GT_("Missing trust anchor certificate: %s\n"), (tmp = sdump(buf, strlen(buf)))); + xfree(tmp); + } + report(stderr, GT_( "This could mean that the root CA's signing certificate is not in the " + "trusted CA certificate location, or that c_rehash needs to be run " + "on the certificate directory. For details, please " + "see the documentation of --sslcertpath and --sslcertfile in the manual page.\n")); + break; + default: + break; } } + /* + * If not in strict checking mode (--sslcertck), override this + * and pretend that verification had succeeded. + */ + _verify_ok &= ok_return; + if (!strict) + ok_return = 1; + return (ok_return); +} - switch (ctx->error) { - case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: - X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256); - report(stdout, _("unknown issuer= %s"), buf); - break; - case X509_V_ERR_CERT_NOT_YET_VALID: - case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: - report(stderr, _("Server Certificate not yet valid")); - break; - case X509_V_ERR_CERT_HAS_EXPIRED: - case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: - report(stderr, _("Server Certificate expired")); - break; - } - /* We are not requiring or validating server or issuer id's as yet */ - /* Always return OK from here */ - ok_return = 1; - return( ok_return ); +static int SSL_nock_verify_callback( int ok_return, X509_STORE_CTX *ctx ) +{ + return SSL_verify_callback(ok_return, ctx, 0); +} + +static int SSL_ck_verify_callback( int ok_return, X509_STORE_CTX *ctx ) +{ + return SSL_verify_callback(ok_return, ctx, 1); } +/* get commonName from certificate set in file. + * commonName is stored in buffer namebuffer, limited with namebufferlen + */ +static const char *SSLCertGetCN(const char *mycert, + char *namebuffer, size_t namebufferlen) +{ + const char *ret = NULL; + BIO *certBio = NULL; + X509 *x509_cert = NULL; + X509_NAME *certname = NULL; + + if (namebuffer && namebufferlen > 0) { + namebuffer[0] = 0x00; + certBio = BIO_new_file(mycert,"r"); + if (certBio) { + x509_cert = PEM_read_bio_X509(certBio,NULL,NULL,NULL); + BIO_free(certBio); + } + if (x509_cert) { + certname = X509_get_subject_name(x509_cert); + if (certname && + X509_NAME_get_text_by_NID(certname, NID_commonName, + namebuffer, namebufferlen) > 0) + ret = namebuffer; + X509_free(x509_cert); + } + } + return ret; +} + /* performs initial SSL handshake over the connected socket * uses SSL *ssl global variable, which is currently defined * in this file */ -int SSLOpen(int sock, char *mycert, char *mykey, char *servercname ) +int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck, + char *cacertfile, char *certpath, + char *fingerprint, char *servercname, char *label, char **remotename) { + struct stat randstat; + int i; + long sslopts = SSL_OP_ALL; + SSL_load_error_strings(); - SSLeay_add_ssl_algorithms(); - - if( sock < 0 || sock > FD_SETSIZE ) { - report(stderr, _("File descriptor out of range for SSL") ); + SSL_library_init(); + OpenSSL_add_all_algorithms(); /* see Debian Bug#576430 and manpage */ + + if (stat("/dev/random", &randstat) && + stat("/dev/urandom", &randstat)) { + /* Neither /dev/random nor /dev/urandom are present, so add + entropy to the SSL PRNG a hard way. */ + for (i = 0; i < 10000 && ! RAND_status (); ++i) { + char buf[4]; + struct timeval tv; + gettimeofday (&tv, 0); + buf[0] = tv.tv_usec & 0xF; + buf[2] = (tv.tv_usec & 0xF0) >> 4; + buf[3] = (tv.tv_usec & 0xF00) >> 8; + buf[1] = (tv.tv_usec & 0xF000) >> 12; + RAND_add (buf, sizeof buf, 0.1); + } + } + + if( sock < 0 || (unsigned)sock > FD_SETSIZE ) { + report(stderr, GT_("File descriptor out of range for SSL") ); return( -1 ); } - if( ! _ctx ) { - /* Be picky and make sure the memory is cleared */ - memset( _ssl_context, 0, sizeof( _ssl_context ) ); - _ctx = SSL_CTX_new(SSLv23_client_method()); - if(_ctx == NULL) { - ERR_print_errors_fp(stderr); - return(-1); + /* Make sure a connection referring to an older context is not left */ + _ssl_context[sock] = NULL; + if(myproto) { + if(!strcasecmp("ssl2",myproto)) { +#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 + _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); +#else + report(stderr, GT_("Your operating system does not support SSLv2.\n")); + return -1; +#endif + } else if(!strcasecmp("ssl3",myproto)) { + _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); + } else if(!strcasecmp("tls1",myproto)) { + _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); + } else if (!strcasecmp("ssl23",myproto)) { + myproto = NULL; + } else { + report(stderr,GT_("Invalid SSL protocol '%s' specified, using default (SSLv23).\n"), myproto); + myproto = NULL; + } + } + if(!myproto) { + _ctx[sock] = SSL_CTX_new(SSLv23_client_method()); + } + if(_ctx[sock] == NULL) { + ERR_print_errors_fp(stderr); + return(-1); + } + + { + char *tmp = getenv("FETCHMAIL_DISABLE_CBC_IV_COUNTERMEASURE"); + if (tmp == NULL || *tmp == '\0' || strspn(tmp, " \t") == strlen(tmp)) + sslopts &= ~ SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; + } + + SSL_CTX_set_options(_ctx[sock], sslopts); + + if (certck) { + SSL_CTX_set_verify(_ctx[sock], SSL_VERIFY_PEER, SSL_ck_verify_callback); + } else { + /* In this case, we do not fail if verification fails. However, + * we provide the callback for output and possible fingerprint + * checks. */ + SSL_CTX_set_verify(_ctx[sock], SSL_VERIFY_PEER, SSL_nock_verify_callback); + } + + /* Check which trusted X.509 CA certificate store(s) to load */ + { + char *tmp; + int want_default_cacerts = 0; + + /* Load user locations if any is given */ + if (certpath || cacertfile) + SSL_CTX_load_verify_locations(_ctx[sock], + cacertfile, certpath); + else + want_default_cacerts = 1; + + tmp = getenv("FETCHMAIL_INCLUDE_DEFAULT_X509_CA_CERTS"); + if (want_default_cacerts || (tmp && tmp[0])) { + SSL_CTX_set_default_verify_paths(_ctx[sock]); } } - _ssl_context[sock] = SSL_new(_ctx); + _ssl_context[sock] = SSL_new(_ctx[sock]); if(_ssl_context[sock] == NULL) { ERR_print_errors_fp(stderr); + SSL_CTX_free(_ctx[sock]); + _ctx[sock] = NULL; return(-1); } /* This static is for the verify callback */ _ssl_server_cname = servercname; - - SSL_CTX_set_verify(_ctx, SSL_VERIFY_PEER, SSL_verify_callback); + _server_label = label; + _check_fp = 1; + _check_digest = fingerprint; + _depth0ck = 0; + _firstrun = 1; + _verify_ok = 1; + _prev_err = -1; if( mycert || mykey ) { @@ -791,21 +992,53 @@ int SSLOpen(int sock, char *mycert, char *mykey, char *servercname ) * he does NOT have a separate certificate and private key file then * assume that it's a combined key and certificate file. */ + char buffer[256]; + if( !mykey ) mykey = mycert; if( !mycert ) mycert = mykey; + + if ((!*remotename || !**remotename) && SSLCertGetCN(mycert, buffer, sizeof(buffer))) { + free(*remotename); + *remotename = xstrdup(buffer); + } SSL_use_certificate_file(_ssl_context[sock], mycert, SSL_FILETYPE_PEM); SSL_use_RSAPrivateKey_file(_ssl_context[sock], mykey, SSL_FILETYPE_PEM); } - SSL_set_fd(_ssl_context[sock], sock); - - if(SSL_connect(_ssl_context[sock]) == -1) { + if (SSL_set_fd(_ssl_context[sock], sock) == 0 + || SSL_connect(_ssl_context[sock]) < 1) { ERR_print_errors_fp(stderr); + SSL_free( _ssl_context[sock] ); + _ssl_context[sock] = NULL; + SSL_CTX_free(_ctx[sock]); + _ctx[sock] = NULL; return(-1); } - + + /* Paranoia: was the callback not called as we expected? */ + if (!_depth0ck) { + report(stderr, GT_("Certificate/fingerprint verification was somehow skipped!\n")); + + if (fingerprint != NULL || certck) { + if( NULL != SSLGetContext( sock ) ) { + /* Clean up the SSL stack */ + SSL_shutdown( _ssl_context[sock] ); + SSL_free( _ssl_context[sock] ); + _ssl_context[sock] = NULL; + SSL_CTX_free(_ctx[sock]); + _ctx[sock] = NULL; + } + return(-1); + } + } + + if (!certck && !fingerprint && + (SSL_get_verify_result(_ssl_context[sock]) != X509_V_OK || !_verify_ok)) { + report(stderr, GT_("Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n")); + } + return(0); } #endif @@ -814,57 +1047,45 @@ int SockClose(int sock) /* close a socket gracefully */ { #ifdef SSL_ENABLE - SSL *ssl; - - if( NULL != ( ssl = SSLGetContext( sock ) ) ) { + if( NULL != SSLGetContext( sock ) ) { /* Clean up the SSL stack */ + SSL_shutdown( _ssl_context[sock] ); SSL_free( _ssl_context[sock] ); _ssl_context[sock] = NULL; + SSL_CTX_free(_ctx[sock]); + _ctx[sock] = NULL; } #endif -#ifdef __UNUSED__ - /* - * This hangs in RedHat 6.2 after fetchmail runs for a while a - * FIN_WAIT2 comes up in netstat and fetchmail never returns from - * the recv system call. (Reported from jtnews - * , Wed, 24 May 2000 21:26:02.) - * - * Half-close the connection first so the other end gets notified. - * - * This stops sends but allows receives (effectively, it sends a - * TCP ). */ - if (shutdown(sock, 1) == 0) { - char ch; - /* If there is any data still waiting in the queue, discard it. - * Call recv() until either it returns 0 (meaning we received a FIN) - * or any error occurs. This makes sure all data sent by the other - * side is acknowledged at the TCP level. - */ - if (fm_peek(sock, &ch, 1) > 0) - while (fm_read(sock, &ch, 1) > 0) - continue; - } -#endif /* __UNUSED__ */ - /* if there's an error closing at this point, not much we can do */ return(fm_close(sock)); /* this is guarded */ } -#ifdef MAIN +#ifdef __CYGWIN__ /* - * Use the chargen service to test input buffering directly. - * You may have to uncomment the `chargen' service description in your - * inetd.conf (and then SIGHUP inetd) for this to work. */ -main() + * Workaround Microsoft Winsock recv/WSARecv(..., MSG_PEEK) bug. + * See http://sources.redhat.com/ml/cygwin/2001-08/msg00628.html + * for more details. + */ +static ssize_t cygwin_read(int sock, void *buf, size_t count) { - int sock = SockOpen("localhost", 19, NULL); - char buf[80]; + char *bp = (char *)buf; + size_t n = 0; - while (SockRead(sock, buf, sizeof(buf)-1)) - SockWrite(1, buf, strlen(buf)); - SockClose(sock); -} -#endif /* MAIN */ + if ((n = read(sock, bp, count)) == (size_t)-1) + return(-1); + + if (n != count) { + size_t n2 = 0; + if (outlevel >= O_VERBOSE) + report(stdout, GT_("Cygwin socket read retry\n")); + n2 = read(sock, bp + n, count - n); + if (n2 == (size_t)-1 || n + n2 != count) { + report(stderr, GT_("Cygwin socket read retry failed!\n")); + return(-1); + } + } -/* socket.c ends here */ + return count; +} +#endif /* __CYGWIN__ */