X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ftcpip.c;h=b9466d69379fb450eb45e2998924415aec6d3006;hp=d9517146cf6c5590a50534e3abc98171c5f42141;hb=896b145fa7a02199bfc3e8aa824c018b9d7cbf98;hpb=95fb5d3a1421a0e170f76aafb4bc0ce27a8f2ddd diff --git a/src/tcpip.c b/src/tcpip.c index d951714..b9466d6 100644 --- a/src/tcpip.c +++ b/src/tcpip.c @@ -1,16 +1,18 @@ -/* - * Copyright (C) 1995-2006, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. - * - * $Id: tcpip.c,v 1.26 2006-09-01 11:27:20 adam Exp $ */ /** * \file tcpip.c * \brief Implements TCP/IP + SSL COMSTACK. */ +#if HAVE_CONFIG_H +#include +#endif #include #include +#include #include #include #include @@ -26,38 +28,56 @@ #endif #ifdef WIN32 +/* VS 2003 or later has getaddrinfo; older versions do not */ #include +#if _MSC_VER >= 1300 #include #define HAVE_GETADDRINFO 1 #else +#define HAVE_GETADDRINFO 0 +#endif +#endif + +#if HAVE_NETINET_IN_H #include +#endif +#if HAVE_NETDB_H #include +#endif +#if HAVE_ARPA_INET_H #include +#endif +#if HAVE_NETINET_TCP_H #include #endif - #if HAVE_SYS_SOCKET_H #include #endif -#if HAVE_SYS_SELECT_H -#include -#endif #if HAVE_SYS_WAIT_H #include #endif +#if HAVE_GNUTLS_H +#include +#include +#define ENABLE_SSL 1 +#endif + #if HAVE_OPENSSL_SSL_H #include #include +#define ENABLE_SSL 1 #endif #include #include -#include +#include -static int tcpip_close(COMSTACK h); +static void tcpip_close(COMSTACK h); static int tcpip_put(COMSTACK h, char *buf, int size); static int tcpip_get(COMSTACK h, char **buf, int *bufsize); +static int tcpip_put_connect(COMSTACK h, char *buf, int size); +static int tcpip_get_connect(COMSTACK h, char **buf, int *bufsize); static int tcpip_connect(COMSTACK h, void *address); static int tcpip_more(COMSTACK h); static int tcpip_rcvconnect(COMSTACK h); @@ -67,13 +87,13 @@ static int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, void *cd); static int tcpip_set_blocking(COMSTACK p, int blocking); -#if HAVE_OPENSSL_SSL_H +#if ENABLE_SSL static int ssl_get(COMSTACK h, char **buf, int *bufsize); static int ssl_put(COMSTACK h, char *buf, int size); #endif static COMSTACK tcpip_accept(COMSTACK h); -static char *tcpip_addrstr(COMSTACK h); +static const char *tcpip_addrstr(COMSTACK h); static void *tcpip_straddr(COMSTACK h, const char *str); #if 0 @@ -86,6 +106,13 @@ static void *tcpip_straddr(COMSTACK h, const char *str); #define YAZ_SOCKLEN_T int #endif +#if HAVE_GNUTLS_H +struct tcpip_cred_ptr { + gnutls_certificate_credentials_t xcred; + int ref; +}; + +#endif /* this state is used for both SSL and straight TCP/IP */ typedef struct tcpip_state { @@ -95,23 +122,31 @@ typedef struct tcpip_state int written; /* -1 if we aren't writing */ int towrite; /* to verify against user input */ - int (*complete)(const unsigned char *buf, int len); /* length/comple. */ + int (*complete)(const char *buf, int len); /* length/complete. */ #if HAVE_GETADDRINFO struct addrinfo *ai; #else struct sockaddr_in addr; /* returned by cs_straddr */ #endif char buf[128]; /* returned by cs_addrstr */ -#if HAVE_OPENSSL_SSL_H +#if HAVE_GNUTLS_H + struct tcpip_cred_ptr *cred_ptr; + gnutls_session_t session; + char cert_fname[256]; +#elif HAVE_OPENSSL_SSL_H SSL_CTX *ctx; /* current CTX. */ SSL_CTX *ctx_alloc; /* If =ctx it is owned by CS. If 0 it is not owned */ SSL *ssl; char cert_fname[256]; #endif + char *connect_request_buf; + int connect_request_len; + char *connect_response_buf; + int connect_response_len; } tcpip_state; #ifdef WIN32 -static int tcpip_init (void) +static int tcpip_init(void) { static int initialized = 0; if (!initialized) @@ -127,7 +162,7 @@ static int tcpip_init (void) return 1; } #else -static int tcpip_init (void) +static int tcpip_init(void) { return 1; } @@ -137,12 +172,12 @@ static int tcpip_init (void) * This function is always called through the cs_create() macro. * s >= 0: socket has already been established for us. */ -COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) +COMSTACK tcpip_type(int s, int flags, int protocol, void *vp) { COMSTACK p; tcpip_state *sp; - if (!tcpip_init ()) + if (!tcpip_init()) return 0; if (!(p = (struct comstack *)xmalloc(sizeof(struct comstack)))) return 0; @@ -150,7 +185,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) xmalloc(sizeof(tcpip_state))))) return 0; - p->blocking = blocking; + p->flags = flags; p->io_pending = 0; p->iofile = s; @@ -174,10 +209,13 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) p->state = s < 0 ? CS_ST_UNBND : CS_ST_IDLE; /* state of line */ p->event = CS_NONE; p->cerrno = 0; - p->stackerr = 0; p->user = 0; -#if HAVE_OPENSSL_SSL_H +#if HAVE_GNUTLS_H + sp->cred_ptr = 0; + sp->session = 0; + strcpy(sp->cert_fname, "yaz.pem"); +#elif HAVE_OPENSSL_SSL_H sp->ctx = sp->ctx_alloc = 0; sp->ssl = 0; strcpy(sp->cert_fname, "yaz.pem"); @@ -194,20 +232,57 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) else sp->complete = cs_complete_auto; + sp->connect_request_buf = 0; + sp->connect_request_len = 0; + sp->connect_response_buf = 0; + sp->connect_response_len = 0; + p->timeout = COMSTACK_DEFAULT_TIMEOUT; TRC(fprintf(stderr, "Created new TCPIP comstack\n")); return p; } -#if HAVE_OPENSSL_SSL_H +COMSTACK yaz_tcpip_create(int s, int flags, int protocol, + const char *connect_host) +{ + COMSTACK p = tcpip_type(s, flags, protocol, 0); + if (!p) + return 0; + if (connect_host) + { + tcpip_state *sp = (tcpip_state *) p->cprivate; + sp->connect_request_buf = (char *) xmalloc(strlen(connect_host) + 30); + sprintf(sp->connect_request_buf, "CONNECT %s HTTP/1.0\r\n\r\n", + connect_host); + sp->connect_request_len = strlen(sp->connect_request_buf); + p->f_put = tcpip_put_connect; + p->f_get = tcpip_get_connect; + sp->complete = cs_complete_auto_head; /* only want HTTP header */ + } + return p; +} + +#if HAVE_GNUTLS_H +static void tcpip_create_cred(COMSTACK cs) +{ + tcpip_state *sp = (tcpip_state *) cs->cprivate; + sp->cred_ptr = (struct tcpip_cred_ptr *) xmalloc(sizeof(*sp->cred_ptr)); + sp->cred_ptr->ref = 1; + gnutls_certificate_allocate_credentials(&sp->cred_ptr->xcred); +} -COMSTACK ssl_type(int s, int blocking, int protocol, void *vp) +#endif + +COMSTACK ssl_type(int s, int flags, int protocol, void *vp) { +#if !ENABLE_SSL + return 0; +#else tcpip_state *sp; COMSTACK p; - p = tcpip_type (s, blocking, protocol, 0); + p = tcpip_type(s, flags, protocol, 0); if (!p) return 0; p->f_get = ssl_get; @@ -215,10 +290,49 @@ COMSTACK ssl_type(int s, int blocking, int protocol, void *vp) p->type = ssl_type; sp = (tcpip_state *) p->cprivate; +#if HAVE_GNUTLS_H + sp->session = (gnutls_session_t) vp; +#elif HAVE_OPENSSL_SSL_H sp->ctx = (SSL_CTX *) vp; /* may be NULL */ - +#endif /* note: we don't handle already opened socket in SSL mode - yet */ return p; +#endif +} + +#if ENABLE_SSL +static int ssl_check_error(COMSTACK h, tcpip_state *sp, int res) +{ +#if HAVE_OPENSSL_SSL_H + int err = SSL_get_error(sp->ssl, res); + TRC(fprintf(stderr, "got err=%d\n", err)); + if (err == SSL_ERROR_WANT_READ) + { + TRC(fprintf(stderr, " -> SSL_ERROR_WANT_READ\n")); + h->io_pending = CS_WANT_READ; + return 1; + } + if (err == SSL_ERROR_WANT_WRITE) + { + TRC(fprintf(stderr, " -> SSL_ERROR_WANT_WRITE\n")); + h->io_pending = CS_WANT_WRITE; + return 1; + } +#elif HAVE_GNUTLS_H + TRC(fprintf(stderr, "ssl_check_error error=%d fatal=%d msg=%s\n", + res, + gnutls_error_is_fatal(res), + gnutls_strerror(res))); + if (res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED) + { + int dir = gnutls_record_get_direction(sp->session); + TRC(fprintf(stderr, " -> incomplete dir=%d\n", dir)); + h->io_pending = dir ? CS_WANT_WRITE : CS_WANT_READ; + return 1; + } +#endif + h->cerrno = CSERRORSSL; + return 0; } #endif @@ -252,6 +366,13 @@ struct addrinfo *tcpip_getaddrinfo(const char *str, const char *port) if (!strcmp("@", host)) { hints.ai_flags = AI_PASSIVE; + hints.ai_family = AF_INET; + error = getaddrinfo(0, port, &hints, &res); + } + else if (!strcmp("@6", host)) + { + hints.ai_flags = AI_PASSIVE; + hints.ai_family = AF_INET6; error = getaddrinfo(0, port, &hints, &res); } else @@ -306,15 +427,15 @@ int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add, return 1; } - #if HAVE_GETADDRINFO void *tcpip_straddr(COMSTACK h, const char *str) { tcpip_state *sp = (tcpip_state *)h->cprivate; const char *port = "210"; + struct addrinfo *ai = 0; if (h->protocol == PROTO_HTTP) port = "80"; - if (!tcpip_init ()) + if (!tcpip_init()) return 0; if (sp->ai) @@ -322,17 +443,22 @@ void *tcpip_straddr(COMSTACK h, const char *str) sp->ai = tcpip_getaddrinfo(str, port); if (sp->ai && h->state == CS_ST_UNBND) { - int s; - struct addrinfo *ai = sp->ai; - s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); - if (s < 0) + int s = -1; + for (ai = sp->ai; ai; ai = ai->ai_next) + { + s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (s != -1) + break; + } + if (s == -1) return 0; + assert(ai); h->iofile = s; - if (!tcpip_set_blocking(h, h->blocking)) + if (!tcpip_set_blocking(h, h->flags)) return 0; } - return sp->ai; + return ai; } #else void *tcpip_straddr(COMSTACK h, const char *str) @@ -342,9 +468,9 @@ void *tcpip_straddr(COMSTACK h, const char *str) if (h->protocol == PROTO_HTTP) port = 80; - if (!tcpip_init ()) + if (!tcpip_init()) return 0; - if (!tcpip_strtoaddr_ex (str, &sp->addr, port)) + if (!tcpip_strtoaddr_ex(str, &sp->addr, port)) return 0; if (h->state == CS_ST_UNBND) { @@ -354,7 +480,7 @@ void *tcpip_straddr(COMSTACK h, const char *str) return 0; h->iofile = s; - if (!tcpip_set_blocking(h, h->blocking)) + if (!tcpip_set_blocking(h, h->flags)) return 0; } return &sp->addr; @@ -365,8 +491,7 @@ int tcpip_more(COMSTACK h) { tcpip_state *sp = (tcpip_state *)h->cprivate; - return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf, - sp->altlen); + return sp->altlen && (*sp->complete)(sp->altbuf, sp->altlen); } /* @@ -377,15 +502,12 @@ int tcpip_more(COMSTACK h) int tcpip_connect(COMSTACK h, void *address) { #if HAVE_GETADDRINFO + struct addrinfo *ai = (struct addrinfo *) address; tcpip_state *sp = (tcpip_state *)h->cprivate; #else struct sockaddr_in *add = (struct sockaddr_in *) address; #endif int r; -#ifdef __sun__ - int recbuflen; - YAZ_SOCKLEN_T rbufsize = sizeof(recbuflen); -#endif TRC(fprintf(stderr, "tcpip_connect\n")); h->io_pending = 0; if (h->state != CS_ST_UNBND) @@ -394,41 +516,7 @@ int tcpip_connect(COMSTACK h, void *address) return -1; } #if HAVE_GETADDRINFO - if (sp->ai != (struct addrinfo *) address) - { - h->cerrno = CSOUTSTATE; - return -1; - } -#endif -#ifdef __sun__ - /* On Suns, you must set a bigger Receive Buffer BEFORE a call to connect - * This gives the connect a chance to negotiate with the other side - * (see 'man tcp') - */ - if ( getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) < 0 ) - { - h->cerrno = CSYSERR; - return -1; - } - TRC(fprintf( stderr, "Current Size of TCP Receive Buffer= %d\n", - recbuflen )); - recbuflen *= 10; /* lets be optimistic */ - if ( setsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, rbufsize ) < 0 ) - { - h->cerrno = CSYSERR; - return -1; - } - if ( getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) ) - { - h->cerrno = CSYSERR; - return -1; - } - TRC(fprintf( stderr, "New Size of TCP Receive Buffer = %d\n", - recbuflen )); -#endif - -#if HAVE_GETADDRINFO - r = connect(h->iofile, sp->ai->ai_addr, sp->ai->ai_addrlen); + r = connect(h->iofile, ai->ai_addr, ai->ai_addrlen); freeaddrinfo(sp->ai); sp->ai = 0; #else @@ -459,7 +547,7 @@ int tcpip_connect(COMSTACK h, void *address) h->event = CS_CONNECT; h->state = CS_ST_CONNECTING; - return tcpip_rcvconnect (h); + return tcpip_rcvconnect(h); } /* @@ -467,7 +555,7 @@ int tcpip_connect(COMSTACK h, void *address) */ int tcpip_rcvconnect(COMSTACK h) { -#if HAVE_OPENSSL_SSL_H +#if ENABLE_SSL tcpip_state *sp = (tcpip_state *)h->cprivate; #endif TRC(fprintf(stderr, "tcpip_rcvconnect\n")); @@ -479,13 +567,38 @@ int tcpip_rcvconnect(COMSTACK h) h->cerrno = CSOUTSTATE; return -1; } -#if HAVE_OPENSSL_SSL_H +#if HAVE_GNUTLS_H + if (h->type == ssl_type && !sp->session) + { + int res; + gnutls_global_init(); + + tcpip_create_cred(h); + + gnutls_init(&sp->session, GNUTLS_CLIENT); + gnutls_set_default_priority(sp->session); + gnutls_credentials_set (sp->session, GNUTLS_CRD_CERTIFICATE, + sp->cred_ptr->xcred); + + /* cast to intermediate size_t to avoid GCC warning. */ + gnutls_transport_set_ptr(sp->session, + (gnutls_transport_ptr_t) + (size_t) h->iofile); + res = gnutls_handshake(sp->session); + if (res < 0) + { + if (ssl_check_error(h, sp, res)) + return 1; + return -1; + } + } +#elif HAVE_OPENSSL_SSL_H if (h->type == ssl_type && !sp->ctx) { + SSL_library_init(); SSL_load_error_strings(); - SSLeay_add_all_algorithms(); - sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method()); + sp->ctx = sp->ctx_alloc = SSL_CTX_new(SSLv23_client_method()); if (!sp->ctx) { h->cerrno = CSERRORSSL; @@ -498,24 +611,14 @@ int tcpip_rcvconnect(COMSTACK h) if (!sp->ssl) { - sp->ssl = SSL_new (sp->ctx); - SSL_set_fd (sp->ssl, h->iofile); + sp->ssl = SSL_new(sp->ctx); + SSL_set_fd(sp->ssl, h->iofile); } - res = SSL_connect (sp->ssl); + res = SSL_connect(sp->ssl); if (res <= 0) { - int err = SSL_get_error(sp->ssl, res); - if (err == SSL_ERROR_WANT_READ) - { - h->io_pending = CS_WANT_READ; + if (ssl_check_error(h, sp, res)) return 1; - } - if (err == SSL_ERROR_WANT_WRITE) - { - h->io_pending = CS_WANT_WRITE; - return 1; - } - h->cerrno = CSERRORSSL; return -1; } } @@ -528,56 +631,46 @@ int tcpip_rcvconnect(COMSTACK h) #define CERTF "ztest.pem" #define KEYF "ztest.pem" -static void tcpip_setsockopt (int fd) -{ -#if 0 - int len = 4096; - int set = 1; - - if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char*)&set, sizeof(int))) - { - yaz_log(LOG_WARN|LOG_ERRNO, "setsockopt TCP_NODELAY"); - } - if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (char*)&len, sizeof(int))) - { - yaz_log(LOG_WARN|LOG_ERRNO, "setsockopt SNDBUF"); - } - if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&len, sizeof(int))) - { - yaz_log(LOG_WARN|LOG_ERRNO, "setsockopt RCVBUF"); - } -#endif -} - static int tcpip_bind(COMSTACK h, void *address, int mode) { int r; tcpip_state *sp = (tcpip_state *)h->cprivate; -#if HAVE_GETADDRINFO +#if HAVE_GETADDRINFO + struct addrinfo *ai = (struct addrinfo *) address; #else struct sockaddr *addr = (struct sockaddr *)address; #endif #ifdef WIN32 BOOL one = 1; #else - unsigned long one = 1; + int one = 1; #endif -#if HAVE_GETADDRINFO - if (sp->ai != (struct addrinfo *) address) +#if HAVE_GNUTLS_H + if (h->type == ssl_type && !sp->session) { - h->cerrno = CSOUTSTATE; - return -1; - } -#endif + int res; + gnutls_global_init(); -#if HAVE_OPENSSL_SSL_H + tcpip_create_cred(h); + + res = gnutls_certificate_set_x509_key_file(sp->cred_ptr->xcred, + sp->cert_fname, + sp->cert_fname, + GNUTLS_X509_FMT_PEM); + if (res != GNUTLS_E_SUCCESS) + { + h->cerrno = CSERRORSSL; + return -1; + } + } +#elif HAVE_OPENSSL_SSL_H if (h->type == ssl_type && !sp->ctx) { + SSL_library_init(); SSL_load_error_strings(); - SSLeay_add_all_algorithms(); - sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method()); + sp->ctx = sp->ctx_alloc = SSL_CTX_new(SSLv23_server_method()); if (!sp->ctx) { h->cerrno = CSERRORSSL; @@ -589,34 +682,35 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) if (sp->ctx_alloc) { int res; - res = SSL_CTX_use_certificate_chain_file(sp->ctx, sp->cert_fname); + res = SSL_CTX_use_certificate_file(sp->ctx, sp->cert_fname, + SSL_FILETYPE_PEM); if (res <= 0) { ERR_print_errors_fp(stderr); - exit (2); + exit(2); } - res = SSL_CTX_use_PrivateKey_file (sp->ctx, sp->cert_fname, + res = SSL_CTX_use_PrivateKey_file(sp->ctx, sp->cert_fname, SSL_FILETYPE_PEM); if (res <= 0) { ERR_print_errors_fp(stderr); - exit (3); + exit(3); } - res = SSL_CTX_check_private_key (sp->ctx); + res = SSL_CTX_check_private_key(sp->ctx); if (res <= 0) { ERR_print_errors_fp(stderr); exit(5); } } - TRC (fprintf (stderr, "ssl_bind\n")); + TRC(fprintf(stderr, "ssl_bind\n")); } else { - TRC (fprintf (stderr, "tcpip_bind\n")); + TRC(fprintf(stderr, "tcpip_bind\n")); } #else - TRC (fprintf (stderr, "tcpip_bind\n")); + TRC(fprintf(stderr, "tcpip_bind\n")); #endif #ifndef WIN32 if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (char*) @@ -626,9 +720,8 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) return -1; } #endif - tcpip_setsockopt(h->iofile); #if HAVE_GETADDRINFO - r = bind(h->iofile, sp->ai->ai_addr, sp->ai->ai_addrlen); + r = bind(h->iofile, ai->ai_addr, ai->ai_addrlen); freeaddrinfo(sp->ai); sp->ai = 0; #else @@ -654,8 +747,12 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, int (*check_ip)(void *cd, const char *a, int len, int t), void *cd) { +#ifdef WIN32 + /* we don't get peer address on Windows (via accept) */ +#else struct sockaddr_in addr; YAZ_SOCKLEN_T len = sizeof(addr); +#endif TRC(fprintf(stderr, "tcpip_listen pid=%d\n", getpid())); if (h->state != CS_ST_IDLE) @@ -663,7 +760,11 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, h->cerrno = CSOUTSTATE; return -1; } +#ifdef WIN32 + h->newfd = accept(h->iofile, 0, 0); +#else h->newfd = accept(h->iofile, (struct sockaddr*)&addr, &len); +#endif if (h->newfd < 0) { if ( @@ -680,9 +781,21 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, ) h->cerrno = CSNODATA; else + { +#ifdef WIN32 + shutdown(h->iofile, SD_RECEIVE); +#else + shutdown(h->iofile, SHUT_RD); +#endif + listen(h->iofile, SOMAXCONN); h->cerrno = CSYSERR; + } return -1; } +#ifdef WIN32 + if (addrlen) + *addrlen = 0; +#else if (addrlen && (size_t) (*addrlen) >= sizeof(struct sockaddr_in)) memcpy(raddr, &addr, *addrlen = sizeof(struct sockaddr_in)); else if (addrlen) @@ -699,22 +812,22 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, h->newfd = -1; return -1; } +#endif h->state = CS_ST_INCON; - tcpip_setsockopt (h->newfd); return 0; } COMSTACK tcpip_accept(COMSTACK h) { COMSTACK cnew; - tcpip_state *state, *st = (tcpip_state *)h->cprivate; #ifdef WIN32 unsigned long tru = 1; #endif - TRC(fprintf(stderr, "tcpip_accept\n")); + TRC(fprintf(stderr, "tcpip_accept h=%p pid=%d\n", h, getpid())); if (h->state == CS_ST_INCON) { + tcpip_state *state, *st = (tcpip_state *)h->cprivate; if (!(cnew = (COMSTACK)xmalloc(sizeof(*cnew)))) { h->cerrno = CSYSERR; @@ -729,6 +842,7 @@ COMSTACK tcpip_accept(COMSTACK h) memcpy(cnew, h, sizeof(*h)); cnew->iofile = h->newfd; cnew->io_pending = 0; + if (!(state = (tcpip_state *) (cnew->cprivate = xmalloc(sizeof(tcpip_state))))) { @@ -744,7 +858,7 @@ COMSTACK tcpip_accept(COMSTACK h) } return 0; } - if (!tcpip_set_blocking(cnew, cnew->blocking)) + if (!tcpip_set_blocking(cnew, cnew->flags)) { h->cerrno = CSYSERR; if (h->newfd != -1) @@ -756,8 +870,8 @@ COMSTACK tcpip_accept(COMSTACK h) #endif h->newfd = -1; } - xfree (cnew); - xfree (state); + xfree(cnew); + xfree(state); return 0; } h->newfd = -1; @@ -771,42 +885,94 @@ COMSTACK tcpip_accept(COMSTACK h) cnew->state = CS_ST_ACCEPT; h->state = CS_ST_IDLE; -#if HAVE_OPENSSL_SSL_H +#if HAVE_GNUTLS_H + state->cred_ptr = st->cred_ptr; + state->session = 0; + if (st->cred_ptr) + { + int res; + + (state->cred_ptr->ref)++; + gnutls_init(&state->session, GNUTLS_SERVER); + if (!state->session) + { + xfree(cnew); + xfree(state); + return 0; + } + res = gnutls_set_default_priority(state->session); + if (res != GNUTLS_E_SUCCESS) + { + xfree(cnew); + xfree(state); + return 0; + } + res = gnutls_credentials_set(state->session, + GNUTLS_CRD_CERTIFICATE, + st->cred_ptr->xcred); + if (res != GNUTLS_E_SUCCESS) + { + xfree(cnew); + xfree(state); + return 0; + } + /* cast to intermediate size_t to avoid GCC warning. */ + gnutls_transport_set_ptr(state->session, + (gnutls_transport_ptr_t) + (size_t) cnew->iofile); + } +#elif HAVE_OPENSSL_SSL_H state->ctx = st->ctx; state->ctx_alloc = 0; state->ssl = st->ssl; if (state->ctx) { - state->ssl = SSL_new (state->ctx); - SSL_set_fd (state->ssl, cnew->iofile); + state->ssl = SSL_new(state->ctx); + SSL_set_fd(state->ssl, cnew->iofile); } #endif + state->connect_request_buf = 0; + state->connect_response_buf = 0; h = cnew; } if (h->state == CS_ST_ACCEPT) { -#if HAVE_OPENSSL_SSL_H +#if HAVE_GNUTLS_H tcpip_state *state = (tcpip_state *)h->cprivate; - if (state->ctx) + if (state->session) { - int res = SSL_accept (state->ssl); - TRC(fprintf(stderr, "SSL_accept\n")); - if (res <= 0) + int res = gnutls_handshake(state->session); + if (res < 0) { - int err = SSL_get_error(state->ssl, res); - if (err == SSL_ERROR_WANT_READ) + if (ssl_check_error(h, state, res)) { - h->io_pending = CS_WANT_READ; + TRC(fprintf(stderr, "gnutls_handshake int in tcpip_accept\n")); return h; } - if (err == SSL_ERROR_WANT_WRITE) + TRC(fprintf(stderr, "gnutls_handshake failed in tcpip_accept\n")); + cs_close(h); + return 0; + } + TRC(fprintf(stderr, "SSL_accept complete. gnutls\n")); + } +#elif HAVE_OPENSSL_SSL_H + tcpip_state *state = (tcpip_state *)h->cprivate; + if (state->ctx) + { + int res; + errno = 0; + res = SSL_accept(state->ssl); + TRC(fprintf(stderr, "SSL_accept res=%d\n", res)); + if (res <= 0) + { + if (ssl_check_error(h, state, res)) { - h->io_pending = CS_WANT_WRITE; return h; } - cs_close (h); + cs_close(h); return 0; } + TRC(fprintf(stderr, "SSL_accept complete\n")); } #endif } @@ -837,8 +1003,8 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) TRC(fprintf(stderr, "tcpip_get: bufsize=%d\n", *bufsize)); if (sp->altlen) /* switch buffers */ { - TRC(fprintf(stderr, " %d bytes in altbuf (0x%x)\n", sp->altlen, - (unsigned) sp->altbuf)); + TRC(fprintf(stderr, " %d bytes in altbuf (%p)\n", sp->altlen, + sp->altbuf)); tmpc = *buf; tmpi = *bufsize; *buf = sp->altbuf; @@ -849,7 +1015,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) sp->altsize = tmpi; } h->io_pending = 0; - while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread))) + while (!(berlen = (*sp->complete)(*buf, hasread))) { if (!*bufsize) { @@ -874,7 +1040,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) TRC(fprintf(stderr, " recv res=%d, hasread=%d\n", res, hasread)); if (res < 0) { - TRC(fprintf(stderr, " recv errno=%d, (%s)\n", yaz_errno(), + TRC(fprintf(stderr, " recv errno=%d, (%s)\n", yaz_errno(), strerror(yaz_errno()))); #ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) @@ -883,7 +1049,10 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) break; } else + { + h->cerrno = CSYSERR; return -1; + } #else if (yaz_errno() == EWOULDBLOCK #ifdef EAGAIN @@ -903,7 +1072,10 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) else if (yaz_errno() == 0) continue; else + { + h->cerrno = CSYSERR; return -1; + } #endif } else if (!res) @@ -915,8 +1087,8 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) return -1; } } - TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n", - hasread, berlen)); + TRC(fprintf(stderr, " Out of read loop with hasread=%d, berlen=%d\n", + hasread, berlen)); /* move surplus buffer (or everything if we didn't get a BER rec.) */ if (hasread > berlen) { @@ -927,12 +1099,18 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) if (!sp->altbuf) { if (!(sp->altbuf = (char *)xmalloc(sp->altsize = req))) + { + h->cerrno = CSYSERR; return -1; + } } else if (sp->altsize < req) if (!(sp->altbuf =(char *)xrealloc(sp->altbuf, sp->altsize = req))) + { + h->cerrno = CSYSERR; return -1; - TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove, - (unsigned) sp->altbuf)); + } + TRC(fprintf(stderr, " Moving %d bytes to altbuf(%p)\n", tomove, + sp->altbuf)); memcpy(sp->altbuf, *buf + berlen, sp->altlen = tomove); } if (berlen < CS_TCPIP_BUFCHUNK - 1) @@ -941,7 +1119,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) } -#if HAVE_OPENSSL_SSL_H +#if ENABLE_SSL /* * Return: -1 error, >1 good, len of buffer, ==1 incomplete buffer, * 0=connection closed. @@ -956,8 +1134,8 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) TRC(fprintf(stderr, "ssl_get: bufsize=%d\n", *bufsize)); if (sp->altlen) /* switch buffers */ { - TRC(fprintf(stderr, " %d bytes in altbuf (0x%x)\n", sp->altlen, - (unsigned) sp->altbuf)); + TRC(fprintf(stderr, " %d bytes in altbuf (%p)\n", sp->altlen, + sp->altbuf)); tmpc = *buf; tmpi = *bufsize; *buf = sp->altbuf; @@ -968,7 +1146,7 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) sp->altsize = tmpi; } h->io_pending = 0; - while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread))) + while (!(berlen = (*sp->complete)(*buf, hasread))) { if (!*bufsize) { @@ -978,26 +1156,25 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK) if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2))) return -1; - res = SSL_read (sp->ssl, *buf + hasread, CS_TCPIP_BUFCHUNK); +#if HAVE_GNUTLS_H + res = gnutls_record_recv(sp->session, *buf + hasread, + CS_TCPIP_BUFCHUNK); + if (res < 0) + { + if (ssl_check_error(h, sp, res)) + break; + return -1; + } +#else + res = SSL_read(sp->ssl, *buf + hasread, CS_TCPIP_BUFCHUNK); TRC(fprintf(stderr, " SSL_read res=%d, hasread=%d\n", res, hasread)); if (res <= 0) { - int ssl_err = SSL_get_error(sp->ssl, res); - if (ssl_err == SSL_ERROR_WANT_READ) - { - h->io_pending = CS_WANT_READ; - break; - } - if (ssl_err == SSL_ERROR_WANT_WRITE) - { - h->io_pending = CS_WANT_WRITE; + if (ssl_check_error(h, sp, res)) break; - } - if (res == 0) - return 0; - h->cerrno = CSERRORSSL; return -1; } +#endif hasread += res; } TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n", @@ -1016,8 +1193,8 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) } else if (sp->altsize < req) if (!(sp->altbuf =(char *)xrealloc(sp->altbuf, sp->altsize = req))) return -1; - TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove, - (unsigned) sp->altbuf)); + TRC(fprintf(stderr, " Moving %d bytes to altbuf(%p)\n", tomove, + sp->altbuf)); memcpy(sp->altbuf, *buf + berlen, sp->altlen = tomove); } if (berlen < CS_TCPIP_BUFCHUNK - 1) @@ -1095,7 +1272,7 @@ int tcpip_put(COMSTACK h, char *buf, int size) } -#if HAVE_OPENSSL_SSL_H +#if ENABLE_SSL /* * Returns 1, 0 or -1 * In nonblocking mode, you must call again with same buffer while @@ -1121,24 +1298,25 @@ int ssl_put(COMSTACK h, char *buf, int size) } while (state->towrite > state->written) { - res = SSL_write (state->ssl, buf + state->written, - size - state->written); +#if HAVE_GNUTLS_H + res = gnutls_record_send(state->session, buf + state->written, + size - state->written); if (res <= 0) { - int ssl_err = SSL_get_error(state->ssl, res); - if (ssl_err == SSL_ERROR_WANT_READ) - { - h->io_pending = CS_WANT_READ; + if (ssl_check_error(h, state, res)) return 1; - } - if (ssl_err == SSL_ERROR_WANT_WRITE) - { - h->io_pending = CS_WANT_WRITE; + return -1; + } +#else + res = SSL_write(state->ssl, buf + state->written, + size - state->written); + if (res <= 0) + { + if (ssl_check_error(h, state, res)) return 1; - } - h->cerrno = CSERRORSSL; return -1; } +#endif state->written += res; TRC(fprintf(stderr, " Wrote %d, written=%d, nbytes=%d\n", res, state->written, size)); @@ -1149,17 +1327,20 @@ int ssl_put(COMSTACK h, char *buf, int size) } #endif -int tcpip_close(COMSTACK h) +void tcpip_close(COMSTACK h) { tcpip_state *sp = (struct tcpip_state *)h->cprivate; - TRC(fprintf(stderr, "tcpip_close\n")); + TRC(fprintf(stderr, "tcpip_close h=%p pid=%d\n", h, getpid())); if (h->iofile != -1) { -#if HAVE_OPENSSL_SSL_H +#if HAVE_GNUTLS_H + if (sp->session) + gnutls_bye(sp->session, GNUTLS_SHUT_RDWR); +#elif HAVE_OPENSSL_SSL_H if (sp->ssl) { - SSL_shutdown (sp->ssl); + SSL_shutdown(sp->ssl); } #endif #ifdef WIN32 @@ -1170,51 +1351,103 @@ int tcpip_close(COMSTACK h) } if (sp->altbuf) xfree(sp->altbuf); -#if HAVE_OPENSSL_SSL_H +#if HAVE_GNUTLS_H + if (sp->session) + { + gnutls_deinit(sp->session); + } + if (sp->cred_ptr) + { + assert(sp->cred_ptr->ref > 0); + + if (--(sp->cred_ptr->ref) == 0) + { + TRC(fprintf(stderr, "Removed credentials %p pid=%d\n", + sp->cred_ptr->xcred, getpid())); + gnutls_certificate_free_credentials(sp->cred_ptr->xcred); + xfree(sp->cred_ptr); + } + sp->cred_ptr = 0; + } +#elif HAVE_OPENSSL_SSL_H if (sp->ssl) { - TRC (fprintf(stderr, "SSL_free\n")); - SSL_free (sp->ssl); + TRC(fprintf(stderr, "SSL_free\n")); + SSL_free(sp->ssl); } sp->ssl = 0; if (sp->ctx_alloc) - SSL_CTX_free (sp->ctx_alloc); + SSL_CTX_free(sp->ctx_alloc); #endif #if HAVE_GETADDRINFO if (sp->ai) freeaddrinfo(sp->ai); #endif + xfree(sp->connect_request_buf); + xfree(sp->connect_response_buf); xfree(sp); xfree(h); - return 0; } -char *tcpip_addrstr(COMSTACK h) +const char *tcpip_addrstr(COMSTACK h) { - struct sockaddr_in addr; tcpip_state *sp = (struct tcpip_state *)h->cprivate; char *r = 0, *buf = sp->buf; - YAZ_SOCKLEN_T len; + +#if HAVE_GETADDRINFO + char host[120]; + struct sockaddr_storage addr; + YAZ_SOCKLEN_T len = sizeof(addr); + + if (getpeername(h->iofile, (struct sockaddr *)&addr, &len) < 0) + { + h->cerrno = CSYSERR; + return 0; + } + if (getnameinfo((struct sockaddr *) &addr, len, host, sizeof(host)-1, + 0, 0, + (h->flags & CS_FLAGS_NUMERICHOST) ? NI_NUMERICHOST : 0)) + { + r = "unknown"; + } + else + r = host; + +#else + + struct sockaddr_in addr; + YAZ_SOCKLEN_T len = sizeof(addr); struct hostent *host; - len = sizeof(addr); if (getpeername(h->iofile, (struct sockaddr*) &addr, &len) < 0) { h->cerrno = CSYSERR; return 0; } - if (!(h->blocking&2)) { - if ((host = gethostbyaddr((char*)&addr.sin_addr, sizeof(addr.sin_addr), - AF_INET))) + if (!(h->flags & CS_FLAGS_NUMERICHOST)) + { + if ((host = gethostbyaddr((char*)&addr.sin_addr, + sizeof(addr.sin_addr), + AF_INET))) r = (char*) host->h_name; } if (!r) - r = inet_ntoa(addr.sin_addr); + r = inet_ntoa(addr.sin_addr); +#endif + if (h->protocol == PROTO_HTTP) sprintf(buf, "http:%s", r); else sprintf(buf, "tcp:%s", r); -#if HAVE_OPENSSL_SSL_H +#if HAVE_GNUTLS_H + if (sp->session) + { + if (h->protocol == PROTO_HTTP) + sprintf(buf, "https:%s", r); + else + sprintf(buf, "ssl:%s", r); + } +#elif HAVE_OPENSSL_SSL_H if (sp->ctx) { if (h->protocol == PROTO_HTTP) @@ -1226,17 +1459,17 @@ char *tcpip_addrstr(COMSTACK h) return buf; } -int static tcpip_set_blocking(COMSTACK p, int blocking) +static int tcpip_set_blocking(COMSTACK p, int flags) { unsigned long flag; #ifdef WIN32 - flag = 1; + flag = (flags & CS_FLAGS_BLOCKING) ? 0 : 1; if (ioctlsocket(p->iofile, FIONBIO, &flag) < 0) return 0; #else flag = fcntl(p->iofile, F_GETFL, 0); - if (blocking & 1) + if (flags & CS_FLAGS_BLOCKING) flag = flag & ~O_NONBLOCK; /* blocking */ else { @@ -1246,49 +1479,98 @@ int static tcpip_set_blocking(COMSTACK p, int blocking) if (fcntl(p->iofile, F_SETFL, flag) < 0) return 0; #endif - p->blocking = blocking; + p->flags = flags; return 1; } -#if HAVE_OPENSSL_SSL_H -int cs_set_ssl_ctx(COMSTACK cs, void *ctx) +void cs_print_session_info(COMSTACK cs) { - struct tcpip_state *sp; - if (!cs || cs->type != ssl_type) - return 0; - sp = (struct tcpip_state *) cs->cprivate; - if (sp->ctx_alloc) - return 0; - sp->ctx = (SSL_CTX *) ctx; - return 1; +#if HAVE_GNUTLS_H + struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate; + if (sp->session) + { + if (gnutls_certificate_type_get(sp->session) != GNUTLS_CRT_X509) + return; + printf("X509 certificate\n"); + } +#elif HAVE_OPENSSL_SSL_H + struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate; + SSL *ssl = (SSL *) sp->ssl; + if (ssl) + { + X509 *server_cert = SSL_get_peer_certificate(ssl); + + if (server_cert) + { + char *pem_buf; + int pem_len; + BIO *bio = BIO_new(BIO_s_mem()); + + /* get PEM buffer in memory */ + PEM_write_bio_X509(bio, server_cert); + pem_len = BIO_get_mem_data(bio, &pem_buf); + fwrite(pem_buf, pem_len, 1, stdout); + + /* print all info on screen .. */ + X509_print_fp(stdout, server_cert); + BIO_free(bio); + + X509_free(server_cert); + } + } +#endif } void *cs_get_ssl(COMSTACK cs) { - struct tcpip_state *sp; - if (!cs || cs->type != ssl_type) - return 0; - sp = (struct tcpip_state *) cs->cprivate; - return sp->ssl; +#if HAVE_OPENSSL_SSL_H + if (cs && cs->type == ssl_type) + { + struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate; + return sp->ssl; + } +#endif + return 0; +} + +int cs_set_ssl_ctx(COMSTACK cs, void *ctx) +{ +#if ENABLE_SSL + if (cs && cs->type == ssl_type) + { +#if HAVE_OPENSSL_SSL_H + struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate; + if (sp->ctx_alloc) + return 0; + sp->ctx = (SSL_CTX *) ctx; +#endif + return 1; + } +#endif + return 0; } int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname) { - struct tcpip_state *sp; - if (!cs || cs->type != ssl_type) - return 0; - sp = (struct tcpip_state *) cs->cprivate; - strncpy(sp->cert_fname, fname, sizeof(sp->cert_fname)-1); - sp->cert_fname[sizeof(sp->cert_fname)-1] = '\0'; - return 1; +#if ENABLE_SSL + if (cs && cs->type == ssl_type) + { + struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate; + strncpy(sp->cert_fname, fname, sizeof(sp->cert_fname)-1); + sp->cert_fname[sizeof(sp->cert_fname)-1] = '\0'; + return 1; + } +#endif + return 0; } int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len) { +#if HAVE_OPENSSL_SSL_H SSL *ssl = (SSL *) cs_get_ssl(cs); if (ssl) { - X509 *server_cert = SSL_get_peer_certificate (ssl); + X509 *server_cert = SSL_get_peer_certificate(ssl); if (server_cert) { BIO *bio = BIO_new(BIO_s_mem()); @@ -1302,33 +1584,45 @@ int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len) return 1; } } - return 0; -} -#else -int cs_set_ssl_ctx(COMSTACK cs, void *ctx) -{ +#endif return 0; } -void *cs_get_ssl(COMSTACK cs) +static int tcpip_put_connect(COMSTACK h, char *buf, int size) { - return 0; -} + struct tcpip_state *state = (struct tcpip_state *)h->cprivate; -int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len) -{ - return 0; + int r = tcpip_put(h, state->connect_request_buf, + state->connect_request_len); + if (r == 0) + { + /* it's sent */ + h->f_put = tcpip_put; /* switch to normal tcpip put */ + r = tcpip_put(h, buf, size); + } + return r; } -int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname) +static int tcpip_get_connect(COMSTACK h, char **buf, int *bufsize) { - return 0; + struct tcpip_state *state = (struct tcpip_state *)h->cprivate; + int r; + + r = tcpip_get(h, &state->connect_response_buf, + &state->connect_response_len); + if (r < 1) + return r; + /* got the connect response completely */ + state->complete = cs_complete_auto; /* switch to normal tcpip get */ + h->f_get = tcpip_get; + return tcpip_get(h, buf, bufsize); } -#endif + /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab