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

4481 commits

Author SHA1 Message Date
Andy Green
760c3d4aa5 fix no extensions build
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-18 10:43:18 +08:00
Andy Green
a7521debde migrate client hs and c_port into ah
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-18 10:38:45 +08:00
Andy Green
6636eec8e5 minor type optimizations
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-18 10:34:25 +08:00
Andy Green
3b49848b36 remove current_alloc_len
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-18 10:29:22 +08:00
Andy Green
cc7cb68ded remove header name buffer
The header name buffer and its max length handling has actually
been unused since the minilex parser was introduced.  We hold
parsing state in the lex-type parts and don't need to store or
worry about max length, since the parser will let us know as
soon as it can't be a match for the valid header names.

This strips it out reducing the per-connection allocation for
x86_64 with default configure from 224 to 160.

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-18 10:22:42 +08:00
Andy Green
0caf9c5acb handle http union transition properly
There's no proper transition to http union state until now.

It only becomes apparant there's a problem when you try to
return -1 from the HTTP callback, during the close action
it will try to close() a nonsense, nonzero fd pointer in
the uninitialized u.http union member.

This patch takes a copy of the allocated headers struct from
the u.hdr union state, transitions to u.http clearing down u
and then calls the HTTP callback with URI args pointing to
the still-in-scope ah allocation.  After the call, the copy ah
is freed.

That makes sure we are in the correct union state while still
giving the HTTP callback access to the URI without having to
copy it around.

Reported-by: Edwin can den Oetelaar <oetelaar.automatisering@gmail.com>
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-18 09:48:31 +08:00
Andy Green
51b20ee92a test server kill skt with minus 1
The client spams the server with mirror protocol content
and then closes the connection.  However the server wants to
send that content back to all the mirror protocol
connections, including the one that closed.

The result is during the send back phase we usually see an
error trying to send to the close client connection. Because
we don't return -1, we don't close it on server side and the
error repeats a lot before finally closing.  This is a side-
effect of a recent patch to drain pending input before
really closing a dead connection.

This patch just changes it to return -1 on the failed send
attempt assertively closing the connection.

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-17 09:14:08 +08:00
Andy Green
c9ac31ee1c handle any POLLIN before error
See if this can impact http://libwebsockets.org/trac/ticket/16

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-16 10:17:52 +08:00
Andy Green
22524a65a2 close if we tried to close politely just close next time
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-15 22:48:58 +08:00
Andy Green
50097dd078 api change deliver socket fd to in param of extpoll callbacks
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-15 22:36:30 +08:00
Andy Green
b059371e40 problems in lws_handle_POLLOUT_event should just close
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-15 22:32:53 +08:00
Andy Green
67d556c682 robustness protect and document ensure_user_space
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-15 22:31:55 +08:00
Andy Green
099f789d2f README.coding add note about closing connections
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-15 10:25:58 +08:00
Andy Green
fbf48227b3 add by hand http send example
This adds a demonstration of how to use the http nonblocking
send action to the test server.

If you ask for /leaf.jpg from the test server, it will send
"by hand" a 2.4MB jpeg in HTTP, including the headers.  See
the test server sources to see how it is done.

Although it's a file, and a jpeg image, actually the exact
same scheme will work for any data or mime type.

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-14 23:24:07 +08:00
Andy Green
e803c82044 create user alloc for http if requested
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-14 23:18:10 +08:00
Andy Green
54cb346320 introduce LWS_CALLBACK_HTTP_WRITEABLE
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-14 22:23:54 +08:00
Andy Green
adc71469da just get hostname into canonical_hostname
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-14 17:11:22 +08:00
Andy Green
475bbdc938 remove getnameinfo
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-14 17:02:26 +08:00
Andy Green
9fc50b5a40 fragge able to send chunks larger than rx buffer
This now exercises the code for dealing with rx that spills over
the rx buffer.  Single fraggle uses the default rx buffer size
of 4096, it also now exercises code around that.

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-14 14:19:26 +08:00
Andy Green
c2bb3dc7b3 unstaged server changes
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-14 11:25:44 +08:00
Andy Green
53a4678608 update 1.21 changelog
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-14 11:23:49 +08:00
Andy Green
ff5dbf91b1 check for default protocol rx buf limit
This fixes

http://libwebsockets.org/trac/ticket/13

When using the default rx protocol buffer, the check is
performed against 0 not the default length.  That's the
case both in client and server code...

There's no problem if you actually give a max frame size
in the protocol definition.

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-14 10:18:31 +08:00
Andy Green
182cb9ae5f update changelog
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-13 11:54:08 +08:00
Andy Green
0878b9ed05 fix missing cr from closing log
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-13 11:44:20 +08:00
Andy Green
3ad2ecfbd8 update echo to use externsion getting api
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-13 09:34:53 +08:00
Joakim Soderberg
f272cb0624 Fixed DLL compilation on Windows for CMake.
- Define LWS_DLL and LWS_INTERNAL when websockets_shared is compiled.

