X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fssl-gnutls.c;h=459556e061a4423f2d004676a12fc5b95ac3245a;hb=3ae5664988dd86d1e780f5cc59a3c6f819f78264;hp=ba4cf0232aa4be76be73cc0318e1690ddebcbb2e;hpb=2daf44115026999612b7a4a48cf35bfa711c35c4;p=ashd.git

diff --git a/src/ssl-gnutls.c b/src/ssl-gnutls.c
index ba4cf02..459556e 100644
--- a/src/ssl-gnutls.c
+++ b/src/ssl-gnutls.c
@@ -56,6 +56,7 @@ struct sslport {
     int fd;
     int sport;
     gnutls_certificate_credentials_t creds;
+    gnutls_priority_t ciphers;
     struct namedcreds **ncreds;
 };
 
@@ -67,6 +68,118 @@ struct sslconn {
     struct charbuf in;
 };
 
+struct savedsess {
+    struct savedsess *next, *prev;
+    gnutls_datum_t key, value;
+};
+
+static int numconn = 0, numsess = 0;
+static struct btree *sessidx = NULL;
+static struct savedsess *sesslistf = NULL, *sesslistl = NULL;
+
+static int sesscmp(void *ap, void *bp)
+{
+    struct savedsess *a = ap, *b = bp;
+    
+    if(a->key.size != b->key.size)
+	return(a->key.size - b->key.size);
+    return(memcmp(a->key.data, b->key.data, a->key.size));
+}
+
+static gnutls_datum_t sessdbfetch(void *uudata, gnutls_datum_t key)
+{
+    struct savedsess *sess, lkey;
+    gnutls_datum_t ret;
+    
+    memset(&ret, 0, sizeof(ret));
+    lkey.key = key;
+    if((sess = btreeget(sessidx, &lkey, sesscmp)) == NULL)
+	return(ret);
+    ret.data = memcpy(gnutls_malloc(ret.size = sess->value.size), sess->value.data, sess->value.size);
+    return(ret);
+}
+
+static void freesess(struct savedsess *sess)
+{
+    bbtreedel(&sessidx, sess, sesscmp);
+    if(sess->next)
+	sess->next->prev = sess->prev;
+    if(sess->prev)
+	sess->prev->next = sess->next;
+    if(sess == sesslistf)
+	sesslistf = sess->next;
+    if(sess == sesslistl)
+	sesslistl = sess->prev;
+    free(sess->key.data);
+    free(sess->value.data);
+    free(sess);
+    numsess--;
+}
+
+static int sessdbdel(void *uudata, gnutls_datum_t key)
+{
+    struct savedsess *sess, lkey;
+    
+    lkey.key = key;
+    if((sess = btreeget(sessidx, &lkey, sesscmp)) == NULL)
+	return(-1);
+    freesess(sess);
+    return(0);
+}
+
+static void cleansess(void)
+{
+    while(numsess > (max(numconn, 1) * 100))
+	freesess(sesslistl);
+}
+
+static int sessdbstore(void *uudata, gnutls_datum_t key, gnutls_datum_t value)
+{
+    static int cc = 0;
+    struct savedsess *sess, lkey;
+    
+    if((value.data == NULL) || (value.size == 0)) {
+	sessdbdel(NULL, key);
+	return(0);
+    }
+    lkey.key = key;
+    if((sess = btreeget(sessidx, &lkey, sesscmp)) == NULL) {
+	omalloc(sess);
+	sess->key.data = memcpy(smalloc(sess->key.size = key.size), key.data, key.size);
+	sess->value.data = memcpy(smalloc(sess->value.size = value.size), value.data, value.size);
+	bbtreeput(&sessidx, sess, sesscmp);
+	sess->prev = NULL;
+	sess->next = sesslistf;
+	if(sesslistf)
+	    sesslistf->prev = sess;
+	sesslistf = sess;
+	if(sesslistl == NULL)
+	    sesslistl = sess;
+	numsess++;
+    } else {
+	free(sess->value.data);
+	sess->value.data = memcpy(smalloc(sess->value.size = value.size), value.data, value.size);
+	if(sess != sesslistf) {
+	    if(sess->next)
+		sess->next->prev = sess->prev;
+	    if(sess->prev)
+		sess->prev->next = sess->next;
+	    if(sess == sesslistl)
+		sesslistl = sess->prev;
+	    sess->prev = NULL;
+	    sess->next = sesslistf;
+	    if(sesslistf)
+		sesslistf->prev = sess;
+	    sesslistf = sess;
+	}
+    }
+    if(cc++ > 100) {
+	cleansess();
+	cc = 0;
+    }
+    return(0);
+}
+
 static int tlsblock(int fd, gnutls_session_t sess, time_t to)
 {
     if(gnutls_record_get_direction(sess))
@@ -136,6 +249,9 @@ static ssize_t sslwrite(void *cookie, const char *buf, size_t len)
 
 static int sslclose(void *cookie)
 {
+    struct sslconn *ssl = cookie;
+    
+    buffree(ssl->in);
     return(0);
 }
 
@@ -207,9 +323,14 @@ static void servessl(struct muth *muth, va_list args)
 	return(0);
     }
 
