hsa: http connect proxy client 90/43490/56
authorMatus Fabian <[email protected]>
Mon, 28 Jul 2025 16:44:13 +0000 (12:44 -0400)
committerFlorin Coras <[email protected]>
Thu, 25 Sep 2025 15:34:08 +0000 (15:34 +0000)
Type: feature

Change-Id: Ibe6c01378688b0b47ef26149663b3de1aa02a083
Signed-off-by: Matus Fabian <[email protected]>
src/plugins/hs_apps/CMakeLists.txt
src/plugins/hs_apps/http_connect_proxy_client.c [new file with mode: 0644]
test-c/hs-test/infra/netconfig.go
test-c/hs-test/infra/suite_masque.go [new file with mode: 0644]
test-c/hs-test/infra/utils.go
test-c/hs-test/infra/vppinstance.go
test-c/hs-test/proxy_test.go
test-c/hs-test/resources/nginx/nginx_masque.conf [new file with mode: 0644]
test-c/hs-test/topo-containers/masque.yaml [new file with mode: 0644]
test-c/hs-test/topo-network/masque.yaml [new file with mode: 0644]

index a301053..95311be 100644 (file)
@@ -30,6 +30,7 @@ add_vpp_plugin(hs_apps
   http_client.c
   http_tps.c
   proxy.c
+  http_connect_proxy_client.c
   test_builtins.c
 )
 
