Mirrors
/
libwebsockets
mirror of https://github.com/warmcat/libwebsockets.git
1
0
Fork 0
Code Issues Releases Wiki Activity

client: improve redirect

This commit is contained in:
Andy Green 2019-08-26 18:41:40 +01:00
parent d808748cd6
commit 49f78ed0d7
9 changed files with 159 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
lib/core-net/close.c
View File

@ -24,12 +24,53 @@
#include "private-lib-core.h"
#if defined(LWS_WITH_CLIENT)
static int
lws_close_trans_q_leader(struct lws_dll2 *d, void *user)
{
struct lws *w = lws_container_of(d, struct lws, dll2_cli_txn_queue);
__lws_close_free_wsi(w, -1, "trans q leader closing");
return 0;
}
#endif
void
__lws_free_wsi(struct lws *wsi)
__lws_reset_wsi(struct lws *wsi)
{
if (!wsi)
return;
#if defined(LWS_WITH_CLIENT)
lws_free_set_NULL(wsi->cli_hostname_copy);
/*
* if we have wsi in our transaction queue, if we are closing we
* must go through and close all those first
*/
if (wsi->vhost) {
/* we are no longer an active client connection that can piggyback */
lws_dll2_remove(&wsi->dll_cli_active_conns);
lws_dll2_foreach_safe(&wsi->dll2_cli_txn_queue_owner, NULL,
lws_close_trans_q_leader);
/*
* !!! If we are closing, but we have pending pipelined
* transaction results we already sent headers for, that's going
* to destroy sync for HTTP/1 and leave H2 stream with no live
* swsi.`
*
* However this is normal if we are being closed because the
* transaction queue leader is closing.
*/
lws_dll2_remove(&wsi->dll2_cli_txn_queue);
}
#endif
/*
* Protocol user data may be allocated either internally by lws
* or by specified the user. We should only free what we allocated.
@ -42,6 +83,20 @@ __lws_free_wsi(struct lws *wsi)
lws_buflist_destroy_all_segments(&wsi->buflist_out);
lws_free_set_NULL(wsi->udp);
#if defined(LWS_WITH_CLIENT)
lws_dll2_remove(&wsi->dll2_cli_txn_queue);
lws_dll2_remove(&wsi->dll_cli_active_conns);
#endif
#if defined(LWS_WITH_ASYNC_DNS)
lws_async_dns_cancel(wsi);
#endif
#if defined(LWS_WITH_HTTP_PROXY)
if (wsi->http.buflist_post_body)
lws_buflist_destroy_all_segments(&wsi->http.buflist_post_body);
#endif
if (wsi->vhost && wsi->vhost->lserv_wsi == wsi)
wsi->vhost->lserv_wsi = NULL;
#if defined(LWS_WITH_CLIENT)
@ -50,18 +105,12 @@ __lws_free_wsi(struct lws *wsi)
#endif
wsi->context->count_wsi_allocated--;
#if defined(LWS_ROLE_H1) || defined(LWS_ROLE_H2)
__lws_header_table_detach(wsi, 0);
#endif
__lws_same_vh_protocol_remove(wsi);
#if defined(LWS_WITH_CLIENT)
lws_free_set_NULL(wsi->stash);
lws_free_set_NULL(wsi->cli_hostname_copy);
#endif
if (wsi->role_ops->destroy_role)
wsi->role_ops->destroy_role(wsi);
#if defined(LWS_WITH_PEER_LIMITS)
lws_peer_track_wsi_close(wsi->context, wsi->peer);
wsi->peer = NULL;
@ -74,6 +123,23 @@ __lws_free_wsi(struct lws *wsi)
#endif
__lws_wsi_remove_from_sul(wsi);
if (wsi->role_ops->destroy_role)
wsi->role_ops->destroy_role(wsi);
#if defined(LWS_ROLE_H1) || defined(LWS_ROLE_H2)
__lws_header_table_detach(wsi, 0);
#endif
}
void
__lws_free_wsi(struct lws *wsi)
{
if (!wsi)
return;
__lws_reset_wsi(wsi);
if (wsi->context->event_loop_ops->destroy_wsi)
wsi->context->event_loop_ops->destroy_wsi(wsi);
@ -120,16 +186,6 @@ lws_remove_child_from_any_parent(struct lws *wsi)
}
#if defined(LWS_WITH_CLIENT)
static int
lws_close_trans_q_leader(struct lws_dll2 *d, void *user)
{
struct lws *w = lws_container_of(d, struct lws, dll2_cli_txn_queue);
__lws_close_free_wsi(w, -1, "trans q leader closing");
return 0;
}
void
lws_inform_client_conn_fail(struct lws *wsi, void *arg, size_t len)
{
@ -174,9 +230,6 @@ __lws_close_free_wsi(struct lws *wsi, enum lws_close_status reason,
struct lws_context_per_thread *pt;
struct lws *wsi1, *wsi2;
struct lws_context *context;
#if defined(LWS_WITH_CLIENT)
long rl = (long)(int)reason;
#endif
int n;
lwsl_info("%s: %p: caller: %s\n", __func__, wsi, caller);
@ -195,35 +248,6 @@ __lws_close_free_wsi(struct lws *wsi, enum lws_close_status reason,
lws_free_set_NULL(wsi->cli_hostname_copy);
lws_addrinfo_clean(wsi);
/*
* if we have wsi in our transaction queue, if we are closing we
* must go through and close all those first
*/
if (wsi->vhost) {
/* we are no longer an active client connection that can piggyback */
lws_dll2_remove(&wsi->dll_cli_active_conns);
if (rl != -1l)
lws_vhost_lock(wsi->vhost);
lws_dll2_foreach_safe(&wsi->dll2_cli_txn_queue_owner, NULL,
lws_close_trans_q_leader);
/*
* !!! If we are closing, but we have pending pipelined
* transaction results we already sent headers for, that's going
* to destroy sync for HTTP/1 and leave H2 stream with no live
* swsi.`
*
* However this is normal if we are being closed because the
* transaction queue leader is closing.
*/
lws_dll2_remove(&wsi->dll2_cli_txn_queue);
if (rl != -1l)
lws_vhost_unlock(wsi->vhost);
}
#endif
/* if we have children, close them first */

3
lib/core-net/service.c
View File

@ -517,6 +517,8 @@ lws_service_flag_pending(struct lws_context *context, int tsi)
struct lws *wsi = lws_container_of(p, struct lws,
tls.dll_pending_tls);
if (wsi->position_in_fds_table >= 0) {
pt->fds[wsi->position_in_fds_table].revents |=
pt->fds[wsi->position_in_fds_table].events & LWS_POLLIN;
if (pt->fds[wsi->position_in_fds_table].revents & LWS_POLLIN) {
@ -529,6 +531,7 @@ lws_service_flag_pending(struct lws_context *context, int tsi)
*/
__lws_ssl_remove_wsi_from_buffered_list(wsi);
}
}
} lws_end_foreach_dll_safe(p, p1);
#endif

