Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

ss: proxy: fix conn deref on onward

Browse source 
Trying to use the opaque pointer in the handle to point to the conn isn't
going to work when we need it to point to the ss handle.

Move it to have its on place in the handle.
This commit is contained in:
Andy Green 2021-04-21 09:15:58 +01:00
parent ff8912ba96
commit 891f28b43e
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/secure-streams/private-lib-secure-streams.h
View file

@ -39,6 +39,7 @@ typedef enum {
SSSEQ_CONNECTED,
} lws_ss_seq_state_t;
struct conn;
/**
* lws_ss_handle_t: publicly-opaque secure stream object implementation
@ -70,6 +71,8 @@ typedef struct lws_ss_handle {
struct lws_sequencer *seq; /**< owning sequencer if any */
struct lws *wsi; /**< the stream wsi if any */
struct conn *conn_if_sspc_onw;
#if defined(LWS_WITH_SSPLUGINS)
void *nauthi; /**< the nauth plugin instance data */
void *sauthi; /**< the sauth plugin instance data */

5
lib/secure-streams/secure-streams-process.c
View file

@ -68,13 +68,12 @@ void
lws_proxy_clean_conn_ss(struct lws *wsi)
{
#if 0
struct conn *conn;
lws_ss_handle_t *h = (lws_ss_handle_t *)wsi->a.opaque_user_data;
struct conn *conn = h->conn_if_sspc_onw;
if (!wsi)
return;
conn = (struct conn *)wsi->a.opaque_user_data;
if (conn && conn->ss)
conn->ss->wsi = NULL;
#endif

2
lib/secure-streams/secure-streams.c
View file

@ -722,7 +722,7 @@ _lws_ss_client_connect(lws_ss_handle_t *h, int is_retry, void *conn_if_sspc_onw)
if (conn_if_sspc_onw) {
i.ssl_connection |= LCCSCF_SECSTREAM_PROXY_ONWARD;
// i.opaque_user_data = conn_if_sspc_onw;
h->conn_if_sspc_onw = conn_if_sspc_onw;
}

8
lib/system/metrics/metrics.c
View file

@ -606,11 +606,13 @@ lws_metrics_hist_bump_describe_wsi(struct lws *wsi, lws_metric_pub_t *pub,
h->ssi.streamtype);
} else
if (wsi->client_proxy_onward) {
struct conn *conn = (struct conn *)wsi->a.opaque_user_data;
lws_ss_handle_t *h = (lws_ss_handle_t *)wsi->a.opaque_user_data;
struct conn *conn = h->conn_if_sspc_onw;
if (conn && conn->ss)
p += lws_snprintf(p, lws_ptr_diff_size_t(end, p), "ss=\"%s\",",
conn->ss->info.streamtype);
p += lws_snprintf(p, lws_ptr_diff_size_t(end, p),
"ss=\"%s\",",
conn->ss->info.streamtype);
} else
#endif
if (wsi->for_ss) {

4
minimal-examples/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt
View file

@ -53,11 +53,11 @@ if (requirements)
-i ${CTEST_SOCKET_PATH} -d1039)
set_tests_properties(st_sstfproxy PROPERTIES WORKING_DIRECTORY . FIXTURES_SETUP sstfproxy TIMEOUT 800)
add_test(NAME ki_ssproxy COMMAND
add_test(NAME ki_sstfproxy COMMAND
${CMAKE_SOURCE_DIR}/scripts/ctest-background-kill.sh
sstfproxy $<TARGET_FILE:lws-minimal-secure-streams-proxy>
-i ${CTEST_SOCKET_PATH})
set_tests_properties(ki_ssproxy PROPERTIES FIXTURES_CLEANUP sstfproxy)
set_tests_properties(ki_sstfproxy PROPERTIES FIXTURES_CLEANUP sstfproxy)
#
# the client part that will connect to the proxy