Merge pull request #1131 from urbit/proxy-retouch

tcp proxy cleanup

include/noun/retrieve.h

@@ -402,6 +402,16 @@
                   c3_w*   c_w,
                   u3_atom d);
 
+      /* u3r_chubs():
+      **
+      **  Copy double-words (a_w) through (a_w + b_w - 1) from (d) to (c).
+      */
+        void
+        u3r_chubs(c3_w    a_w,
+                  c3_w    b_w,
+                  c3_d*   c_d,
+                  u3_atom d);
+
       /* u3r_string(): `a`, a text atom, as malloced C string.
       */
         c3_c*

include/vere/vere.h

@@ -133,7 +133,7 @@
         c3_w             ipf_w;             //  ward ip
         c3_s             por_s;             //  ward port
         c3_o             sec;               //  secure connection
-        u3_atom          sip;               //  ward ship
+        c3_d             who_d[2];          //  ward ship
         c3_c*            hot_c;             //  ward hostname
         uv_buf_t         non_u;             //  nonce
         struct _u3_http* htp_u;             //  local server backlink
@@ -154,7 +154,7 @@
       typedef struct _u3_ward {
         uv_tcp_t         tcp_u;             //  listener handle
         uv_timer_t       tim_u;             //  expiration timer
-        u3_atom          sip;               //  reverse proxy for ship
+        c3_d             who_d[2];          //  reverse proxy for ship
         c3_s             por_s;             //  listening on port
         uv_buf_t         non_u;             //  nonce
         struct _u3_wcon* won_u;             //  candidate upstream connections

noun/retrieve.c

@@ -1352,6 +1352,21 @@ u3r_words(c3_w    a_w,
   }
 }
 
+/* u3r_chubs():
+**
+**  Copy double-words (a_w) through (a_w + b_w - 1) from (d) to (c).
+*/
+void
+u3r_chubs(c3_w    a_w,
+          c3_w    b_w,
+          c3_d*   c_d,
+          u3_atom d)
+{
+  /* XX: assumes little-endian
+  */
+  u3r_words(a_w * 2, b_w * 2, (c3_w *)c_d, d);
+}
+
 /* u3r_chop():
 **
 **   Into the bloq space of `met`, from position `fum` for a

vere/http.c

@@ -41,6 +41,10 @@ static void _http_form_free(void);
 
 static const c3_i TCP_BACKLOG = 16;
 
+//  XX temporary, add to u3_http_ef_form
+//
+#define PROXY_DOMAIN "arvo.network"
+
 /* _http_vec_to_meth(): convert h2o_iovec_t to meth
 */
 static u3_weak
@@ -1652,22 +1656,32 @@ _proxy_warc_free(u3_warc* cli_u)
 /* _proxy_warc_new(): allocate ship-specific proxy client
 */
 static u3_warc*
-_proxy_warc_new(u3_http* htp_u, u3_atom sip, c3_s por_s, c3_o sec)
+_proxy_warc_new(u3_http* htp_u, u3_atom sip, u3_atom non, c3_s por_s, c3_o sec)
 {
-  u3_warc* cli_u = c3_malloc(sizeof(*cli_u));
+  u3_warc* cli_u = c3_calloc(sizeof(*cli_u));
   cli_u->htp_u = htp_u;
   cli_u->por_s = por_s;
-  // XX set here instead of u3_http_ef_that() ?
-  cli_u->non_u = uv_buf_init(0, 0);
-  cli_u->sip = sip;
   cli_u->sec = sec;
-  // XX set here instead of _proxy_ward_resolve() ?
-  cli_u->hot_c = 0;
-  cli_u->nex_u = 0;
-  cli_u->pre_u = 0;
 
+  u3r_chubs(0, 2, cli_u->who_d, sip);
   _proxy_warc_link(cli_u);
 
+  {
+    c3_w len_w = u3r_met(3, non);
+
+    c3_assert( 256 > len_w );
+
+    c3_y* non_y = c3_malloc(1 + len_w);
+    non_y[0] = (c3_y)len_w;
+
+    u3r_bytes(0, len_w, non_y + 1, non);
+
+    cli_u->non_u = uv_buf_init((c3_c*)non_y, 1 + len_w);
+  }
+
+  u3z(non);
+  u3z(sip);
+
   return cli_u;
 }
 
