mirrors/libmicrohttpd
2
0
Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-09-25 04:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

some test fixes

Browse Source 
tls connection teardown upon unrecognized message type
connection state dictionary compiles based on 'enable_messages'
This commit is contained in:
lv-426
2008-09-08 22:39:05 +00:00
parent 4f5e802908
commit 04a3265002
10 changed files with 56 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/connection_https.c
+8 -5
View File
@@ -87,7 +87,7 @@ MHD_get_connection_info (struct MHD_Connection *connection,
/**
* This function is called once a secure connection has been marked
* for closure.
*
*
* NOTE: Some code duplication with connection_close_error
* in connection.c
*
@@ -216,6 +216,7 @@ MHD_tls_connection_handle_read (struct MHD_Connection *connection)
{
/* set connection state to enable HTTP processing */
connection->state = MHD_CONNECTION_INIT;
break;
}
/* set connection as closed */
else
@@ -227,7 +228,6 @@ MHD_tls_connection_handle_read (struct MHD_Connection *connection)
connection->state = MHD_TLS_HANDSHAKE_FAILED;
return MHD_NO;
}
break;
}
/* a handshake message has been received out of bound */
else
@@ -241,7 +241,7 @@ MHD_tls_connection_handle_read (struct MHD_Connection *connection)
return MHD_NO;
}
/* ignore any out of bound change chiper spec messages */
/* ignore any out of bound change chiper spec messages */
case GNUTLS_CHANGE_CIPHER_SPEC:
MHD_tls_connection_close (connection,
MHD_TLS_REQUEST_TERMINATED_WITH_ERROR);
@@ -303,9 +303,12 @@ MHD_tls_connection_handle_read (struct MHD_Connection *connection)
default:
#if HAVE_MESSAGES
MHD_DLOG (connection->daemon,
"Error: unrecognized TLS read message. con-state: %d. l: %d, f: %s\n",
connection->state, __LINE__, __FUNCTION__);
"Error: unrecognized TLS message type: %d, connection state: %s. l: %d, f: %s\n",
msg_type, MHD_state_to_string(connection->state), __LINE__, __FUNCTION__);
#endif
/* close connection upon reception of unrecognized message type */
MHD_tls_connection_close (connection,
MHD_TLS_REQUEST_TERMINATED_WITH_ERROR);
return MHD_NO;
}
src/daemon/https/tls/gnutls_buffers.c
+1 -12
View File
@@ -487,7 +487,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
if (sizeOfPtr > MAX_RECV_SIZE || sizeOfPtr == 0)
{
gnutls_assert (); /* internal error */
printf("AT %u\n", __LINE__);
return GNUTLS_E_INVALID_REQUEST;
}
@@ -538,7 +537,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
> MAX_RECV_SIZE)
{
gnutls_assert (); /* internal error */
printf("AT %u\n", __LINE__);
return GNUTLS_E_INVALID_REQUEST;
}
@@ -551,14 +549,12 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
if (session->internals.record_recv_buffer.data == NULL)
{
gnutls_assert ();
printf("AT %u\n", __LINE__);
return GNUTLS_E_MEMORY_ERROR;
}
buf_pos = session->internals.record_recv_buffer.length;
buf = session->internals.record_recv_buffer.data;
*iptr = buf;
printf("AT %u\n", __LINE__);
/* READ DATA - but leave RCVLOWAT bytes in the kernel buffer. */
if (recvdata - recvlowat > 0)
@@ -570,7 +566,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
*/
if (ret < 0 && MHD_gtls_error_is_fatal (ret) == 0)
{
printf("AT %u\n", __LINE__);
return ret;
}
}
@@ -598,7 +593,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
if (ret2 < 0 && MHD_gtls_error_is_fatal (ret2) == 0)
{
printf("AT %u\n", __LINE__);
return ret2;
}
@@ -618,7 +612,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
{
gnutls_assert ();
/* that's because they are initialized to 0 */
printf("AT %u\n", __LINE__);
return MIN (ret, ret2);
}
@@ -627,14 +620,12 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
if (ret > 0 && ret < recvlowat)
{
gnutls_assert ();
printf("AT %u\n", __LINE__);
return GNUTLS_E_AGAIN;
}
if (ret == 0)
{ /* EOF */
gnutls_assert ();
printf("AT %u\n", __LINE__);
return 0;
}
@@ -644,12 +635,10 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
{
/* Short Read */
gnutls_assert ();
printf("AT %u\n", __LINE__);
return GNUTLS_E_AGAIN;
}
else
{
printf("AT %u\n", __LINE__);
return ret;
}
}
@@ -1234,7 +1223,7 @@ mhd_gtls_handshake_buffer_get_ptr (mhd_gtls_session_t session,
if (length != NULL)
*length = session->internals.handshake_hash_buffer.length;
_gnutls_buffers_log ("BUF[HSK]: Peeked %d bytes of Data\n",
_gnutls_buffers_log ("BUF[HSK]: Peeked %d bytes of Data\n",
session->internals.handshake_hash_buffer.length);
if (data_ptr != NULL)
src/daemon/https/tls/gnutls_str.c
-27
View File
@@ -227,33 +227,6 @@ mhd_gtls_string_append_data (mhd_gtls_string * dest,
}
}
int
mhd_gtls_string_append_printf (mhd_gtls_string * dest, const char *fmt, ...)
{
va_list args;
int len;
char *str;
va_start (args, fmt);
len = vsnprintf (NULL, 0, fmt, args);
va_end (args);
if (len < 0)
return -1;
str = malloc(len + 1);
if (! str)
return -1;
va_start (args, fmt);
len = vsprintf (str, fmt, args);
va_end (args);
len = mhd_gtls_string_append_str (dest, str);
free (str);
return len;
}
/* Converts the given string (old) to hex. A buffer must be provided
* to hold the new hex string. The new string will be null terminated.
* If the buffer does not have enough space to hold the string, a
src/daemon/https/tls/gnutls_str.h
-3
View File
@@ -55,9 +55,6 @@ int mhd_gtls_string_copy_str (mhd_gtls_string * dest, const char *src);
int mhd_gtls_string_append_str (mhd_gtls_string *, const char *str);
int mhd_gtls_string_append_data (mhd_gtls_string *, const void *data,
size_t data_size);
int mhd_gtls_string_append_printf (mhd_gtls_string * dest, const char *fmt,
...);
char *mhd_gtls_bin2hex (const void *old, size_t oldlen, char *buffer,
size_t buffer_size);
int mhd_gtls_hex2bin (const opaque * hex_data, int hex_size,
src/daemon/internal.c
+6 -2
View File
@@ -26,7 +26,10 @@
#include "internal.h"
#if DEBUG_STATES
#if HAVE_MESSAGES
/**
* State to string dictionary.
*/
char *
MHD_state_to_string (enum MHD_CONNECTION_STATE state)
{
@@ -80,8 +83,9 @@ MHD_state_to_string (enum MHD_CONNECTION_STATE state)
return "secure handshake failed";
case MHD_TLS_HANDSHAKE_COMPLETE:
return "secure handshake _complete";
default:
return "unrecognized connection state";
}
return "unrecognized connection state";
}
#endif
src/daemon/internal.h
+2 -2
View File
@@ -301,7 +301,7 @@ enum MHD_CONNECTION_STATE
*/
#define DEBUG_STATES MHD_NO
#if DEBUG_STATES
#if HAVE_MESSAGES
char *MHD_state_to_string (enum MHD_CONNECTION_STATE state);
#endif
@@ -568,7 +568,7 @@ struct MHD_Connection
ReceiveCallback recv_cls;
TransmitCallback send_cls;
#if HTTPS_SUPPORT
/* TODO rename as this might be an SSL connection */
mhd_gtls_session_t tls_session;
src/examples/Makefile.am
+4 -4
View File
@@ -14,7 +14,7 @@ fileserver_example_external_select \
refuse_post_example
if ENABLE_HTTPS
noinst_PROGRAMS += https_server_example
noinst_PROGRAMS += https_fileserver_example
endif
minimal_example_SOURCES = \
@@ -47,7 +47,7 @@ fileserver_example_external_select_SOURCES = \
fileserver_example_external_select_LDADD = \
$(top_builddir)/src/daemon/libmicrohttpd.la
https_server_example_SOURCES = \
https_server_example.c
https_server_example_LDADD = \
https_fileserver_example_SOURCES = \
https_fileserver_example.c
https_fileserver_example_LDADD = \
$(top_builddir)/src/daemon/libmicrohttpd.la
src/examples/https_server_example.c → src/examples/https_fileserver_example.c
+28 -18
View File
@@ -20,17 +20,15 @@
* @file https_server_example.c
* @brief a simple HTTPS file server using TLS.
*
* Server may be supplied either with included hard coded certificates or using
* external ones, which are to be supplied through command line arguments.
* A private key file named "key.pem" and a server certificate file named "cert.pem".
* are necessary to run the server in this way.
* Usage :
*
* 'http_fileserver_example HTTP-PORT SECONDS-TO-RUN [CERTIFICATE PATH, KEY PATH]'
*
* The certificate & key are required by the server to operate, Omitting the
* path arguments will cause the server to use the hard coded example certificate & key.
*
* 'certtool' may be used to generate these if required.
*
* Access server with your browser of choice or with curl :
*
* curl --insecure --tlsv1 --ciphers AES256-SHA <url>
*
* @author Sagie Amir
*/
@@ -159,31 +157,43 @@ main (int argc, char *const *argv)
{
struct MHD_Daemon *TLS_daemon;
/* look for HTTPS arguments */
if (argc < 5)
{
printf
("Usage : %s HTTP-PORT SECONDS-TO-RUN KEY-FILE CERT-FILE\n", argv[0]);
return 1;
}
if (argc == 3){
/* TODO check if this is truly necessary - disallow usage of the blocking /dev/random */
/* gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); */
TLS_daemon = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG
| MHD_USE_SSL, atoi (argv[3]),
| MHD_USE_SSL, atoi (argv[1]),
NULL,
NULL, &http_ahc,
NULL, MHD_OPTION_CONNECTION_TIMEOUT, 256,
MHD_OPTION_HTTPS_MEM_KEY, key_pem,
MHD_OPTION_HTTPS_MEM_CERT, cert_pem,
MHD_OPTION_END);
}
else if (argc == 5){
TLS_daemon = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG
| MHD_USE_SSL, atoi (argv[1]),
NULL,
NULL, &http_ahc,
NULL, MHD_OPTION_CONNECTION_TIMEOUT, 256,
MHD_OPTION_HTTPS_CERT_PATH, argv[3],
MHD_OPTION_HTTPS_KEY_PATH, argv[4],
MHD_OPTION_END);
}
else {
printf
("Usage : %s HTTP-PORT SECONDS-TO-RUN [CERTIFICATE PATH, KEY PATH]\n", argv[0]);
return 1;
}
if (TLS_daemon == NULL)
{
printf ("Error: failed to start TLS_daemon");
return 1;
}
else {
printf ("MHD daemon listening on port %d\n", atoi (argv[1]));
}
sleep (atoi (argv[2]));
src/testcurl/https/tls_daemon_options_test.c
+7 -3
View File
@@ -403,6 +403,7 @@ main (int argc, char *const *argv)
{
FILE *test_fd;
unsigned int errorCount = 0;
char * cur_dir;
MHD_gtls_global_set_log_level (DEBUG_GNUTLS_LOG_LEVEL);
@@ -434,11 +435,14 @@ main (int argc, char *const *argv)
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
cur_dir = get_current_dir_name ();
errorCount +=
test_wrap ("file certificates", &test_file_certificates, test_fd,
"AES256-SHA", CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
"AES256-SHA", CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_CERT_PATH, cur_dir,
MHD_OPTION_HTTPS_KEY_PATH, cur_dir, MHD_OPTION_END);
free (cur_dir);
errorCount +=
test_wrap ("protocol_version", &test_protocol_version, test_fd,
"AES256-SHA", CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
src/testcurl/https/tls_session_time_out_test.c
-1
View File
@@ -156,7 +156,6 @@ main (int argc, char *const *argv)
MHD_USE_DEBUG, 42433,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_CONNECTION_TIMEOUT, TIME_OUT,
MHD_OPTION_SOCK_ADDR, "127.0.0.1",
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);