diff --git a/src/plugins/hs_apps/http_connect_proxy_client.c b/src/plugins/hs_apps/http_connect_proxy_client.c
new file mode 100644 (file)
index 0000000..32cc729
--- /dev/null
@@ -0,0 +1,1275 @@
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright(c) 2025 Cisco Systems, Inc.
+ */
+
+#include <vnet/session/application_interface.h>
+#include <vnet/session/application.h>
+#include <vnet/session/session.h>
+#include <http/http.h>
+#include <http/http_status_codes.h>
+#include <vnet/tls/tls_types.h>
+#include <vnet/tcp/tcp.h>
+
+#define HCPC_DEBUG 0
+
+#if HCPC_DEBUG
+#define HCPC_DBG(_fmt, _args...) clib_warning (_fmt, ##_args)
+#else
+#define HCPC_DBG(_fmt, _args...)
+#endif
+
+#define TCP_MSS 1460
+
+#define foreach_hcpc_session_state                                            \
+  _ (CONNECTING, "CONNECTING")                                                \
+  _ (ESTABLISHED, "ESTABLISHED")                                              \
+  _ (CLOSED, "CLOSED")
+
+typedef enum
+{
+#define _(sym, str) HCPC_SESSION_##sym,
+  foreach_hcpc_session_state
+#undef _
+} hcpc_session_state_t;
+
+#define foreach_hcpc_session_flags                                            \
+  _ (IS_PARENT)                                                               \
+  _ (IS_UDP)                                                                  \
+  _ (HTTP_DISCONNECTED)                                                       \
+  _ (LISTENER_DISCONNECTED)
+
+typedef enum
+{
+#define _(sym) HCPC_SESSION_F_BIT_##sym,
+  foreach_hcpc_session_flags
+#undef _
+} hcpc_session_flags_bit_t;
+
+typedef enum
+{
+#define _(sym) HCPC_SESSION_F_##sym = 1 << HCPC_SESSION_F_BIT_##sym,
+  foreach_hcpc_session_flags
+#undef _
+} hcpc_session_flags_t;
+
+typedef struct
+{
+  u32 session_index;
+  hcpc_session_state_t state;
+  hcpc_session_flags_t flags;
+  session_handle_t listener_session_handle;
+  session_handle_t http_session_handle;
+} hcpc_session_t;
+
+typedef struct
+{
+  session_endpoint_cfg_t sep;
+  u32 l_index;
+  session_handle_t session_handle;
+} hcpc_listener_t;
+
+typedef struct
+{
+  u32 http_app_index;
+  u32 listener_app_index;
+  u32 ckpair_index;
+  session_endpoint_cfg_t proxy_server_sep;
+  http_headers_ctx_t capsule_proto_header;
+  u8 *capsule_proto_header_buf;
+  hcpc_listener_t *listeners;
+  hcpc_session_t *sessions;
+  u64 http_connection_handle;
+  u8 is_init;
+  u8 hsi4_enabled;
+  u8 hsi6_enabled;
+  u32 sw_if_index;
+  u32 fifo_size;
+  u32 prealloc_fifos;
+  u64 private_segment_size;
+} hcpc_main_t;
+
+hcpc_main_t hcpc_main;
+
+static u8 *
+format_hcpc_session_state (u8 *s, va_list *va)
+{
+  hcpc_session_state_t state = va_arg (*va, hcpc_session_state_t);
+  u8 *t = 0;
+
+  switch (state)
+    {
+#define _(sym, str)                                                           \
+  case HCPC_SESSION_##sym:                                                    \
+    t = (u8 *) str;                                                           \
+    break;
+      foreach_hcpc_session_state
+#undef _
+       default : return format (s, "unknown");
+    }
+  return format (s, "%s", t);
+}
+
+static void
+hcpc_session_close_http (hcpc_session_t *ps)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  vnet_disconnect_args_t _a = { 0 }, *a = &_a;
+  session_error_t rv;
+
+  a->handle = ps->http_session_handle;
+  a->app_index = hcpcm->http_app_index;
+  rv = vnet_disconnect_session (a);
+  if (rv)
+    clib_warning ("disconnect returned: %U", format_session_error, rv);
+  ps->flags |= HCPC_SESSION_F_HTTP_DISCONNECTED;
+}
+
+static void
+hcpc_session_close_listener (hcpc_session_t *ps)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  vnet_disconnect_args_t _a = { 0 }, *a = &_a;
+  session_error_t rv;
+
+  a->handle = ps->listener_session_handle;
+  a->app_index = hcpcm->listener_app_index;
+  rv = vnet_disconnect_session (a);
+  if (rv)
+    clib_warning ("disconnect returned: %U", format_session_error, rv);
+  ps->flags |= HCPC_SESSION_F_LISTENER_DISCONNECTED;
+}
+
+static hcpc_session_t *
+hcpc_session_alloc ()
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  hcpc_session_t *ps;
+
+  pool_get_zero (hcpcm->sessions, ps);
+  ps->session_index = ps - hcpcm->sessions;
+  ps->http_session_handle = SESSION_INVALID_HANDLE;
+  ps->listener_session_handle = SESSION_INVALID_HANDLE;
+
+  return ps;
+}
+
+static void
+hcpc_session_free (hcpc_session_t *ps)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+
+  if (CLIB_DEBUG)
+    memset (ps, 0xB0, sizeof (*ps));
+  pool_put (hcpcm->sessions, ps);
+}
+
+static hcpc_session_t *
+hcpc_session_get (u32 s_index)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+
+  if (pool_is_free_index (hcpcm->sessions, s_index))
+    return 0;
+  return pool_elt_at_index (hcpcm->sessions, s_index);
+}
+
+static void
+hcpc_delete_session (session_t *s, u8 is_http)
+{
+  hcpc_session_t *ps;
+  session_t *ls;
+
+  HCPC_DBG ("session %u (is http %u)", s->opaque, is_http);
+  ps = hcpc_session_get (s->opaque);
+  ASSERT (ps);
+
+  if (is_http)
+    {
+      ps->http_session_handle = SESSION_INVALID_HANDLE;
+      /* http connection session doesn't have listener */
+      if (ps->flags & HCPC_SESSION_F_IS_PARENT)
+       {
+         ASSERT (ps->listener_session_handle == SESSION_INVALID_HANDLE);
+         hcpc_session_free (ps);
+         return;
+       }
+      /* listener already cleaned up */
+      if (ps->listener_session_handle == SESSION_INVALID_HANDLE)
+       {
+         ASSERT (s->rx_fifo->refcnt == 1);
+         hcpc_session_free (ps);
+         return;
+       }
+      ls = session_get_from_handle (ps->listener_session_handle);
+      ls->rx_fifo->master_thread_index = ls->tx_fifo->master_thread_index;
+    }
+  else
+    {
+      ps->listener_session_handle = SESSION_INVALID_HANDLE;
+      /* http already cleaned up */
+      if (ps->http_session_handle == SESSION_INVALID_HANDLE)
+       hcpc_session_free (ps);
+    }
+}
+
+static void
+hcpc_http_connection_closed ()
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  hcpc_listener_t *l;
+  hcpc_session_t *ps;
+
+  pool_foreach (l, hcpcm->listeners)
+    {
+      if (l->session_handle != SESSION_INVALID_HANDLE)
+       {
+         vnet_unlisten_args_t a = { .handle = l->session_handle,
+                                    .app_index = hcpcm->listener_app_index };
+         vnet_unlisten (&a);
+       }
+    }
+
+  pool_foreach (ps, hcpcm->sessions)
+    {
+      ps->state = HCPC_SESSION_CLOSED;
+    }
+}
+
+static void
+hcpc_close_session (session_t *s, u8 is_http)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  hcpc_session_t *ps;
+
+  HCPC_DBG ("session %u (is http %u)", s->opaque, is_http);
+  ps = hcpc_session_get (s->opaque);
+  ASSERT (ps);
+  ps->state = HCPC_SESSION_CLOSED;
+
+  if (is_http)
+    {
+      /* http connection went down */
+      if (ps->flags & HCPC_SESSION_F_IS_PARENT)
+       {
+         hcpcm->http_connection_handle = SESSION_INVALID_HANDLE;
+         hcpc_http_connection_closed ();
+         return;
+       }
+      hcpc_session_close_http (ps);
+      if (!(ps->flags & HCPC_SESSION_F_LISTENER_DISCONNECTED))
+       {
+         ASSERT (ps->http_session_handle != SESSION_INVALID_HANDLE);
+         hcpc_session_close_listener (ps);
+       }
+    }
+  else
+    {
+      hcpc_session_close_listener (ps);
+      if (!(ps->flags & HCPC_SESSION_F_HTTP_DISCONNECTED))
+       {
+         if (ps->http_session_handle != SESSION_INVALID_HANDLE)
+           hcpc_session_close_http (ps);
+         ps->flags |= HCPC_SESSION_F_HTTP_DISCONNECTED;
+       }
+    }
+}
+
+static void
+hcpc_listen (hcpc_listener_t *l)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  vnet_listen_args_t _a, *a = &_a;
+  session_error_t rv;
+
+  clib_memset (a, 0, sizeof (*a));
+  a->app_index = hcpcm->listener_app_index;
+  clib_memcpy (&a->sep_ext, &l->sep, sizeof (l->sep));
+  /* Make sure listener is marked connected for transports like udp */
+  a->sep_ext.transport_flags = TRANSPORT_CFG_F_CONNECTED;
+  if ((rv = vnet_listen (a)))
+    {
+      clib_warning ("listen returned: %U", format_session_error, rv);
+      return;
+    }
+  l->session_handle = a->handle;
+  HCPC_DBG ("listener started %U:%u", format_ip46_address, &l->sep.ip,
+           l->sep.is_ip4, clib_net_to_host_u16 (l->sep.port));
+}
+
+static void
+hcpc_start_listen ()
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  hcpc_listener_t *l;
+
+  pool_foreach (l, hcpcm->listeners)
+    {
+      hcpc_listen (l);
+    }
+}
+
+static void
+hcpc_listener_add (hcpc_listener_t *l_cfg)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  hcpc_listener_t *l;
+
+  pool_get (hcpcm->listeners, l);
+  *l = *l_cfg;
+  l->l_index = l - hcpcm->listeners;
+  l->session_handle = SESSION_INVALID_HANDLE;
+
+  if (hcpcm->http_connection_handle != SESSION_INVALID_HANDLE)
+    hcpc_listen (l);
+}
+
+static int
+hcpc_listener_del (hcpc_listener_t *l_cfg)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  hcpc_listener_t *l;
+  u8 found = 0;
+  session_error_t rv = 0;
+
+  pool_foreach (l, hcpcm->listeners)
+    {
+      if (clib_memcmp (&l_cfg->sep, &l->sep, sizeof (l_cfg->sep)) == 0)
+       {
+         found = 1;
+         break;
+       }
+    }
+
+  if (!found)
+    return 1;
+
+  if (l->session_handle != SESSION_INVALID_HANDLE)
+    {
+      vnet_unlisten_args_t a = { .handle = l->session_handle,
+                                .app_index = hcpcm->listener_app_index };
+      rv = vnet_unlisten (&a);
+    }
+
+  pool_put (hcpcm->listeners, l);
+
+  return rv;
+}
+
+static void
+hcpc_connect_http_stream_rpc (void *rpc_args)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  vnet_connect_args_t _a, *a = &_a;
+  u32 session_index = pointer_to_uword (rpc_args);
+  session_error_t rv;
+
+  clib_memset (a, 0, sizeof (*a));
+  clib_memcpy (&a->sep_ext, &hcpcm->proxy_server_sep,
+              sizeof (hcpcm->proxy_server_sep));
+  a->sep_ext.parent_handle = hcpcm->http_connection_handle;
+  a->app_index = hcpcm->http_app_index;
+  a->api_context = session_index;
+
+  rv = vnet_connect (a);
+  if (rv)
+    clib_warning ("connect returned: %U", format_session_error, rv);
+}
+
+static void
+hcpc_connect_http_stream (u32 session_index)
+{
+  session_send_rpc_evt_to_thread_force (
+    transport_cl_thread (), hcpc_connect_http_stream_rpc,
+    uword_to_pointer (session_index, void *));
+}
+
+static void
+hcpc_connect_http_connection_rpc (void *rpc_args)
+{
+  vnet_connect_args_t *a = rpc_args;
+  session_error_t rv;
+
+  rv = vnet_connect (a);
+  if (rv)
+    clib_warning ("connect returned: %U", format_session_error, rv);
+
+  session_endpoint_free_ext_cfgs (&a->sep_ext);
+  vec_free (a);
+}
+
+static void
+hcpc_connect_http_connection ()
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  vnet_connect_args_t *a = 0;
+  transport_endpt_ext_cfg_t *ext_cfg;
+  transport_endpt_cfg_http_t http_cfg = { 120, HTTP_UDP_TUNNEL_DGRAM, 0 };
+
+  vec_validate (a, 0);
+  clib_memset (a, 0, sizeof (a[0]));
+  clib_memcpy (&a->sep_ext, &hcpcm->proxy_server_sep,
+              sizeof (hcpcm->proxy_server_sep));
+  a->app_index = hcpcm->http_app_index;
+
+  if (hcpcm->proxy_server_sep.flags & SESSION_ENDPT_CFG_F_SECURE)
+    {
+      ext_cfg = session_endpoint_add_ext_cfg (
+       &a->sep_ext, TRANSPORT_ENDPT_EXT_CFG_CRYPTO,
+       sizeof (transport_endpt_crypto_cfg_t));
+      ext_cfg->crypto.ckpair_index = hcpcm->ckpair_index;
+      ext_cfg->crypto.alpn_protos[0] = TLS_ALPN_PROTO_HTTP_2;
+    }
+  else
+    http_cfg.flags |= HTTP_ENDPT_CFG_F_HTTP2_PRIOR_KNOWLEDGE;
+
+  ext_cfg = session_endpoint_add_ext_cfg (
+    &a->sep_ext, TRANSPORT_ENDPT_EXT_CFG_HTTP, sizeof (http_cfg));
+  clib_memcpy (ext_cfg->data, &http_cfg, sizeof (http_cfg));
+
+  session_send_rpc_evt_to_thread_force (transport_cl_thread (),
+                                       hcpc_connect_http_connection_rpc, a);
+}
+
+static int
+hcpc_write_http_connect_udp_req (svm_fifo_t *f, transport_connection_t *tc)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  u8 *target;
+  http_msg_t msg;
+  int rv;
+
+  if (tc->is_ip4)
+    target = format (0, "/.well-known/masque/udp/%U/%u/", format_ip4_address,
+                    &tc->lcl_ip.ip4, clib_net_to_host_u16 (tc->lcl_port));
+  else
+    target = format (0, "/.well-known/masque/udp/[%U]/%u/", format_ip6_address,
+                    &tc->lcl_ip.ip6, clib_net_to_host_u16 (tc->lcl_port));
+
+  HCPC_DBG ("opening UDP tunnel to: %U:%u", format_ip46_address, &tc->lcl_ip,
+           tc->is_ip4, clib_net_to_host_u16 (tc->lcl_port));
+
+  msg.type = HTTP_MSG_REQUEST;
+  msg.method_type = HTTP_REQ_CONNECT;
+  msg.data.upgrade_proto = HTTP_UPGRADE_PROTO_CONNECT_UDP;
+  msg.data.target_path_offset = 0;
+  msg.data.target_path_len = vec_len (target);
+  msg.data.headers_offset = msg.data.target_path_len;
+  msg.data.headers_len = hcpcm->capsule_proto_header.tail_offset;
+  msg.data.body_len = 0;
+  msg.data.type = HTTP_MSG_DATA_INLINE;
+  msg.data.len = msg.data.target_path_len + msg.data.headers_len;
+
+  svm_fifo_seg_t segs[3] = { { (u8 *) &msg, sizeof (msg) },
+                            { target, msg.data.target_path_len },
+                            { hcpcm->capsule_proto_header_buf,
+                              msg.data.headers_len } };
+  rv = svm_fifo_enqueue_segments (f, segs, 3, 0);
+  vec_free (target);
+  if (rv < (sizeof (msg) + msg.data.len))
+    {
+      clib_warning ("enqueue failed: %d", rv);
+      return -1;
+    }
+  clib_warning ("%d", rv);
+
+  return 0;
+}
+
+static int
+hcpc_write_http_connect_req (svm_fifo_t *f, transport_connection_t *tc)
+{
+  u8 *target = 0;
+  http_msg_t msg;
+  int rv;
+
+  if (tc->is_ip4)
+    target = format (0, "%U:%u", format_ip4_address, &tc->lcl_ip.ip4,
+                    clib_net_to_host_u16 (tc->lcl_port));
+  else
+    target = format (0, "[%U]:%u", format_ip6_address, &tc->lcl_ip.ip6,
+                    clib_net_to_host_u16 (tc->lcl_port));
+
+  HCPC_DBG ("opening TCP tunnel to: %v", target);
+
+  msg.type = HTTP_MSG_REQUEST;
+  msg.method_type = HTTP_REQ_CONNECT;
+  msg.data.upgrade_proto = HTTP_UPGRADE_PROTO_NA;
+  msg.data.target_path_offset = 0;
+  msg.data.target_path_len = vec_len (target);
+  msg.data.headers_len = 0;
+  msg.data.body_len = 0;
+  msg.data.type = HTTP_MSG_DATA_INLINE;
+  msg.data.len = msg.data.target_path_len;
+
+  svm_fifo_seg_t segs[2] = { { (u8 *) &msg, sizeof (msg) },
+                            { target, msg.data.target_path_len } };
+  rv = svm_fifo_enqueue_segments (f, segs, 2, 0);
+  vec_free (target);
+  if (rv < (sizeof (msg) + msg.data.len))
+    {
+      clib_warning ("enqueue failed: %d", rv);
+      return -1;
+    }
+
+  return 0;
+}
+
+static int
+hcpc_read_http_connect_resp (session_t *s, hcpc_session_t *ps)
+{
+  http_msg_t msg;
+  int rv;
+
+  rv = svm_fifo_dequeue (s->rx_fifo, sizeof (msg), (u8 *) &msg);
+  ASSERT (rv == sizeof (msg));
+  ASSERT (msg.type == HTTP_MSG_REPLY);
+  /* drop everything up to body */
+  svm_fifo_dequeue_drop (s->rx_fifo, msg.data.body_offset);
+  HCPC_DBG ("response: %U %U", format_http_version,
+           http_session_get_version (s), format_http_status_code, msg.code);
+  if (http_status_code_str[msg.code][0] != '2')
+    return -1;
+
+  ps->state = HCPC_SESSION_ESTABLISHED;
+
+  return 0;
+}
+
+/***************************/
+/* http side vft callbacks */
+/***************************/
+
+static int
+http_session_connected_callback (u32 app_index, u32 session_index,
+                                session_t *s, session_error_t err)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  hcpc_session_t *ps;
+
+  if (err)
+    {
+      clib_warning ("connect error: %U", format_session_error, err);
+      return -1;
+    }
+
+  if (hcpcm->http_connection_handle == SESSION_INVALID_HANDLE)
+    {
+      HCPC_DBG ("parent session connected");
+      ps = hcpc_session_alloc ();
+      ps->http_session_handle = session_handle (s);
+      ps->flags |= HCPC_SESSION_F_IS_PARENT;
+      s->opaque = ps->session_index;
+      hcpcm->http_connection_handle = session_handle (s);
+      hcpc_start_listen ();
+      return 0;
+    }
+
+  HCPC_DBG ("stream for session %u opened", session_index);
+  ps = hcpc_session_get (session_index);
+  if (!ps)
+    return -1;
+
+  ps->http_session_handle = session_handle (s);
+
+  if (svm_fifo_set_event (s->tx_fifo))
+    session_program_tx_io_evt (s->handle, SESSION_IO_EVT_TX);
+
+  return 0;
+}
+
+static void
+http_session_disconnect_callback (session_t *s)
+{
+  hcpc_close_session (s, 1);
+}
+
+static void
+http_session_transport_closed_callback (session_t *s)
+{
+  clib_warning ("transport closed");
+}
+
+static void
+http_session_reset_callback (session_t *s)
+{
+  hcpc_close_session (s, 1);
+}
+
+static int
+http_rx_callback (session_t *s)
+{
+  hcpc_session_t *ps;
+  svm_fifo_t *listener_tx_fifo;
+
+  HCPC_DBG ("session %u", s->opaque);
+  ps = hcpc_session_get (s->opaque);
+  ASSERT (ps);
+  if (ps->state == HCPC_SESSION_CLOSED)
+    return -1;
+  else if (ps->state == HCPC_SESSION_CONNECTING)
+    return hcpc_read_http_connect_resp (s, ps);
+
+  /* send event for listener tx fifo */
+  listener_tx_fifo = s->rx_fifo;
+  if (svm_fifo_set_event (listener_tx_fifo))
+    session_program_tx_io_evt (listener_tx_fifo->vpp_sh, SESSION_IO_EVT_TX);
+
+  return 0;
+}
+
+static int
+http_tx_callback (session_t *s)
+{
+  hcpc_session_t *ps;
+  u32 min_free;
+
+  HCPC_DBG ("session %u", s->opaque);
+  min_free = clib_min (svm_fifo_size (s->tx_fifo) >> 3, 128 << 10);
+  if (svm_fifo_max_enqueue (s->tx_fifo) < min_free)
+    {
+      svm_fifo_add_want_deq_ntf (s->tx_fifo, SVM_FIFO_WANT_DEQ_NOTIF);
+      return 0;
+    }
+
+  ps = hcpc_session_get (s->opaque);
+  ASSERT (ps);
+
+  if (ps->state < HCPC_SESSION_ESTABLISHED)
+    return 0;
+
+  if (ps->state == HCPC_SESSION_CLOSED)
+    return -1;
+
+  /* force ack on listener side to update rcv wnd */
+  if (ps->flags & HCPC_SESSION_F_IS_UDP)
+    return 0;
+  tcp_send_ack ((tcp_connection_t *) session_get_transport (
+    session_get_from_handle (ps->listener_session_handle)));
+
+  return 0;
+}
+
+static void
+http_session_cleanup_callback (session_t *s, session_cleanup_ntf_t ntf)
+{
+  if (ntf == SESSION_CLEANUP_TRANSPORT)
+    return;
+
+  hcpc_delete_session (s, 1);
+}
+
+static int
+http_alloc_session_fifos (session_t *s)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  hcpc_session_t *ps;
+  session_t *ls;
+  svm_fifo_t *rx_fifo = 0, *tx_fifo = 0;
+  int rv;
+
+  HCPC_DBG ("session %u alloc fifos", s->opaque);
+  ps = hcpc_session_get (s->opaque);
+  /* http connection session doesn't have listener */
+  if (!ps)
+    {
+      HCPC_DBG ("http connection session");
+      app_worker_t *app_wrk = app_worker_get (hcpcm->http_app_index);
+      segment_manager_t *sm = app_worker_get_connect_segment_manager (app_wrk);
+      if ((rv = segment_manager_alloc_session_fifos (sm, s->thread_index,
+                                                    &rx_fifo, &tx_fifo)))
+       return rv;
+      rx_fifo->shr->master_session_index = s->session_index;
+      rx_fifo->vpp_sh = s->handle;
+      s->flags &= ~SESSION_F_PROXY;
+    }
+  else
+    {
+      HCPC_DBG ("http stream session");
+      ls = session_get_from_handle (ps->listener_session_handle);
+      tx_fifo = ls->rx_fifo;
+      rx_fifo = ls->tx_fifo;
+      rx_fifo->refcnt++;
+      tx_fifo->refcnt++;
+    }
+
+  tx_fifo->shr->master_session_index = s->session_index;
+  tx_fifo->vpp_sh = s->handle;
+  s->rx_fifo = rx_fifo;
+  s->tx_fifo = tx_fifo;
+  return 0;
+}
+
+static session_cb_vft_t http_session_cb_vft = {
+  .session_connected_callback = http_session_connected_callback,
+  .session_disconnect_callback = http_session_disconnect_callback,
+  .session_transport_closed_callback = http_session_transport_closed_callback,
+  .session_reset_callback = http_session_reset_callback,
+  .builtin_app_rx_callback = http_rx_callback,
+  .builtin_app_tx_callback = http_tx_callback,
+  .session_cleanup_callback = http_session_cleanup_callback,
+  .proxy_alloc_session_fifos = http_alloc_session_fifos,
+};
+
+/*******************************/
+/* listener side vft callbacks */
+/*******************************/
+
+static int
+listener_accept_callback (session_t *s)
+{
+  hcpc_session_t *ps;
+  hcpc_main_t *hcpcm = &hcpc_main;
+
+  if (hcpcm->http_connection_handle == SESSION_INVALID_HANDLE)
+    return -1;
+
+  ps = hcpc_session_alloc ();
+  ps->state = HCPC_SESSION_CONNECTING;
+  ps->listener_session_handle = session_handle (s);
+  if (session_get_transport_proto (s) == TRANSPORT_PROTO_UDP)
+    ps->flags |= HCPC_SESSION_F_IS_UDP;
+  s->opaque = ps->session_index;
+  s->session_state = SESSION_STATE_READY;
+
+  HCPC_DBG ("going to open stream for new session %u", ps->session_index);
+  hcpc_connect_http_stream (ps->session_index);
+
+  return 0;
+}
+
+static void
+listener_session_disconnect_callback (session_t *s)
+{
+  hcpc_close_session (s, 0);
+}
+
+static void
+listener_session_reset_callback (session_t *s)
+{
+  hcpc_close_session (s, 0);
+}
+
+static int
+listener_rx_callback (session_t *s)
+{
+  hcpc_session_t *ps;
+  svm_fifo_t *http_tx_fifo;
+
+  HCPC_DBG ("session %u", s->opaque);
+  ps = hcpc_session_get (s->opaque);
+  if (!ps)
+    return -1;
+
+  if (ps->state < HCPC_SESSION_ESTABLISHED)
+    return 0;
+
+  if (ps->state == HCPC_SESSION_CLOSED)
+    return -1;
+
+  /* send event for http tx fifo */
+  http_tx_fifo = s->rx_fifo;
+  if (svm_fifo_set_event (http_tx_fifo))
+    session_program_tx_io_evt (ps->http_session_handle, SESSION_IO_EVT_TX);
+
+  if (svm_fifo_max_enqueue (http_tx_fifo) <= TCP_MSS)
+    svm_fifo_add_want_deq_ntf (http_tx_fifo, SVM_FIFO_WANT_DEQ_NOTIF);
+
+  return 0;
+}
+
+static int
+listener_tx_callback (session_t *s)
+{
+  hcpc_session_t *ps;
+
+  HCPC_DBG ("session %u", s->opaque);
+  ps = hcpc_session_get (s->opaque);
+  ASSERT (ps);
+
+  if (ps->state < HCPC_SESSION_ESTABLISHED)
+    return 0;
+
+  if (ps->state == HCPC_SESSION_CLOSED)
+    return -1;
+
+  /* pass notification to http transport */
+  session_program_transport_io_evt (ps->http_session_handle,
+                                   SESSION_IO_EVT_RX);
+  return 0;
+}
+
+static void
+listener_session_cleanup_callback (session_t *s, session_cleanup_ntf_t ntf)
+{
+  if (ntf == SESSION_CLEANUP_TRANSPORT)
+    return;
+
+  hcpc_delete_session (s, 0);
+}
+
+static int
+listener_add_segment_callback (u32 client_index, u64 segment_handle)
+{
+  return 0;
+}
+
+static int
+listener_write_early_data (session_t *s)
+{
+  transport_proto_t tp;
+  transport_connection_t *tc;
+  int rv;
+
+  tp = session_get_transport_proto (s);
+  tc = session_get_transport (s);
+  /* write http connect request first so it will be before tunneled data when
+   * http stream is connected */
+  switch (tp)
+    {
+    case TRANSPORT_PROTO_TCP:
+      rv = hcpc_write_http_connect_req (s->rx_fifo, tc);
+      break;
+    case TRANSPORT_PROTO_UDP:
+      rv = hcpc_write_http_connect_udp_req (s->rx_fifo, tc);
+      break;
+    default:
+      clib_warning ("unsupported protocol %U", format_transport_proto, tp);
+      return -1;
+    }
+  if (rv)
+    return -1;
+
+  return 0;
+}
+
+static session_cb_vft_t listener_session_cb_vft = {
+  .session_accept_callback = listener_accept_callback,
+  .session_disconnect_callback = listener_session_disconnect_callback,
+  .session_reset_callback = listener_session_reset_callback,
+  .builtin_app_rx_callback = listener_rx_callback,
+  .builtin_app_tx_callback = listener_tx_callback,
+  .session_cleanup_callback = listener_session_cleanup_callback,
+  .add_segment_callback = listener_add_segment_callback,
+  .proxy_write_early_data = listener_write_early_data,
+};
+
+static clib_error_t *
+hcpc_attach_http_client ()
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  vnet_app_attach_args_t _a, *a = &_a;
+  vnet_app_add_cert_key_pair_args_t _ck_pair, *ck_pair = &_ck_pair;
+  u64 options[APP_OPTIONS_N_OPTIONS];
+  session_error_t rv;
+
+  clib_memset (a, 0, sizeof (*a));
+  clib_memset (options, 0, sizeof (options));
+
+  a->api_client_index = APP_INVALID_INDEX;
+  a->name = format (0, "http-connect-proxy-client");
+  a->session_cb_vft = &http_session_cb_vft;
+  a->options = options;
+  a->options[APP_OPTIONS_SEGMENT_SIZE] = hcpcm->private_segment_size;
+  a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = hcpcm->private_segment_size;
+  a->options[APP_OPTIONS_RX_FIFO_SIZE] = hcpcm->fifo_size;
+  a->options[APP_OPTIONS_TX_FIFO_SIZE] = hcpcm->fifo_size;
+  a->options[APP_OPTIONS_FLAGS] =
+    APP_OPTIONS_FLAGS_IS_BUILTIN | APP_OPTIONS_FLAGS_IS_PROXY;
+  a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = hcpcm->prealloc_fifos;
+  a->options[APP_OPTIONS_TLS_ENGINE] = CRYPTO_ENGINE_OPENSSL;
+
+  if ((rv = vnet_application_attach (a)))
+    return clib_error_return (0, "attach returned: %U", format_session_error,
+                             rv);
+
+  hcpcm->http_app_index = a->app_index;
+  vec_free (a->name);
+
+  clib_memset (ck_pair, 0, sizeof (*ck_pair));
+  ck_pair->cert = (u8 *) test_srv_crt_rsa;
+  ck_pair->key = (u8 *) test_srv_key_rsa;
+  ck_pair->cert_len = test_srv_crt_rsa_len;
+  ck_pair->key_len = test_srv_key_rsa_len;
+  vnet_app_add_cert_key_pair (ck_pair);
+  hcpcm->ckpair_index = ck_pair->index;
+
+  return 0;
+}
+
+static clib_error_t *
+hcpc_attach_listener ()
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  vnet_app_attach_args_t _a, *a = &_a;
+  u64 options[APP_OPTIONS_N_OPTIONS];
+  session_error_t rv;
+
+  clib_memset (a, 0, sizeof (*a));
+  clib_memset (options, 0, sizeof (options));
+
+  a->api_client_index = APP_INVALID_INDEX;
+  a->name = format (0, "http-connect-proxy-client-listener");
+  a->session_cb_vft = &listener_session_cb_vft;
+  a->options = options;
+  a->options[APP_OPTIONS_SEGMENT_SIZE] = hcpcm->private_segment_size;
+  a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = hcpcm->private_segment_size;
+  a->options[APP_OPTIONS_RX_FIFO_SIZE] = hcpcm->fifo_size;
+  a->options[APP_OPTIONS_TX_FIFO_SIZE] = hcpcm->fifo_size;
+  a->options[APP_OPTIONS_FLAGS] =
+    APP_OPTIONS_FLAGS_IS_BUILTIN | APP_OPTIONS_FLAGS_IS_PROXY;
+  a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = hcpcm->prealloc_fifos;
+
+  if ((rv = vnet_application_attach (a)))
+    return clib_error_return (0, "attach returned: %U", format_session_error,
+                             rv);
+
+  hcpcm->listener_app_index = a->app_index;
+  vec_free (a->name);
+
+  return 0;
+}
+
+#define HCPC_ARC_IP4  "ip4-unicast"
+#define HCPC_ARC_IP6  "ip6-unicast"
+#define HCPC_NODE_IP4 "hsi4-in"
+#define HCPC_NODE_IP6 "hsi6-in"
+
+static clib_error_t *
+hcpc_enable_hsi (u8 is_ip4)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  vnet_feature_registration_t *reg;
+  clib_error_t *err = 0;
+  int rv;
+
+  if (is_ip4)
+    {
+      if (hcpcm->hsi4_enabled)
+       return 0;
+      reg = vnet_get_feature_reg (HCPC_ARC_IP4, HCPC_NODE_IP4);
+    }
+  else
+    {
+      if (hcpcm->hsi6_enabled)
+       return 0;
+      reg = vnet_get_feature_reg (HCPC_ARC_IP6, HCPC_NODE_IP6);
+    }
+  if (reg == 0)
+    return clib_error_return (0, "hsi plugin not loaded");
+
+  if (reg->enable_disable_cb)
+    {
+      if ((err = reg->enable_disable_cb (hcpcm->sw_if_index, 1)))
+       return err;
+    }
+
+  if (is_ip4)
+    rv = vnet_feature_enable_disable (HCPC_ARC_IP4, HCPC_NODE_IP4,
+                                     hcpcm->sw_if_index, 1, 0, 0);
+  else
+    rv = vnet_feature_enable_disable (HCPC_ARC_IP6, HCPC_NODE_IP6,
+                                     hcpcm->sw_if_index, 1, 0, 0);
+  if (rv)
+    return clib_error_return (0, "vnet feature enable failed (rv=%d)", rv);
+
+  if (is_ip4)
+    hcpcm->hsi4_enabled = 1;
+  else
+    hcpcm->hsi6_enabled = 1;
+  return 0;
+}
+
+/*******/
+/* cli */
+/*******/
+
+static clib_error_t *
+hcpc_create_command_fn (vlib_main_t *vm, unformat_input_t *input,
+                       vlib_cli_command_t *cmd)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  clib_error_t *err = 0;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 *server_uri = 0, *listener_uri = 0;
+  session_error_t rv;
+  hcpc_listener_t _l = {}, *l = &_l;
+  u64 mem_size;
+  vnet_main_t *vnm = vnet_get_main ();
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return clib_error_return (0, "expected arguments");
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "server-uri %s", &server_uri))
+       ;
+      else if (unformat (line_input, "listener %s", &listener_uri))
+       ;
+      else if (unformat (line_input, "fifo-size %U", unformat_memory_size,
+                        &mem_size))
+       hcpcm->fifo_size = mem_size;
+      else if (unformat (line_input, "private-segment-size %U",
+                        unformat_memory_size, &mem_size))
+       hcpcm->private_segment_size = mem_size;
+      else if (unformat (line_input, "prealloc-fifos %d",
+                        &hcpcm->prealloc_fifos))
+       ;
+      else if (unformat (line_input, "interface %U",
+                        unformat_vnet_sw_interface, vnm, &hcpcm->sw_if_index))
+       ;
+      else
+       {
+         err = clib_error_return (0, "unknown input `%U'",
+                                  format_unformat_error, line_input);
+         goto done;
+       }
+    }
+
+  if (hcpcm->sw_if_index == ~0)
+    {
+      err = clib_error_return (0, "interface not provided");
+      goto done;
+    }
+  if (!server_uri)
+    {
+      err = clib_error_return (0, "server-uri not provided");
+      goto done;
+    }
+  if (!listener_uri)
+    {
+      err = clib_error_return (0, "listener uri not provided");
+      goto done;
+    }
+
+  if ((rv = parse_uri ((char *) server_uri, &hcpcm->proxy_server_sep)))
+    {
+      err = clib_error_return (0, "server-uri parse error: %U",
+                              format_session_error, rv);
+      goto done;
+    }
+
+  if ((rv = parse_uri ((char *) listener_uri, &l->sep)))
+    {
+      err = clib_error_return (0, "target uri parse error: %U",
+                              format_session_error, rv);
+      goto done;
+    }
+
+  err = hcpc_enable_hsi (l->sep.is_ip4);
+  if (err)
+    goto done;
+
+  session_enable_disable_args_t args = { .is_en = 1,
+                                        .rt_engine_type =
+                                          RT_BACKEND_ENGINE_RULE_TABLE };
+  vlib_worker_thread_barrier_sync (vm);
+  vnet_session_enable_disable (vm, &args);
+  vlib_worker_thread_barrier_release (vm);
+
+  err = hcpc_attach_http_client ();
+  if (err)
+    goto done;
+
+  err = hcpc_attach_listener ();
+  if (err)
+    goto done;
+
+  hcpc_listener_add (l);
+  hcpc_connect_http_connection ();
+
+  hcpcm->is_init = 1;
+
+done:
+  vec_free (server_uri);
+  vec_free (listener_uri);
+  return err;
+}
+
+VLIB_CLI_COMMAND (hcpc_create_command, static) = {
+  .path = "http connect proxy client enable",
+  .short_help =
+    "http connect proxy client enable server-uri <http[s]://ip:port>\n"
+    "interface <intfc> listener <tcp|udp://ip:port>\n"
+    "[fifo-size <nM|G>] [private-segment-size <nM|G>] [prealloc-fifos <n>]",
+  .function = hcpc_create_command_fn,
+};
+
+static clib_error_t *
+hcpc_add_del_listener_command_fn (vlib_main_t *vm, unformat_input_t *input,
+                                 vlib_cli_command_t *cmd)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  clib_error_t *err = 0;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 *listener_uri = 0;
+  session_error_t rv;
+  hcpc_listener_t _l = {}, *l = &_l;
+  u8 is_add = 1;
+
+  if (!hcpcm->is_init)
+    return clib_error_return (0, "http connect proxy client disabled");
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return clib_error_return (0, "expected arguments");
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+       is_add = 1;
+      else if (unformat (line_input, "del"))
+       is_add = 0;
+      else if (unformat (line_input, "listener %s", &listener_uri))
+       ;
+      else
+       {
+         err = clib_error_return (0, "unknown input `%U'",
+                                  format_unformat_error, line_input);
+         goto done;
+       }
+    }
+
+  if (!listener_uri)
+    {
+      err = clib_error_return (0, "listener uri not provided");
+      goto done;
+    }
+  if ((rv = parse_uri ((char *) listener_uri, &l->sep)))
+    {
+      err = clib_error_return (0, "target uri parse error: %U",
+                              format_session_error, rv);
+      goto done;
+    }
+
+  if (is_add)
+    {
+      err = hcpc_enable_hsi (l->sep.is_ip4);
+      if (err)
+       goto done;
+      hcpc_listener_add (l);
+    }
+  else
+    {
+      rv = hcpc_listener_del (l);
+      if (rv > 0)
+       {
+         err = clib_error_return (0, "listener not found");
+         goto done;
+       }
+      else if (rv < 0)
+       {
+         err = clib_error_return (0, "unlisten failed: %U",
+                                  format_session_error, rv);
+         goto done;
+       }
+    }
+
+done:
+  vec_free (listener_uri);
+  return err;
+}
+
+VLIB_CLI_COMMAND (hcpc_add_del_listener_command, static) = {
+  .path = "http connect proxy client listener",
+  .short_help =
+    "http connect proxy client listener [add|del] <tcp|udp://ip:port>",
+  .function = hcpc_add_del_listener_command_fn,
+};
+
+static clib_error_t *
+hcpc_show_command_fn (vlib_main_t *vm, unformat_input_t *input,
+                     vlib_cli_command_t *cmd)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  u8 show_listeners = 0, show_sessions = 0;
+
+  if (!hcpcm->is_init)
+    return clib_error_return (0, "http connect proxy client disabled");
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "listeners"))
+       show_listeners = 1;
+      else if (unformat (input, "sessions"))
+       show_sessions = 1;
+      else
+       {
+         return clib_error_return (0, "unknown input `%U'",
+                                   format_unformat_error, input);
+       }
+    }
+
+  vlib_cli_output (vm, "connection state: %s",
+                  hcpcm->http_connection_handle == SESSION_INVALID_HANDLE ?
+                    "disconnected" :
+                    "connected");
+  vlib_cli_output (vm, "server address: %U:%u", format_ip46_address,
+                  &hcpcm->proxy_server_sep.ip, hcpcm->proxy_server_sep.is_ip4,
+                  clib_net_to_host_u16 (hcpcm->proxy_server_sep.port));
+
+  if (show_listeners)
+    {
+      hcpc_listener_t *l;
+      pool_foreach (l, hcpcm->listeners)
+       {
+         vlib_cli_output (vm, "listener [%u] %U://%U:%u", l->l_index,
+                          format_transport_proto, l->sep.transport_proto,
+                          format_ip46_address, &l->sep.ip, l->sep.is_ip4,
+                          clib_net_to_host_u16 (l->sep.port));
+       }
+    }
+
+  if (show_sessions)
+    {
+      hcpc_session_t *ps;
+      transport_connection_t *tc;
+      pool_foreach (ps, hcpcm->sessions)
+       {
+         if (ps->flags & HCPC_SESSION_F_IS_PARENT)
+           continue;
+         tc = session_get_transport (
+           session_get_from_handle (ps->listener_session_handle));
+         vlib_cli_output (vm, "session [%lu] %U %U:%u->%U:%u %U",
+                          ps->session_index, format_transport_proto,
+                          tc->proto, format_ip46_address, &tc->rmt_ip,
+                          tc->is_ip4, clib_net_to_host_u16 (tc->rmt_port),
+                          format_ip46_address, &tc->lcl_ip, tc->is_ip4,
+                          clib_net_to_host_u16 (tc->lcl_port),
+                          format_hcpc_session_state, ps->state);
+       }
+    }
+
+  return 0;
+}
+
+VLIB_CLI_COMMAND (hcpc_show_command, static) = {
+  .path = "show http connect proxy client",
+  .short_help = "show http connect proxy [listeners] [sessions]",
+  .function = hcpc_show_command_fn,
+};
+
+clib_error_t *
+hcpc_main_init (vlib_main_t *vm)
+{
+  hcpc_main_t *hcpcm = &hcpc_main;
+  session_endpoint_cfg_t sep_null = SESSION_ENDPOINT_CFG_NULL;
+
+  hcpcm->http_app_index = APP_INVALID_INDEX;
+  hcpcm->listener_app_index = APP_INVALID_INDEX;
+  hcpcm->proxy_server_sep = sep_null;
+  hcpcm->http_connection_handle = SESSION_INVALID_HANDLE;
+  hcpcm->fifo_size = 32 << 10;
+  hcpcm->private_segment_size = 128 << 20;
+  hcpcm->prealloc_fifos = 0;
+  hcpcm->sw_if_index = ~0;
+
+  vec_validate (hcpcm->capsule_proto_header_buf, 10);
+  http_init_headers_ctx (&hcpcm->capsule_proto_header,
+                        hcpcm->capsule_proto_header_buf,
+                        vec_len (hcpcm->capsule_proto_header_buf));
+  http_add_header (&hcpcm->capsule_proto_header, HTTP_HEADER_CAPSULE_PROTOCOL,
+                  http_token_lit (HTTP_BOOLEAN_TRUE));
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (hcpc_main_init);
index c8c2719..082a074 100644 (file)
@@ -3,6 +3,7 @@ package hst
 import (
        "errors"
        "fmt"
+       "net"
        "os/exec"
        "strings"
 
@@ -237,6 +238,11 @@ func (n *NetInterface) configure() error {
        }
 
        if n.Peer != nil && n.Peer.name != "" {
+               netIntf, err := net.InterfaceByName(n.Peer.name)
+               if err == nil {
+                       n.Peer.HwAddress, _ = ethernet_types.ParseMacAddress(netIntf.HardwareAddr.String())
+               }
+
                if err := n.Peer.configureUpState(); err != nil {
                        return err
                }
diff --git a/test-c/hs-test/infra/suite_masque.go b/test-c/hs-test/infra/suite_masque.go
new file mode 100644 (file)
index 0000000..3bac3bf
--- /dev/null
@@ -0,0 +1,283 @@
+package hst
+
+import (
+       "fmt"
+       "os/exec"
+       "reflect"
+       "runtime"
+       "strings"
+       "time"
+
+       . "github.com/onsi/ginkgo/v2"
+)
+
+type MasqueSuite struct {
+       HstSuite
+       maxTimeout int
+       Interfaces struct {
+               Client       *NetInterface
+               TunnelClient *NetInterface
+               TunnelServer *NetInterface
+               Server       *NetInterface
+       }
+       Containers struct {
+               VppClient   *Container
+               VppServer   *Container
+               NginxServer *Container
+               IperfServer *Container
+       }
+       Ports struct {
+               Nginx    string
+               NginxSsl string
+               Proxy    string
+       }
+       NetNamespaces struct {
+               Client string
+       }
+}
+
+var masqueTests = map[string][]func(s *MasqueSuite){}
+var masqueSoloTests = map[string][]func(s *MasqueSuite){}
+var masqueMWTests = map[string][]func(s *MasqueSuite){}
+
+func RegisterMasqueTests(tests ...func(s *MasqueSuite)) {
+       masqueTests[GetTestFilename()] = tests
+}
+
+func RegisterMasqueSoloTests(tests ...func(s *MasqueSuite)) {
+       masqueSoloTests[GetTestFilename()] = tests
+}
+
+func RegisterMasqueMWTests(tests ...func(s *MasqueSuite)) {
+       masqueMWTests[GetTestFilename()] = tests
+}
+
+func (s *MasqueSuite) SetupSuite() {
+       s.HstSuite.SetupSuite()
+       s.ConfigureNetworkTopology("masque")
+       s.LoadContainerTopology("masque")
+       s.Ports.Nginx = s.GeneratePort()
+       s.Ports.NginxSsl = s.GeneratePort()
+       s.Ports.Proxy = s.GeneratePort()
+       s.NetNamespaces.Client = s.GetNetNamespaceByName("client-ns")
+       s.Interfaces.Client = s.GetInterfaceByName("cln")
+       s.Interfaces.TunnelClient = s.GetInterfaceByName("cln-tun")
+       s.Interfaces.TunnelServer = s.GetInterfaceByName("srv-tun")
+       s.Interfaces.Server = s.GetInterfaceByName("srv")
+       s.Containers.VppClient = s.GetContainerByName("vpp-masque-client")
+       s.Containers.VppServer = s.GetContainerByName("vpp-masque-server")
+       s.Containers.NginxServer = s.GetContainerByName("nginx-server")
+       s.Containers.IperfServer = s.GetContainerByName("iperf-server")
+}
+
+func (s *MasqueSuite) SetupTest() {
+       s.HstSuite.SetupTest()
+
+       // vpp masque proxy client
+       clientVpp, err := s.Containers.VppClient.newVppInstance(s.Containers.VppClient.AllocatedCpus)
+       s.AssertNotNil(clientVpp, fmt.Sprint(err))
+       s.AssertNil(clientVpp.Start())
+       idx, err := clientVpp.createAfPacket(s.Interfaces.Client, false)
+       s.AssertNil(err, fmt.Sprint(err))
+       s.AssertNotEqual(0, idx)
+       idx, err = clientVpp.createAfPacket(s.Interfaces.TunnelClient, false)
+       s.AssertNil(err, fmt.Sprint(err))
+       s.AssertNotEqual(0, idx)
+
+       // vpp masque proxy server
+       serverVpp, err := s.Containers.VppServer.newVppInstance(s.Containers.VppServer.AllocatedCpus)
+       s.AssertNotNil(serverVpp, fmt.Sprint(err))
+       s.AssertNil(serverVpp.Start())
+       idx, err = serverVpp.createAfPacket(s.Interfaces.TunnelServer, false)
+       s.AssertNil(err, fmt.Sprint(err))
+       s.AssertNotEqual(0, idx)
+       idx, err = serverVpp.createAfPacket(s.Interfaces.Server, false)
+       s.AssertNil(err, fmt.Sprint(err))
+       s.AssertNotEqual(0, idx)
+       proxyCmd := fmt.Sprintf("test proxy server fifo-size 512k server-uri https://%s:%s", s.ProxyAddr(), s.Ports.Proxy)
+       s.Log(serverVpp.Vppctl(proxyCmd))
+
+       // let the client know howto get to the server (must be created here after vpp interface)
+       cmd := exec.Command("ip", "netns", "exec", s.NetNamespaces.Client, "ip", "route", "add",
+               s.NginxAddr(), "via", s.Interfaces.Client.Ip4AddressString())
+       s.Log(cmd.String())
+       o, err := cmd.CombinedOutput()
+       s.Log(string(o))
+       s.AssertNil(err, fmt.Sprint(err))
+
+       arp := fmt.Sprintf("set ip neighbor host-%s %s %s",
+               s.Interfaces.TunnelClient.Name(),
+               s.ProxyAddr(),
+               s.Interfaces.TunnelServer.HwAddress)
+       s.Log(clientVpp.Vppctl(arp))
+       arp = fmt.Sprintf("set ip neighbor host-%s %s %s",
+               s.Interfaces.Client.Name(),
+               s.Interfaces.Client.Peer.Ip4AddressString(),
+               s.Interfaces.Client.Peer.HwAddress)
+       s.Log(clientVpp.Vppctl(arp))
+       arp = fmt.Sprintf("set ip neighbor host-%s %s %s",
+               s.Interfaces.Server.Name(),
+               s.NginxAddr(),
+               s.Interfaces.Server.Peer.HwAddress)
+       s.Log(serverVpp.Vppctl(arp))
+
+       if *DryRun {
+               s.LogStartedContainers()
+               s.Skip("Dry run mode = true")
+       }
+}
+
+func (s *MasqueSuite) TeardownTest() {
+       defer s.HstSuite.TeardownTest()
+       // delete route
+       cmd := exec.Command("ip", "netns", "exec", s.NetNamespaces.Client, "ip", "route", "del",
+               s.NginxAddr(), "via", s.Interfaces.Client.Ip4AddressString())
+       s.Log(cmd.String())
+       o, err := cmd.CombinedOutput()
+       s.Log(string(o))
+       s.AssertNil(err, fmt.Sprint(err))
+       clientVpp := s.Containers.VppClient.VppInstance
+       serverVpp := s.Containers.VppServer.VppInstance
+       if CurrentSpecReport().Failed() {
+               s.CollectNginxLogs(s.Containers.NginxServer)
+               s.Log(clientVpp.Vppctl("show session verbose 2"))
+               s.Log(clientVpp.Vppctl("show error"))
+               s.Log(clientVpp.Vppctl("show http connect proxy client listeners sessions"))
+               s.Log(serverVpp.Vppctl("show session verbose 2"))
+               s.Log(serverVpp.Vppctl("show error"))
+       }
+}
+
+func (s *MasqueSuite) ProxyClientConnect(proto, port string) {
+       vpp := s.Containers.VppClient.VppInstance
+       cmd := fmt.Sprintf("http connect proxy client enable server-uri https://%s:%s listener %s://0.0.0.0:%s interface host-%s",
+               s.ProxyAddr(), s.Ports.Proxy, proto, port, s.Interfaces.Client.Name())
+       s.Log(vpp.Vppctl(cmd))
+
+       connected := false
+       for nTries := 0; nTries < 10; nTries++ {
+               o := vpp.Vppctl("show http connect proxy client")
+               if strings.Contains(o, "connection state: connected") {
+                       connected = true
+                       break
+               }
+               time.Sleep(1 * time.Second)
+       }
+       vpp.Container.Suite.AssertEqual(connected, true)
+}
+
+func (s *MasqueSuite) StartNginxServer() {
+       s.AssertNil(s.Containers.NginxServer.Create())
+       nginxSettings := struct {
+               LogPrefix string
+               Address   string
+               Port      string
+               PortSsl   string
+       }{
+               LogPrefix: s.Containers.NginxServer.Name,
+               Address:   s.NginxAddr(),
+               Port:      s.Ports.Nginx,
+               PortSsl:   s.Ports.NginxSsl,
+       }
+       s.Containers.NginxServer.CreateConfigFromTemplate(
+               "/nginx.conf",
+               "./resources/nginx/nginx_masque.conf",
+               nginxSettings,
+       )
+       s.AssertNil(s.Containers.NginxServer.Start())
+}
+
+func (s *MasqueSuite) NginxAddr() string {
+       return s.Interfaces.Server.Peer.Ip4AddressString()
+}
+
+func (s *MasqueSuite) ProxyAddr() string {
+       return s.Interfaces.TunnelServer.Ip4AddressString()
+}
+
+var _ = Describe("MasqueSuite", Ordered, ContinueOnFailure, func() {
+       var s MasqueSuite
+       BeforeAll(func() {
+               s.SetupSuite()
+       })
+       BeforeEach(func() {
+               s.SetupTest()
+       })
+       AfterAll(func() {
+               s.TeardownSuite()
+       })
+       AfterEach(func() {
+               s.TeardownTest()
+       })
+
+       for filename, tests := range masqueTests {
+               for _, test := range tests {
+                       test := test
+                       pc := reflect.ValueOf(test).Pointer()
+                       funcValue := runtime.FuncForPC(pc)
+                       testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
+                       It(testName, func(ctx SpecContext) {
+                               s.Log(testName + ": BEGIN")
+                               test(&s)
+                       }, SpecTimeout(TestTimeout))
+               }
+       }
+})
+
+var _ = Describe("MasqueSoloSuite", Ordered, ContinueOnFailure, Serial, func() {
+       var s MasqueSuite
+       BeforeAll(func() {
+               s.SetupSuite()
+       })
+       BeforeEach(func() {
+               s.SetupTest()
+       })
+       AfterAll(func() {
+               s.TeardownSuite()
+       })
+       AfterEach(func() {
+               s.TeardownTest()
+       })
+
+       for filename, tests := range masqueSoloTests {
+               for _, test := range tests {
+                       test := test
+                       pc := reflect.ValueOf(test).Pointer()
+                       funcValue := runtime.FuncForPC(pc)
+                       testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
+                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                               s.Log(testName + ": BEGIN")
+                               test(&s)
+                       }, SpecTimeout(TestTimeout))
+               }
+       }
+})
+
+var _ = Describe("MasqueMWSuite", Ordered, ContinueOnFailure, Serial, func() {
+       var s MasqueSuite
+       BeforeAll(func() {
+               s.SetupSuite()
+       })
+       BeforeEach(func() {
+               s.SkipIfNotEnoguhCpus = true
+       })
+       AfterAll(func() {
+               s.TeardownSuite()
+       })
+       AfterEach(func() {
+               s.TeardownTest()
+       })
+
+       for filename, tests := range masqueMWTests {
+               for _, test := range tests {
+                       test := test
+                       pc := reflect.ValueOf(test).Pointer()
+                       funcValue := runtime.FuncForPC(pc)
+                       testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
+                       It(testName, Label("SOLO", "VPP Multi-Worker"), func(ctx SpecContext) {
+                               s.Log(testName + ": BEGIN")
+                               test(&s)
+                       }, SpecTimeout(TestTimeout))
+               }
+       }
+})
index 3cf152e..666afd5 100644 (file)
@@ -275,6 +275,47 @@ func (s *HstSuite) StartWget(finished chan error, server_ip, port, query, netNs
        finished <- nil
 }
 
+func (s *HstSuite) StartCurl(finished chan error, uri, netNs, expectedRespCode string, timeout int, args []string) {
+       defer func() {
+               finished <- errors.New("curl error")
+       }()
+
+       c := []string{"curl", "-v", "-s", "-k", "--max-time", strconv.Itoa(timeout), "-o", "/dev/null", "--noproxy", "*"}
+       c = append(c, args...)
+       c = append(c, uri)
+       cmd := newCommand(c, netNs)
+       s.Log(cmd)
+       o, err := cmd.CombinedOutput()
+       s.Log(string(o))
+       if err != nil {
+               finished <- fmt.Errorf("curl error: '%v\n\n%s'", err, o)
+               return
+       } else if !strings.Contains(string(o), expectedRespCode) {
+               finished <- fmt.Errorf("curl error: response not " + expectedRespCode)
+               return
+       }
+       finished <- nil
+}
+
+func (s *HstSuite) StartIperfClient(finished chan error, clientAddress, serverAddress, serverPort, netNs string, args []string) {
+       defer func() {
+               finished <- errors.New("iperf client error")
+       }()
+
+       c := []string{"iperf3", "-c", serverAddress, "-B", clientAddress, "-J", "-l", "1460", "-b", "10g", "-p", serverPort}
+       c = append(c, args...)
+       cmd := newCommand(c, netNs)
+       s.Log(cmd)
+       o, err := cmd.CombinedOutput()
+       if err != nil {
+               finished <- fmt.Errorf("iperf client error: '%v\n\n%s'", err, o)
+               return
+       }
+       result := s.ParseJsonIperfOutput(o)
+       s.LogJsonIperfOutput(result)
+       finished <- nil
+}
+
 // Start a server app. 'processName' is used to check whether the app started correctly.
 func (s *HstSuite) StartServerApp(c *Container, processName string, cmd string,
        running chan error, done chan struct{}) {
index 43eaaf3..0db8099 100644 (file)
@@ -399,6 +399,19 @@ func (vpp *VppInstance) createAfPacket(veth *NetInterface, IPv6 bool, opts ...Af
 
        veth.Index = reply.SwIfIndex
 
+       // Get mac
+       if err := vpp.ApiStream.SendMsg(&interfaces.SwInterfaceDump{
+               SwIfIndex: reply.SwIfIndex,
+       }); err != nil {
+               return 0, err
+       }
+       replymsg, err = vpp.ApiStream.RecvMsg()
+       if err != nil {
+               return 0, err
+       }
+       ifDetails := replymsg.(*interfaces.SwInterfaceDetails)
+       veth.HwAddress = ifDetails.L2Address
+
        // Set to up
        upReq := &interfaces.SwInterfaceSetFlags{
                SwIfIndex: veth.Index,
index 2168134..5adce76 100644 (file)
@@ -10,6 +10,7 @@ import (
        "net"
        "net/http"
        "os"
+       "os/exec"
        "strconv"
        "strings"
        "sync"
@@ -33,6 +34,9 @@ func init() {
        RegisterVppUdpProxyMWTests(VppProxyUdpMigrationMWTest, VppConnectUdpStressMWTest)
        RegisterEnvoyProxyTests(EnvoyHttpGetTcpTest, EnvoyHttpPutTcpTest)
        RegisterNginxProxySoloTests(NginxMirroringTest, MirrorMultiThreadTest)
+       RegisterMasqueTests(VppConnectProxyClientDownloadTcpTest, VppConnectProxyClientDownloadUdpTest,
+               VppConnectProxyClientUploadTcpTest, VppConnectProxyClientUploadUdpTest)
+       RegisterMasqueSoloTests(VppConnectProxyIperfTcpTest, VppConnectProxyIperfUdpTest)
 }
 
 func VppProxyHttpGetTcpMWTest(s *VppProxySuite) {
@@ -659,3 +663,141 @@ func VppConnectUdpStressMWTest(s *VppUdpProxySuite) {
 
        vppConnectUdpStressLoad(s)
 }
+
+func VppConnectProxyClientDownloadTcpTest(s *MasqueSuite) {
+       s.StartNginxServer()
+       clientVpp := s.Containers.VppClient.VppInstance
+       s.ProxyClientConnect("tcp", s.Ports.NginxSsl)
+       cmd := fmt.Sprintf("http connect proxy client listener add listener tcp://0.0.0.0:%s", s.Ports.Nginx)
+       s.Log(clientVpp.Vppctl(cmd))
+       o := clientVpp.Vppctl("show http connect proxy client listeners")
+       s.Log(o)
+       s.AssertContains(o, "tcp://0.0.0.0:"+s.Ports.Nginx)
+       s.AssertContains(o, "tcp://0.0.0.0:"+s.Ports.NginxSsl)
+
+       uri := fmt.Sprintf("https://%s:%s/httpTestFile", s.NginxAddr(), s.Ports.NginxSsl)
+       finished := make(chan error, 1)
+       go func() {
+               defer GinkgoRecover()
+               s.StartCurl(finished, uri, s.NetNamespaces.Client, "200", 30, []string{"--http1.1"})
+       }()
+       s.Log(clientVpp.Vppctl("show http connect proxy client sessions"))
+       s.AssertNil(<-finished)
+}
+
+func VppConnectProxyClientDownloadUdpTest(s *MasqueSuite) {
+       s.StartNginxServer()
+       clientVpp := s.Containers.VppClient.VppInstance
+       s.ProxyClientConnect("udp", s.Ports.NginxSsl)
+       s.Log(clientVpp.Vppctl("show http connect proxy client listeners"))
+
+       uri := fmt.Sprintf("https://%s:%s/httpTestFile", s.NginxAddr(), s.Ports.NginxSsl)
+       finished := make(chan error, 1)
+       go func() {
+               defer GinkgoRecover()
+               s.StartCurl(finished, uri, s.NetNamespaces.Client, "200", 30, []string{"--http3-only"})
+       }()
+       s.AssertNil(<-finished)
+}
+
+func VppConnectProxyClientUploadTcpTest(s *MasqueSuite) {
+       s.StartNginxServer()
+       s.ProxyClientConnect("tcp", s.Ports.NginxSsl)
+
+       fileName := "/tmp/test_file"
+       defer os.Remove(fileName)
+       fallocate := exec.Command("fallocate", "-l", "10MB", fileName)
+       _, err := fallocate.CombinedOutput()
+       s.AssertNil(err)
+
+       uri := fmt.Sprintf("https://%s:%s/upload/testFile", s.NginxAddr(), s.Ports.NginxSsl)
+       finished := make(chan error, 1)
+       go func() {
+               defer GinkgoRecover()
+               s.StartCurl(finished, uri, s.NetNamespaces.Client, "201", 30, []string{"--http1.1", "-T", fileName})
+       }()
+       s.AssertNil(<-finished)
+}
+
+func VppConnectProxyClientUploadUdpTest(s *MasqueSuite) {
+       s.StartNginxServer()
+       s.ProxyClientConnect("udp", s.Ports.NginxSsl)
+
+       fileName := "/tmp/test_file"
+       defer os.Remove(fileName)
+       fallocate := exec.Command("fallocate", "-l", "10MB", fileName)
+       _, err := fallocate.CombinedOutput()
+       s.AssertNil(err)
+
+       uri := fmt.Sprintf("https://%s:%s/upload/testFile", s.NginxAddr(), s.Ports.NginxSsl)
+       finished := make(chan error, 1)
+       go func() {
+               defer GinkgoRecover()
+               s.StartCurl(finished, uri, s.NetNamespaces.Client, "201", 30, []string{"--http3-only", "-T", fileName})
+       }()
+       s.AssertNil(<-finished)
+}
+
+func VppConnectProxyIperfTcpTest(s *MasqueSuite) {
+       s.Containers.IperfServer.Run()
+       s.ProxyClientConnect("tcp", s.Ports.Nginx)
+       clientVpp := s.Containers.VppClient.VppInstance
+
+       stopServerCh := make(chan struct{})
+       srvCh := make(chan error, 1)
+
+       defer func() {
+               stopServerCh <- struct{}{}
+       }()
+
+       go func() {
+               defer GinkgoRecover()
+               c := "iperf3 -s -B " + s.NginxAddr() + " -p " + s.Ports.Nginx
+               s.StartServerApp(s.Containers.IperfServer, "iperf3", c, srvCh, stopServerCh)
+       }()
+       err := <-srvCh
+       s.AssertNil(err, fmt.Sprint(err))
+       s.Log("server running")
+
+       finished := make(chan error, 1)
+       go func() {
+               defer GinkgoRecover()
+               s.StartIperfClient(finished, s.Interfaces.Client.Peer.Ip4AddressString(), s.NginxAddr(), s.Ports.Nginx,
+                       s.NetNamespaces.Client, []string{"-P", "4"})
+       }()
+       s.Log(clientVpp.Vppctl("show http connect proxy client sessions"))
+       s.AssertNil(<-finished)
+}
+
+func VppConnectProxyIperfUdpTest(s *MasqueSuite) {
+       s.Containers.IperfServer.Run()
+       s.ProxyClientConnect("udp", s.Ports.Nginx)
+       clientVpp := s.Containers.VppClient.VppInstance
+       cmd := fmt.Sprintf("http connect proxy client listener add listener tcp://0.0.0.0:%s", s.Ports.Nginx)
+       s.Log(clientVpp.Vppctl(cmd))
+
+       stopServerCh := make(chan struct{})
+       srvCh := make(chan error, 1)
+
+       defer func() {
+               stopServerCh <- struct{}{}
+       }()
+
+       go func() {
+               defer GinkgoRecover()
+               c := "iperf3 -s -B " + s.NginxAddr() + " -p " + s.Ports.Nginx
+               s.StartServerApp(s.Containers.IperfServer, "iperf3", c, srvCh, stopServerCh)
+       }()
+       err := <-srvCh
+       s.AssertNil(err, fmt.Sprint(err))
+       s.Log("server running")
+
+       finished := make(chan error, 1)
+       go func() {
+               defer GinkgoRecover()
+               s.StartIperfClient(finished, s.Interfaces.Client.Peer.Ip4AddressString(), s.NginxAddr(), s.Ports.Nginx,
+                       s.NetNamespaces.Client, []string{"-u", "-P", "4"})
+       }()
+       s.Log(clientVpp.Vppctl("show http connect proxy client sessions"))
+       s.AssertNil(<-finished)
+}
diff --git a/test-c/hs-test/resources/nginx/nginx_masque.conf b/test-c/hs-test/resources/nginx/nginx_masque.conf
new file mode 100644 (file)
index 0000000..2377329
--- /dev/null
@@ -0,0 +1,37 @@
+master_process on;
+worker_processes 1;
+worker_rlimit_nofile 10240;
+daemon off;
+
+error_log /tmp/nginx/{{.LogPrefix}}-error.log info;
+
+events {
+   use epoll;
+   accept_mutex       off;
+   multi_accept       off;
+}
+
+http {
+  quic_retry off;
+
+  access_log /tmp/nginx/{{.LogPrefix}}-access.log;
+  keepalive_timeout 300s;
+  sendfile on;
+  server {
+    listen {{.Address}}:{{.Port}};
+    listen {{.Address}}:{{.PortSsl}} quic;
+    listen {{.Address}}:{{.PortSsl}} ssl;
+    root /usr/share/nginx;
+    ssl_certificate     /etc/nginx/ssl/localhost.crt;
+    ssl_certificate_key /etc/nginx/ssl/localhost.key;
+    index index.html index.htm;
+    location ~ "/upload/([0-9a-zA-Z-.]*)$" {
+      alias /usr/share/nginx/upload/$1;
+      client_body_temp_path /tmp;
+      client_max_body_size 200M;
+      dav_methods PUT;
+      create_full_put_path off;
+      dav_access all:rw;
+    }
+  }
+}
diff --git a/test-c/hs-test/topo-containers/masque.yaml b/test-c/hs-test/topo-containers/masque.yaml
new file mode 100644 (file)
index 0000000..7ea8575
--- /dev/null
@@ -0,0 +1,34 @@
+---
+volumes:
+  - volume: &shared-vol
+      host-dir: "$HST_VOLUME_DIR/shared"
+
+containers:
+  - name: "vpp-masque-client"
+    volumes:
+      - host-dir: "$HST_VOLUME_DIR/client"
+        container-dir: "/tmp/vpp_client"
+        is-default-work-dir: true
+
+  - name: "vpp-masque-server"
+    volumes:
+      - host-dir: "$HST_VOLUME_DIR/server"
+        container-dir: "/tmp/vpp_server"
+        is-default-work-dir: true
+
+  - name: "nginx-server"
+    volumes:
+      - <<: *shared-vol
+        container-dir: "/tmp/nginx"
+        is-default-work-dir: true
+      - host-dir: $HST_DIR/resources/cert
+        container-dir: "/etc/nginx/ssl"
+    image: "hs-test/nginx-server"
+    is-optional: true
+
+  - name: "iperf-server"
+    volumes:
+      - <<: *shared-vol
+        container-dir: "/tmp/vpp"
+        is-default-work-dir: true
+    is-optional: true
diff --git a/test-c/hs-test/topo-network/masque.yaml b/test-c/hs-test/topo-network/masque.yaml
new file mode 100644 (file)
index 0000000..f93e51b
--- /dev/null
@@ -0,0 +1,40 @@
+---
+devices:
+  - name: "client-ns"
+    type: "netns"
+
+  - name: "cln"
+    type: "veth"
+    preset-hw-address: "00:00:5e:00:53:03"
+    peer:
+      name: "mcln"
+      netns: "client-ns"
+      ip4:
+        network: 1
+
+  - name: "cln-tun"
+    type: "veth"
+    peer:
+      name: "mtuncln"
+      ip4:
+        network: 2
+
+  - name: "srv-tun"
+    type: "veth"
+    peer:
+      name: "mtunsrv"
+      ip4:
+        network: 2
+
+  - name: "srv"
+    type: "veth"
+    peer:
+      name: "msrv"
+      ip4:
+        network: 3
+
+  - name: "br"
+    type: "bridge"
+    interfaces:
+      - mtuncln
+      - mtunsrv