@@ -2133,7 +2147,6 @@ _proxy_ward_free(uv_handle_t* han_u)
 {
   u3_ward* rev_u = han_u->data;
 
-  u3z(rev_u->sip);
   free(rev_u->non_u.base);
   free(rev_u);
 }
@@ -2168,18 +2181,16 @@ _proxy_ward_close(u3_ward* rev_u)
 static u3_ward*
 _proxy_ward_new(u3_pcon* con_u, u3_atom sip)
 {
-  u3_ward* rev_u = c3_malloc(sizeof(*rev_u));
+  u3_ward* rev_u = c3_calloc(sizeof(*rev_u));
   rev_u->tcp_u.data = rev_u;
   rev_u->tim_u.data = rev_u;
   rev_u->con_u = con_u;
-  rev_u->sip = sip;
-  rev_u->por_s = 0; // set after opened
-  rev_u->won_u = 0;
-  rev_u->nex_u = 0;
-  rev_u->pre_u = 0;
 
+  u3r_chubs(0, 2, rev_u->who_d, sip);
   _proxy_ward_link(con_u, rev_u);
 
+  u3z(sip);
+
   return rev_u;
 }
 
@@ -2204,11 +2215,10 @@ _proxy_wcon_peek_read_cb(uv_stream_t* upt_u,
 
     c3_w len_w = rev_u->non_u.len;
 
-    // XX await further reads if siz_w < len_w ?
     if ( ((len_w + 1) != siz_w) ||
          (len_w != buf_u->base[0]) ||
          (0 != memcmp(rev_u->non_u.base, buf_u->base + 1, len_w)) ) {
-      uL(fprintf(uH, "proxy: ward auth fail\n"));
+      // uL(fprintf(uH, "proxy: ward auth fail\n"));
       _proxy_wcon_unlink(won_u);
       _proxy_wcon_close(won_u);
     }
@@ -2289,14 +2299,31 @@ _proxy_ward_timer_cb(uv_timer_t* tim_u)
 static void
 _proxy_ward_plan(u3_ward* rev_u)
 {
+  u3_noun non;
+
+  {
+    c3_w* non_w = c3_malloc(64);
+    c3_w  len_w;
+
+    c3_rand(non_w);
+
+    non = u3i_words(16, non_w);
+    len_w = u3r_met(3, non);
+
+    //  the nonce is saved to authenticate u3_wcon
+    //  and will be freed with u3_ward
+    //
+    rev_u->non_u = uv_buf_init((c3_c*)non_w, len_w);
+  }
+
   // XX confirm duct
   u3_noun pax = u3nq(u3_blip, c3__http, c3__prox,
                      u3nc(u3k(u3A->sen), u3_nul));
 
-  u3_noun wis = u3nc(c3__wise, u3nq(u3k(rev_u->sip),
+  u3_noun wis = u3nc(c3__wise, u3nq(u3i_chubs(2, rev_u->who_d),
                                     rev_u->por_s,
                                     u3k(rev_u->con_u->sec),
-                                    u3i_words(16, (c3_w*)rev_u->non_u.base)));
+                                    non));
   u3v_plan(pax, wis);
 }
 
@@ -2305,7 +2332,7 @@ _proxy_ward_plan(u3_ward* rev_u)
 static void
 _proxy_ward_start(u3_pcon* con_u, u3_noun sip)
 {
-  u3_ward* rev_u = _proxy_ward_new(con_u, sip);
+  u3_ward* rev_u = _proxy_ward_new(con_u, u3k(sip));
 
   uv_tcp_init(u3L, &rev_u->tcp_u);
 
@@ -2333,28 +2360,27 @@ _proxy_ward_start(u3_pcon* con_u, u3_noun sip)
 
     rev_u->por_s = ntohs(add_u.sin_port);
 
+#if 0
     {
-      c3_w* non_w = c3_malloc(64);
+      u3_noun who = u3dc("scot", 'p', u3k(sip));
-
+      c3_c* who_c = u3r_string(who);
-      c3_rand(non_w);
+      fprintf(stderr, "\r\nward for %s started on %u\r\n", who_c, rev_u->por_s);
-
+      free(who_c);
-      u3_noun non = u3i_words(16, non_w);
+      u3z(who);
-      c3_w len_w = u3r_met(3, non);
-
-      rev_u->non_u = uv_buf_init((c3_c*)non_w, len_w);
-
-      u3z(non);
     }
+#endif
 
     _proxy_ward_plan(rev_u);
 
+    //  XX how long?
+    //
     uv_timer_init(u3L, &rev_u->tim_u);
-
-    // XX how long?
     uv_timer_start(&rev_u->tim_u, _proxy_ward_timer_cb, 300 * 1000, 0);
 
     // XX u3_lo_shut(c3y);
   }
+
+  u3z(sip);
 }
 
 /* _proxy_ward_connect_cb(): ward connection callback
@@ -2451,16 +2477,15 @@ _proxy_ward_resolve(u3_warc* cli_u)
   hin_u.ai_socktype = SOCK_STREAM;
   hin_u.ai_protocol = IPPROTO_TCP;
 
+  //  XX why the conditional?
+  //
   if ( 0 == cli_u->hot_c ) {
-    // XX revisit
+    u3_noun sip = u3dc("scot", 'p', u3i_chubs(2, cli_u->who_d));
-    c3_assert( 0 != u3_Host.sam_u.dns_c );
-
-    u3_noun sip = u3dc("scot", 'p', u3k(cli_u->sip));
     c3_c* sip_c = u3r_string(sip);
-    c3_w len_w = 1 + strlen(sip_c) + strlen(u3_Host.sam_u.dns_c);
+    c3_w len_w = 1 + strlen(sip_c) + strlen(PROXY_DOMAIN);
     cli_u->hot_c = c3_malloc(len_w);
     // incremented to skip '~'
-    snprintf(cli_u->hot_c, len_w, "%s.%s", sip_c + 1, u3_Host.sam_u.dns_c);
+    snprintf(cli_u->hot_c, len_w, "%s.%s", sip_c + 1, PROXY_DOMAIN);
 
     free(sip_c);
     u3z(sip);
@@ -2554,45 +2579,52 @@ _proxy_parse_sni(const uv_buf_t* buf_u, c3_c** hot_c)
   return u3_pars_good;
 }
 
-/* _proxy_parse_ship(): determine destination for proxied request
+/* _proxy_parse_ship(): determine destination (unit ship) for proxied request
 */
 static u3_noun
 _proxy_parse_ship(c3_c* hot_c)
 {
-  u3_noun sip = u3_nul;
-  c3_c* dom_c;
-
   if ( 0 == hot_c ) {
-    return sip;
+    return u3_nul;
   }
+  else {
+    c3_c* dom_c = strchr(hot_c, '.');
 
-  dom_c = strchr(hot_c, '.');
+    if ( 0 == dom_c ) {
+      return u3_nul;
+    }
+    else {
+      //  length of the first subdomain
+      //
+      c3_w dif_w = dom_c - hot_c;
+      c3_w dns_w = strlen(PROXY_DOMAIN);
 
-  if ( 0 == dom_c ) {
+      //  validate that everything after the first subdomain
-    return sip;
+      //  matches the proxy domain
-  }
+      //  (skipped if networking is disabled)
+      //
+      if ( (c3y == u3_Host.ops_u.net) &&
+           ( (dns_w != strlen(hot_c) - (dif_w + 1)) ||
+             (0 != strncmp(dom_c + 1, PROXY_DOMAIN, dns_w)) ) )
+      {
+        return u3_nul;
+      }
+      else {
+        //  attempt to parse the first subdomain as a @p
+        //
+        u3_noun sip;
+        c3_c* sip_c = c3_malloc(2 + dif_w);
 
-  // XX revisit
+        strncpy(sip_c + 1, hot_c, dif_w);
-  c3_assert( 0 != u3_Host.sam_u.dns_c );
+        sip_c[0] = '~';
+        sip_c[1 + dif_w] = 0;
 
-  c3_w dif_w = dom_c - hot_c;
+        sip = u3dc("slaw", 'p', u3i_string(sip_c));
-  c3_w dns_w = strlen(u3_Host.sam_u.dns_c);
+        free(sip_c);
 
-  if ( (dns_w != strlen(hot_c) - (dif_w + 1)) ||
+        return sip;
-       (0 != strncmp(dom_c + 1, u3_Host.sam_u.dns_c, dns_w)) ) {
+      }
-    return sip;
+    }
-  }
-
-  {
-    c3_c* sip_c = c3_malloc(2 + dif_w);
-    strncpy(sip_c + 1, hot_c, dif_w);
-    sip_c[0] = '~';
-    sip_c[1 + dif_w] = 0;
-
-    sip = u3dc("slaw", 'p', u3i_string(sip_c));
-    free(sip_c);
-
-    return sip;
   }
 }
 
@@ -2611,9 +2643,9 @@ _proxy_dest(u3_pcon* con_u, u3_noun sip)
       _proxy_loop_connect(con_u);
     }
     else {
-      // XX check if (sein:title sip) == our
+      //  XX we should u3v_peek %j /=sein= to confirm
-      // XX check will
+      //  that we're sponsoring this ship
-      // XX extract bytes from hip, this could leak
+      //
       _proxy_ward_start(con_u, u3k(hip));
     }
   }
