Tue Dec 16 16:19:37 CST 2008 Jarod Neuner <janeuner@networkharbor.com>

  * Early TLS Handshake and Verification
  
  tport_type_tls.c:
  * tport_tls_accept():
    - Replaces tport_accept for incoming TLS connections.
  * tport_tls_connect():
    - Replaces tport_base_connect() for outgoing TLS connections.
  
  tport_tls.c:
  * tls_t now use a memory home instead of malloc.
  * removed tls_check_hosts()
  * tls_connect():
    - Replaces tport_base_connect for TLS connection setup.
    - Completes TLS handshake and verifies peer certificates.
    - Destroys suspect TLS connections before sending/receiving payload.
    - Populates a su_strlst_t with subjects from the peer certificate.
  
  tport.c:
  * tport_is_verified()
    - true if peer certificate validated successfully
  * tport_delivered_from_subjects()
    - Certificate subjects listed in the peer certificate.



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11769 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/sofia-sip/.update

-Wed Feb 11 10:10:42 CST 2009
+Wed Feb 11 10:11:23 CST 2009

libs/sofia-sip/libsofia-sip-ua/tport/sofia-sip/tport.h

@@ -36,6 +36,9 @@
 #ifndef SU_H
 #include <sofia-sip/su.h>
 #endif
+#ifndef SU_STRLST_H
+#include <sofia-sip/su_strlst.h>
+#endif
 #ifndef SU_WAIT_H
 #include <sofia-sip/su_wait.h>
 #endif
@@ -267,6 +270,9 @@ TPORT_DLL int tport_is_tcp(tport_t const *self);
 /** Test if transport has TLS. */
 TPORT_DLL int tport_has_tls(tport_t const *tport);
 
+/** Test if transport provided a verified certificate chain (TLS only) */
+TPORT_DLL int tport_is_verified(tport_t const *tport);
+
 /** Return true if transport is being updated. */
 TPORT_DLL int tport_is_updating(tport_t const *self);
 
@@ -332,6 +338,9 @@ TPORT_DLL tport_t *tport_delivered_by(tport_t const *tp, msg_t const *msg);
 TPORT_DLL int tport_delivered_from(tport_t *tp, msg_t const *msg,
 				   tp_name_t name[1]);
 
+/** Return TLS Subjects provided by the source transport */
+TPORT_DLL su_strlst_t *tport_delivered_from_subjects(tport_t *tp, msg_t const *msg);
+
 /** Check if transport named is already resolved */
 TPORT_DLL int tport_name_is_resolved(tp_name_t const *);
 

libs/sofia-sip/libsofia-sip-ua/tport/tport.c

@@ -268,7 +268,12 @@ int tport_has_ip6(tport_t const *self)
 int tport_has_tls(tport_t const *self)
 {
   return self && self->tp_pri->pri_has_tls;
+}
 
+/** Return true if transport certificate verified successfully */
+int tport_is_verified(tport_t const *self)
+{
+  return tport_has_tls(self) && self->tp_verified;
 }
 
 /** Return true if transport is being updated. */
@@ -3040,6 +3045,17 @@ int tport_delivered_from(tport_t *tp, msg_t const *msg, tp_name_t name[1])
   }
 }
 
