mirror of
https://github.com/warmcat/libwebsockets.git
synced 2025-03-16 00:00:07 +01:00

If the SSL connection failed before the headers came, we were not dealing with deallocating the header malloc. This takes care of it. Using CyaSSL, we are then valgrind-clean for ssl client and server. With OpenSSL, there is 88 bytes lost at init that never changes or gets recovered. AFAIK there's nothing to do about that. OpenSSL also blows these during operation ==1059== Conditional jump or move depends on uninitialised value(s) ==1059== at 0x4A0B131: bcmp (mc_replace_strmem.c:935) ==1059== by 0x3014CDDBA8: ??? (in /usr/lib64/libcrypto.so.1.0.1c) ==1059== by 0x3015430852: tls1_enc (in /usr/lib64/libssl.so.1.0.1c) ==1059== by 0x3015428CEC: ssl3_read_bytes (in /usr/lib64/libssl.so.1.0.1c) ==1059== by 0x30154264C5: ??? (in /usr/lib64/libssl.so.1.0.1c) ==1059== by 0x4C3C596: lws_server_socket_service (server.c:153) ==1059== by 0x4C32C1E: libwebsocket_service_fd (libwebsockets.c:927) ==1059== by 0x4C33270: libwebsocket_service (libwebsockets.c:1225) ==1059== by 0x401C84: main (in /usr/bin/libwebsockets-test-server) However googling around https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/60021 http://www.openssl.org/support/faq.html#PROG13 (also the next FAQ down) it seems OpenSSL have a relaxed attitude to this and it's expected. It's interesting CyaSSL works fine but doesn't have that problem... Signed-off-by: Andy Green <andy.green@linaro.org>
329 lines
8.4 KiB
C
329 lines
8.4 KiB
C
#include "private-libwebsockets.h"
|
|
|
|
struct libwebsocket *__libwebsocket_client_connect_2(
|
|
struct libwebsocket_context *context,
|
|
struct libwebsocket *wsi
|
|
) {
|
|
struct pollfd pfd;
|
|
struct hostent *server_hostent;
|
|
struct sockaddr_in server_addr;
|
|
int n;
|
|
int plen = 0;
|
|
const char *ads;
|
|
|
|
lwsl_client("__libwebsocket_client_connect_2\n");
|
|
|
|
/*
|
|
* proxy?
|
|
*/
|
|
|
|
if (context->http_proxy_port) {
|
|
plen = sprintf((char *)context->service_buffer,
|
|
"CONNECT %s:%u HTTP/1.0\x0d\x0a"
|
|
"User-agent: libwebsockets\x0d\x0a"
|
|
/*Proxy-authorization: basic aGVsbG86d29ybGQ= */
|
|
"\x0d\x0a",
|
|
lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS),
|
|
wsi->u.hdr.c_port);
|
|
|
|
/* OK from now on we talk via the proxy, so connect to that */
|
|
|
|
/*
|
|
* (will overwrite existing pointer,
|
|
* leaving old string/frag there but unreferenced)
|
|
*/
|
|
if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS,
|
|
context->http_proxy_address))
|
|
goto oom4;
|
|
wsi->u.hdr.c_port = context->http_proxy_port;
|
|
}
|
|
|
|
/*
|
|
* prepare the actual connection (to the proxy, if any)
|
|
*/
|
|
|
|
ads = lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS);
|
|
|
|
lwsl_client("__libwebsocket_client_connect_2: address %s\n", ads);
|
|
|
|
server_hostent = gethostbyname(ads);
|
|
if (server_hostent == NULL) {
|
|
lwsl_err("Unable to get host name from %s\n", ads);
|
|
goto oom4;
|
|
}
|
|
|
|
wsi->sock = socket(AF_INET, SOCK_STREAM, 0);
|
|
|
|
if (wsi->sock < 0) {
|
|
lwsl_warn("Unable to open socket\n");
|
|
goto oom4;
|
|
}
|
|
|
|
server_addr.sin_family = AF_INET;
|
|
server_addr.sin_port = htons(wsi->u.hdr.c_port);
|
|
server_addr.sin_addr = *((struct in_addr *)server_hostent->h_addr);
|
|
bzero(&server_addr.sin_zero, 8);
|
|
|
|
if (connect(wsi->sock, (struct sockaddr *)&server_addr,
|
|
sizeof(struct sockaddr)) == -1) {
|
|
lwsl_debug("Connect failed\n");
|
|
compatible_close(wsi->sock);
|
|
goto oom4;
|
|
}
|
|
|
|
lwsl_client("connected\n");
|
|
|
|
if (lws_set_socket_options(context, wsi->sock)) {
|
|
lwsl_err("Failed to set wsi socket options\n");
|
|
close(wsi->sock);
|
|
goto oom4;
|
|
}
|
|
|
|
insert_wsi_socket_into_fds(context, wsi);
|
|
|
|
/* we are connected to server, or proxy */
|
|
|
|
if (context->http_proxy_port) {
|
|
|
|
n = send(wsi->sock, context->service_buffer, plen, 0);
|
|
if (n < 0) {
|
|
compatible_close(wsi->sock);
|
|
lwsl_debug("ERROR writing to proxy socket\n");
|
|
goto oom4;
|
|
}
|
|
|
|
libwebsocket_set_timeout(wsi,
|
|
PENDING_TIMEOUT_AWAITING_PROXY_RESPONSE,
|
|
AWAITING_TIMEOUT);
|
|
|
|
wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY;
|
|
|
|
return wsi;
|
|
}
|
|
|
|
/*
|
|
* provoke service to issue the handshake directly
|
|
* we need to do it this way because in the proxy case, this is the
|
|
* next state and executed only if and when we get a good proxy
|
|
* response inside the state machine... but notice in SSL case this
|
|
* may not have sent anything yet with 0 return, and won't until some
|
|
* many retries from main loop. To stop that becoming endless,
|
|
* cover with a timeout.
|
|
*/
|
|
|
|
libwebsocket_set_timeout(wsi,
|
|
PENDING_TIMEOUT_SENT_CLIENT_HANDSHAKE, AWAITING_TIMEOUT);
|
|
|
|
wsi->mode = LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE;
|
|
pfd.fd = wsi->sock;
|
|
pfd.revents = POLLIN;
|
|
|
|
n = libwebsocket_service_fd(context, &pfd);
|
|
|
|
if (n < 0)
|
|
goto oom4;
|
|
|
|
if (n) /* returns 1 on failure after closing wsi */
|
|
return NULL;
|
|
|
|
return wsi;
|
|
|
|
oom4:
|
|
free(wsi->u.hdr.ah);
|
|
free(wsi);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/**
|
|
* libwebsocket_client_connect() - Connect to another websocket server
|
|
* @context: Websocket context
|
|
* @address: Remote server address, eg, "myserver.com"
|
|
* @port: Port to connect to on the remote server, eg, 80
|
|
* @ssl_connection: 0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self
|
|
* signed certs
|
|
* @path: Websocket path on server
|
|
* @host: Hostname on server
|
|
* @origin: Socket origin name
|
|
* @protocol: Comma-separated list of protocols being asked for from
|
|
* the server, or just one. The server will pick the one it
|
|
* likes best.
|
|
* @ietf_version_or_minus_one: -1 to ask to connect using the default, latest
|
|
* protocol supported, or the specific protocol ordinal
|
|
*
|
|
* This function creates a connection to a remote server
|
|
*/
|
|
|
|
struct libwebsocket *
|
|
libwebsocket_client_connect(struct libwebsocket_context *context,
|
|
const char *address,
|
|
int port,
|
|
int ssl_connection,
|
|
const char *path,
|
|
const char *host,
|
|
const char *origin,
|
|
const char *protocol,
|
|
int ietf_version_or_minus_one)
|
|
{
|
|
struct libwebsocket *wsi;
|
|
int n;
|
|
#ifndef LWS_NO_EXTENSIONS
|
|
int m;
|
|
struct libwebsocket_extension *ext;
|
|
int handled;
|
|
#endif
|
|
|
|
#ifndef LWS_OPENSSL_SUPPORT
|
|
if (ssl_connection) {
|
|
lwsl_err("libwebsockets not configured for ssl\n");
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
wsi = (struct libwebsocket *) malloc(sizeof(struct libwebsocket));
|
|
if (wsi == NULL)
|
|
goto bail;
|
|
|
|
memset(wsi, 0, sizeof(*wsi));
|
|
|
|
/* -1 means just use latest supported */
|
|
|
|
if (ietf_version_or_minus_one == -1)
|
|
ietf_version_or_minus_one = SPEC_LATEST_SUPPORTED;
|
|
|
|
wsi->ietf_spec_revision = ietf_version_or_minus_one;
|
|
wsi->u.hdr.name_buffer_pos = 0;
|
|
wsi->user_space = NULL;
|
|
wsi->state = WSI_STATE_CLIENT_UNCONNECTED;
|
|
wsi->protocol = NULL;
|
|
wsi->pending_timeout = NO_PENDING_TIMEOUT;
|
|
#ifndef LWS_NO_EXTENSIONS
|
|
wsi->count_active_extensions = 0;
|
|
#endif
|
|
#ifdef LWS_OPENSSL_SUPPORT
|
|
wsi->use_ssl = ssl_connection;
|
|
#endif
|
|
|
|
if (lws_allocate_header_table(wsi))
|
|
goto bail;
|
|
|
|
/*
|
|
* we're not necessarily in a position to action these right away,
|
|
* stash them... we only need during connect phase so u.hdr is fine
|
|
*/
|
|
wsi->u.hdr.c_port = port;
|
|
if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS, address))
|
|
goto bail1;
|
|
|
|
/* these only need u.hdr lifetime as well */
|
|
|
|
if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_URI, path))
|
|
goto bail1;
|
|
|
|
if (lws_hdr_simple_create(wsi, _WSI_TOKEN_CLIENT_HOST, host))
|
|
goto bail1;
|
|
|
|
if (origin)
|
|
if (lws_hdr_simple_create(wsi,
|
|
_WSI_TOKEN_CLIENT_ORIGIN, origin))
|
|
goto bail1;
|
|
/*
|
|
* this is a list of protocols we tell the server we're okay with
|
|
* stash it for later when we compare server response with it
|
|
*/
|
|
if (protocol)
|
|
if (lws_hdr_simple_create(wsi,
|
|
_WSI_TOKEN_CLIENT_SENT_PROTOCOLS, protocol))
|
|
goto bail1;
|
|
|
|
wsi->protocol = &context->protocols[0];
|
|
|
|
#ifndef LWS_NO_EXTENSIONS
|
|
/*
|
|
* Check with each extension if it is able to route and proxy this
|
|
* connection for us. For example, an extension like x-google-mux
|
|
* can handle this and then we don't need an actual socket for this
|
|
* connection.
|
|
*/
|
|
|
|
handled = 0;
|
|
ext = context->extensions;
|
|
n = 0;
|
|
|
|
while (ext && ext->callback && !handled) {
|
|
m = ext->callback(context, ext, wsi,
|
|
LWS_EXT_CALLBACK_CAN_PROXY_CLIENT_CONNECTION,
|
|
(void *)(long)n, (void *)address, port);
|
|
if (m)
|
|
handled = 1;
|
|
|
|
ext++;
|
|
n++;
|
|
}
|
|
|
|
if (handled) {
|
|
lwsl_client("libwebsocket_client_connect: ext handling conn\n");
|
|
|
|
libwebsocket_set_timeout(wsi,
|
|
PENDING_TIMEOUT_AWAITING_EXTENSION_CONNECT_RESPONSE,
|
|
AWAITING_TIMEOUT);
|
|
|
|
wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT;
|
|
return wsi;
|
|
}
|
|
#endif
|
|
lwsl_client("libwebsocket_client_connect: direct conn\n");
|
|
|
|
return __libwebsocket_client_connect_2(context, wsi);
|
|
|
|
bail1:
|
|
free(wsi->u.hdr.ah);
|
|
bail:
|
|
free(wsi);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/**
|
|
* libwebsocket_client_connect_extended() - Connect to another websocket server
|
|
* @context: Websocket context
|
|
* @address: Remote server address, eg, "myserver.com"
|
|
* @port: Port to connect to on the remote server, eg, 80
|
|
* @ssl_connection: 0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self
|
|
* signed certs
|
|
* @path: Websocket path on server
|
|
* @host: Hostname on server
|
|
* @origin: Socket origin name
|
|
* @protocol: Comma-separated list of protocols being asked for from
|
|
* the server, or just one. The server will pick the one it
|
|
* likes best.
|
|
* @ietf_version_or_minus_one: -1 to ask to connect using the default, latest
|
|
* protocol supported, or the specific protocol ordinal
|
|
* @userdata: Pre-allocated user data
|
|
*
|
|
* This function creates a connection to a remote server
|
|
*/
|
|
|
|
struct libwebsocket *
|
|
libwebsocket_client_connect_extended(struct libwebsocket_context *context,
|
|
const char *address,
|
|
int port,
|
|
int ssl_connection,
|
|
const char *path,
|
|
const char *host,
|
|
const char *origin,
|
|
const char *protocol,
|
|
int ietf_version_or_minus_one,
|
|
void *userdata)
|
|
{
|
|
struct libwebsocket *ws =
|
|
libwebsocket_client_connect(context, address, port,
|
|
ssl_connection, path, host, origin, protocol,
|
|
ietf_version_or_minus_one);
|
|
|
|
if (ws && !ws->user_space && userdata)
|
|
ws->user_space = userdata ;
|
|
|
|
return ws ;
|
|
}
|