@@ -2657,7 +2689,7 @@ _proxy_peek(u3_pcon* con_u)
     }
   }
 
-  if ( 0 !=  hot_c ) {
+  if ( 0 != hot_c ) {
     free(hot_c);
   }
 }
@@ -2855,50 +2887,39 @@ u3_http_ef_that(u3_noun tat)
        !( c3y == sec || c3n == sec ) ||
        ( c3n == u3ud(non) ) ) {
     uL(fprintf(uH, "http: that: invalid card\n"));
-    u3z(tat);
-    return;
   }
+  else {
+    u3_http* htp_u;
+    u3_warc* cli_u;
 
-  u3_http* htp_u;
+    for ( htp_u = u3_Host.htp_u; (0 != htp_u); htp_u = htp_u->nex_u ) {
-  u3_warc* cli_u;
+      if ( c3n == htp_u->lop && sec == htp_u->sec ) {
+        break;
+      }
+    }
 
-  for ( htp_u = u3_Host.htp_u; (0 != htp_u); htp_u = htp_u->nex_u ) {
+    //  XX we should inform our sponsor if we aren't running a server
-    if ( c3n == htp_u->lop && sec == htp_u->sec ) {
+    //  so this situation can be avoided
-      break;
+    //
+    if ( 0 == htp_u ) {
+      uL(fprintf(uH, "http: that: no %s server\n", (c3y == sec) ?
+                                                   "secure" : "insecure"));
+    }
+    else {
+      cli_u = _proxy_warc_new(htp_u, (u3_atom)u3k(sip), (u3_atom)u3k(non),
+                                                    (c3_s)por, (c3_o)sec);
+
+      //  resolve to loopback if networking is disabled
+      //
+      if ( c3n == u3_Host.ops_u.net ) {
+        cli_u->ipf_w = INADDR_LOOPBACK;
+        _proxy_ward_connect(cli_u);
+      }
+      else {
+        _proxy_ward_resolve(cli_u);
+      }
     }
   }
 
-  if ( 0 == htp_u ) {
-    uL(fprintf(uH, "http: that: no %s server\n", (c3y == sec) ?
-                                                 "secure" : "insecure"));
-    u3z(tat);
-    return;
-  }
-
-  // XX extract bytes from sip, this could leak
-  cli_u = _proxy_warc_new(htp_u, (u3_atom)sip, (c3_s)por, (c3_o)sec);
-
-  // XX add to constructor
-  c3_w len_w = u3r_met(3, non);
-
-  c3_assert( 256 > len_w );
-
-  c3_y* non_y = c3_malloc(1 + len_w);
-  non_y[0] = (c3_y)len_w;
-
-  u3r_bytes(0, len_w, non_y + 1, non);
-
-  cli_u->non_u = uv_buf_init((c3_c*)non_y, 1 + len_w);
-
-
-  if ( c3n == u3_Host.ops_u.net ) {
-    cli_u->ipf_w = INADDR_LOOPBACK;
-    _proxy_ward_connect(cli_u);
-    u3z(tat);
-    return;
-  }
-
-  _proxy_ward_resolve(cli_u);
-
   u3z(tat);
 }