+/** Return TLS Subjects provided by the source transport */
+su_strlst_t *tport_delivered_from_subjects(tport_t *tp, msg_t const *msg)
+{
+  if (tp && msg && msg == tp->tp_master->mr_delivery->d_msg) {
+    tport_t *tp_sec = tp->tp_master->mr_delivery->d_tport;
+    return (tp_sec) ? tp_sec->tp_subjects : NULL;
+  }
+  else
+    return NULL;
+}
+
 /** Return UDVM used to decompress the message. */
 int
 tport_delivered_with_comp(tport_t *tp, msg_t const *msg,

libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h

@@ -40,6 +40,7 @@
 #endif
 
 #include <sofia-sip/su_uniqueid.h>
+#include <sofia-sip/su_strlst.h>
 
 #ifndef MSG_ADDR_H
 #include <sofia-sip/msg_addr.h>
@@ -155,6 +156,7 @@ struct tport_s {
   unsigned            tp_has_stun_server:1;
   unsigned            tp_trunc:1;
   unsigned            tp_is_connected:1; /**< Connection is established */
+  unsigned            tp_verified:1;     /**< Certificate Chain was verified */
   unsigned:0;
 
   tport_t *tp_left, *tp_right, *tp_dad; /**< Links in tport tree */
@@ -177,6 +179,12 @@ struct tport_s {
 					 * or peer name (if secondary).
 					 */
 
+  su_strlst_t        *tp_subjects;      /**< Transport Subjects.
+                                         *
+                                         * Subject Name(s) provided by the 
+                                         * peer in a TLS connection (if secondary).
+                                         */
+
 #define tp_protoname tp_name->tpn_proto
 #define tp_canon     tp_name->tpn_canon
 #define tp_host      tp_name->tpn_host

libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.h

@@ -39,6 +39,8 @@
 #include <sofia-sip/su_types.h>
 #endif
 
+#include "tport_internal.h"
+
 SOFIA_BEGIN_DECLS
 
 #define TLS_MAX_HOSTS (16)
@@ -64,6 +66,17 @@ typedef struct tls_issues_s {
 			 * used, it is 0. */
 } tls_issues_t;
 
+typedef struct tport_tls_s {
+  tport_t  tlstp_tp[1];
+  tls_t   *tlstp_context;
+  char    *tlstp_buffer;
+} tport_tls_t;
+
+typedef struct tport_tls_primary_s {
+  tport_primary_t tlspri_pri[1];
+  tls_t *tlspri_master;
+} tport_tls_primary_t;
+
 tls_t *tls_init_master(tls_issues_t *tls_issues);
 tls_t *tls_init_slave(tls_t *tls_master, int sock);
 tls_t *tls_init_client(tls_t *tls_master, int sock);
@@ -74,11 +87,10 @@ void *tls_read_buffer(tls_t *tls, size_t N);
 int tls_want_read(tls_t *tls, int events);
 int tls_pending(tls_t const *tls);
 
+int tls_connect(su_root_magic_t *magic, su_wait_t *w, tport_t *self);
 ssize_t tls_write(tls_t *tls, void *buf, size_t size);
 int tls_want_write(tls_t *tls, int events);
 
-int tls_check_hosts(tls_t *tls, char const *hosts[TLS_MAX_HOSTS]);
-
 int tls_events(tls_t const *tls, int flags);
 
 SOFIA_END_DECLS

libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c

@@ -38,6 +38,8 @@
 
 #include "config.h"
 
+#define SU_WAKEUP_ARG_T  struct tport_s
+
 #include "tport_internal.h"
 
 #include <stdlib.h>
@@ -89,19 +91,10 @@ static int tport_tls_events(tport_t *self, int events);
 static int tport_tls_recv(tport_t *self);
 static ssize_t tport_tls_send(tport_t const *self, msg_t *msg,
 			      msg_iovec_t iov[], size_t iovused);
-
-typedef struct
-{
-  tport_primary_t tlspri_pri[1];
-  tls_t *tlspri_master;
-} tport_tls_primary_t;
-
-typedef struct
-{
-  tport_t tlstp_tp[1];
-  tls_t  *tlstp_context;
-  char   *tlstp_buffer;    /**< 2k Buffer  */
-} tport_tls_t;
+static int tport_tls_accept(tport_primary_t *pri, int events);
+static tport_t *tport_tls_connect(tport_primary_t *pri, su_addrinfo_t *ai,
+                                  tp_name_t const *tpn);
+static void tport_tls_deliver(tport_t *self, msg_t *msg, su_time_t now);
 
 tport_vtable_t const tport_tls_vtable =
 {
@@ -109,8 +102,8 @@ tport_vtable_t const tport_tls_vtable =
   sizeof (tport_tls_primary_t),
   tport_tls_init_primary,
   tport_tls_deinit_primary,
-  tport_accept,
-  NULL,
+  tport_tls_accept,
+  tport_tls_connect,
   sizeof (tport_tls_t),
   tport_tls_init_secondary,
   tport_tls_deinit_secondary,
@@ -127,8 +120,8 @@ tport_vtable_t const tport_tls_client_vtable =
   sizeof (tport_tls_primary_t),
   tport_tls_init_client,
   tport_tls_deinit_primary,
-  tport_accept,
-  NULL,
+  tport_tls_accept,
+  tport_tls_connect,
   sizeof (tport_tls_t),
   tport_tls_init_secondary,
   tport_tls_deinit_secondary,
@@ -527,3 +520,149 @@ ssize_t tport_tls_send(tport_t const *self,
 
   return size;
 }
+
+static
+int tport_tls_accept(tport_primary_t *pri, int events)
+{
+  tport_t *self;
+  su_addrinfo_t ai[1];
+  su_sockaddr_t su[1];
+  socklen_t sulen = sizeof su;
+  su_socket_t s = INVALID_SOCKET, l = pri->pri_primary->tp_socket;
+  char const *reason = "accept";
+
+  if (events & SU_WAIT_ERR)
+    tport_error_event(pri->pri_primary);
+
+  if (!(events & SU_WAIT_ACCEPT))
+    return 0;
+
+  memcpy(ai, pri->pri_primary->tp_addrinfo, sizeof ai);
+  ai->ai_canonname = NULL;
+
+  s = accept(l, &su->su_sa, &sulen);
+
+  if (s < 0) {
+    tport_error_report(pri->pri_primary, su_errno(), NULL);
+    return 0;
+  }
+
+  ai->ai_addr = &su->su_sa, ai->ai_addrlen = sulen;
+
+  /* Alloc a new transport object, then register socket events with it */
+  if ((self = tport_alloc_secondary(pri, s, 1, &reason)) == NULL) {
+    SU_DEBUG_3(("%s(%p): incoming secondary on "TPN_FORMAT
+                " failed. reason = %s\n", __func__, pri, 
+                TPN_ARGS(pri->pri_primary->tp_name), reason));
+    return 0;
+  }
+  else {
+    tport_tls_t *tlstp = (tport_tls_t *)self;
+    tport_tls_primary_t *tlspri = (tport_tls_primary_t *)self->tp_pri;
+    int events = SU_WAIT_IN|SU_WAIT_ERR|SU_WAIT_HUP;
+
+    SU_CANONIZE_SOCKADDR(su);
+
+    if (/* Name this transport */
+        tport_setname(self, pri->pri_protoname, ai, NULL) != -1
+	/* Register this secondary */
+	&&
+	tport_register_secondary(self, tls_connect, events) != -1) {
+
+      self->tp_conn_orient = 1;
+      self->tp_is_connected = 0;
+
+      tlstp->tlstp_context = tls_init_slave(tlspri->tlspri_master, s);
+
+      SU_DEBUG_5(("%s(%p): new connection from " TPN_FORMAT "\n",
+		  __func__,  (void *)self, TPN_ARGS(self->tp_name)));
+
+      /* Return succesfully */
+      return 0;
+    }
+
+    /* Failure: shutdown socket,  */
+    tport_close(self);
+    tport_zap_secondary(self);
+    self = NULL;
+  }
+
+  return 0;
+}
+
+static
+tport_t *tport_tls_connect(tport_primary_t *pri,
+                           su_addrinfo_t *ai,
+			   tp_name_t const *tpn)
+{
+  tport_t *self = NULL;
+
+  su_socket_t s, server_socket;
+  int events = SU_WAIT_CONNECT | SU_WAIT_ERR;
+
+  int err;
+  unsigned errlevel = 3;
+  char buf[TPORT_HOSTPORTSIZE];
+  char const *what;
+
+  s = su_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+  if (s == INVALID_SOCKET)
+    goto sys_error;
+
+  what = "tport_alloc_secondary";
+  if ((self = tport_alloc_secondary(pri, s, 0, &what)) == NULL)
+    goto sys_error;
+
+  self->tp_conn_orient = 1;
+
+  if ((server_socket = pri->pri_primary->tp_socket) != INVALID_SOCKET) {
+    su_sockaddr_t susa;
+    socklen_t susalen = sizeof(susa);
+
+    if (getsockname(server_socket, &susa.su_sa, &susalen) < 0) {
+      SU_DEBUG_3(("%s(%p): getsockname(): %s\n", 
+                  __func__, (void *)self, su_strerror(su_errno())));
+    } else {
+      susa.su_port = 0;
+      if (bind(s, &susa.su_sa, susalen) < 0) {
+        SU_DEBUG_3(("%s(%p): bind(local-ip): %s\n", 
+                    __func__, (void *)self, su_strerror(su_errno())));
+      }
+    }
+  }
+
+  if (connect(s, ai->ai_addr, (socklen_t)(ai->ai_addrlen)) == SOCKET_ERROR) {
+    err = su_errno();
+    if (!su_is_blocking(err))
+      goto sys_error;
+  }
+
+  if (tport_setname(self, tpn->tpn_proto, ai, tpn->tpn_canon) != -1
+      &&
+      tport_register_secondary(self, tls_connect, events) != -1) {
+    tport_tls_t *tlstp = (tport_tls_t *)self;
+    tport_tls_primary_t *tlspri = (tport_tls_primary_t *)self->tp_pri;
+    tlstp->tlstp_context = tls_init_client(tlspri->tlspri_master, s);
+  }
+  else
+    goto sys_error;
+
+  SU_DEBUG_5(("%s(%p): connecting to " TPN_FORMAT "\n",
+              __func__, (void *)self, TPN_ARGS(self->tp_name)));
+  
+  tport_set_secondary_timer(self);
+
+  return self;
+
+sys_error:
+  err = errno;
+  if (SU_LOG_LEVEL >= errlevel)
+    su_llog(tport_log, errlevel, "%s(%p): %s (pf=%d %s/%s): %s\n",
+            __func__, (void *)pri, what, ai->ai_family, tpn->tpn_proto, 
+	    tport_hostport(buf, sizeof(buf), (void *)ai->ai_addr, 2),
+	    su_strerror(err));
+  tport_zap_secondary(self);
+  su_seterrno(err);
+  return NULL;
+}
+