+    numconn++;
     fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
     gnutls_init(&sess, GNUTLS_SERVER);
-    gnutls_set_default_priority(sess);
+    gnutls_priority_set(sess, pd->ciphers);
+    gnutls_db_set_retrieve_function(sess, sessdbfetch);
+    gnutls_db_set_store_function(sess, sessdbstore);
+    gnutls_db_set_remove_function(sess, sessdbdel);
+    gnutls_db_set_ptr(sess, NULL);
     gnutls_handshake_set_post_client_hello_function(sess, setcreds);
     gnutls_transport_set_ptr(sess, (gnutls_transport_ptr_t)(intptr_t)fd);
     while((ret = gnutls_handshake(sess)) != 0) {
@@ -233,29 +354,43 @@ static void servessl(struct muth *muth, va_list args)
 out:
     gnutls_deinit(sess);
     close(fd);
+    numconn--;
 }
 
 static void listenloop(struct muth *muth, va_list args)
 {
     vavar(struct sslport *, pd);
-    int ns;
+    int i, ns, n;
     struct sockaddr_storage name;
     socklen_t namelen;
     
+    fcntl(pd->fd, F_SETFL, fcntl(pd->fd, F_GETFL) | O_NONBLOCK);
     while(1) {
 	namelen = sizeof(name);
-	block(pd->fd, EV_READ, 0);
-	ns = accept(pd->fd, (struct sockaddr *)&name, &namelen);
-	if(ns < 0) {
-	    flog(LOG_ERR, "accept: %s", strerror(errno));
+	if(block(pd->fd, EV_READ, 0) == 0)
 	    goto out;
+	n = 0;
+	while(1) {
+	    ns = accept(pd->fd, (struct sockaddr *)&name, &namelen);
+	    if(ns < 0) {
+		if(errno == EAGAIN)
+		    break;
+		flog(LOG_ERR, "accept: %s", strerror(errno));
+		goto out;
+	    }
+	    mustart(servessl, ns, name, pd);
+	    if(++n >= 100)
+		break;
 	}
-	mustart(servessl, ns, name, pd);
     }
     
 out:
     close(pd->fd);
     free(pd);
+    for(i = 0; i < listeners.d; i++) {
+	if(listeners.b[i] == muth)
+	    bufdel(listeners, i);
+    }
 }
 
 static gnutls_dh_params_t dhparams(void)
@@ -386,15 +521,17 @@ void handlegnussl(int argc, char **argp, char **argv)
 {
     int i, ret, port, fd;
     gnutls_certificate_credentials_t creds;
+    gnutls_priority_t ciphers;
     struct ncredbuf ncreds;
     struct sslport *pd;
-    char *crtfile, *keyfile;
+    char *crtfile, *keyfile, *perr;
     
     init();
     port = 443;
     bufinit(ncreds);
     gnutls_certificate_allocate_credentials(&creds);
     keyfile = crtfile = NULL;
+    ciphers = NULL;
     for(i = 0; i < argc; i++) {
 	if(!strcmp(argp[i], "help")) {
 	    printf("ssl handler parameters:\n");
@@ -402,6 +539,8 @@ void handlegnussl(int argc, char **argp, char **argv)
 	    printf("\t\tThe name of the file to read the certificate from.\n");
 	    printf("\tkey=KEY-FILE    [same as CERT-FILE]\n");
 	    printf("\t\tThe name of the file to read the private key from.\n");
+	    printf("\tprio=PRIORITIES [NORMAL]\n");
+	    printf("\t\tCiphersuite priorities, as a GnuTLS priority string.\n");
 	    printf("\ttrust=CA-FILE   [no default]\n");
 	    printf("\t\tThe name of a file to read trusted certificates from.\n");
 	    printf("\t\tMay be given multiple times.\n");
@@ -431,6 +570,17 @@ void handlegnussl(int argc, char **argp, char **argv)
 	    crtfile = argv[i];
 	} else if(!strcmp(argp[i], "key")) {
 	    keyfile = argv[i];
+	} else if(!strcmp(argp[i], "prio")) {
+	    if(ciphers != NULL)
+		gnutls_priority_deinit(ciphers);
+	    ret = gnutls_priority_init(&ciphers, argv[i], (const char **)&perr);
+	    if(ret == GNUTLS_E_INVALID_REQUEST) {
+		flog(LOG_ERR, "ssl: invalid cipher priority string, at `%s'", perr);
+		exit(1);
+	    } else if(ret != 0) {
+		flog(LOG_ERR, "ssl: could not initialize cipher priorities: %s", gnutls_strerror(ret));
+		exit(1);
+	    }
 	} else if(!strcmp(argp[i], "trust")) {
 	    if((ret = gnutls_certificate_set_x509_trust_file(creds, argv[i], GNUTLS_X509_FMT_PEM)) != 0) {
 		flog(LOG_ERR, "ssl: could not load trust file `%s': %s", argv[i], gnutls_strerror(ret));
@@ -478,6 +628,10 @@ void handlegnussl(int argc, char **argp, char **argv)
 	flog(LOG_ERR, "ssl: could not load certificate or key: %s", gnutls_strerror(ret));
 	exit(1);
     }
+    if((ciphers == NULL) && ((ret = gnutls_priority_init(&ciphers, "NORMAL", NULL)) != 0)) {
+	flog(LOG_ERR, "ssl: could not initialize cipher priorities: %s", gnutls_strerror(ret));
+	exit(1);
+    }
     gnutls_certificate_set_dh_params(creds, dhparams());
     bufadd(ncreds, NULL);
     omalloc(pd);
@@ -485,10 +639,11 @@ void handlegnussl(int argc, char **argp, char **argv)
     pd->sport = port;
     pd->creds = creds;
     pd->ncreds = ncreds.b;
-    mustart(listenloop, pd);
-    if((fd = listensock6(port)) < 0) {
+    pd->ciphers = ciphers;
+    bufadd(listeners, mustart(listenloop, pd));
+    if((fd = listensock4(port)) < 0) {
 	if(errno != EADDRINUSE) {
-	    flog(LOG_ERR, "could not listen on IPv6 port (port %i): %s", port, strerror(errno));
+	    flog(LOG_ERR, "could not listen on IPv4 port (port %i): %s", port, strerror(errno));
 	    exit(1);
 	}
     } else {
@@ -496,7 +651,9 @@ void handlegnussl(int argc, char **argp, char **argv)
 	pd->fd = fd;
 	pd->sport = port;
 	pd->creds = creds;
-	mustart(listenloop, pd);
+	pd->ncreds = ncreds.b;
+	pd->ciphers = ciphers;
+	bufadd(listeners, mustart(listenloop, pd));
     }
 }