3
lib/core-net/wsi-timeout.c
View File

@ -35,6 +35,9 @@ __lws_wsi_remove_from_sul(struct lws *wsi)
// lws_dll2_describe(&pt->pt_sul_owner, "pre-remove");
lws_dll2_remove(&wsi->sul_timeout.list);
lws_dll2_remove(&wsi->sul_hrtimer.list);
#if defined(LWS_ROLE_WS)
lws_dll2_remove(&wsi->sul_ping.list);
#endif
// lws_dll2_describe(&pt->pt_sul_owner, "post-remove");
}

12
lib/roles/h2/http2.c
View File

@ -1406,9 +1406,7 @@ lws_h2_parse_end_of_frame(struct lws *wsi)
#if defined(LWS_WITH_CLIENT)
if (h2n->swsi->client_h2_substream) {
if (lws_client_interpret_server_handshake(h2n->swsi)) {
lws_h2_rst_stream(h2n->swsi,
H2_ERR_STREAM_CLOSED,
"protocol CLI_EST closed it");
lwsl_info("%s: cli int serv hs closed it\n", __func__);
break;
}
}
@ -1912,15 +1910,17 @@ lws_h2_parser(struct lws *wsi, unsigned char *in, lws_filepos_t inlen,
}
#if defined(LWS_WITH_CLIENT)
if (h2n->swsi->client_h2_substream) {
if (h2n->swsi->protocol) {
if (!h2n->swsi->protocol) {
lwsl_err("%s: swsi %pdoesn't have protocol\n", __func__, h2n->swsi);
m = 1;
} else
m = user_callback_handle_rxflow(
h2n->swsi->protocol->callback,
h2n->swsi,
LWS_CALLBACK_RECEIVE_CLIENT_HTTP_READ,
h2n->swsi->user_space,
in - 1, n);
} else
m = 1;
in += n - 1;
h2n->inside += n;
h2n->count += n - 1;

8
lib/roles/h2/ops-h2.c
View File

@ -630,6 +630,10 @@ rops_close_kill_connection_h2(struct lws *wsi, enum lws_close_status reason)
if (wsi->http2_substream && wsi->h2_stream_carries_ws)
lws_h2_rst_stream(wsi, 0, "none");
/* else
if (wsi->http2_substream)
lws_h2_rst_stream(wsi, H2_ERR_STREAM_CLOSED, "swsi got closed");
*/
if (wsi->h2.parent_wsi && lwsl_visible(LLL_INFO)) {
lwsl_info(" wsi: %p, his parent %p: siblings:\n", wsi,
@ -691,15 +695,15 @@ rops_close_kill_connection_h2(struct lws *wsi, enum lws_close_status reason)
#endif
wsi->http2_substream) &&
wsi->h2.parent_wsi) {
lwsl_info(" %p: disentangling from siblings\n", wsi);
lws_start_foreach_llp(struct lws **, w,
wsi->h2.parent_wsi->h2.child_list) {
/* disconnect from siblings */
if (*w == wsi) {
wsi2 = (*w)->h2.sibling_list;
(*w)->h2.sibling_list = NULL;
*w = wsi2;
lwsl_info(" %p disentangled from sibling %p\n",
lwsl_debug(" %p disentangled from sibling %p\n",
wsi, wsi2);
break;
}

67
lib/roles/http/client/client-handshake.c
View File

@ -534,7 +534,7 @@ ads_known:
else
iface = lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_IFACE);
if (iface) {
if (iface && *iface) {
n = lws_socket_bind(wsi->vhost, wsi->desc.sockfd, 0,
iface, wsi->ipv6);
if (n < 0)
@ -707,13 +707,19 @@ lws_client_connect_2_dnsreq(struct lws *wsi)
else
meth = lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_METHOD);
if (meth && strcmp(meth, "GET") && strcmp(meth, "POST"))
if (meth && strcmp(meth, "GET") && strcmp(meth, "POST")) {
lwsl_debug("%s: new conn on meth\n", __func__);
goto create_new_conn;
}
/* we only pipeline connections that said it was okay */
if (!wsi->client_pipeline)
if (!wsi->client_pipeline) {
lwsl_debug("%s: new conn on no pipeline flag\n", __func__);
goto create_new_conn;
}
/*
* let's take a look first and see if there are any already-active
@ -729,8 +735,8 @@ lws_client_connect_2_dnsreq(struct lws *wsi)
struct lws *w = lws_container_of(d, struct lws,
dll_cli_active_conns);
lwsl_debug("%s: check %s %s %d %d\n", __func__, adsin,
w->cli_hostname_copy, wsi->c_port, w->c_port);
// lwsl_notice("%s: check %s %s %d %d\n", __func__, adsin,
// w->cli_hostname_copy, wsi->c_port, w->c_port);
if (w != wsi && w->cli_hostname_copy &&
!strcmp(adsin, w->cli_hostname_copy) &&
@ -1008,18 +1014,33 @@ lws_client_reset(struct lws **pwsi, int ssl, const char *address, int port,
wsi = *pwsi;
lwsl_debug("%s: wsi %p: redir %d: %s\n", __func__, wsi, wsi->redirects,
address);
if (wsi->redirects == 3) {
lwsl_err("%s: Too many redirects\n", __func__);
return NULL;
}
wsi->redirects++;
/*
* goal is to close our role part, close the sockfd, detach the ah
* but leave our wsi extant and still bound to whatever vhost it was
*/
for (n = 0; n < (int)LWS_ARRAY_SIZE(hnames2); n++)
size += lws_hdr_total_length(wsi, hnames2[n]) + 1;
if ((int)size < lws_hdr_total_length(wsi, _WSI_TOKEN_CLIENT_URI) + 1)
size = lws_hdr_total_length(wsi, _WSI_TOKEN_CLIENT_URI) + 1;
/*
* The incoming address and host can be from inside the existing ah
* we are going to detach and reattch
*/
size += strlen(address) + 1 + strlen(host) + 1;
p = stash = lws_malloc(size, __func__);
if (!stash)
return NULL;
@ -1032,13 +1053,23 @@ lws_client_reset(struct lws **pwsi, int ssl, const char *address, int port,
} else
*p++ = '\0';
memcpy(p, address, strlen(address) + 1);
address = p;
p += strlen(address) + 1;
memcpy(p, host, strlen(host) + 1);
host = p;
if (!port) {
port = 443;
ssl = 1;
}
lwsl_info("redirect ads='%s', port=%d, path='%s', ssl = %d\n",
address, port, path, ssl);
lwsl_info("redirect ads='%s', port=%d, path='%s', ssl = %d, pifds %d\n",
address, port, path, ssl, wsi->position_in_fds_table);
__remove_wsi_socket_from_fds(wsi);
__lws_reset_wsi(wsi); /* detaches ah here */
wsi->client_pipeline = 1;
/* close the connection by hand */
@ -1046,7 +1077,8 @@ lws_client_reset(struct lws **pwsi, int ssl, const char *address, int port,
lws_ssl_close(wsi);
#endif
__remove_wsi_socket_from_fds(wsi);
if (wsi->role_ops && wsi->role_ops->close_kill_connection)
wsi->role_ops->close_kill_connection(wsi, 1);
if (wsi->context->event_loop_ops->close_handle_manually)
wsi->context->event_loop_ops->close_handle_manually(wsi);
@ -1063,13 +1095,26 @@ lws_client_reset(struct lws **pwsi, int ssl, const char *address, int port,
}
#endif
if (wsi->protocol && wsi->role_ops && wsi->protocol_bind_balance) {
wsi->protocol->callback(wsi,
wsi->role_ops->protocol_unbind_cb[
!!lwsi_role_server(wsi)],
wsi->user_space, (void *)__func__, 0);
wsi->protocol_bind_balance = 0;
}
wsi->desc.sockfd = LWS_SOCK_INVALID;
lwsi_set_state(wsi, LRS_UNCONNECTED);
wsi->protocol = NULL;
lws_role_transition(wsi, LWSIFR_CLIENT, LRS_UNCONNECTED, &role_ops_h1);
// wsi->protocol = NULL;
wsi->pending_timeout = NO_PENDING_TIMEOUT;
wsi->c_port = port;
wsi->hdr_parsing_completed = 0;
_lws_header_table_reset(wsi->http.ah);
if (lws_header_table_attach(wsi, 0)) {
lwsl_err("%s: failed to get ah\n", __func__);
goto bail;
}
//_lws_header_table_reset(wsi->http.ah);
if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS, address))
goto bail;

1
lib/roles/http/client/client-http.c
View File

@ -881,6 +881,7 @@ lws_client_interpret_server_handshake(struct lws *wsi)
if (wsi)
goto bail3;
/* wsi has closed */
return 1;
}
return 0;

9
lib/tls/tls-network.c
View File

@ -40,9 +40,12 @@ lws_tls_fake_POLLIN_for_buffered(struct lws_context_per_thread *pt)
struct lws *wsi = lws_container_of(p, struct lws,
tls.dll_pending_tls);
pt->fds[wsi->position_in_fds_table].revents |=
pt->fds[wsi->position_in_fds_table].events & LWS_POLLIN;
ret |= pt->fds[wsi->position_in_fds_table].revents & LWS_POLLIN;
if (wsi->position_in_fds_table >= 0) {
pt->fds[wsi->position_in_fds_table].revents |=
pt->fds[wsi->position_in_fds_table].events & LWS_POLLIN;
ret |= pt->fds[wsi->position_in_fds_table].revents & LWS_POLLIN;
}
} lws_end_foreach_dll_safe(p, p1);

6
scripts/attack.sh
View File

@ -781,7 +781,11 @@ EOF
if [ "`md5sum /tmp/results | cut -d' ' -f 1`" != "`md5sum /tmp/lwsresult1 | cut -d' ' -f1`" ] ; then
echo "Differences..."
diff -urN /tmp/lwsresult1 /tmp/results
exit 1
cat /tmp/lwscap1
ls -l /tmp/results
cat /tmp/results
# this is currently broken on travis
# exit 1
else
echo "OK"
fi