- The websocket_shared target compiles to websocket.lib / websocket.dll
  (websocket.lib contains the exported functions for websocket.dll, and is
  the file that is linked to when a program wants to use the dll)

- The websocket target compiles to websocket_static.lib on windows.

- Replaced any "extern" with "LWS_EXTERN" on libwebsockets.h for proper
  DLL function exports.

- Created a LIB_LIST with all the libwebsocket dependencies, instead of
  multiple calls to target_link_libraries, only one call is made for both
  the static and shared library version. This makes it easy to add other
  variants if wanted in the future.

- Added ZLIB as a dependency for the libs, so that the build order will be
  correct at all times.

- Added a dependency for the websockets lib to the test apps, so it is
  built before them.

- Fixed the test-server-extpoll app to include the emulated_poll, and link
  to winsock on Windows.

- Removed the global export of libwebsocket_internal_extensions, and added
  a function libwebsocket_get_internal_extensions() that returns it
  instead. Using the global would not work with the DLL export on Windows.
2013-02-13 09:29:26 +08:00
Joakim Soderberg
08483536d2 Fixed soname and build shared lib for CMake.
- Build a shared version of the library (used to be only static).
- Set the so version name properly since the ABI has changed for version 1.2
2013-02-13 09:29:17 +08:00
Joakim Soderberg
f83585f4b6 Added so-version information to the lib. 2013-02-13 09:29:09 +08:00
Andy Green
5b7312213e disable fstack usage
It's only workable on gcc 4.6+... and in fact it's only
going to be interesting typically to the maintainer, so it's
commented out in Makefile.am.

Currently the worst remaining ones for x86_64 are

libwebsockets.c:2250:6:_lws_log	496	static
libwebsockets.c:2203:13:lwsl_emit_stderr	352	static
client.c:700:1:libwebsockets_generate_client_handshake	320	static
server.c:42:1:libwebsockets_decode_ssl_error	288	static
server-handshake.c:31:1:handshake_0405	272	static
client.c:368:1:lws_client_interpret_server_handshake	272	static
libwebsockets.c:447:1:libwebsockets_get_peer_addresses	256	static
daemonize.c:93:1:lws_daemonize	240	static
output.c:536:5:libwebsockets_serve_http_file	224	static
sha-1.c:131:1:sha1_step	192	static
sha-1.c:316:1:SHA1	160	static
libwebsockets.c:1604:1:libwebsocket_create_context	160	static

The top two there are error assembly buffers, they could be made
static but then they won't be usable from threaded user code.

Reported-by: Anders Brander <anders@brander.dk>
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-13 09:08:43 +08:00
Andy Green
0f13459048 echo test app needs different lockfile
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 22:44:43 +08:00
Andy Green
676bac2583 update rpm specfile
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 15:48:00 +08:00
Andy Green
f59d56cbd8 introduce attack script
Seems like it would be a good idea to try to mess with the
server at least before someone else does it for us

Just run the script

$ test-server/attack.sh

it will spawn a test server and fire things at it.  If you
see the end result

---- survived

then you should be OK.

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 14:16:09 +08:00
Andy Green
94f94652ed security disallow repeated GET
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 14:16:06 +08:00
Andy Green
3ee9b31054 security harden http parser a bit
Drop the connection during parsing for a few more cases that can't be legit.

Take care about trying to free rxflow_buffer only if we reached a connmode
where it exists

Change behaviour on setting unknown HTTP method to kill connection

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 12:55:40 +08:00
Andy Green
d579a7d89a fix another escaape runon
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 12:53:36 +08:00
Andy Green
c3ef0d600a add cyassl keepalive valgrind minimal mem to changelog
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 10:50:49 +08:00
Andy Green
48258817a0 bump version to 1.2 and soname to 3
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 10:36:39 +08:00
Andy Green
508946cefd api make close api private only
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 10:19:08 +08:00
Andy Green
70edd6fb80 api remove hangup_on_client
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 10:15:25 +08:00
Andy Green
728569af60 update test echo for iface info member namechange
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 10:13:15 +08:00
Andy Green
cecf5e73cf eliminate snprintf
The two cases where I introduced snprintf are either already
safe for buffer overflow or can be made so with one extra
statement, allowing sprintf.

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 10:13:12 +08:00
Andy Green
7a506ba5cb fix info struct api docs for iface vs interface
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-12 10:13:02 +08:00
Joakim Soderberg
63ff120ba5 Fixed compilation on Windows. 2013-02-12 09:58:12 +08:00
Andy Green
72dfd756d4 update memory performance info
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-11 22:40:39 +08:00
Andy Green
224149ab58 fix ssl reject path for freeing header allocation
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>
2013-02-11 21:43:41 +08:00
Andy Green
35517092ff fix busted debug format in ssl mode
CyaSSL blows (symptomless?) uninitialized memory accesses in
valgrind when using SSL_get_version()... don't need to do it...

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-11 20:10:56 +08:00
Andy Green
090789e87b fix string escape runon
Oh well it was a big patch to just be cosmetic ^^

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-11 20:03:59 +08:00
Andy Green
14f4729c0d fix without server
Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-11 19:36:15 +08:00
Andy Green
b5b23199f6 style cleanup
This brings the library sources into compliance with checkpatch
style except for three or four exceptions like WIN32 related stuff
and one long string constant I don't want to break into multiple
sprintf calls.

