urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-03 01:54:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactors proxy domain parsing and validation

Browse Source
This commit is contained in:
Joe Bryan 2019-01-10 13:42:30 -05:00
parent a20508b49d
commit 280ff87251
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
vere/http.c
View File

@ -2566,45 +2566,52 @@ _proxy_parse_sni(const uv_buf_t* buf_u, c3_c** hot_c)
return u3_pars_good; 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 static u3_noun
_proxy_parse_ship(c3_c* hot_c) _proxy_parse_ship(c3_c* hot_c)
{ {
u3_noun sip = u3_nul;
c3_c* dom_c;
if ( 0 == hot_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;
} }
} }
@ -2623,8 +2630,9 @@ _proxy_dest(u3_pcon* con_u, u3_noun sip)
_proxy_loop_connect(con_u); _proxy_loop_connect(con_u);
} }
else { 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
//
_proxy_ward_start(con_u, u3k(hip)); _proxy_ward_start(con_u, u3k(hip));
} }
} }