#include <memory.h>
#endif /* HAVE_MEMORY_H */
#include <sys/types.h>
+#include <sys/stat.h>
#ifndef HAVE_NET_SOCKET_H
#include <sys/socket.h>
#else
#else
#include <varargs.h>
#endif
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include "socket.h"
#include "fetchmail.h"
#include "i18n.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)
#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 */
#endif /* ndef h_errno */
-#if NET_SECURITY
+#ifdef NET_SECURITY
#include <net/security.h>
#endif /* NET_SECURITY */
#ifdef HAVE_SOCKETPAIR
-char *const *parse_plugin(const char *plugin, const char *host, const char *service)
+static char *const *parse_plugin(const char *plugin, const char *host, const char *service)
{ const char **argvec;
const char *c, *p;
char *cp, *plugin_copy;
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++;
}
memset(argvec, 0, s);
for (c = p = plugin_copy, i = 0; *c; c++)
- { if ((!isspace(*c)) && (c == p ? 1 : isspace(*p))) {
+ { if ((!isspace((unsigned char)*c)) && (c == p ? 1 : isspace((unsigned char)*p))) {
argvec[i] = c;
i++;
}
p = c;
}
for (cp = plugin_copy; *cp; cp++)
- { if (isspace(*cp))
+ { if (isspace((unsigned char)*cp))
*cp = 0;
}
return (char *const*)argvec;
/* error */
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 */
#endif /* HAVE_SOCKETPAIR */
#ifdef __UNUSED__
-#include <sys/time.h>
int SockCheckOpen(int fd)
/* poll given socket; is it selectable? */
h_errno = 0;
return -1;
}
- if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) < 0)
+
+ /* 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
+#ifdef INET6_ENABLE
int SockOpen(const char *host, const char *service, const char *options,
const char *plugin)
{
struct addrinfo *ai, *ai0, req;
int i;
-#if NET_SECURITY
+#ifdef NET_SECURITY
void *request = NULL;
int requestlen;
#endif /* NET_SECURITY */
if (i >= 0)
break;
#else
+
i = -1;
for (ai = ai0; ai; ai = ai->ai_next) {
i = socket(ai->ai_family, ai->ai_socktype, 0);
if (i < 0)
continue;
+
+ /* Socket opened saved. Usefull if connect timeout
+ * because it can be closed.
+ */
+ mailserver_socket_temp = i;
+
if (connect(i, (struct sockaddr *) ai->ai_addr, ai->ai_addrlen) < 0) {
fm_close(i);
i = -1;
continue;
}
+
+ /* No connect timeout, then no need to set mailserver_socket_temp */
+ mailserver_socket_temp = -1;
+
break;
}
+
#endif
#endif /* NET_SECURITY */
#ifdef HAVE_SOCKETPAIR
if (plugin) {
char buf[10];
-#ifdef HAVE_SNPRINTF
- snprintf(buf, sizeof(buf), /* Yeah, paranoic. So what? :P */
-#else
- sprintf(buf,
-#endif /* HAVE_SNPRINTF */
- "%d",clientPort);
+ snprintf(buf, sizeof(buf), "%d", clientPort);
return handle_plugin(host,buf,plugin);
}
#endif /* HAVE_SOCKETPAIR */
/* we'll accept a quad address */
#ifndef HAVE_INET_ATON
- inaddr = inet_addr(host);
+ inaddr = inet_addr((char*)host);
if (inaddr != INADDR_NONE)
{
memcpy(&ad.sin_addr, &inaddr, sizeof(inaddr));
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;
errno = olderr;
return -1;
}
+
+ /* No connect timeout, then no need to set mailserver_socket_temp */
+ mailserver_socket_temp = -1;
+
#ifndef HAVE_INET_ATON
}
#else
}
#endif /* HAVE_INET_ATON */
else {
- hp = gethostbyname(host);
+ hp = gethostbyname((char*)host);
if (hp == NULL)
{
h_errno = 0;
return -1;
}
+
+ /* Socket opened saved. Usefull if connect timeout because
+ * it can be closed
+ */
+ mailserver_socket_temp = sock;
+
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 */
+ if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) == 0) {
+ /* No connect timeout, then no need to set mailserver_socket_temp */
+ mailserver_socket_temp = -1;
+ break; /* success */
+ }
fm_close(sock); /* don't use SockClose, no traffic yet */
memset(&ad, 0, sizeof(ad));
ad.sin_family = AF_INET;
#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 <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
+#include <openssl/rand.h>
static SSL_CTX *_ctx = NULL;
static SSL *_ssl_context[FD_SETSIZE];
-SSL *SSLGetContext( int );
+static SSL *SSLGetContext( int );
#endif /* SSL_ENABLE */
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;
{
char *newline, *bp = buf;
int n;
+#ifdef FORCE_STUFFING
+ int maxavailable = 0;
+#endif
#ifdef SSL_ENABLE
SSL *ssl;
#endif
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);
}
+#ifdef FORCE_STUFFING
+ maxavailable = n;
+#endif
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 != ( n = SSL_get_error(ssl, n) ) ) {
return -1;
}
/* We didn't get an error so read at least one
newline = NULL;
} else if ((newline = 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 cal 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
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);
+#ifdef FORCE_STUFFING
+ maxavailable = n;
+#endif
+ if ((newline = 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';
+
+#ifdef FORCE_STUFFING /* too ugly to live -- besides, there's IMAP */
+ /* OK, very weird hack coming up here:
+ * When POP3 servers send us a message, they're supposed to
+ * terminate the message with a line containing only a dot. To protect
+ * against lines in the real message that might contain only a dot,
+ * they're supposed to preface any line that starts with a dot with
+ * an additional dot, which will be removed on the client side. That
+ * process, called byte-stuffing (and unstuffing) is really not the
+ * concern of this low-level routine, ordinarily, but there are some
+ * POP servers (and maybe IMAP servers too, who knows) that fail to
+ * do the byte-stuffing, and this routine is the best place to try to
+ * identify and fix that fault.
+ *
+ * Since the DOT line is supposed to come only at the end of a
+ * message, the implication is that right after we see it, the server
+ * is supposed to go back to waiting for the next command. There
+ * isn't supposed to be any more data to read after we see the dot.
+ * THEREFORE, if we see more data to be read after something that
+ * looks like the dot line, then probably the server is failing to
+ * do byte-stuffing. In that case, we'll byte-pack it for them so
+ * that the higher-level routines see things as hunky-dorey.
+ * This is not a perfect test or fix by any means (it has an
+ * obvious race condition, for one thing), but it should at least
+ * reduce the nastiness that ensues when people don't know how
+ * to write POP servers.
+ */
+ if ((maxavailable > (bp-buf)) &&
+ ((((bp-buf) == 3) &&
+ (buf[0] == '.') &&
+ (buf[1] == '\r') &&
+ (buf[2] == '\n')) ||
+ (((bp-buf) == 2) &&
+ (buf[0] == '.') &&
+ (buf[1] == '\n')))) {
+
+ memmove(buf+1, buf, (bp-buf)+1);
+ buf[0] = '.';
+ bp++;
+ }
+#endif /* FORCE_STUFFING */
return bp - buf;
}
#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 != ( n = SSL_get_error(ssl, n) ) ) {
return -1;
}
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;
static char *_check_digest;
static char *_server_label;
static int _depth0ck;
+static int _prev_err;
SSL *SSLGetContext( int sock )
{
}
-int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict )
+/* 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[257];
X509 *x509_cert;
int err, depth;
unsigned char digest[EVP_MAX_MD_SIZE];
char text[EVP_MAX_MD_SIZE * 3 + 1], *tp, *te;
- EVP_MD *digest_tp;
+ const EVP_MD *digest_tp;
unsigned int dsz, i, esz;
X509_NAME *subj, *issuer;
subj = X509_get_subject_name(x509_cert);
issuer = X509_get_issuer_name(x509_cert);
- if (depth == 0) {
+ if (depth == 0 && !_depth0ck) {
_depth0ck = 1;
if (outlevel == O_VERBOSE) {
if (ok_return && strict)
return (0);
}
- } else if (ok_return && strict) {
+ } else if (ok_return) {
report(stderr, GT_("Server name not set, could not verify certificate!\n"));
- return (0);
+ if (strict) return (0);
}
} else {
if (outlevel == O_VERBOSE)
tp = text;
te = text + sizeof(text);
for (i = 0; i < dsz; i++) {
-#ifdef HAVE_SNPRINTF
esz = snprintf(tp, te - tp, i > 0 ? ":%02X" : "%02X", digest[i]);
-#else
- esz = sprintf(tp, i > 0 ? ":%02X" : "%02X", digest[i]);
-#endif
if (esz >= te - tp) {
report(stderr, GT_("Digest text buffer too small!\n"));
return (0);
}
tp += esz;
}
- report(stdout, GT_("%s key fingerprint: %s\n"), _server_label, text);
+ if (outlevel > O_NORMAL)
+ report(stdout, GT_("%s key fingerprint: %s\n"), _server_label, text);
if (_check_digest != NULL) {
- if (strcmp(text, _check_digest) == 0)
+ if (strcmp(text, _check_digest) == 0) {
+ if (outlevel > O_NORMAL)
report(stdout, GT_("%s fingerprints match.\n"), _server_label);
- else {
+ } else {
+ if (outlevel > O_SILENT)
report(stderr, GT_("%s fingerprints do not match!\n"), _server_label);
- return (0);
+ return (0);
}
}
}
}
- if (err != X509_V_OK && (strict || outlevel == O_VERBOSE)) {
- report(strict ? stderr : stdout, GT_("Warning: server certificate verification: %s\n"), X509_verify_cert_error_string(err));
+ if (err != X509_V_OK && err != _prev_err) {
+ _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) {
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
X509_NAME_oneline(issuer, buf, sizeof(buf));
buf[sizeof(buf) - 1] = '\0';
- report(stdout, GT_("unknown issuer (first %d characters): %s\n"), sizeof(buf), buf);
+ report(stderr, GT_("unknown issuer (first %d characters): %s\n"), sizeof(buf)-1, buf);
break;
}
}
return (ok_return);
}
-int SSL_nock_verify_callback( int ok_return, X509_STORE_CTX *ctx )
+static int SSL_nock_verify_callback( int ok_return, X509_STORE_CTX *ctx )
{
return SSL_verify_callback(ok_return, ctx, 0);
}
-int SSL_ck_verify_callback( int ok_return, X509_STORE_CTX *ctx )
+static int SSL_ck_verify_callback( int ok_return, X509_STORE_CTX *ctx )
{
return SSL_verify_callback(ok_return, ctx, 1);
}
int SSLOpen(int sock, char *mycert, char *mykey, char *myproto, int certck, char *certpath,
char *fingerprint, char *servercname, char *label)
{
- SSL *ssl;
-
+ struct stat randstat;
+ int i;
+
SSL_load_error_strings();
SSLeay_add_ssl_algorithms();
+#ifdef SSL_ENABLE
+ 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);
+ }
+ }
+#endif /* SSL_ENABLE */
+
+
if( sock < 0 || sock > FD_SETSIZE ) {
report(stderr, GT_("File descriptor out of range for SSL") );
return( -1 );
_ctx = SSL_CTX_new(SSLv3_client_method());
} else if(!strcmp("tls1",myproto)) {
_ctx = SSL_CTX_new(TLSv1_client_method());
+ } else if (!strcmp("ssl23",myproto)) {
+ myproto = NULL;
} else {
fprintf(stderr,GT_("Invalid SSL protocol '%s' specified, using default (SSLv23).\n"), myproto);
myproto = NULL;
if (certck) {
SSL_CTX_set_verify(_ctx, SSL_VERIFY_PEER, SSL_ck_verify_callback);
- if (certpath)
- SSL_CTX_load_verify_locations(_ctx, NULL, certpath);
} 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, SSL_VERIFY_PEER, SSL_nock_verify_callback);
}
+ if (certpath)
+ SSL_CTX_load_verify_locations(_ctx, NULL, certpath);
_ssl_context[sock] = SSL_new(_ctx);
_check_fp = 1;
_check_digest = fingerprint;
_depth0ck = 0;
+ _prev_err = -1;
if( mycert || mykey ) {
SSL_set_fd(_ssl_context[sock], sock);
- if(SSL_connect(_ssl_context[sock]) == -1) {
+ if(SSL_connect(_ssl_context[sock]) < 1) {
ERR_print_errors_fp(stderr);
return(-1);
}
/* Paranoia: was the callback not called as we expected? */
- if ((fingerprint != NULL || certck) && !_depth0ck) {
+ if (!_depth0ck) {
report(stderr, GT_("Certificate/fingerprint verification was somehow skipped!\n"));
-
- if( NULL != ( ssl = SSLGetContext( sock ) ) ) {
- /* Clean up the SSL stack */
- SSL_free( _ssl_context[sock] );
- _ssl_context[sock] = NULL;
+
+ if (fingerprint != NULL || certck) {
+ if( NULL != SSLGetContext( sock ) ) {
+ /* Clean up the SSL stack */
+ SSL_free( _ssl_context[sock] );
+ _ssl_context[sock] = NULL;
+ }
+ return(-1);
}
- return(-1);
}
return(0);
/* close a socket gracefully */
{
#ifdef SSL_ENABLE
- SSL *ssl;
-
- if( NULL != ( ssl = SSLGetContext( sock ) ) ) {
+ if( NULL != SSLGetContext( sock ) ) {
/* Clean up the SSL stack */
SSL_free( _ssl_context[sock] );
_ssl_context[sock] = NULL;
return(fm_close(sock)); /* this is guarded */
}
+#ifdef __CYGWIN__
+/*
+ * 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)
+{
+ char *bp = buf;
+ int n = 0;
+
+ if ((n = read(sock, bp, count)) == -1)
+ return(-1);
+
+ if (n != count) {
+ int n2 = 0;
+ if (outlevel >= O_VERBOSE)
+ report(stdout, GT_("Cygwin socket read retry\n"));
+ n2 = read(sock, bp + n, count - n);
+ if (n2 == -1 || n + n2 != count) {
+ report(stderr, GT_("Cygwin socket read retry failed!\n"));
+ return(-1);
+ }
+ }
+
+ return count;
+}
+#endif /* __CYGWIN__ */
+
#ifdef MAIN
/*
* Use the chargen service to test input buffering directly.
projects / ~andy / fetchmail / blobdiff