dovecot/original-hg/dovecot-1.2: src/login-common/ssl-proxy-openssl.c annotate

annotate src/login-common/ssl-proxy-openssl.c @ 8621:22985329af92 HEAD

Check broken ssl-parameters.dat files better and give a better error message when seeing one.

author	Timo Sirainen <tss@iki.fi>
date	Tue, 13 Jan 2009 13:13:19 -0500
parents	b9faf4db2a9f
children	1c6361f7111d

rev	line source
8590 b9faf4db2a9f Updated copyright notices to include year 2009. Timo Sirainen <tss@iki.fi> parents: 8302 diff changeset	1 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	2
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	3 #include "common.h"
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	4 #include "array.h"
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	5 #include "ioloop.h"
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	6 #include "network.h"
4474 1ff1603403de Second try with SSL proxy rewrite. Did some fixes since last try. Timo Sirainen <tss@iki.fi> parents: 4471 diff changeset	7 #include "ostream.h"
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	8 #include "read-full.h"
7119 8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	9 #include "llist.h"
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	10 #include "ssl-proxy.h"
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	11
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	12 #include <fcntl.h>
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	13 #include <unistd.h>
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	14 #include <sys/stat.h>
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	15
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	16 #ifdef HAVE_OPENSSL
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	17
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	18 #include <openssl/crypto.h>
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	19 #include <openssl/x509.h>
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	20 #include <openssl/pem.h>
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	21 #include <openssl/ssl.h>
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	22 #include <openssl/err.h>
1556 545f6b150e2c Make sure PRNG gets initialized before chrooting so it can open /dev/urandom. Timo Sirainen <tss@iki.fi> parents: 1544 diff changeset	23 #include <openssl/rand.h>
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	24
4696 abf9a1234b99 Don't allow SSLv2 by default. Timo Sirainen <tss@iki.fi> parents: 4695 diff changeset	25 #define DOVECOT_SSL_DEFAULT_CIPHER_LIST "ALL:!LOW:!SSLv2"
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	26 /* Check every 30 minutes if parameters file has been updated */
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	27 #define SSL_PARAMFILE_CHECK_INTERVAL (60*30)
1544 ac6ee442376d OpenSSL proxy changes - hopefully fixes something. Also don't crash with Timo Sirainen <tss@iki.fi> parents: 1492 diff changeset	28
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	29 enum ssl_io_action {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	30 SSL_ADD_INPUT,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	31 SSL_REMOVE_INPUT,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	32 SSL_ADD_OUTPUT,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	33 SSL_REMOVE_OUTPUT
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	34 };
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	35
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	36 struct ssl_proxy {
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	37 int refcount;
7119 8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	38 struct ssl_proxy prev, next;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	39
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	40 SSL *ssl;
1235 2660b47fd9bc Added setting verbose_ssl Timo Sirainen <tss@iki.fi> parents: 1234 diff changeset	41 struct ip_addr ip;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	42
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	43 int fd_ssl, fd_plain;
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	44 struct io io_ssl_read, io_ssl_write, io_plain_read, io_plain_write;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	45
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	46 unsigned char plainout_buf[1024];
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	47 unsigned int plainout_size;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	48
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	49 unsigned char sslout_buf[1024];
1324 13d8f69d4f1a rewrite, maybe it works properly now. Timo Sirainen <tss@iki.fi> parents: 1268 diff changeset	50 unsigned int sslout_size;
1458 98362534b2c7 Unexpected SSL connection errors sometimes crashed Timo Sirainen <tss@iki.fi> parents: 1457 diff changeset	51
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	52 char *last_error;
1458 98362534b2c7 Unexpected SSL connection errors sometimes crashed Timo Sirainen <tss@iki.fi> parents: 1457 diff changeset	53 unsigned int handshaked:1;
98362534b2c7 Unexpected SSL connection errors sometimes crashed Timo Sirainen <tss@iki.fi> parents: 1457 diff changeset	54 unsigned int destroyed:1;
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	55 unsigned int cert_received:1;
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	56 unsigned int cert_broken:1;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	57 };
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	58
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	59 struct ssl_parameters {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	60 const char *fname;
4505 886d7af1f38d Don't constantly re-read ssl-parameters.dat. Make sure that in input handler Timo Sirainen <tss@iki.fi> parents: 4474 diff changeset	61 time_t last_mtime, last_check;
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	62 int fd;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	63
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	64 DH dh_512, dh_1024;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	65 };
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	66
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	67 static int extdata_index;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	68 static SSL_CTX *ssl_ctx;
7119 8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	69 static unsigned int ssl_proxy_count;
8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	70 static struct ssl_proxy *ssl_proxies;
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	71 static struct ssl_parameters ssl_params;
6364 7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	72 static int ssl_username_nid;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	73
4907 5b4c9b20eba0 Replaced void context from a lot of callbacks with the actual context Timo Sirainen <tss@iki.fi>* parents: 4827 diff changeset	74 static void plain_read(struct ssl_proxy *proxy);
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	75 static void ssl_read(struct ssl_proxy *proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	76 static void ssl_write(struct ssl_proxy *proxy);
4907 5b4c9b20eba0 Replaced void context from a lot of callbacks with the actual context Timo Sirainen <tss@iki.fi>* parents: 4827 diff changeset	77 static void ssl_step(struct ssl_proxy *proxy);
1458 98362534b2c7 Unexpected SSL connection errors sometimes crashed Timo Sirainen <tss@iki.fi> parents: 1457 diff changeset	78 static void ssl_proxy_destroy(struct ssl_proxy *proxy);
3863 55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool. Timo Sirainen <tss@iki.fi> parents: 3635 diff changeset	79 static void ssl_proxy_unref(struct ssl_proxy *proxy);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	80
8621 22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	81 static void ssl_params_corrupted(const char *path)
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	82 {
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	83 i_fatal("Corrupted SSL parameters file: %s/%s "
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	84 "(delete it and also the one in %s)",
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	85 getenv("LOGIN_DIR"), path, PKG_STATEDIR);
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	86 }
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	87
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	88 static void read_next(struct ssl_parameters params, void data, size_t size)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	89 {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	90 int ret;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	91
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	92 if ((ret = read_full(params->fd, data, size)) < 0)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	93 i_fatal("read(%s) failed: %m", params->fname);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	94 if (ret == 0)
8621 22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	95 ssl_params_corrupted(params->fname);
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	96 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	97
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	98 static bool read_dh_parameters_next(struct ssl_parameters *params)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	99 {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	100 unsigned char *buf;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	101 const unsigned char *cbuf;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	102 unsigned int len;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	103 int bits;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	104
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	105 /* read bit size. 0 ends the DH parameters list. */
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	106 read_next(params, &bits, sizeof(bits));
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	107
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	108 if (bits == 0)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	109 return FALSE;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	110
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	111 /* read data size. */
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	112 read_next(params, &len, sizeof(len));
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	113 if (len > 1024100) / should be enough? */
8621 22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	114 ssl_params_corrupted(params->fname);
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	115
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	116 buf = i_malloc(len);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	117 read_next(params, buf, len);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	118
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	119 cbuf = buf;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	120 switch (bits) {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	121 case 512:
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	122 params->dh_512 = d2i_DHparams(NULL, &cbuf, len);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	123 break;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	124 case 1024:
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	125 params->dh_1024 = d2i_DHparams(NULL, &cbuf, len);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	126 break;
8621 22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	127 default:
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	128 ssl_params_corrupted(params->fname);
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	129 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	130
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	131 i_free(buf);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	132 return TRUE;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	133 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	134
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	135 static void ssl_free_parameters(struct ssl_parameters *params)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	136 {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	137 if (params->dh_512 != NULL) {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	138 DH_free(params->dh_512);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	139 params->dh_512 = NULL;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	140 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	141 if (params->dh_1024 != NULL) {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	142 DH_free(params->dh_1024);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	143 params->dh_1024 = NULL;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	144 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	145 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	146
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	147 static void ssl_read_parameters(struct ssl_parameters *params)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	148 {
4505 886d7af1f38d Don't constantly re-read ssl-parameters.dat. Make sure that in input handler Timo Sirainen <tss@iki.fi> parents: 4474 diff changeset	149 struct stat st;
8621 22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	150 ssize_t ret;
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	151 char c;
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	152 bool warned = FALSE;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	153
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	154 /* we'll wait until parameter file exists */
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	155 for (;;) {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	156 params->fd = open(params->fname, O_RDONLY);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	157 if (params->fd != -1)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	158 break;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	159
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	160 if (errno != ENOENT) {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	161 i_fatal("Can't open SSL parameter file %s: %m",
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	162 params->fname);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	163 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	164
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	165 if (!warned) {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	166 i_warning("Waiting for SSL parameter file %s",
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	167 params->fname);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	168 warned = TRUE;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	169 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	170 sleep(1);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	171 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	172
4505 886d7af1f38d Don't constantly re-read ssl-parameters.dat. Make sure that in input handler Timo Sirainen <tss@iki.fi> parents: 4474 diff changeset	173 if (fstat(params->fd, &st) < 0)
886d7af1f38d Don't constantly re-read ssl-parameters.dat. Make sure that in input handler Timo Sirainen <tss@iki.fi> parents: 4474 diff changeset	174 i_error("fstat(%s) failed: %m", params->fname);
886d7af1f38d Don't constantly re-read ssl-parameters.dat. Make sure that in input handler Timo Sirainen <tss@iki.fi> parents: 4474 diff changeset	175 else
886d7af1f38d Don't constantly re-read ssl-parameters.dat. Make sure that in input handler Timo Sirainen <tss@iki.fi> parents: 4474 diff changeset	176 params->last_mtime = st.st_mtime;
886d7af1f38d Don't constantly re-read ssl-parameters.dat. Make sure that in input handler Timo Sirainen <tss@iki.fi> parents: 4474 diff changeset	177
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	178 ssl_free_parameters(params);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	179 while (read_dh_parameters_next(params)) ;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	180
8621 22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	181 if ((ret = read_full(params->fd, &c, 1)) < 0)
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	182 i_fatal("read(%s) failed: %m", params->fname);
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	183 else if (ret != 0) {
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	184 /* more data than expected */
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	185 ssl_params_corrupted(params->fname);
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	186 }
22985329af92 Check broken ssl-parameters.dat files better and give a better error message when seeing one. Timo Sirainen <tss@iki.fi> parents: 8590 diff changeset	187
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	188 if (close(params->fd) < 0)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	189 i_error("close() failed: %m");
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	190 params->fd = -1;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	191 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	192
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	193 static void ssl_refresh_parameters(struct ssl_parameters *params)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	194 {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	195 struct stat st;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	196
4505 886d7af1f38d Don't constantly re-read ssl-parameters.dat. Make sure that in input handler Timo Sirainen <tss@iki.fi> parents: 4474 diff changeset	197 if (params->last_check > ioloop_time - SSL_PARAMFILE_CHECK_INTERVAL)
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	198 return;
4505 886d7af1f38d Don't constantly re-read ssl-parameters.dat. Make sure that in input handler Timo Sirainen <tss@iki.fi> parents: 4474 diff changeset	199 params->last_check = ioloop_time;
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	200
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	201 if (params->last_mtime == 0)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	202 ssl_read_parameters(params);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	203 else {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	204 if (stat(params->fname, &st) < 0)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	205 i_error("stat(%s) failed: %m", params->fname);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	206 else if (st.st_mtime != params->last_mtime)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	207 ssl_read_parameters(params);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	208 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	209 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	210
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	211 static void ssl_set_io(struct ssl_proxy *proxy, enum ssl_io_action action)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	212 {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	213 switch (action) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	214 case SSL_ADD_INPUT:
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	215 if (proxy->io_ssl_read != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	216 break;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	217 proxy->io_ssl_read = io_add(proxy->fd_ssl, IO_READ,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	218 ssl_step, proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	219 break;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	220 case SSL_REMOVE_INPUT:
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	221 if (proxy->io_ssl_read != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	222 io_remove(&proxy->io_ssl_read);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	223 break;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	224 case SSL_ADD_OUTPUT:
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	225 if (proxy->io_ssl_write != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	226 break;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	227 proxy->io_ssl_write = io_add(proxy->fd_ssl, IO_WRITE,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	228 ssl_step, proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	229 break;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	230 case SSL_REMOVE_OUTPUT:
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	231 if (proxy->io_ssl_write != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	232 io_remove(&proxy->io_ssl_write);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	233 break;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	234 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	235 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	236
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	237 static void plain_block_input(struct ssl_proxy *proxy, bool block)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	238 {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	239 if (block) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	240 if (proxy->io_plain_read != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	241 io_remove(&proxy->io_plain_read);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	242 } else {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	243 if (proxy->io_plain_read == NULL) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	244 proxy->io_plain_read = io_add(proxy->fd_plain, IO_READ,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	245 plain_read, proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	246 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	247 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	248 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	249
4907 5b4c9b20eba0 Replaced void context from a lot of callbacks with the actual context Timo Sirainen <tss@iki.fi>* parents: 4827 diff changeset	250 static void plain_read(struct ssl_proxy *proxy)
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	251 {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	252 ssize_t ret;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	253 bool corked = FALSE;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	254
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	255 if (proxy->sslout_size == sizeof(proxy->sslout_buf)) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	256 /* buffer full, block input until it's written */
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	257 plain_block_input(proxy, TRUE);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	258 return;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	259 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	260
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	261 proxy->refcount++;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	262
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	263 while (proxy->sslout_size < sizeof(proxy->sslout_buf) &&
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	264 !proxy->destroyed) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	265 ret = net_receive(proxy->fd_plain,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	266 proxy->sslout_buf + proxy->sslout_size,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	267 sizeof(proxy->sslout_buf) -
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	268 proxy->sslout_size);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	269 if (ret <= 0) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	270 if (ret < 0)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	271 ssl_proxy_destroy(proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	272 break;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	273 } else {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	274 proxy->sslout_size += ret;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	275 if (!corked) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	276 net_set_cork(proxy->fd_ssl, TRUE);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	277 corked = TRUE;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	278 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	279 ssl_write(proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	280 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	281 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	282
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	283 if (corked)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	284 net_set_cork(proxy->fd_ssl, FALSE);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	285
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	286 ssl_proxy_unref(proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	287 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	288
4907 5b4c9b20eba0 Replaced void context from a lot of callbacks with the actual context Timo Sirainen <tss@iki.fi>* parents: 4827 diff changeset	289 static void plain_write(struct ssl_proxy *proxy)
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	290 {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	291 ssize_t ret;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	292
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	293 proxy->refcount++;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	294
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	295 ret = net_transmit(proxy->fd_plain, proxy->plainout_buf,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	296 proxy->plainout_size);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	297 if (ret < 0)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	298 ssl_proxy_destroy(proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	299 else {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	300 proxy->plainout_size -= ret;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	301 memmove(proxy->plainout_buf, proxy->plainout_buf + ret,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	302 proxy->plainout_size);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	303
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	304 if (proxy->plainout_size > 0) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	305 if (proxy->io_plain_write == NULL) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	306 proxy->io_plain_write =
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	307 io_add(proxy->fd_plain, IO_WRITE,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	308 plain_write, proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	309 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	310 } else {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	311 if (proxy->io_plain_write != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	312 io_remove(&proxy->io_plain_write);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	313 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	314
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	315 ssl_set_io(proxy, SSL_ADD_INPUT);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	316 if (SSL_pending(proxy->ssl) > 0)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	317 ssl_read(proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	318 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	319
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	320 ssl_proxy_unref(proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	321 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	322
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	323 static const char *ssl_last_error(void)
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	324 {
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	325 unsigned long err;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	326 char *buf;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	327 size_t err_size = 256;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	328
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	329 err = ERR_get_error();
7508 bec3cd8e8151 If SSL function fails and there are no errors, return "Unknown error" Timo Sirainen <tss@iki.fi> parents: 7500 diff changeset	330 if (err == 0) {
bec3cd8e8151 If SSL function fails and there are no errors, return "Unknown error" Timo Sirainen <tss@iki.fi> parents: 7500 diff changeset	331 if (errno != 0)
bec3cd8e8151 If SSL function fails and there are no errors, return "Unknown error" Timo Sirainen <tss@iki.fi> parents: 7500 diff changeset	332 return strerror(errno);
bec3cd8e8151 If SSL function fails and there are no errors, return "Unknown error" Timo Sirainen <tss@iki.fi> parents: 7500 diff changeset	333 return "Unknown error";
bec3cd8e8151 If SSL function fails and there are no errors, return "Unknown error" Timo Sirainen <tss@iki.fi> parents: 7500 diff changeset	334 }
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	335
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	336 buf = t_malloc(err_size);
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	337 buf[err_size-1] = '\0';
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	338 ERR_error_string_n(err, buf, err_size-1);
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	339 return buf;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	340 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	341
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	342 static void ssl_handle_error(struct ssl_proxy *proxy, int ret,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	343 const char *func_name)
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	344 {
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	345 const char *errstr = NULL;
1235 2660b47fd9bc Added setting verbose_ssl Timo Sirainen <tss@iki.fi> parents: 1234 diff changeset	346 int err;
2660b47fd9bc Added setting verbose_ssl Timo Sirainen <tss@iki.fi> parents: 1234 diff changeset	347
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	348 proxy->refcount++;
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	349
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	350 i_free_and_null(proxy->last_error);
1235 2660b47fd9bc Added setting verbose_ssl Timo Sirainen <tss@iki.fi> parents: 1234 diff changeset	351 err = SSL_get_error(proxy->ssl, ret);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	352
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	353 switch (err) {
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	354 case SSL_ERROR_WANT_READ:
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	355 ssl_set_io(proxy, SSL_ADD_INPUT);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	356 break;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	357 case SSL_ERROR_WANT_WRITE:
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	358 ssl_set_io(proxy, SSL_ADD_OUTPUT);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	359 break;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	360 case SSL_ERROR_SYSCALL:
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	361 /* eat up the error queue */
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	362 if (ERR_peek_error() != 0)
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	363 errstr = ssl_last_error();
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	364 else if (ret != 0)
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	365 errstr = strerror(errno);
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	366 else {
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	367 /* EOF. */
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	368 errstr = "Disconnected";
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	369 break;
1235 2660b47fd9bc Added setting verbose_ssl Timo Sirainen <tss@iki.fi> parents: 1234 diff changeset	370 }
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	371 errstr = t_strdup_printf("%s syscall failed: %s",
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	372 func_name, errstr);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	373 break;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	374 case SSL_ERROR_ZERO_RETURN:
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	375 /* clean connection closing */
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	376 ssl_proxy_destroy(proxy);
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	377 break;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	378 case SSL_ERROR_SSL:
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	379 errstr = t_strdup_printf("%s failed: %s",
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	380 func_name, ssl_last_error());
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	381 break;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	382 default:
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	383 errstr = t_strdup_printf("%s failed: unknown failure %d (%s)",
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	384 func_name, err, ssl_last_error());
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	385 break;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	386 }
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	387
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	388 if (errstr != NULL) {
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	389 proxy->last_error = i_strdup(errstr);
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	390 ssl_proxy_destroy(proxy);
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	391 }
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	392 ssl_proxy_unref(proxy);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	393 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	394
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	395 static void ssl_handshake(struct ssl_proxy *proxy)
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	396 {
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	397 int ret;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	398
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	399 ret = SSL_accept(proxy->ssl);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	400 if (ret != 1)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	401 ssl_handle_error(proxy, ret, "SSL_accept()");
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	402 else {
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	403 i_free_and_null(proxy->last_error);
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	404 proxy->handshaked = TRUE;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	405
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	406 ssl_set_io(proxy, SSL_ADD_INPUT);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	407 plain_block_input(proxy, FALSE);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	408 }
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	409 }
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	410
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	411 static void ssl_read(struct ssl_proxy *proxy)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	412 {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	413 int ret;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	414
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	415 while (proxy->plainout_size < sizeof(proxy->plainout_buf) &&
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	416 !proxy->destroyed) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	417 ret = SSL_read(proxy->ssl,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	418 proxy->plainout_buf + proxy->plainout_size,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	419 sizeof(proxy->plainout_buf) -
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	420 proxy->plainout_size);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	421 if (ret <= 0) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	422 ssl_handle_error(proxy, ret, "SSL_read()");
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	423 break;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	424 } else {
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	425 i_free_and_null(proxy->last_error);
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	426 proxy->plainout_size += ret;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	427 plain_write(proxy);
4131 c12bb541f925 Reverted back for now. Timo Sirainen <tss@iki.fi> parents: 4127 diff changeset	428 }
4127 60583fb75d9e Rewrite. Hopefully works better. Timo Sirainen <tss@iki.fi> parents: 3960 diff changeset	429 }
60583fb75d9e Rewrite. Hopefully works better. Timo Sirainen <tss@iki.fi> parents: 3960 diff changeset	430 }
60583fb75d9e Rewrite. Hopefully works better. Timo Sirainen <tss@iki.fi> parents: 3960 diff changeset	431
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	432 static void ssl_write(struct ssl_proxy *proxy)
4127 60583fb75d9e Rewrite. Hopefully works better. Timo Sirainen <tss@iki.fi> parents: 3960 diff changeset	433 {
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	434 int ret;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	435
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	436 ret = SSL_write(proxy->ssl, proxy->sslout_buf, proxy->sslout_size);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	437 if (ret <= 0)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	438 ssl_handle_error(proxy, ret, "SSL_write()");
4127 60583fb75d9e Rewrite. Hopefully works better. Timo Sirainen <tss@iki.fi> parents: 3960 diff changeset	439 else {
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	440 i_free_and_null(proxy->last_error);
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	441 proxy->sslout_size -= ret;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	442 memmove(proxy->sslout_buf, proxy->sslout_buf + ret,
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	443 proxy->sslout_size);
4474 1ff1603403de Second try with SSL proxy rewrite. Did some fixes since last try. Timo Sirainen <tss@iki.fi> parents: 4471 diff changeset	444
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	445 ssl_set_io(proxy, proxy->sslout_size > 0 ?
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	446 SSL_ADD_OUTPUT : SSL_REMOVE_OUTPUT);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	447 plain_block_input(proxy, FALSE);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	448 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	449 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	450
4907 5b4c9b20eba0 Replaced void context from a lot of callbacks with the actual context Timo Sirainen <tss@iki.fi>* parents: 4827 diff changeset	451 static void ssl_step(struct ssl_proxy *proxy)
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	452 {
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	453 proxy->refcount++;
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	454
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	455 if (!proxy->handshaked)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	456 ssl_handshake(proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	457
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	458 if (proxy->handshaked) {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	459 if (proxy->plainout_size == sizeof(proxy->plainout_buf))
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	460 ssl_set_io(proxy, SSL_REMOVE_INPUT);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	461 else
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	462 ssl_read(proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	463
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	464 if (proxy->sslout_size == 0)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	465 ssl_set_io(proxy, SSL_REMOVE_OUTPUT);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	466 else {
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	467 net_set_cork(proxy->fd_ssl, TRUE);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	468 ssl_write(proxy);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	469 net_set_cork(proxy->fd_ssl, FALSE);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	470 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	471 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	472
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	473 ssl_proxy_unref(proxy);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	474 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	475
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	476 int ssl_proxy_new(int fd, struct ip_addr ip, struct ssl_proxy *proxy_r)
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	477 {
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	478 struct ssl_proxy *proxy;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	479 SSL *ssl;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	480 int sfd[2];
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	481
4664 881ed99266a2 New asserts / cleanup Timo Sirainen <tss@iki.fi> parents: 4570 diff changeset	482 i_assert(fd != -1);
881ed99266a2 New asserts / cleanup Timo Sirainen <tss@iki.fi> parents: 4570 diff changeset	483
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	484 *proxy_r = NULL;
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	485
2679 8f7b01c29bcb Show clear error messages if --ssl is tried to be used but it's not Timo Sirainen <tss@iki.fi> parents: 2629 diff changeset	486 if (!ssl_initialized) {
8f7b01c29bcb Show clear error messages if --ssl is tried to be used but it's not Timo Sirainen <tss@iki.fi> parents: 2629 diff changeset	487 i_error("SSL support not enabled in configuration");
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	488 return -1;
2679 8f7b01c29bcb Show clear error messages if --ssl is tried to be used but it's not Timo Sirainen <tss@iki.fi> parents: 2629 diff changeset	489 }
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	490
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	491 ssl_refresh_parameters(&ssl_params);
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	492
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	493 ssl = SSL_new(ssl_ctx);
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	494 if (ssl == NULL) {
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	495 i_error("SSL_new() failed: %s", ssl_last_error());
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	496 return -1;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	497 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	498
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	499 if (SSL_set_fd(ssl, fd) != 1) {
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	500 i_error("SSL_set_fd() failed: %s", ssl_last_error());
1457 7dd0e88ed7ef cleanups Timo Sirainen <tss@iki.fi> parents: 1324 diff changeset	501 SSL_free(ssl);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	502 return -1;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	503 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	504
4664 881ed99266a2 New asserts / cleanup Timo Sirainen <tss@iki.fi> parents: 4570 diff changeset	505 if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) < 0) {
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	506 i_error("socketpair() failed: %m");
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	507 SSL_free(ssl);
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	508 return -1;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	509 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	510
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	511 net_set_nonblock(sfd[0], TRUE);
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	512 net_set_nonblock(sfd[1], TRUE);
1268 0d9f0e617a1a net_* functions don't anymore set sockets to non-blocking by default. Timo Sirainen <tss@iki.fi> parents: 1235 diff changeset	513 net_set_nonblock(fd, TRUE);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	514
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	515 proxy = i_new(struct ssl_proxy, 1);
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	516 proxy->refcount = 2;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	517 proxy->ssl = ssl;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	518 proxy->fd_ssl = fd;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	519 proxy->fd_plain = sfd[0];
1235 2660b47fd9bc Added setting verbose_ssl Timo Sirainen <tss@iki.fi> parents: 1234 diff changeset	520 proxy->ip = *ip;
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	521 SSL_set_ex_data(ssl, extdata_index, proxy);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	522
7119 8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	523 ssl_proxy_count++;
8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	524 DLLIST_PREPEND(&ssl_proxies, proxy);
1544 ac6ee442376d OpenSSL proxy changes - hopefully fixes something. Also don't crash with Timo Sirainen <tss@iki.fi> parents: 1492 diff changeset	525
4827 966f7b3fb03c Call ssl_step() at startup instead of ssl_handshake(). If the first input Timo Sirainen <tss@iki.fi> parents: 4783 diff changeset	526 ssl_step(proxy);
4474 1ff1603403de Second try with SSL proxy rewrite. Did some fixes since last try. Timo Sirainen <tss@iki.fi> parents: 4471 diff changeset	527 main_ref();
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	528
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	529 *proxy_r = proxy;
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	530 return sfd[1];
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	531 }
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	532
7912 81806d402514 Added more consts, ATTR_CONSTs and ATTR_PUREs. Timo Sirainen <tss@iki.fi> parents: 7508 diff changeset	533 bool ssl_proxy_has_valid_client_cert(const struct ssl_proxy *proxy)
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	534 {
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	535 return proxy->cert_received && !proxy->cert_broken;
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	536 }
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	537
8302 0db37acdc59f Login process: Log auth failure reasons better in disconnect message. Timo Sirainen <tss@iki.fi> parents: 8224 diff changeset	538 bool ssl_proxy_has_broken_client_cert(struct ssl_proxy *proxy)
0db37acdc59f Login process: Log auth failure reasons better in disconnect message. Timo Sirainen <tss@iki.fi> parents: 8224 diff changeset	539 {
0db37acdc59f Login process: Log auth failure reasons better in disconnect message. Timo Sirainen <tss@iki.fi> parents: 8224 diff changeset	540 return proxy->cert_received && proxy->cert_broken;
0db37acdc59f Login process: Log auth failure reasons better in disconnect message. Timo Sirainen <tss@iki.fi> parents: 8224 diff changeset	541 }
0db37acdc59f Login process: Log auth failure reasons better in disconnect message. Timo Sirainen <tss@iki.fi> parents: 8224 diff changeset	542
3635 c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	543 const char ssl_proxy_get_peer_name(struct ssl_proxy proxy)
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	544 {
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	545 X509 *x509;
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	546 char buf[1024];
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	547 const char *name;
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	548
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	549 if (!ssl_proxy_has_valid_client_cert(proxy))
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	550 return NULL;
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	551
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	552 x509 = SSL_get_peer_certificate(proxy->ssl);
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	553 if (x509 == NULL)
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	554 return NULL; /* we should have had it.. */
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	555
4352 d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	556 if (X509_NAME_get_text_by_NID(X509_get_subject_name(x509),
6364 7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	557 ssl_username_nid, buf, sizeof(buf)) < 0)
4352 d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	558 name = "";
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	559 else
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	560 name = t_strndup(buf, sizeof(buf));
3635 c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	561 X509_free(x509);
4352 d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	562
3635 c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	563 return *name == '\0' ? NULL : name;
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	564 }
c12df370e1b2 Added ssl_username_from_cert setting. Not actually tested yet.. Timo Sirainen <tss@iki.fi> parents: 3584 diff changeset	565
7912 81806d402514 Added more consts, ATTR_CONSTs and ATTR_PUREs. Timo Sirainen <tss@iki.fi> parents: 7508 diff changeset	566 bool ssl_proxy_is_handshaked(const struct ssl_proxy *proxy)
4570 cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS" Timo Sirainen <tss@iki.fi> parents: 4549 diff changeset	567 {
cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS" Timo Sirainen <tss@iki.fi> parents: 4549 diff changeset	568 return proxy->handshaked;
cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS" Timo Sirainen <tss@iki.fi> parents: 4549 diff changeset	569 }
cbbe2377f591 If SSL/TLS handshake didn't finish, show "TLS handshaking" instead of "TLS" Timo Sirainen <tss@iki.fi> parents: 4549 diff changeset	570
7912 81806d402514 Added more consts, ATTR_CONSTs and ATTR_PUREs. Timo Sirainen <tss@iki.fi> parents: 7508 diff changeset	571 const char ssl_proxy_get_last_error(const struct ssl_proxy proxy)
7374 0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	572 {
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	573 return proxy->last_error;
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	574 }
0bb3fc72a74f If TLS connection closes with anything except a clean disconnection, log the Timo Sirainen <tss@iki.fi> parents: 7346 diff changeset	575
8122 3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	576 const char ssl_proxy_get_security_string(struct ssl_proxy proxy)
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	577 {
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	578 SSL_CIPHER *cipher;
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	579 int bits, alg_bits;
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	580
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	581 if (!proxy->handshaked)
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	582 return "";
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	583
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	584 cipher = SSL_get_current_cipher(proxy->ssl);
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	585 bits = SSL_CIPHER_get_bits(cipher, &alg_bits);
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	586 return t_strdup_printf("%s with cipher %s (%d/%d bits)",
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	587 SSL_get_version(proxy->ssl),
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	588 SSL_CIPHER_get_name(cipher),
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	589 bits, alg_bits);
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	590 }
3917bf9cf311 login_log_format_elements: Added %k to show SSL protocol/cipher information. Timo Sirainen <tss@iki.fi> parents: 7912 diff changeset	591
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	592 void ssl_proxy_free(struct ssl_proxy *proxy)
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	593 {
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	594 ssl_proxy_unref(proxy);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	595 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	596
3863 55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool. Timo Sirainen <tss@iki.fi> parents: 3635 diff changeset	597 static void ssl_proxy_unref(struct ssl_proxy *proxy)
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	598 {
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	599 if (--proxy->refcount > 0)
3863 55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool. Timo Sirainen <tss@iki.fi> parents: 3635 diff changeset	600 return;
1490 63242ba50ea4 fixes Timo Sirainen <tss@iki.fi> parents: 1485 diff changeset	601 i_assert(proxy->refcount == 0);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	602
2302 8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	603 SSL_free(proxy->ssl);
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	604 i_free(proxy);
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	605
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	606 main_unref();
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	607 }
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	608
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	609 static void ssl_proxy_destroy(struct ssl_proxy *proxy)
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	610 {
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	611 if (proxy->destroyed)
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	612 return;
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	613 proxy->destroyed = TRUE;
8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	614
7119 8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	615 ssl_proxy_count--;
8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	616 DLLIST_REMOVE(&ssl_proxies, proxy);
1230 e6d2b8c78519 Keep list of the SSL proxies, so they're deinitialized properly if we have Timo Sirainen <tss@iki.fi> parents: 1215 diff changeset	617
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	618 if (proxy->io_ssl_read != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	619 io_remove(&proxy->io_ssl_read);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	620 if (proxy->io_ssl_write != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	621 io_remove(&proxy->io_ssl_write);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	622 if (proxy->io_plain_read != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	623 io_remove(&proxy->io_plain_read);
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	624 if (proxy->io_plain_write != NULL)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	625 io_remove(&proxy->io_plain_write);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	626
7346 393abdd250bb Call SSL_shutdown() Timo Sirainen <tss@iki.fi> parents: 7119 diff changeset	627 (void)SSL_shutdown(proxy->ssl);
393abdd250bb Call SSL_shutdown() Timo Sirainen <tss@iki.fi> parents: 7119 diff changeset	628
3960 aeb424e64f24 Call io_remove() before closing the fd. It's required by kqueue. Timo Sirainen <tss@iki.fi> parents: 3889 diff changeset	629 (void)net_disconnect(proxy->fd_ssl);
aeb424e64f24 Call io_remove() before closing the fd. It's required by kqueue. Timo Sirainen <tss@iki.fi> parents: 3889 diff changeset	630 (void)net_disconnect(proxy->fd_plain);
aeb424e64f24 Call io_remove() before closing the fd. It's required by kqueue. Timo Sirainen <tss@iki.fi> parents: 3889 diff changeset	631
2302 8438064ddf08 Refcounting fixes. Unexpectedly destroyed SSL connection could have left Timo Sirainen <tss@iki.fi> parents: 2027 diff changeset	632 ssl_proxy_unref(proxy);
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	633
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	634 main_listen_start();
1458 98362534b2c7 Unexpected SSL connection errors sometimes crashed Timo Sirainen <tss@iki.fi> parents: 1457 diff changeset	635 }
98362534b2c7 Unexpected SSL connection errors sometimes crashed Timo Sirainen <tss@iki.fi> parents: 1457 diff changeset	636
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 6364 diff changeset	637 static RSA ssl_gen_rsa_key(SSL ssl ATTR_UNUSED,
6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 6364 diff changeset	638 int is_export ATTR_UNUSED, int keylength)
1492 383d87166963 Generate temporary RSA key when requested. Could be slow, should do some Timo Sirainen <tss@iki.fi> parents: 1490 diff changeset	639 {
383d87166963 Generate temporary RSA key when requested. Could be slow, should do some Timo Sirainen <tss@iki.fi> parents: 1490 diff changeset	640 return RSA_generate_key(keylength, RSA_F4, NULL, NULL);
383d87166963 Generate temporary RSA key when requested. Could be slow, should do some Timo Sirainen <tss@iki.fi> parents: 1490 diff changeset	641 }
383d87166963 Generate temporary RSA key when requested. Could be slow, should do some Timo Sirainen <tss@iki.fi> parents: 1490 diff changeset	642
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 6364 diff changeset	643 static DH ssl_tmp_dh_callback(SSL ssl ATTR_UNUSED,
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	644 int is_export, int keylength)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	645 {
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	646 /* Well, I'm not exactly sure why the logic in here is this.
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	647 It's the same as in Postfix, so it can't be too wrong. */
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	648 if (is_export && keylength == 512 && ssl_params.dh_512 != NULL)
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	649 return ssl_params.dh_512;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	650
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	651 return ssl_params.dh_1024;
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	652 }
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	653
4471 a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	654 static void ssl_info_callback(const SSL *ssl, int where, int ret)
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	655 {
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	656 struct ssl_proxy *proxy;
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	657
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	658 proxy = SSL_get_ex_data(ssl, extdata_index);
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	659
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	660 if ((where & SSL_CB_ALERT) != 0) {
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	661 i_warning("SSL alert: where=0x%x, ret=%d: %s %s [%s]",
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	662 where, ret, SSL_alert_type_string_long(ret),
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	663 SSL_alert_desc_string_long(ret),
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	664 net_ip2addr(&proxy->ip));
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	665 } else {
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	666 i_warning("SSL BIO failed: where=0x%x, ret=%d: %s [%s]",
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	667 where, ret, SSL_state_string_long(ssl),
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	668 net_ip2addr(&proxy->ip));
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	669 }
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	670 }
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	671
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	672 static int ssl_verify_client_cert(int preverify_ok, X509_STORE_CTX *ctx)
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	673 {
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	674 SSL *ssl;
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	675 struct ssl_proxy *proxy;
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	676
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	677 ssl = X509_STORE_CTX_get_ex_data(ctx,
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	678 SSL_get_ex_data_X509_STORE_CTX_idx());
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	679 proxy = SSL_get_ex_data(ssl, extdata_index);
4352 d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	680 proxy->cert_received = TRUE;
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	681
4352 d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	682 if (verbose_ssl \|\| (verbose_auth && !preverify_ok)) {
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	683 char buf[1024];
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	684 X509_NAME *subject;
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	685
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	686 subject = X509_get_subject_name(ctx->current_cert);
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	687 (void)X509_NAME_oneline(subject, buf, sizeof(buf));
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	688 buf[sizeof(buf)-1] = '\0'; /* just in case.. */
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	689 if (!preverify_ok)
4695 07afd19bc53e Updates to ssl_ca_file and ssl_username_from_cert comments in Timo Sirainen <tss@iki.fi> parents: 4664 diff changeset	690 i_info("Invalid certificate: %s: %s", X509_verify_cert_error_string(ctx->error),buf);
4352 d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	691 else
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	692 i_info("Valid certificate: %s", buf);
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	693 }
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	694 if (!preverify_ok)
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	695 proxy->cert_broken = TRUE;
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	696
4352 d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	697 /* Return success anyway, because if ssl_require_client_cert=no we
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	698 could still allow authentication. */
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	699 return 1;
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	700 }
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	701
3889 c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	702 static int
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 6364 diff changeset	703 pem_password_callback(char *buf, int size, int rwflag ATTR_UNUSED,
3889 c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	704 void *userdata)
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	705 {
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	706 if (userdata == NULL) {
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	707 i_error("SSL private key file is password protected, "
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	708 "but password isn't given");
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	709 return 0;
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	710 }
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	711
6422 18173a52f721 Renamed strocpy() to i_strocpy(). Timo Sirainen <tss@iki.fi> parents: 6417 diff changeset	712 if (i_strocpy(buf, userdata, size) < 0)
3889 c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	713 return 0;
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	714 return strlen(buf);
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	715 }
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	716
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	717 unsigned int ssl_proxy_get_count(void)
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	718 {
7119 8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	719 return ssl_proxy_count;
4538 9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	720 }
9d9e72374164 Fixes to login process handling, especially with Timo Sirainen <tss@iki.fi> parents: 4506 diff changeset	721
5361 bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	722 static void *ssl_clean_malloc(size_t size)
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	723 {
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	724 return p_malloc(system_clean_pool, size);
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	725 }
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	726
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	727 static void ssl_clean_realloc(void ptr, size_t size)
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	728 {
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	729 return p_realloc(system_clean_pool, ptr, (size_t)-1, size);
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	730 }
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	731
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	732 static void ssl_clean_free(void *ptr)
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	733 {
6495 94501a17dcd0 Don't return void values from void functions. Timo Sirainen <tss@iki.fi> parents: 6475 diff changeset	734 p_free(system_clean_pool, ptr);
5361 bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	735 }
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	736
8224 7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	737 static bool is_pem_key_file(const char *path)
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	738 {
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	739 char buf[4096];
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	740 int fd, ret;
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	741
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	742 /* this code is used only for giving a better error message,
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	743 so it needs to catch only the normal key files */
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	744 fd = open(path, O_RDONLY);
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	745 if (fd == -1)
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	746 return FALSE;
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	747 ret = read(fd, buf, sizeof(buf)-1);
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	748 close(fd);
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	749 if (ret <= 0)
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	750 return FALSE;
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	751 buf[ret] = '\0';
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	752 return strstr(buf, "PRIVATE KEY---") != NULL;
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	753 }
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	754
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	755 void ssl_proxy_init(void)
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	756 {
5335 79ea613496aa Replace some string literals with non-const static buffers to avoid compiler Timo Sirainen <tss@iki.fi> parents: 4907 diff changeset	757 static char dovecot[] = "dovecot";
6364 7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	758 const char cafile, certfile, keyfile, cipher_list, *username_field;
3889 c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	759 char *password;
2629 6ba9dcff11b9 Compiler warning fixes and cleanups Timo Sirainen <tss@iki.fi> parents: 2335 diff changeset	760 unsigned char buf;
8224 7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	761 unsigned long err;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	762
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	763 memset(&ssl_params, 0, sizeof(ssl_params));
650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	764
1907 190f1d315ce6 Added setting ssl_ca_file, patch by Zach Bagnall Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	765 cafile = getenv("SSL_CA_FILE");
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	766 certfile = getenv("SSL_CERT_FILE");
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	767 keyfile = getenv("SSL_KEY_FILE");
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	768 ssl_params.fname = getenv("SSL_PARAM_FILE");
3889 c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	769 password = getenv("SSL_KEY_PASSWORD");
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	770
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	771 if (certfile == NULL \|\| keyfile == NULL \|\| ssl_params.fname == NULL) {
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	772 /* SSL support is disabled */
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	773 return;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	774 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	775
5361 bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	776 CRYPTO_set_mem_functions(ssl_clean_malloc, ssl_clean_realloc,
bde589bd09d4 Make OpenSSL memory allocations go through system_clean_pool. Timo Sirainen <tss@iki.fi> parents: 5360 diff changeset	777 ssl_clean_free);
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	778 SSL_library_init();
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	779 SSL_load_error_strings();
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	780
5335 79ea613496aa Replace some string literals with non-const static buffers to avoid compiler Timo Sirainen <tss@iki.fi> parents: 4907 diff changeset	781 extdata_index = SSL_get_ex_new_index(0, dovecot, NULL, NULL, NULL);
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	782
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	783 if ((ssl_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	784 i_fatal("SSL_CTX_new() failed");
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	785
1544 ac6ee442376d OpenSSL proxy changes - hopefully fixes something. Also don't crash with Timo Sirainen <tss@iki.fi> parents: 1492 diff changeset	786 SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
ac6ee442376d OpenSSL proxy changes - hopefully fixes something. Also don't crash with Timo Sirainen <tss@iki.fi> parents: 1492 diff changeset	787
1996 d8f06a0c818e Added ssl_cipher_list setting. Timo Sirainen <tss@iki.fi> parents: 1907 diff changeset	788 cipher_list = getenv("SSL_CIPHER_LIST");
d8f06a0c818e Added ssl_cipher_list setting. Timo Sirainen <tss@iki.fi> parents: 1907 diff changeset	789 if (cipher_list == NULL)
d8f06a0c818e Added ssl_cipher_list setting. Timo Sirainen <tss@iki.fi> parents: 1907 diff changeset	790 cipher_list = DOVECOT_SSL_DEFAULT_CIPHER_LIST;
d8f06a0c818e Added ssl_cipher_list setting. Timo Sirainen <tss@iki.fi> parents: 1907 diff changeset	791 if (SSL_CTX_set_cipher_list(ssl_ctx, cipher_list) != 1) {
1544 ac6ee442376d OpenSSL proxy changes - hopefully fixes something. Also don't crash with Timo Sirainen <tss@iki.fi> parents: 1492 diff changeset	792 i_fatal("Can't set cipher list to '%s': %s",
1996 d8f06a0c818e Added ssl_cipher_list setting. Timo Sirainen <tss@iki.fi> parents: 1907 diff changeset	793 cipher_list, ssl_last_error());
1544 ac6ee442376d OpenSSL proxy changes - hopefully fixes something. Also don't crash with Timo Sirainen <tss@iki.fi> parents: 1492 diff changeset	794 }
ac6ee442376d OpenSSL proxy changes - hopefully fixes something. Also don't crash with Timo Sirainen <tss@iki.fi> parents: 1492 diff changeset	795
1907 190f1d315ce6 Added setting ssl_ca_file, patch by Zach Bagnall Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	796 if (cafile != NULL) {
190f1d315ce6 Added setting ssl_ca_file, patch by Zach Bagnall Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	797 if (SSL_CTX_load_verify_locations(ssl_ctx, cafile, NULL) != 1) {
190f1d315ce6 Added setting ssl_ca_file, patch by Zach Bagnall Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	798 i_fatal("Can't load CA file %s: %s",
190f1d315ce6 Added setting ssl_ca_file, patch by Zach Bagnall Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	799 cafile, ssl_last_error());
190f1d315ce6 Added setting ssl_ca_file, patch by Zach Bagnall Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	800 }
190f1d315ce6 Added setting ssl_ca_file, patch by Zach Bagnall Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	801 }
190f1d315ce6 Added setting ssl_ca_file, patch by Zach Bagnall Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	802
1544 ac6ee442376d OpenSSL proxy changes - hopefully fixes something. Also don't crash with Timo Sirainen <tss@iki.fi> parents: 1492 diff changeset	803 if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
8224 7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	804 err = ERR_peek_error();
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	805 if (ERR_GET_LIB(err) != ERR_LIB_PEM \|\|
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	806 ERR_GET_REASON(err) != PEM_R_NO_START_LINE) {
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	807 i_fatal("Can't load certificate file %s: %s",
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	808 certfile, ssl_last_error());
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	809 } else if (is_pem_key_file(certfile)) {
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	810 i_fatal("Can't load certificate file %s: "
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	811 "The file contains a private key "
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	812 "(you've mixed ssl_cert_file and ssl_key_file settings)",
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	813 certfile);
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	814 } else {
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	815 i_fatal("Can't load certificate file %s: "
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	816 "The file doesn't contain a certificate.",
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	817 certfile);
7ac86b33ad64 Log a better error message if ssl_cert_file doesn't point to a valid certificate. Timo Sirainen <tss@iki.fi> parents: 8122 diff changeset	818 }
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	819 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	820
3889 c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	821 SSL_CTX_set_default_passwd_cb(ssl_ctx, pem_password_callback);
c7462001227b Added support for password protected SSL private keys. The password can be Timo Sirainen <tss@iki.fi> parents: 3888 diff changeset	822 SSL_CTX_set_default_passwd_cb_userdata(ssl_ctx, password);
3584 b686c8bbcd6f Don't require private key to be RSA Timo Sirainen <tss@iki.fi> parents: 3580 diff changeset	823 if (SSL_CTX_use_PrivateKey_file(ssl_ctx, keyfile,
b686c8bbcd6f Don't require private key to be RSA Timo Sirainen <tss@iki.fi> parents: 3580 diff changeset	824 SSL_FILETYPE_PEM) != 1) {
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	825 i_fatal("Can't load private key file %s: %s",
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	826 keyfile, ssl_last_error());
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	827 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	828
1492 383d87166963 Generate temporary RSA key when requested. Could be slow, should do some Timo Sirainen <tss@iki.fi> parents: 1490 diff changeset	829 if (SSL_CTX_need_tmp_RSA(ssl_ctx))
383d87166963 Generate temporary RSA key when requested. Could be slow, should do some Timo Sirainen <tss@iki.fi> parents: 1490 diff changeset	830 SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key);
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	831 SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback);
1492 383d87166963 Generate temporary RSA key when requested. Could be slow, should do some Timo Sirainen <tss@iki.fi> parents: 1490 diff changeset	832
4471 a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	833 if (verbose_ssl)
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	834 SSL_CTX_set_info_callback(ssl_ctx, ssl_info_callback);
a939ee143a96 If verbose_ssl=yes set ssl_info_callback and print any alerts and BIO Timo Sirainen <tss@iki.fi> parents: 4352 diff changeset	835
1997 1d0985f6bdd9 Added ssl_verify_client_cert setting. Timo Sirainen <tss@iki.fi> parents: 1996 diff changeset	836 if (getenv("SSL_VERIFY_CLIENT_CERT") != NULL) {
4352 d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	837 #if OPENSSL_VERSION_NUMBER >= 0x00907000L
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	838 X509_STORE *store;
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	839
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	840 store = SSL_CTX_get_cert_store(ssl_ctx);
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	841 X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK \|
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	842 X509_V_FLAG_CRL_CHECK_ALL);
d57c83c64b20 Updates to ssl_verify_client_cert: Check CRLs. If auth_verbose=yes, log Timo Sirainen <tss@iki.fi> parents: 4131 diff changeset	843 #endif
1997 1d0985f6bdd9 Added ssl_verify_client_cert setting. Timo Sirainen <tss@iki.fi> parents: 1996 diff changeset	844 SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER \|
2027 dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	845 SSL_VERIFY_CLIENT_ONCE,
dc5d0da1abe9 Added ssl_require_client_cert auth-specific setting. Hide Timo Sirainen <tss@iki.fi> parents: 2007 diff changeset	846 ssl_verify_client_cert);
5528 bad62bc7bafc Send list of CA names to client when using ssl_verify_client_cert=yes. Timo Sirainen <tss@iki.fi> parents: 5361 diff changeset	847 SSL_CTX_set_client_CA_list(ssl_ctx,
bad62bc7bafc Send list of CA names to client when using ssl_verify_client_cert=yes. Timo Sirainen <tss@iki.fi> parents: 5361 diff changeset	848 SSL_load_client_CA_file(cafile));
1997 1d0985f6bdd9 Added ssl_verify_client_cert setting. Timo Sirainen <tss@iki.fi> parents: 1996 diff changeset	849 }
1d0985f6bdd9 Added ssl_verify_client_cert setting. Timo Sirainen <tss@iki.fi> parents: 1996 diff changeset	850
6364 7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	851 username_field = getenv("SSL_CERT_USERNAME_FIELD");
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	852 if (username_field == NULL)
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	853 ssl_username_nid = NID_commonName;
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	854 else {
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	855 ssl_username_nid = OBJ_txt2nid(username_field);
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	856 if (ssl_username_nid == NID_undef) {
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	857 i_fatal("Invalid ssl_cert_username_field: %s",
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	858 username_field);
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	859 }
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	860 }
7ad61f00ee55 Added ssl_cert_username_field setting. Timo Sirainen <tss@iki.fi> parents: 5528 diff changeset	861
1556 545f6b150e2c Make sure PRNG gets initialized before chrooting so it can open /dev/urandom. Timo Sirainen <tss@iki.fi> parents: 1544 diff changeset	862 /* PRNG initialization might want to use /dev/urandom, make sure it
2007 3dd9d3165bff Don't require initializing RAND_bytes() to return cryptographically strong Timo Sirainen <tss@iki.fi> parents: 1997 diff changeset	863 does it before chrooting. We might not have enough entropy at
3dd9d3165bff Don't require initializing RAND_bytes() to return cryptographically strong Timo Sirainen <tss@iki.fi> parents: 1997 diff changeset	864 the first try, so this function may fail. It's still been
3dd9d3165bff Don't require initializing RAND_bytes() to return cryptographically strong Timo Sirainen <tss@iki.fi> parents: 1997 diff changeset	865 initialized though. */
3dd9d3165bff Don't require initializing RAND_bytes() to return cryptographically strong Timo Sirainen <tss@iki.fi> parents: 1997 diff changeset	866 (void)RAND_bytes(&buf, 1);
1556 545f6b150e2c Make sure PRNG gets initialized before chrooting so it can open /dev/urandom. Timo Sirainen <tss@iki.fi> parents: 1544 diff changeset	867
7119 8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	868 ssl_proxy_count = 0;
8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	869 ssl_proxies = NULL;
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	870 ssl_initialized = TRUE;
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	871 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	872
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	873 void ssl_proxy_deinit(void)
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	874 {
1230 e6d2b8c78519 Keep list of the SSL proxies, so they're deinitialized properly if we have Timo Sirainen <tss@iki.fi> parents: 1215 diff changeset	875 if (!ssl_initialized)
e6d2b8c78519 Keep list of the SSL proxies, so they're deinitialized properly if we have Timo Sirainen <tss@iki.fi> parents: 1215 diff changeset	876 return;
e6d2b8c78519 Keep list of the SSL proxies, so they're deinitialized properly if we have Timo Sirainen <tss@iki.fi> parents: 1215 diff changeset	877
7119 8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	878 while (ssl_proxies != NULL)
8c6a7af67e8c Replaced clients hash with a linked list. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	879 ssl_proxy_destroy(ssl_proxies);
1232 f7da7d46e3f2 destroy proxies before destroying ssl context Timo Sirainen <tss@iki.fi> parents: 1231 diff changeset	880
3888 650701d41cdf Generate DH parameters and use them. Changed default regeneration time to 1 Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	881 ssl_free_parameters(&ssl_params);
1232 f7da7d46e3f2 destroy proxies before destroying ssl context Timo Sirainen <tss@iki.fi> parents: 1231 diff changeset	882 SSL_CTX_free(ssl_ctx);
7500 74e2c7b68c71 Free OpenSSL memory at deinit. Timo Sirainen <tss@iki.fi> parents: 7374 diff changeset	883 EVP_cleanup();
74e2c7b68c71 Free OpenSSL memory at deinit. Timo Sirainen <tss@iki.fi> parents: 7374 diff changeset	884 ERR_free_strings();
1049 c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	885 }
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	886
c41787e8c3f4 Moved common login process code to login-common, created pop3-login. Timo Sirainen <tss@iki.fi> parents: diff changeset	887 #endif

Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/login-common/ssl-proxy-openssl.c @ 8621:22985329af92 HEAD