2008-01-18 22:04:33 +00:00
|
|
|
/*
|
|
|
|
* Asterisk -- An open source telephony toolkit.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2007 - 2008, Digium, Inc.
|
|
|
|
*
|
|
|
|
* Luigi Rizzo (TCP and TLS server code)
|
|
|
|
* Brett Bryant <brettbryant@gmail.com> (updated for client support)
|
|
|
|
*
|
|
|
|
* See http://www.asterisk.org for more information about
|
|
|
|
* the Asterisk project. Please do not directly contact
|
|
|
|
* any of the maintainers of this project for assistance;
|
|
|
|
* the project provides a web site, mailing lists and IRC
|
|
|
|
* channels for your use.
|
|
|
|
*
|
|
|
|
* This program is free software, distributed under the terms of
|
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
* at the top of the source tree.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* \file
|
|
|
|
* \brief Code to support TCP and TLS server/client
|
|
|
|
*
|
|
|
|
* \author Luigi Rizzo
|
|
|
|
* \author Brett Bryant <brettbryant@gmail.com>
|
|
|
|
*/
|
|
|
|
|
2012-06-15 16:20:16 +00:00
|
|
|
/*** MODULEINFO
|
|
|
|
<support_level>core</support_level>
|
|
|
|
***/
|
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
#include "asterisk.h"
|
|
|
|
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
|
|
|
|
2010-03-20 12:03:07 +00:00
|
|
|
#include <signal.h>
|
2008-01-18 22:04:33 +00:00
|
|
|
#include <sys/signal.h>
|
|
|
|
|
|
|
|
#include "asterisk/compat.h"
|
|
|
|
#include "asterisk/tcptls.h"
|
|
|
|
#include "asterisk/http.h"
|
|
|
|
#include "asterisk/utils.h"
|
|
|
|
#include "asterisk/strings.h"
|
|
|
|
#include "asterisk/options.h"
|
|
|
|
#include "asterisk/manager.h"
|
2008-10-19 19:11:28 +00:00
|
|
|
#include "asterisk/astobj2.h"
|
2008-01-18 22:04:33 +00:00
|
|
|
|
2008-01-22 08:58:46 +00:00
|
|
|
/*! \brief
|
2008-01-18 22:04:33 +00:00
|
|
|
* replacement read/write functions for SSL support.
|
|
|
|
* We use wrappers rather than SSL_read/SSL_write directly so
|
|
|
|
* we can put in some debugging.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef DO_SSL
|
|
|
|
static HOOK_T ssl_read(void *cookie, char *buf, LEN_T len)
|
|
|
|
{
|
|
|
|
int i = SSL_read(cookie, buf, len-1);
|
|
|
|
#if 0
|
2011-11-06 09:51:09 +00:00
|
|
|
if (i >= 0) {
|
2008-01-18 22:04:33 +00:00
|
|
|
buf[i] = '\0';
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-02-05 23:00:15 +00:00
|
|
|
ast_verb(0, "ssl read size %d returns %d <%s>\n", (int)len, i, buf);
|
2008-01-18 22:04:33 +00:00
|
|
|
#endif
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
static HOOK_T ssl_write(void *cookie, const char *buf, LEN_T len)
|
|
|
|
{
|
|
|
|
#if 0
|
2012-07-31 20:21:43 +00:00
|
|
|
char *s = ast_alloca(len+1);
|
2011-11-06 09:51:09 +00:00
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
strncpy(s, buf, len);
|
|
|
|
s[len] = '\0';
|
2008-02-05 23:00:15 +00:00
|
|
|
ast_verb(0, "ssl write size %d <%s>\n", (int)len, s);
|
2008-01-18 22:04:33 +00:00
|
|
|
#endif
|
|
|
|
return SSL_write(cookie, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ssl_close(void *cookie)
|
|
|
|
{
|
2011-11-30 22:03:02 +00:00
|
|
|
int cookie_fd = SSL_get_fd(cookie);
|
|
|
|
int ret;
|
2012-09-14 19:53:43 +00:00
|
|
|
|
2011-11-30 22:03:02 +00:00
|
|
|
if (cookie_fd > -1) {
|
|
|
|
/*
|
|
|
|
* According to the TLS standard, it is acceptable for an application to only send its shutdown
|
|
|
|
* alert and then close the underlying connection without waiting for the peer's response (this
|
|
|
|
* way resources can be saved, as the process can already terminate or serve another connection).
|
|
|
|
*/
|
|
|
|
if ((ret = SSL_shutdown(cookie)) < 0) {
|
|
|
|
ast_log(LOG_ERROR, "SSL_shutdown() failed: %d\n", SSL_get_error(cookie, ret));
|
|
|
|
}
|
2012-09-14 19:53:43 +00:00
|
|
|
|
|
|
|
if (!((SSL*)cookie)->server) {
|
|
|
|
/* For client threads, ensure that the error stack is cleared */
|
|
|
|
ERR_remove_state(0);
|
|
|
|
}
|
|
|
|
|
2011-11-30 22:03:02 +00:00
|
|
|
SSL_free(cookie);
|
|
|
|
/* adding shutdown(2) here has no added benefit */
|
|
|
|
if (close(cookie_fd)) {
|
|
|
|
ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* DO_SSL */
|
|
|
|
|
2008-12-12 18:45:03 +00:00
|
|
|
HOOK_T ast_tcptls_server_read(struct ast_tcptls_session_instance *tcptls_session, void *buf, size_t count)
|
2008-01-18 22:04:33 +00:00
|
|
|
{
|
2008-12-12 18:45:03 +00:00
|
|
|
if (tcptls_session->fd == -1) {
|
2008-06-17 21:46:57 +00:00
|
|
|
ast_log(LOG_ERROR, "server_read called with an fd of -1\n");
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
#ifdef DO_SSL
|
2011-11-06 09:51:09 +00:00
|
|
|
if (tcptls_session->ssl) {
|
2008-12-12 18:45:03 +00:00
|
|
|
return ssl_read(tcptls_session->ssl, buf, count);
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
#endif
|
2008-12-12 18:45:03 +00:00
|
|
|
return read(tcptls_session->fd, buf, count);
|
2008-01-18 22:04:33 +00:00
|
|
|
}
|
|
|
|
|
2008-12-13 08:36:35 +00:00
|
|
|
HOOK_T ast_tcptls_server_write(struct ast_tcptls_session_instance *tcptls_session, const void *buf, size_t count)
|
2008-01-18 22:04:33 +00:00
|
|
|
{
|
2008-12-12 18:45:03 +00:00
|
|
|
if (tcptls_session->fd == -1) {
|
2008-06-17 21:46:57 +00:00
|
|
|
ast_log(LOG_ERROR, "server_write called with an fd of -1\n");
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
#ifdef DO_SSL
|
2011-11-06 09:51:09 +00:00
|
|
|
if (tcptls_session->ssl) {
|
2008-12-12 18:45:03 +00:00
|
|
|
return ssl_write(tcptls_session->ssl, buf, count);
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
#endif
|
2008-12-12 18:45:03 +00:00
|
|
|
return write(tcptls_session->fd, buf, count);
|
2008-01-18 22:04:33 +00:00
|
|
|
}
|
|
|
|
|
2012-10-12 16:31:01 +00:00
|
|
|
static void session_instance_destructor(void *obj)
|
|
|
|
{
|
|
|
|
struct ast_tcptls_session_instance *i = obj;
|
|
|
|
ast_free(i->overflow_buf);
|
|
|
|
}
|
|
|
|
|
2008-10-19 19:11:28 +00:00
|
|
|
/*! \brief
|
|
|
|
* creates a FILE * from the fd passed by the accept thread.
|
|
|
|
* This operation is potentially expensive (certificate verification),
|
|
|
|
* so we do it in the child thread context.
|
2009-09-24 20:37:20 +00:00
|
|
|
*
|
|
|
|
* \note must decrement ref count before returning NULL on error
|
2008-10-19 19:11:28 +00:00
|
|
|
*/
|
SIP TCP/TLS: move client connection setup/write into tcp helper thread, various related locking/memory fixes.
What this patch fixes
1.Moves sip TCP/TLS connection setup into the TCP helper thread:
Connection setup takes awhile and before this it was being
done while holding the monitor lock.
2.Moves TCP/TLS writing to the TCP helper thread: Through the
use of a packet queue and an alert pipe, the TCP helper thread
can now be woken up to write data as well as read data.
3.Locking error: sip_xmit returned an XMIT_ERROR without giving
up the tcptls_session lock. This lock has been completely removed
from sip_xmit and placed in the new sip_tcptls_write() function.
4.Memory leak: When creating a tcptls_client the tls_cfg was alloced
but never freed unless the tcptls_session failed to start. Now the
session_args for a sip client are an ao2 object which frees the
tls_cfg on destruction.
5.Pointer to stack variable: During sip_prepare_socket the creation
of a client's ast_tcptls_session_args was done on the stack and
stored as a pointer in the newly created tcptls_session. Depending
on the events that followed, there was a slight possibility that
pointer could have been accessed after the stack returned. Given
the new changes, it is always accessed after the stack returns
which is why I found it.
Notable code changes
1.I broke tcptls.c's ast_tcptls_client_start() function into two
functions. One for creating and allocating the new tcptls_session,
and a separate one for starting and handling the new connection.
This allowed me to create the tcptls_session, launch the helper
thread, and then establish the connection within the helper thread.
2.Writes to a tcptls_session are now done within the helper thread.
This is done by using an alert pipe to wake up the thread if new
data needs to be sent. The thread's sip_threadinfo object contains
the alert pipe as well as the packet queue.
3.Since the threadinfo object contains the alert pipe, it must now be
accessed outside of the helper thread for every write (queuing of a
packet). For easy lookup, I moved the threadinfo objects from a
linked list to an ao2_container.
(closes issue #13136)
Reported by: pabelanger
Tested by: dvossel, whys
(closes issue #15894)
Reported by: dvossel
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/380/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 19:55:51 +00:00
|
|
|
static void *handle_tcptls_connection(void *data)
|
2008-10-19 19:11:28 +00:00
|
|
|
{
|
2008-12-12 18:45:03 +00:00
|
|
|
struct ast_tcptls_session_instance *tcptls_session = data;
|
2008-10-19 19:11:28 +00:00
|
|
|
#ifdef DO_SSL
|
2008-12-12 18:45:03 +00:00
|
|
|
int (*ssl_setup)(SSL *) = (tcptls_session->client) ? SSL_connect : SSL_accept;
|
2008-10-19 19:11:28 +00:00
|
|
|
int ret;
|
|
|
|
char err[256];
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* open a FILE * as appropriate.
|
|
|
|
*/
|
2009-02-04 18:48:06 +00:00
|
|
|
if (!tcptls_session->parent->tls_cfg) {
|
2011-03-16 19:51:55 +00:00
|
|
|
if ((tcptls_session->f = fdopen(tcptls_session->fd, "w+"))) {
|
|
|
|
if(setvbuf(tcptls_session->f, NULL, _IONBF, 0)) {
|
2011-11-30 22:03:02 +00:00
|
|
|
ast_tcptls_close_session_file(tcptls_session);
|
2011-03-16 19:51:55 +00:00
|
|
|
}
|
|
|
|
}
|
2009-02-04 18:48:06 +00:00
|
|
|
}
|
2008-10-19 19:11:28 +00:00
|
|
|
#ifdef DO_SSL
|
2008-12-12 18:45:03 +00:00
|
|
|
else if ( (tcptls_session->ssl = SSL_new(tcptls_session->parent->tls_cfg->ssl_ctx)) ) {
|
|
|
|
SSL_set_fd(tcptls_session->ssl, tcptls_session->fd);
|
|
|
|
if ((ret = ssl_setup(tcptls_session->ssl)) <= 0) {
|
2008-10-19 19:11:28 +00:00
|
|
|
ast_verb(2, "Problem setting up ssl connection: %s\n", ERR_error_string(ERR_get_error(), err));
|
|
|
|
} else {
|
|
|
|
#if defined(HAVE_FUNOPEN) /* the BSD interface */
|
2008-12-12 18:45:03 +00:00
|
|
|
tcptls_session->f = funopen(tcptls_session->ssl, ssl_read, ssl_write, NULL, ssl_close);
|
2008-10-19 19:11:28 +00:00
|
|
|
|
|
|
|
#elif defined(HAVE_FOPENCOOKIE) /* the glibc/linux interface */
|
|
|
|
static const cookie_io_functions_t cookie_funcs = {
|
|
|
|
ssl_read, ssl_write, NULL, ssl_close
|
|
|
|
};
|
2008-12-12 18:45:03 +00:00
|
|
|
tcptls_session->f = fopencookie(tcptls_session->ssl, "w+", cookie_funcs);
|
2008-10-19 19:11:28 +00:00
|
|
|
#else
|
|
|
|
/* could add other methods here */
|
2012-04-06 18:19:03 +00:00
|
|
|
ast_debug(2, "no tcptls_session->f methods attempted!\n");
|
2008-10-19 19:11:28 +00:00
|
|
|
#endif
|
2008-12-12 18:45:03 +00:00
|
|
|
if ((tcptls_session->client && !ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_DONT_VERIFY_SERVER))
|
|
|
|
|| (!tcptls_session->client && ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_VERIFY_CLIENT))) {
|
2008-10-19 19:11:28 +00:00
|
|
|
X509 *peer;
|
|
|
|
long res;
|
2008-12-12 18:45:03 +00:00
|
|
|
peer = SSL_get_peer_certificate(tcptls_session->ssl);
|
2011-11-06 09:51:09 +00:00
|
|
|
if (!peer) {
|
2012-10-17 19:01:27 +00:00
|
|
|
ast_log(LOG_ERROR, "No peer SSL certificate to verify\n");
|
|
|
|
ast_tcptls_close_session_file(tcptls_session);
|
|
|
|
ao2_ref(tcptls_session, -1);
|
|
|
|
return NULL;
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2012-10-17 19:01:27 +00:00
|
|
|
|
2008-12-12 18:45:03 +00:00
|
|
|
res = SSL_get_verify_result(tcptls_session->ssl);
|
2011-11-06 09:51:09 +00:00
|
|
|
if (res != X509_V_OK) {
|
2008-10-19 19:11:28 +00:00
|
|
|
ast_log(LOG_ERROR, "Certificate did not verify: %s\n", X509_verify_cert_error_string(res));
|
2012-10-17 19:01:27 +00:00
|
|
|
X509_free(peer);
|
|
|
|
ast_tcptls_close_session_file(tcptls_session);
|
|
|
|
ao2_ref(tcptls_session, -1);
|
|
|
|
return NULL;
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-12-12 18:45:03 +00:00
|
|
|
if (!ast_test_flag(&tcptls_session->parent->tls_cfg->flags, AST_SSL_IGNORE_COMMON_NAME)) {
|
2008-10-19 19:11:28 +00:00
|
|
|
ASN1_STRING *str;
|
|
|
|
unsigned char *str2;
|
|
|
|
X509_NAME *name = X509_get_subject_name(peer);
|
|
|
|
int pos = -1;
|
|
|
|
int found = 0;
|
2009-04-29 21:13:43 +00:00
|
|
|
|
2008-10-19 19:11:28 +00:00
|
|
|
for (;;) {
|
|
|
|
/* Walk the certificate to check all available "Common Name" */
|
|
|
|
/* XXX Probably should do a gethostbyname on the hostname and compare that as well */
|
|
|
|
pos = X509_NAME_get_index_by_NID(name, NID_commonName, pos);
|
2011-11-06 09:51:09 +00:00
|
|
|
if (pos < 0) {
|
2008-10-19 19:11:28 +00:00
|
|
|
break;
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-10-19 19:11:28 +00:00
|
|
|
str = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, pos));
|
|
|
|
ASN1_STRING_to_UTF8(&str2, str);
|
|
|
|
if (str2) {
|
2011-11-06 09:51:09 +00:00
|
|
|
if (!strcasecmp(tcptls_session->parent->hostname, (char *) str2)) {
|
2008-10-19 19:11:28 +00:00
|
|
|
found = 1;
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-12-12 18:45:03 +00:00
|
|
|
ast_debug(3, "SSL Common Name compare s1='%s' s2='%s'\n", tcptls_session->parent->hostname, str2);
|
2008-10-19 19:11:28 +00:00
|
|
|
OPENSSL_free(str2);
|
|
|
|
}
|
2011-11-06 09:51:09 +00:00
|
|
|
if (found) {
|
2008-10-19 19:11:28 +00:00
|
|
|
break;
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-10-19 19:11:28 +00:00
|
|
|
}
|
|
|
|
if (!found) {
|
2008-12-12 18:45:03 +00:00
|
|
|
ast_log(LOG_ERROR, "Certificate common name did not match (%s)\n", tcptls_session->parent->hostname);
|
2012-10-17 19:01:27 +00:00
|
|
|
X509_free(peer);
|
2011-11-30 22:03:02 +00:00
|
|
|
ast_tcptls_close_session_file(tcptls_session);
|
2009-09-24 20:37:20 +00:00
|
|
|
ao2_ref(tcptls_session, -1);
|
2008-10-19 19:11:28 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2012-10-17 19:01:27 +00:00
|
|
|
X509_free(peer);
|
2008-10-19 19:11:28 +00:00
|
|
|
}
|
|
|
|
}
|
2011-11-06 09:51:09 +00:00
|
|
|
if (!tcptls_session->f) { /* no success opening descriptor stacking */
|
2008-12-12 18:45:03 +00:00
|
|
|
SSL_free(tcptls_session->ssl);
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2011-11-30 22:03:02 +00:00
|
|
|
}
|
2008-10-19 19:11:28 +00:00
|
|
|
#endif /* DO_SSL */
|
|
|
|
|
2008-12-12 18:45:03 +00:00
|
|
|
if (!tcptls_session->f) {
|
2011-11-30 22:03:02 +00:00
|
|
|
ast_tcptls_close_session_file(tcptls_session);
|
2008-10-19 19:11:28 +00:00
|
|
|
ast_log(LOG_WARNING, "FILE * open failed!\n");
|
2010-02-16 20:54:48 +00:00
|
|
|
#ifndef DO_SSL
|
|
|
|
if (tcptls_session->parent->tls_cfg) {
|
2011-11-06 09:51:09 +00:00
|
|
|
ast_log(LOG_WARNING, "Attempted a TLS connection without OpenSSL support. This will not work!\n");
|
2010-02-16 20:54:48 +00:00
|
|
|
}
|
|
|
|
#endif
|
2008-12-12 18:45:03 +00:00
|
|
|
ao2_ref(tcptls_session, -1);
|
2008-10-19 19:11:28 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-05-31 18:39:30 +00:00
|
|
|
if (tcptls_session->parent->worker_fn) {
|
2008-12-12 18:45:03 +00:00
|
|
|
return tcptls_session->parent->worker_fn(tcptls_session);
|
2011-11-06 09:51:09 +00:00
|
|
|
} else {
|
2008-12-12 18:45:03 +00:00
|
|
|
return tcptls_session;
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-10-19 19:11:28 +00:00
|
|
|
}
|
|
|
|
|
2008-03-04 22:23:21 +00:00
|
|
|
void *ast_tcptls_server_root(void *data)
|
2008-01-18 22:04:33 +00:00
|
|
|
{
|
2008-10-19 19:11:28 +00:00
|
|
|
struct ast_tcptls_session_args *desc = data;
|
2008-01-18 22:04:33 +00:00
|
|
|
int fd;
|
2010-07-08 22:08:07 +00:00
|
|
|
struct ast_sockaddr addr;
|
2008-12-12 18:45:03 +00:00
|
|
|
struct ast_tcptls_session_instance *tcptls_session;
|
2008-01-18 22:04:33 +00:00
|
|
|
pthread_t launched;
|
2009-04-29 21:13:43 +00:00
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
for (;;) {
|
|
|
|
int i, flags;
|
|
|
|
|
2011-11-06 09:51:09 +00:00
|
|
|
if (desc->periodic_fn) {
|
2008-01-18 22:04:33 +00:00
|
|
|
desc->periodic_fn(desc);
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
i = ast_wait_for_input(desc->accept_fd, desc->poll_timeout);
|
2011-11-06 09:51:09 +00:00
|
|
|
if (i <= 0) {
|
2008-01-18 22:04:33 +00:00
|
|
|
continue;
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2010-07-08 22:08:07 +00:00
|
|
|
fd = ast_accept(desc->accept_fd, &addr);
|
2008-01-18 22:04:33 +00:00
|
|
|
if (fd < 0) {
|
2011-11-06 09:51:09 +00:00
|
|
|
if ((errno != EAGAIN) && (errno != EINTR)) {
|
2008-01-18 22:04:33 +00:00
|
|
|
ast_log(LOG_WARNING, "Accept failed: %s\n", strerror(errno));
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
continue;
|
|
|
|
}
|
2012-10-12 16:31:01 +00:00
|
|
|
tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor);
|
2008-12-12 18:45:03 +00:00
|
|
|
if (!tcptls_session) {
|
2008-01-18 22:04:33 +00:00
|
|
|
ast_log(LOG_WARNING, "No memory for new session: %s\n", strerror(errno));
|
2011-11-30 22:03:02 +00:00
|
|
|
if (close(fd)) {
|
|
|
|
ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
|
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
continue;
|
|
|
|
}
|
2008-06-17 21:46:57 +00:00
|
|
|
|
2012-10-12 16:31:01 +00:00
|
|
|
tcptls_session->overflow_buf = ast_str_create(128);
|
2008-01-18 22:04:33 +00:00
|
|
|
flags = fcntl(fd, F_GETFL);
|
|
|
|
fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
|
2008-12-12 18:45:03 +00:00
|
|
|
tcptls_session->fd = fd;
|
|
|
|
tcptls_session->parent = desc;
|
2010-07-08 22:08:07 +00:00
|
|
|
ast_sockaddr_copy(&tcptls_session->remote_address, &addr);
|
2008-01-18 22:04:33 +00:00
|
|
|
|
2008-12-12 18:45:03 +00:00
|
|
|
tcptls_session->client = 0;
|
2009-04-29 21:13:43 +00:00
|
|
|
|
2009-09-24 20:37:20 +00:00
|
|
|
/* This thread is now the only place that controls the single ref to tcptls_session */
|
SIP TCP/TLS: move client connection setup/write into tcp helper thread, various related locking/memory fixes.
What this patch fixes
1.Moves sip TCP/TLS connection setup into the TCP helper thread:
Connection setup takes awhile and before this it was being
done while holding the monitor lock.
2.Moves TCP/TLS writing to the TCP helper thread: Through the
use of a packet queue and an alert pipe, the TCP helper thread
can now be woken up to write data as well as read data.
3.Locking error: sip_xmit returned an XMIT_ERROR without giving
up the tcptls_session lock. This lock has been completely removed
from sip_xmit and placed in the new sip_tcptls_write() function.
4.Memory leak: When creating a tcptls_client the tls_cfg was alloced
but never freed unless the tcptls_session failed to start. Now the
session_args for a sip client are an ao2 object which frees the
tls_cfg on destruction.
5.Pointer to stack variable: During sip_prepare_socket the creation
of a client's ast_tcptls_session_args was done on the stack and
stored as a pointer in the newly created tcptls_session. Depending
on the events that followed, there was a slight possibility that
pointer could have been accessed after the stack returned. Given
the new changes, it is always accessed after the stack returns
which is why I found it.
Notable code changes
1.I broke tcptls.c's ast_tcptls_client_start() function into two
functions. One for creating and allocating the new tcptls_session,
and a separate one for starting and handling the new connection.
This allowed me to create the tcptls_session, launch the helper
thread, and then establish the connection within the helper thread.
2.Writes to a tcptls_session are now done within the helper thread.
This is done by using an alert pipe to wake up the thread if new
data needs to be sent. The thread's sip_threadinfo object contains
the alert pipe as well as the packet queue.
3.Since the threadinfo object contains the alert pipe, it must now be
accessed outside of the helper thread for every write (queuing of a
packet). For easy lookup, I moved the threadinfo objects from a
linked list to an ao2_container.
(closes issue #13136)
Reported by: pabelanger
Tested by: dvossel, whys
(closes issue #15894)
Reported by: dvossel
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/380/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 19:55:51 +00:00
|
|
|
if (ast_pthread_create_detached_background(&launched, NULL, handle_tcptls_connection, tcptls_session)) {
|
2008-01-18 22:04:33 +00:00
|
|
|
ast_log(LOG_WARNING, "Unable to launch helper thread: %s\n", strerror(errno));
|
2011-11-30 22:03:02 +00:00
|
|
|
ast_tcptls_close_session_file(tcptls_session);
|
2008-12-12 18:45:03 +00:00
|
|
|
ao2_ref(tcptls_session, -1);
|
2008-01-18 22:04:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __ssl_setup(struct ast_tls_config *cfg, int client)
|
|
|
|
{
|
|
|
|
#ifndef DO_SSL
|
|
|
|
cfg->enabled = 0;
|
|
|
|
return 0;
|
|
|
|
#else
|
2011-11-06 09:51:09 +00:00
|
|
|
if (!cfg->enabled) {
|
2008-01-18 22:04:33 +00:00
|
|
|
return 0;
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
|
2012-05-18 17:24:57 +00:00
|
|
|
/* Get rid of an old SSL_CTX since we're about to
|
|
|
|
* allocate a new one
|
|
|
|
*/
|
|
|
|
if (cfg->ssl_ctx) {
|
|
|
|
SSL_CTX_free(cfg->ssl_ctx);
|
|
|
|
cfg->ssl_ctx = NULL;
|
|
|
|
}
|
|
|
|
|
2009-04-29 21:13:43 +00:00
|
|
|
if (client) {
|
2011-04-19 15:42:32 +00:00
|
|
|
#ifndef OPENSSL_NO_SSL2
|
2009-04-29 21:13:43 +00:00
|
|
|
if (ast_test_flag(&cfg->flags, AST_SSL_SSLV2_CLIENT)) {
|
|
|
|
cfg->ssl_ctx = SSL_CTX_new(SSLv2_client_method());
|
2011-04-19 15:42:32 +00:00
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
if (ast_test_flag(&cfg->flags, AST_SSL_SSLV3_CLIENT)) {
|
2009-04-29 21:13:43 +00:00
|
|
|
cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method());
|
|
|
|
} else if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
|
|
|
|
cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
|
|
|
|
} else {
|
|
|
|
/* SSLv23_client_method() sends SSLv2, this was the original
|
|
|
|
* default for ssl clients before the option was given to
|
|
|
|
* pick what protocol a client should use. In order not
|
|
|
|
* to break expected behavior it remains the default. */
|
|
|
|
cfg->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* SSLv23_server_method() supports TLSv1, SSLv2, and SSLv3 inbound connections. */
|
|
|
|
cfg->ssl_ctx = SSL_CTX_new(SSLv23_server_method());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!cfg->ssl_ctx) {
|
2008-01-22 08:58:46 +00:00
|
|
|
ast_debug(1, "Sorry, SSL_CTX_new call returned null...\n");
|
2008-01-18 22:04:33 +00:00
|
|
|
cfg->enabled = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
2013-03-15 12:53:03 +00:00
|
|
|
|
|
|
|
SSL_CTX_set_verify(cfg->ssl_ctx,
|
|
|
|
ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
|
|
|
|
NULL);
|
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
if (!ast_strlen_zero(cfg->certfile)) {
|
2009-04-24 21:22:31 +00:00
|
|
|
char *tmpprivate = ast_strlen_zero(cfg->pvtfile) ? cfg->certfile : cfg->pvtfile;
|
|
|
|
if (SSL_CTX_use_certificate_file(cfg->ssl_ctx, cfg->certfile, SSL_FILETYPE_PEM) == 0) {
|
2008-01-18 22:04:33 +00:00
|
|
|
if (!client) {
|
|
|
|
/* Clients don't need a certificate, but if its setup we can use it */
|
2011-11-30 23:38:34 +00:00
|
|
|
ast_verb(0, "SSL error loading cert file. <%s>\n", cfg->certfile);
|
2009-04-24 21:22:31 +00:00
|
|
|
cfg->enabled = 0;
|
2012-05-18 17:24:57 +00:00
|
|
|
SSL_CTX_free(cfg->ssl_ctx);
|
|
|
|
cfg->ssl_ctx = NULL;
|
2009-04-24 21:22:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((SSL_CTX_use_PrivateKey_file(cfg->ssl_ctx, tmpprivate, SSL_FILETYPE_PEM) == 0) || (SSL_CTX_check_private_key(cfg->ssl_ctx) == 0 )) {
|
|
|
|
if (!client) {
|
|
|
|
/* Clients don't need a private key, but if its setup we can use it */
|
2011-11-30 23:38:34 +00:00
|
|
|
ast_verb(0, "SSL error loading private key file. <%s>\n", tmpprivate);
|
2008-01-18 22:04:33 +00:00
|
|
|
cfg->enabled = 0;
|
2012-05-18 17:24:57 +00:00
|
|
|
SSL_CTX_free(cfg->ssl_ctx);
|
|
|
|
cfg->ssl_ctx = NULL;
|
2008-01-18 22:04:33 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!ast_strlen_zero(cfg->cipher)) {
|
|
|
|
if (SSL_CTX_set_cipher_list(cfg->ssl_ctx, cfg->cipher) == 0 ) {
|
|
|
|
if (!client) {
|
2011-11-30 23:38:34 +00:00
|
|
|
ast_verb(0, "SSL cipher error <%s>\n", cfg->cipher);
|
2008-01-18 22:04:33 +00:00
|
|
|
cfg->enabled = 0;
|
2012-05-18 17:24:57 +00:00
|
|
|
SSL_CTX_free(cfg->ssl_ctx);
|
|
|
|
cfg->ssl_ctx = NULL;
|
2008-01-18 22:04:33 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
|
2011-11-06 09:51:09 +00:00
|
|
|
if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0) {
|
2008-02-05 23:00:15 +00:00
|
|
|
ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath);
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
}
|
|
|
|
|
2008-02-05 23:00:15 +00:00
|
|
|
ast_verb(0, "SSL certificate ok\n");
|
2008-01-18 22:04:33 +00:00
|
|
|
return 1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-03-04 22:23:21 +00:00
|
|
|
int ast_ssl_setup(struct ast_tls_config *cfg)
|
2008-01-18 22:04:33 +00:00
|
|
|
{
|
|
|
|
return __ssl_setup(cfg, 0);
|
|
|
|
}
|
|
|
|
|
2012-05-18 17:24:57 +00:00
|
|
|
void ast_ssl_teardown(struct ast_tls_config *cfg)
|
|
|
|
{
|
2012-05-23 20:30:21 +00:00
|
|
|
#ifdef DO_SSL
|
2012-05-18 17:24:57 +00:00
|
|
|
if (cfg->ssl_ctx) {
|
|
|
|
SSL_CTX_free(cfg->ssl_ctx);
|
|
|
|
cfg->ssl_ctx = NULL;
|
|
|
|
}
|
2012-05-23 20:30:21 +00:00
|
|
|
#endif
|
2012-05-18 17:24:57 +00:00
|
|
|
}
|
|
|
|
|
SIP TCP/TLS: move client connection setup/write into tcp helper thread, various related locking/memory fixes.
What this patch fixes
1.Moves sip TCP/TLS connection setup into the TCP helper thread:
Connection setup takes awhile and before this it was being
done while holding the monitor lock.
2.Moves TCP/TLS writing to the TCP helper thread: Through the
use of a packet queue and an alert pipe, the TCP helper thread
can now be woken up to write data as well as read data.
3.Locking error: sip_xmit returned an XMIT_ERROR without giving
up the tcptls_session lock. This lock has been completely removed
from sip_xmit and placed in the new sip_tcptls_write() function.
4.Memory leak: When creating a tcptls_client the tls_cfg was alloced
but never freed unless the tcptls_session failed to start. Now the
session_args for a sip client are an ao2 object which frees the
tls_cfg on destruction.
5.Pointer to stack variable: During sip_prepare_socket the creation
of a client's ast_tcptls_session_args was done on the stack and
stored as a pointer in the newly created tcptls_session. Depending
on the events that followed, there was a slight possibility that
pointer could have been accessed after the stack returned. Given
the new changes, it is always accessed after the stack returns
which is why I found it.
Notable code changes
1.I broke tcptls.c's ast_tcptls_client_start() function into two
functions. One for creating and allocating the new tcptls_session,
and a separate one for starting and handling the new connection.
This allowed me to create the tcptls_session, launch the helper
thread, and then establish the connection within the helper thread.
2.Writes to a tcptls_session are now done within the helper thread.
This is done by using an alert pipe to wake up the thread if new
data needs to be sent. The thread's sip_threadinfo object contains
the alert pipe as well as the packet queue.
3.Since the threadinfo object contains the alert pipe, it must now be
accessed outside of the helper thread for every write (queuing of a
packet). For easy lookup, I moved the threadinfo objects from a
linked list to an ao2_container.
(closes issue #13136)
Reported by: pabelanger
Tested by: dvossel, whys
(closes issue #15894)
Reported by: dvossel
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/380/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 19:55:51 +00:00
|
|
|
struct ast_tcptls_session_instance *ast_tcptls_client_start(struct ast_tcptls_session_instance *tcptls_session)
|
2008-01-18 22:04:33 +00:00
|
|
|
{
|
SIP TCP/TLS: move client connection setup/write into tcp helper thread, various related locking/memory fixes.
What this patch fixes
1.Moves sip TCP/TLS connection setup into the TCP helper thread:
Connection setup takes awhile and before this it was being
done while holding the monitor lock.
2.Moves TCP/TLS writing to the TCP helper thread: Through the
use of a packet queue and an alert pipe, the TCP helper thread
can now be woken up to write data as well as read data.
3.Locking error: sip_xmit returned an XMIT_ERROR without giving
up the tcptls_session lock. This lock has been completely removed
from sip_xmit and placed in the new sip_tcptls_write() function.
4.Memory leak: When creating a tcptls_client the tls_cfg was alloced
but never freed unless the tcptls_session failed to start. Now the
session_args for a sip client are an ao2 object which frees the
tls_cfg on destruction.
5.Pointer to stack variable: During sip_prepare_socket the creation
of a client's ast_tcptls_session_args was done on the stack and
stored as a pointer in the newly created tcptls_session. Depending
on the events that followed, there was a slight possibility that
pointer could have been accessed after the stack returned. Given
the new changes, it is always accessed after the stack returns
which is why I found it.
Notable code changes
1.I broke tcptls.c's ast_tcptls_client_start() function into two
functions. One for creating and allocating the new tcptls_session,
and a separate one for starting and handling the new connection.
This allowed me to create the tcptls_session, launch the helper
thread, and then establish the connection within the helper thread.
2.Writes to a tcptls_session are now done within the helper thread.
This is done by using an alert pipe to wake up the thread if new
data needs to be sent. The thread's sip_threadinfo object contains
the alert pipe as well as the packet queue.
3.Since the threadinfo object contains the alert pipe, it must now be
accessed outside of the helper thread for every write (queuing of a
packet). For easy lookup, I moved the threadinfo objects from a
linked list to an ao2_container.
(closes issue #13136)
Reported by: pabelanger
Tested by: dvossel, whys
(closes issue #15894)
Reported by: dvossel
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/380/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 19:55:51 +00:00
|
|
|
struct ast_tcptls_session_args *desc;
|
2008-01-18 22:04:33 +00:00
|
|
|
int flags;
|
SIP TCP/TLS: move client connection setup/write into tcp helper thread, various related locking/memory fixes.
What this patch fixes
1.Moves sip TCP/TLS connection setup into the TCP helper thread:
Connection setup takes awhile and before this it was being
done while holding the monitor lock.
2.Moves TCP/TLS writing to the TCP helper thread: Through the
use of a packet queue and an alert pipe, the TCP helper thread
can now be woken up to write data as well as read data.
3.Locking error: sip_xmit returned an XMIT_ERROR without giving
up the tcptls_session lock. This lock has been completely removed
from sip_xmit and placed in the new sip_tcptls_write() function.
4.Memory leak: When creating a tcptls_client the tls_cfg was alloced
but never freed unless the tcptls_session failed to start. Now the
session_args for a sip client are an ao2 object which frees the
tls_cfg on destruction.
5.Pointer to stack variable: During sip_prepare_socket the creation
of a client's ast_tcptls_session_args was done on the stack and
stored as a pointer in the newly created tcptls_session. Depending
on the events that followed, there was a slight possibility that
pointer could have been accessed after the stack returned. Given
the new changes, it is always accessed after the stack returns
which is why I found it.
Notable code changes
1.I broke tcptls.c's ast_tcptls_client_start() function into two
functions. One for creating and allocating the new tcptls_session,
and a separate one for starting and handling the new connection.
This allowed me to create the tcptls_session, launch the helper
thread, and then establish the connection within the helper thread.
2.Writes to a tcptls_session are now done within the helper thread.
This is done by using an alert pipe to wake up the thread if new
data needs to be sent. The thread's sip_threadinfo object contains
the alert pipe as well as the packet queue.
3.Since the threadinfo object contains the alert pipe, it must now be
accessed outside of the helper thread for every write (queuing of a
packet). For easy lookup, I moved the threadinfo objects from a
linked list to an ao2_container.
(closes issue #13136)
Reported by: pabelanger
Tested by: dvossel, whys
(closes issue #15894)
Reported by: dvossel
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/380/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 19:55:51 +00:00
|
|
|
|
|
|
|
if (!(desc = tcptls_session->parent)) {
|
|
|
|
goto client_start_error;
|
|
|
|
}
|
|
|
|
|
2010-07-08 22:08:07 +00:00
|
|
|
if (ast_connect(desc->accept_fd, &desc->remote_address)) {
|
|
|
|
ast_log(LOG_ERROR, "Unable to connect %s to %s: %s\n",
|
SIP TCP/TLS: move client connection setup/write into tcp helper thread, various related locking/memory fixes.
What this patch fixes
1.Moves sip TCP/TLS connection setup into the TCP helper thread:
Connection setup takes awhile and before this it was being
done while holding the monitor lock.
2.Moves TCP/TLS writing to the TCP helper thread: Through the
use of a packet queue and an alert pipe, the TCP helper thread
can now be woken up to write data as well as read data.
3.Locking error: sip_xmit returned an XMIT_ERROR without giving
up the tcptls_session lock. This lock has been completely removed
from sip_xmit and placed in the new sip_tcptls_write() function.
4.Memory leak: When creating a tcptls_client the tls_cfg was alloced
but never freed unless the tcptls_session failed to start. Now the
session_args for a sip client are an ao2 object which frees the
tls_cfg on destruction.
5.Pointer to stack variable: During sip_prepare_socket the creation
of a client's ast_tcptls_session_args was done on the stack and
stored as a pointer in the newly created tcptls_session. Depending
on the events that followed, there was a slight possibility that
pointer could have been accessed after the stack returned. Given
the new changes, it is always accessed after the stack returns
which is why I found it.
Notable code changes
1.I broke tcptls.c's ast_tcptls_client_start() function into two
functions. One for creating and allocating the new tcptls_session,
and a separate one for starting and handling the new connection.
This allowed me to create the tcptls_session, launch the helper
thread, and then establish the connection within the helper thread.
2.Writes to a tcptls_session are now done within the helper thread.
This is done by using an alert pipe to wake up the thread if new
data needs to be sent. The thread's sip_threadinfo object contains
the alert pipe as well as the packet queue.
3.Since the threadinfo object contains the alert pipe, it must now be
accessed outside of the helper thread for every write (queuing of a
packet). For easy lookup, I moved the threadinfo objects from a
linked list to an ao2_container.
(closes issue #13136)
Reported by: pabelanger
Tested by: dvossel, whys
(closes issue #15894)
Reported by: dvossel
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/380/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 19:55:51 +00:00
|
|
|
desc->name,
|
2010-07-08 22:08:07 +00:00
|
|
|
ast_sockaddr_stringify(&desc->remote_address),
|
SIP TCP/TLS: move client connection setup/write into tcp helper thread, various related locking/memory fixes.
What this patch fixes
1.Moves sip TCP/TLS connection setup into the TCP helper thread:
Connection setup takes awhile and before this it was being
done while holding the monitor lock.
2.Moves TCP/TLS writing to the TCP helper thread: Through the
use of a packet queue and an alert pipe, the TCP helper thread
can now be woken up to write data as well as read data.
3.Locking error: sip_xmit returned an XMIT_ERROR without giving
up the tcptls_session lock. This lock has been completely removed
from sip_xmit and placed in the new sip_tcptls_write() function.
4.Memory leak: When creating a tcptls_client the tls_cfg was alloced
but never freed unless the tcptls_session failed to start. Now the
session_args for a sip client are an ao2 object which frees the
tls_cfg on destruction.
5.Pointer to stack variable: During sip_prepare_socket the creation
of a client's ast_tcptls_session_args was done on the stack and
stored as a pointer in the newly created tcptls_session. Depending
on the events that followed, there was a slight possibility that
pointer could have been accessed after the stack returned. Given
the new changes, it is always accessed after the stack returns
which is why I found it.
Notable code changes
1.I broke tcptls.c's ast_tcptls_client_start() function into two
functions. One for creating and allocating the new tcptls_session,
and a separate one for starting and handling the new connection.
This allowed me to create the tcptls_session, launch the helper
thread, and then establish the connection within the helper thread.
2.Writes to a tcptls_session are now done within the helper thread.
This is done by using an alert pipe to wake up the thread if new
data needs to be sent. The thread's sip_threadinfo object contains
the alert pipe as well as the packet queue.
3.Since the threadinfo object contains the alert pipe, it must now be
accessed outside of the helper thread for every write (queuing of a
packet). For easy lookup, I moved the threadinfo objects from a
linked list to an ao2_container.
(closes issue #13136)
Reported by: pabelanger
Tested by: dvossel, whys
(closes issue #15894)
Reported by: dvossel
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/380/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 19:55:51 +00:00
|
|
|
strerror(errno));
|
|
|
|
goto client_start_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
flags = fcntl(desc->accept_fd, F_GETFL);
|
|
|
|
fcntl(desc->accept_fd, F_SETFL, flags & ~O_NONBLOCK);
|
|
|
|
|
|
|
|
if (desc->tls_cfg) {
|
|
|
|
desc->tls_cfg->enabled = 1;
|
|
|
|
__ssl_setup(desc->tls_cfg, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return handle_tcptls_connection(tcptls_session);
|
|
|
|
|
|
|
|
client_start_error:
|
Resolve FORWARD_NULL static analysis warnings
This resolves core findings from ASTERISK-19650 numbers 0-2, 6, 7, 9-11, 14-20,
22-24, 28, 30-32, 34-36, 42-56, 82-84, 87, 89-90, 93-102, 104, 105, 109-111,
and 115. Finding numbers 26, 33, and 29 were already resolved. Those skipped
were either extended/deprecated or in areas of code that shouldn't be
disturbed.
(Closes issue ASTERISK-19650)
........
Merged revisions 366167 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 366168 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@366169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-05-10 20:56:09 +00:00
|
|
|
if (desc) {
|
|
|
|
close(desc->accept_fd);
|
|
|
|
desc->accept_fd = -1;
|
|
|
|
}
|
2012-05-31 18:39:30 +00:00
|
|
|
ao2_ref(tcptls_session, -1);
|
SIP TCP/TLS: move client connection setup/write into tcp helper thread, various related locking/memory fixes.
What this patch fixes
1.Moves sip TCP/TLS connection setup into the TCP helper thread:
Connection setup takes awhile and before this it was being
done while holding the monitor lock.
2.Moves TCP/TLS writing to the TCP helper thread: Through the
use of a packet queue and an alert pipe, the TCP helper thread
can now be woken up to write data as well as read data.
3.Locking error: sip_xmit returned an XMIT_ERROR without giving
up the tcptls_session lock. This lock has been completely removed
from sip_xmit and placed in the new sip_tcptls_write() function.
4.Memory leak: When creating a tcptls_client the tls_cfg was alloced
but never freed unless the tcptls_session failed to start. Now the
session_args for a sip client are an ao2 object which frees the
tls_cfg on destruction.
5.Pointer to stack variable: During sip_prepare_socket the creation
of a client's ast_tcptls_session_args was done on the stack and
stored as a pointer in the newly created tcptls_session. Depending
on the events that followed, there was a slight possibility that
pointer could have been accessed after the stack returned. Given
the new changes, it is always accessed after the stack returns
which is why I found it.
Notable code changes
1.I broke tcptls.c's ast_tcptls_client_start() function into two
functions. One for creating and allocating the new tcptls_session,
and a separate one for starting and handling the new connection.
This allowed me to create the tcptls_session, launch the helper
thread, and then establish the connection within the helper thread.
2.Writes to a tcptls_session are now done within the helper thread.
This is done by using an alert pipe to wake up the thread if new
data needs to be sent. The thread's sip_threadinfo object contains
the alert pipe as well as the packet queue.
3.Since the threadinfo object contains the alert pipe, it must now be
accessed outside of the helper thread for every write (queuing of a
packet). For easy lookup, I moved the threadinfo objects from a
linked list to an ao2_container.
(closes issue #13136)
Reported by: pabelanger
Tested by: dvossel, whys
(closes issue #15894)
Reported by: dvossel
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/380/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 19:55:51 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
struct ast_tcptls_session_instance *ast_tcptls_client_create(struct ast_tcptls_session_args *desc)
|
|
|
|
{
|
2008-10-19 19:11:28 +00:00
|
|
|
int x = 1;
|
2008-12-12 18:45:03 +00:00
|
|
|
struct ast_tcptls_session_instance *tcptls_session = NULL;
|
2008-01-18 22:04:33 +00:00
|
|
|
|
|
|
|
/* Do nothing if nothing has changed */
|
2010-07-08 22:08:07 +00:00
|
|
|
if (!ast_sockaddr_cmp(&desc->old_address, &desc->remote_address)) {
|
2008-01-22 08:58:46 +00:00
|
|
|
ast_debug(1, "Nothing changed in %s\n", desc->name);
|
2008-01-18 22:04:33 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-05-20 21:40:19 +00:00
|
|
|
/* If we return early, there is no connection */
|
|
|
|
ast_sockaddr_setnull(&desc->old_address);
|
2008-01-18 22:04:33 +00:00
|
|
|
|
2011-11-06 09:51:09 +00:00
|
|
|
if (desc->accept_fd != -1) {
|
2008-01-18 22:04:33 +00:00
|
|
|
close(desc->accept_fd);
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
|
2010-07-08 22:08:07 +00:00
|
|
|
desc->accept_fd = socket(ast_sockaddr_is_ipv6(&desc->remote_address) ?
|
|
|
|
AF_INET6 : AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
2008-01-18 22:04:33 +00:00
|
|
|
if (desc->accept_fd < 0) {
|
|
|
|
ast_log(LOG_WARNING, "Unable to allocate socket for %s: %s\n",
|
|
|
|
desc->name, strerror(errno));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-10-19 19:11:28 +00:00
|
|
|
/* if a local address was specified, bind to it so the connection will
|
|
|
|
originate from the desired address */
|
2010-07-08 22:08:07 +00:00
|
|
|
if (!ast_sockaddr_isnull(&desc->local_address)) {
|
2008-10-19 19:11:28 +00:00
|
|
|
setsockopt(desc->accept_fd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
|
2010-07-08 22:08:07 +00:00
|
|
|
if (ast_bind(desc->accept_fd, &desc->local_address)) {
|
|
|
|
ast_log(LOG_ERROR, "Unable to bind %s to %s: %s\n",
|
|
|
|
desc->name,
|
|
|
|
ast_sockaddr_stringify(&desc->local_address),
|
2008-10-19 19:11:28 +00:00
|
|
|
strerror(errno));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-12 16:31:01 +00:00
|
|
|
if (!(tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor))) {
|
2008-01-18 22:04:33 +00:00
|
|
|
goto error;
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
|
2012-10-12 16:31:01 +00:00
|
|
|
tcptls_session->overflow_buf = ast_str_create(128);
|
SIP TCP/TLS: move client connection setup/write into tcp helper thread, various related locking/memory fixes.
What this patch fixes
1.Moves sip TCP/TLS connection setup into the TCP helper thread:
Connection setup takes awhile and before this it was being
done while holding the monitor lock.
2.Moves TCP/TLS writing to the TCP helper thread: Through the
use of a packet queue and an alert pipe, the TCP helper thread
can now be woken up to write data as well as read data.
3.Locking error: sip_xmit returned an XMIT_ERROR without giving
up the tcptls_session lock. This lock has been completely removed
from sip_xmit and placed in the new sip_tcptls_write() function.
4.Memory leak: When creating a tcptls_client the tls_cfg was alloced
but never freed unless the tcptls_session failed to start. Now the
session_args for a sip client are an ao2 object which frees the
tls_cfg on destruction.
5.Pointer to stack variable: During sip_prepare_socket the creation
of a client's ast_tcptls_session_args was done on the stack and
stored as a pointer in the newly created tcptls_session. Depending
on the events that followed, there was a slight possibility that
pointer could have been accessed after the stack returned. Given
the new changes, it is always accessed after the stack returns
which is why I found it.
Notable code changes
1.I broke tcptls.c's ast_tcptls_client_start() function into two
functions. One for creating and allocating the new tcptls_session,
and a separate one for starting and handling the new connection.
This allowed me to create the tcptls_session, launch the helper
thread, and then establish the connection within the helper thread.
2.Writes to a tcptls_session are now done within the helper thread.
This is done by using an alert pipe to wake up the thread if new
data needs to be sent. The thread's sip_threadinfo object contains
the alert pipe as well as the packet queue.
3.Since the threadinfo object contains the alert pipe, it must now be
accessed outside of the helper thread for every write (queuing of a
packet). For easy lookup, I moved the threadinfo objects from a
linked list to an ao2_container.
(closes issue #13136)
Reported by: pabelanger
Tested by: dvossel, whys
(closes issue #15894)
Reported by: dvossel
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/380/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-22 19:55:51 +00:00
|
|
|
tcptls_session->client = 1;
|
2008-12-12 18:45:03 +00:00
|
|
|
tcptls_session->fd = desc->accept_fd;
|
|
|
|
tcptls_session->parent = desc;
|
|
|
|
tcptls_session->parent->worker_fn = NULL;
|
2010-07-08 22:08:07 +00:00
|
|
|
ast_sockaddr_copy(&tcptls_session->remote_address,
|
|
|
|
&desc->remote_address);
|
2008-01-18 22:04:33 +00:00
|
|
|
|
2011-05-20 21:40:19 +00:00
|
|
|
/* Set current info */
|
|
|
|
ast_sockaddr_copy(&desc->old_address, &desc->remote_address);
|
2008-12-12 18:45:03 +00:00
|
|
|
return tcptls_session;
|
2008-01-18 22:04:33 +00:00
|
|
|
|
|
|
|
error:
|
|
|
|
close(desc->accept_fd);
|
|
|
|
desc->accept_fd = -1;
|
2011-11-06 09:51:09 +00:00
|
|
|
if (tcptls_session) {
|
2008-12-12 18:45:03 +00:00
|
|
|
ao2_ref(tcptls_session, -1);
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-10-19 19:11:28 +00:00
|
|
|
void ast_tcptls_server_start(struct ast_tcptls_session_args *desc)
|
2008-01-18 22:04:33 +00:00
|
|
|
{
|
|
|
|
int flags;
|
|
|
|
int x = 1;
|
2009-04-29 21:13:43 +00:00
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
/* Do nothing if nothing has changed */
|
2010-07-08 22:08:07 +00:00
|
|
|
if (!ast_sockaddr_cmp(&desc->old_address, &desc->local_address)) {
|
2008-01-22 08:58:46 +00:00
|
|
|
ast_debug(1, "Nothing changed in %s\n", desc->name);
|
2008-01-18 22:04:33 +00:00
|
|
|
return;
|
|
|
|
}
|
2009-04-29 21:13:43 +00:00
|
|
|
|
2011-05-20 21:40:19 +00:00
|
|
|
/* If we return early, there is no one listening */
|
|
|
|
ast_sockaddr_setnull(&desc->old_address);
|
2009-04-29 21:13:43 +00:00
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
/* Shutdown a running server if there is one */
|
|
|
|
if (desc->master != AST_PTHREADT_NULL) {
|
|
|
|
pthread_cancel(desc->master);
|
|
|
|
pthread_kill(desc->master, SIGURG);
|
|
|
|
pthread_join(desc->master, NULL);
|
|
|
|
}
|
2009-04-29 21:13:43 +00:00
|
|
|
|
2011-11-06 09:51:09 +00:00
|
|
|
if (desc->accept_fd != -1) {
|
2008-01-18 22:04:33 +00:00
|
|
|
close(desc->accept_fd);
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
|
|
|
|
/* If there's no new server, stop here */
|
2010-07-08 22:08:07 +00:00
|
|
|
if (ast_sockaddr_isnull(&desc->local_address)) {
|
2008-10-13 15:49:01 +00:00
|
|
|
ast_debug(2, "Server disabled: %s\n", desc->name);
|
2008-01-18 22:04:33 +00:00
|
|
|
return;
|
2008-10-13 15:49:01 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
|
2010-07-08 22:08:07 +00:00
|
|
|
desc->accept_fd = socket(ast_sockaddr_is_ipv6(&desc->local_address) ?
|
|
|
|
AF_INET6 : AF_INET, SOCK_STREAM, 0);
|
2008-01-18 22:04:33 +00:00
|
|
|
if (desc->accept_fd < 0) {
|
2008-10-13 15:49:01 +00:00
|
|
|
ast_log(LOG_ERROR, "Unable to allocate socket for %s: %s\n", desc->name, strerror(errno));
|
2008-01-18 22:04:33 +00:00
|
|
|
return;
|
|
|
|
}
|
2009-04-29 21:13:43 +00:00
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
setsockopt(desc->accept_fd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
|
2010-07-08 22:08:07 +00:00
|
|
|
if (ast_bind(desc->accept_fd, &desc->local_address)) {
|
|
|
|
ast_log(LOG_ERROR, "Unable to bind %s to %s: %s\n",
|
2008-01-18 22:04:33 +00:00
|
|
|
desc->name,
|
2010-07-08 22:08:07 +00:00
|
|
|
ast_sockaddr_stringify(&desc->local_address),
|
2008-01-18 22:04:33 +00:00
|
|
|
strerror(errno));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (listen(desc->accept_fd, 10)) {
|
2008-01-22 08:58:46 +00:00
|
|
|
ast_log(LOG_ERROR, "Unable to listen for %s!\n", desc->name);
|
2008-01-18 22:04:33 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
flags = fcntl(desc->accept_fd, F_GETFL);
|
|
|
|
fcntl(desc->accept_fd, F_SETFL, flags | O_NONBLOCK);
|
|
|
|
if (ast_pthread_create_background(&desc->master, NULL, desc->accept_fn, desc)) {
|
2010-07-08 22:08:07 +00:00
|
|
|
ast_log(LOG_ERROR, "Unable to launch thread for %s on %s: %s\n",
|
2008-01-18 22:04:33 +00:00
|
|
|
desc->name,
|
2010-07-08 22:08:07 +00:00
|
|
|
ast_sockaddr_stringify(&desc->local_address),
|
2008-01-18 22:04:33 +00:00
|
|
|
strerror(errno));
|
|
|
|
goto error;
|
|
|
|
}
|
2011-05-20 21:40:19 +00:00
|
|
|
|
|
|
|
/* Set current info */
|
|
|
|
ast_sockaddr_copy(&desc->old_address, &desc->local_address);
|
|
|
|
|
2008-01-18 22:04:33 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
error:
|
|
|
|
close(desc->accept_fd);
|
|
|
|
desc->accept_fd = -1;
|
|
|
|
}
|
|
|
|
|
2011-11-30 22:03:02 +00:00
|
|
|
void ast_tcptls_close_session_file(struct ast_tcptls_session_instance *tcptls_session)
|
|
|
|
{
|
|
|
|
if (tcptls_session->f) {
|
|
|
|
if (fclose(tcptls_session->f)) {
|
|
|
|
ast_log(LOG_ERROR, "fclose() failed: %s\n", strerror(errno));
|
|
|
|
}
|
|
|
|
tcptls_session->f = NULL;
|
|
|
|
tcptls_session->fd = -1;
|
|
|
|
} else if (tcptls_session->fd != -1) {
|
|
|
|
if (close(tcptls_session->fd)) {
|
|
|
|
ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
|
|
|
|
}
|
|
|
|
tcptls_session->fd = -1;
|
|
|
|
} else {
|
|
|
|
ast_log(LOG_ERROR, "ast_tcptls_close_session_file invoked on session instance without file or file descriptor\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-19 19:11:28 +00:00
|
|
|
void ast_tcptls_server_stop(struct ast_tcptls_session_args *desc)
|
2008-01-18 22:04:33 +00:00
|
|
|
{
|
|
|
|
if (desc->master != AST_PTHREADT_NULL) {
|
|
|
|
pthread_cancel(desc->master);
|
|
|
|
pthread_kill(desc->master, SIGURG);
|
|
|
|
pthread_join(desc->master, NULL);
|
2011-05-23 16:28:14 +00:00
|
|
|
desc->master = AST_PTHREADT_NULL;
|
2008-01-18 22:04:33 +00:00
|
|
|
}
|
2011-11-06 09:51:09 +00:00
|
|
|
if (desc->accept_fd != -1) {
|
2008-01-18 22:04:33 +00:00
|
|
|
close(desc->accept_fd);
|
2011-11-06 09:51:09 +00:00
|
|
|
}
|
2008-01-18 22:04:33 +00:00
|
|
|
desc->accept_fd = -1;
|
2008-10-13 15:49:01 +00:00
|
|
|
ast_debug(2, "Stopped server :: %s\n", desc->name);
|
2008-01-18 22:04:33 +00:00
|
|
|
}
|
2009-04-29 14:39:48 +00:00
|
|
|
|
|
|
|
int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_args *tls_desc, const char *varname, const char *value)
|
|
|
|
{
|
|
|
|
if (!strcasecmp(varname, "tlsenable") || !strcasecmp(varname, "sslenable")) {
|
|
|
|
tls_cfg->enabled = ast_true(value) ? 1 : 0;
|
2009-04-29 21:13:43 +00:00
|
|
|
} else if (!strcasecmp(varname, "tlscertfile") || !strcasecmp(varname, "sslcert") || !strcasecmp(varname, "tlscert")) {
|
2009-04-29 14:39:48 +00:00
|
|
|
ast_free(tls_cfg->certfile);
|
|
|
|
tls_cfg->certfile = ast_strdup(value);
|
|
|
|
} else if (!strcasecmp(varname, "tlsprivatekey") || !strcasecmp(varname, "sslprivatekey")) {
|
|
|
|
ast_free(tls_cfg->pvtfile);
|
|
|
|
tls_cfg->pvtfile = ast_strdup(value);
|
|
|
|
} else if (!strcasecmp(varname, "tlscipher") || !strcasecmp(varname, "sslcipher")) {
|
|
|
|
ast_free(tls_cfg->cipher);
|
|
|
|
tls_cfg->cipher = ast_strdup(value);
|
|
|
|
} else if (!strcasecmp(varname, "tlscafile")) {
|
|
|
|
ast_free(tls_cfg->cafile);
|
|
|
|
tls_cfg->cafile = ast_strdup(value);
|
2011-01-31 22:26:06 +00:00
|
|
|
} else if (!strcasecmp(varname, "tlscapath") || !strcasecmp(varname, "tlscadir")) {
|
2009-04-29 14:39:48 +00:00
|
|
|
ast_free(tls_cfg->capath);
|
|
|
|
tls_cfg->capath = ast_strdup(value);
|
|
|
|
} else if (!strcasecmp(varname, "tlsverifyclient")) {
|
|
|
|
ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_VERIFY_CLIENT);
|
|
|
|
} else if (!strcasecmp(varname, "tlsdontverifyserver")) {
|
|
|
|
ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DONT_VERIFY_SERVER);
|
|
|
|
} else if (!strcasecmp(varname, "tlsbindaddr") || !strcasecmp(varname, "sslbindaddr")) {
|
2010-07-08 22:08:07 +00:00
|
|
|
if (ast_parse_arg(value, PARSE_ADDR, &tls_desc->local_address))
|
2009-04-29 14:39:48 +00:00
|
|
|
ast_log(LOG_WARNING, "Invalid %s '%s'\n", varname, value);
|
2009-04-29 21:13:43 +00:00
|
|
|
} else if (!strcasecmp(varname, "tlsclientmethod") || !strcasecmp(varname, "sslclientmethod")) {
|
|
|
|
if (!strcasecmp(value, "tlsv1")) {
|
|
|
|
ast_set_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
|
|
|
|
ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
|
|
|
|
ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV2_CLIENT);
|
|
|
|
} else if (!strcasecmp(value, "sslv3")) {
|
|
|
|
ast_set_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
|
|
|
|
ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV2_CLIENT);
|
|
|
|
ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
|
|
|
|
} else if (!strcasecmp(value, "sslv2")) {
|
|
|
|
ast_set_flag(&tls_cfg->flags, AST_SSL_SSLV2_CLIENT);
|
|
|
|
ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
|
|
|
|
ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
|
|
|
|
}
|
2009-04-29 14:39:48 +00:00
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|