There should be no functional or compilability change from all
this (hopefully).

Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-11 17:13:32 +08:00
Andy Green
ad68639a7b valgrind openssl destroy as far as possible
OpenSSL doesn't seem to have a way to close out three allocations
it creates during SSL library init.

Even after doing the magic incantations suggested on the openssl list, we're
left with these.  Well, 88 bytes from ssl init is probably not critical,
but it's annoying

==15206== HEAP SUMMARY:
==15206==     in use at exit: 88 bytes in 3 blocks
==15206==   total heap usage: 13,566 allocs, 13,563 frees, 5,933,134 bytes allocated
==15206==
==15206== 24 bytes in 1 blocks are still reachable in loss record 1 of 3
==15206==    at 0x4A06409: malloc (vg_replace_malloc.c:270)
==15206==    by 0x3014C612B2: CRYPTO_malloc (in /usr/lib64/libcrypto.so.1.0.1c)
==15206==    by 0x3015441B38: ??? (in /usr/lib64/libssl.so.1.0.1c)
==15206==    by 0x3015443A78: SSL_COMP_get_compression_methods (in /usr/lib64/libssl.so.1.0.1c)
==15206==    by 0x301544932B: SSL_library_init (in /usr/lib64/libssl.so.1.0.1c)
==15206==    by 0x4C340D4: libwebsocket_create_context (libwebsockets.c:1796)
==15206==    by 0x401C08: main (in /usr/bin/libwebsockets-test-server)
==15206==
==15206== 32 bytes in 1 blocks are still reachable in loss record 2 of 3
==15206==    at 0x4A06409: malloc (vg_replace_malloc.c:270)
==15206==    by 0x3014C612B2: CRYPTO_malloc (in /usr/lib64/libcrypto.so.1.0.1c)
==15206==    by 0x3014CC91BE: sk_new (in /usr/lib64/libcrypto.so.1.0.1c)
==15206==    by 0x3015441AF9: ??? (in /usr/lib64/libssl.so.1.0.1c)
==15206==    by 0x3015443A78: SSL_COMP_get_compression_methods (in /usr/lib64/libssl.so.1.0.1c)
==15206==    by 0x301544932B: SSL_library_init (in /usr/lib64/libssl.so.1.0.1c)
==15206==    by 0x4C340D4: libwebsocket_create_context (libwebsockets.c:1796)
==15206==    by 0x401C08: main (in /usr/bin/libwebsockets-test-server)
==15206==
==15206== 32 bytes in 1 blocks are still reachable in loss record 3 of 3
==15206==    at 0x4A06409: malloc (vg_replace_malloc.c:270)
==15206==    by 0x3014C612B2: CRYPTO_malloc (in /usr/lib64/libcrypto.so.1.0.1c)
==15206==    by 0x3014CC91DC: sk_new (in /usr/lib64/libcrypto.so.1.0.1c)
==15206==    by 0x3015441AF9: ??? (in /usr/lib64/libssl.so.1.0.1c)
==15206==    by 0x3015443A78: SSL_COMP_get_compression_methods (in /usr/lib64/libssl.so.1.0.1c)
==15206==    by 0x301544932B: SSL_library_init (in /usr/lib64/libssl.so.1.0.1c)
==15206==    by 0x4C340D4: libwebsocket_create_context (libwebsockets.c:1796)
==15206==    by 0x401C08: main (in /usr/bin/libwebsockets-test-server)
==15206==
==15206== LEAK SUMMARY:
==15206==    definitely lost: 0 bytes in 0 blocks
==15206==    indirectly lost: 0 bytes in 0 blocks
==15206==      possibly lost: 0 bytes in 0 blocks
==15206==    still reachable: 88 bytes in 3 blocks
==15206==         suppressed: 0 bytes in 0 blocks


Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-11 14:50:45 +08:00