add tests for empty reply in HTTPS

This commit is contained in:
Christian Grothoff committed 2019-10-26 18:52:53 +02:00
1 parent b8516d23ba
commit 5e5dbf980d
9 files changed
+1331 -32

No files matched your search

+151 -5
View File
@@ -37,6 +37,10 @@
extern const char srv_signed_cert_pem[];
extern const char srv_signed_key_pem[];
static int global_port;
/* perform a HTTP GET request via SSL/TLS */
static int
test_secure_get (FILE *test_fd,
@@ -55,7 +59,8 @@ test_secure_get (FILE *test_fd,
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION
| MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
| MHD_USE_ERROR_LOG, port,
NULL, NULL, &http_ahc, NULL,
NULL, NULL,
&http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
MHD_OPTION_END);
@@ -76,13 +81,156 @@ test_secure_get (FILE *test_fd,
port = (int) dinfo->port;
}
ret = test_https_transfer (test_fd, port, cipher_suite, proto_version);
ret = test_https_transfer (test_fd,
port,
cipher_suite,
proto_version);
MHD_stop_daemon (d);
return ret;
}
static int
ahc_empty (void *cls,
struct MHD_Connection *connection,
const char *url,
const char *method,
const char *version,
const char *upload_data,
size_t *upload_data_size,
void **unused)
{
static int ptr;
struct MHD_Response *response;
int ret;
(void) cls;
(void) url;
(void) url;
(void) version; /* Unused. Silent compiler warning. */
(void) upload_data;
(void) upload_data_size; /* Unused. Silent compiler warning. */
if (0 != strcasecmp ("GET",
method))
return MHD_NO; /* unexpected method */
if (&ptr != *unused)
{
*unused = &ptr;
return MHD_YES;
}
*unused = NULL;
response = MHD_create_response_from_buffer (0,
NULL,
MHD_RESPMEM_PERSISTENT);
ret = MHD_queue_response (connection,
MHD_HTTP_OK,
response);
MHD_destroy_response (response);
if (ret == MHD_NO)
{
fprintf (stderr, "Failed to queue response.\n");
_exit (20);
}
return ret;
}
static int
curlExcessFound (CURL *c,
curl_infotype type,
char *data,
size_t size,
void *cls)
{
static const char *excess_found = "Excess found";
const size_t str_size = strlen (excess_found);
(void) c; /* Unused. Silence compiler warning. */
if ((CURLINFO_TEXT == type)
&&(size >= str_size)
&&(0 == strncmp (excess_found, data, str_size)))
*(int *) cls = 1;
return 0;
}
static int
testEmptyGet (int poll_flag)
{
struct MHD_Daemon *d;
CURL *c;
char buf[2048];
struct CBC cbc;
CURLcode errornum;
int excess_found = 0;
if ( (0 == global_port) &&
(MHD_NO == MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) )
{
global_port = 1225;
}
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG
| poll_flag | MHD_USE_TLS,
global_port, NULL, NULL,
&ahc_empty, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
MHD_OPTION_END);
if (d == NULL)
return 4194304;
if (0 == global_port)
{
const union MHD_DaemonInfo *dinfo;
dinfo = MHD_get_daemon_info (d, MHD_DAEMON_INFO_BIND_PORT);
if ((NULL == dinfo) ||(0 == dinfo->port) )
{
MHD_stop_daemon (d); return 32;
}
global_port = (int) dinfo->port;
}
c = curl_easy_init ();
curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1/");
curl_easy_setopt (c, CURLOPT_PORT, (long) global_port);
curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
curl_easy_setopt (c, CURLOPT_DEBUGFUNCTION, &curlExcessFound);
curl_easy_setopt (c, CURLOPT_DEBUGDATA, &excess_found);
curl_easy_setopt (c, CURLOPT_VERBOSE, 1L);
curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L);
curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L);
curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L);
curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L);
curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L);
/* NOTE: use of CONNECTTIMEOUT without also
setting NOSIGNAL results in really weird
crashes on my system!*/
curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1L);
if (CURLE_OK != (errornum = curl_easy_perform (c)))
{
fprintf (stderr,
"curl_easy_perform failed: `%s'\n",
curl_easy_strerror (errornum));
curl_easy_cleanup (c);
MHD_stop_daemon (d);
return 8388608;
}
curl_easy_cleanup (c);
MHD_stop_daemon (d);
if (cbc.pos != 0)
return 16777216;
if (excess_found)
return 33554432;
return 0;
}
int
main (int argc, char *const *argv)
{
@@ -109,11 +257,9 @@ main (int argc, char *const *argv)
{
aes256_sha_tlsv1 = "rsa_aes_256_sha";
}
errorCount +=
test_secure_get (NULL, aes256_sha_tlsv1, CURL_SSLVERSION_TLSv1);
print_test_result (errorCount, argv[0]);
errorCount += testEmptyGet (0);
curl_global_cleanup ();
return errorCount != 0 ? 1 : 0;
+45 -16
View File
@@ -62,7 +62,8 @@ setup_ca_cert ()
*/
int
test_daemon_get (void *cls,
const char *cipher_suite, int proto_version,
const char *cipher_suite,
int proto_version,
int port,
int ver_peer)
{
@@ -71,7 +72,7 @@ test_daemon_get (void *cls,
CURLcode errornum;
char url[255];
size_t len;
(void) cls; /* Unused. Silent compiler warning. */
(void) cls; /* Unused. Silence compiler warning. */
len = strlen (test_data);
if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
@@ -138,20 +139,29 @@ test_daemon_get (void *cls,
void
print_test_result (int test_outcome, char *test_name)
print_test_result (int test_outcome,
char *test_name)
{
if (test_outcome != 0)
fprintf (stderr, "running test: %s [fail: %u]\n", test_name, (unsigned
int)
fprintf (stderr,
"running test: %s [fail: %u]\n",
test_name, (unsigned
int)
test_outcome);
#if 0
else
fprintf (stdout, "running test: %s [pass]\n", test_name);
fprintf (stdout,
"running test: %s [pass]\n",
test_name);
#endif
}
size_t
copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
copyBuffer (void *ptr,
size_t size,
size_t nmemb,
void *ctx)
{
struct CBC *cbc = ctx;
@@ -162,13 +172,19 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
return size * nmemb;
}
/**
* HTTP access handler call back
*/
int
http_ahc (void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char *version,
const char *upload_data, size_t *upload_data_size, void **ptr)
http_ahc (void *cls,
struct MHD_Connection *connection,
const char *url,
const char *method,
const char *version,
const char *upload_data,
size_t *upload_data_size,
void **ptr)
{
static int aptr;
struct MHD_Response *response;
@@ -193,15 +209,26 @@ http_ahc (void *cls, struct MHD_Connection *connection,
return ret;
}
/* HTTP access handler call back */
int
http_dummy_ahc (void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char *version,
const char *upload_data, size_t *upload_data_size,
http_dummy_ahc (void *cls,
struct MHD_Connection *connection,
const char *url,
const char *method,
const char *version,
const char *upload_data,
size_t *upload_data_size,
void **ptr)
{
(void) cls; (void) connection; (void) url; (void) method; (void) version; /* Unused. Silent compiler warning. */
(void) upload_data; (void) upload_data_size; (void) ptr; /* Unused. Silent compiler warning. */
(void) cls;
(void) connection;
(void) url;
(void) method;
(void) version; /* Unused. Silent compiler warning. */
(void) upload_data;
(void) upload_data_size;
(void) ptr; /* Unused. Silent compiler warning. */
return 0;
}
@@ -215,7 +242,9 @@ http_dummy_ahc (void *cls, struct MHD_Connection *connection,
*/
/* TODO have test wrap consider a NULL cbc */
int
send_curl_req (char *url, struct CBC *cbc, const char *cipher_suite,
send_curl_req (char *url,
struct CBC *cbc,
const char *cipher_suite,
int proto_version)
{
CURL *c;