[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7324 - in libmicrohttpd/src: daemon testcurl
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7324 - in libmicrohttpd/src: daemon testcurl |
|
Date: |
Wed, 25 Jun 2008 07:59:37 -0600 (MDT) |
Author: lv-426
Date: 2008-06-25 07:59:37 -0600 (Wed, 25 Jun 2008)
New Revision: 7324
Added:
libmicrohttpd/src/testcurl/daemon_HTTPS_test_get.c
Modified:
libmicrohttpd/src/daemon/connection.c
libmicrohttpd/src/daemon/daemon.c
Log:
HTTPS daemon test file
currently MHDS state machine unused
Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c 2008-06-25 10:21:33 UTC (rev
7323)
+++ libmicrohttpd/src/daemon/connection.c 2008-06-25 13:59:37 UTC (rev
7324)
@@ -1213,6 +1213,42 @@
return MHD_YES;
}
+/**
+ * Try writing data to the socket from the
+ * write buffer of the connection.
+ *
+ * @return MHD_YES if something changed,
+ * MHD_NO if we were interrupted
+ */
+static int
+do_write (struct MHD_Connection *connection)
+{
+ int ret;
+
+ ret = connection->send_cls (connection);
+
+ if (ret < 0)
+ {
+ if (errno == EINTR)
+ return MHD_NO;
+#if HAVE_MESSAGES
+ MHD_DLOG (connection->daemon,
+ "Failed to send data: %s\n", STRERROR (errno));
+#endif
+ connection_close_error (connection);
+ return MHD_YES;
+ }
+#if DEBUG_SEND_DATA
+ fprintf (stderr,
+ "Sent HEADER response: `%.*s'\n",
+ ret,
+ &connection->write_buffer[connection->write_buffer_send_offset]);
+#endif
+ connection->write_buffer_send_offset += ret;
+ return MHD_YES;
+}
+
+
int
MHD_con_read (struct MHD_Connection *connection)
{
@@ -1227,14 +1263,36 @@
MHDS_con_read (struct MHD_Connection * connection)
{
ssize_t size = gnutls_record_recv (connection->tls_session,
- connection->read_buffer[connection->
- read_buffer_offset],
- connection->read_buffer_size);
+ &connection->read_buffer[connection->
+
read_buffer_offset],
+ connection->read_buffer_size);
return size;
}
#endif
/**
+ * Check if we are done sending the write-buffer.
+ * If so, transition into "next_state".
+ * @return MHY_NO if we are not done, MHD_YES if we are
+ */
+static int
+check_write_done (struct MHD_Connection *connection,
+ enum MHD_CONNECTION_STATE next_state)
+{
+ if (connection->write_buffer_append_offset !=
+ connection->write_buffer_send_offset)
+ return MHD_NO;
+ connection->write_buffer_append_offset = 0;
+ connection->write_buffer_send_offset = 0;
+ connection->state = next_state;
+ MHD_pool_reallocate (connection->pool, connection->write_buffer,
+ connection->write_buffer_size, 0);
+ connection->write_buffer = NULL;
+ connection->write_buffer_size = 0;
+ return MHD_YES;
+}
+
+/**
* We have received (possibly the beginning of) a line in the
* header (or footer). Validate (check for ":") and prepare
* to process.
@@ -1483,7 +1541,7 @@
#endif
switch (connection->s_state)
{
- /* thest cases shouldn't occur */
+ /* thest cases shouldn't occur */
case MHDS_CONNECTION_INIT:
case MHDS_HANDSHAKE_FAILED:
return MHD_NO;
@@ -1493,7 +1551,7 @@
case MHDS_REQUEST_READ:
if (MHD_YES == connection->read_closed)
{
- connection->state = MHD_CONNECTION_CLOSED;
+ connection->s_state = MHDS_CONNECTION_CLOSED;
continue;
}
break;
@@ -1501,7 +1559,7 @@
case MHDS_HANDSHAKE_COMPLETE:
case MHDS_REPLY_SENT:
connection->s_state = MHDS_REQUEST_READING;
- do_read (connection);
+ // do_read (connection);
break;
case MHDS_REQUEST_READING:
/* req comes in while sending previous reply - wait until reply sent
*/
@@ -1526,41 +1584,7 @@
}
#endif
-/**
- * Try writing data to the socket from the
- * write buffer of the connection.
- *
- * @return MHD_YES if something changed,
- * MHD_NO if we were interrupted
- */
-static int
-do_write (struct MHD_Connection *connection)
-{
- int ret;
- ret = connection->send_cls (connection);
-
- if (ret < 0)
- {
- if (errno == EINTR)
- return MHD_NO;
-#if HAVE_MESSAGES
- MHD_DLOG (connection->daemon,
- "Failed to send data: %s\n", STRERROR (errno));
-#endif
- connection_close_error (connection);
- return MHD_YES;
- }
-#if DEBUG_SEND_DATA
- fprintf (stderr,
- "Sent HEADER response: `%.*s'\n",
- ret,
- &connection->write_buffer[connection->write_buffer_send_offset]);
-#endif
- connection->write_buffer_send_offset += ret;
- return MHD_YES;
-}
-
int
MHD_con_write (struct MHD_Connection *connection)
{
@@ -1575,38 +1599,16 @@
ssize_t
MHDS_con_write (struct MHD_Connection * connection)
{
- return gnutls_record_send (connection->tls_session,
- &connection->write_buffer[connection->
-
write_buffer_send_offset],
- connection->write_buffer_append_offset
- - connection->write_buffer_send_offset);
-
+ ssize_t sent = gnutls_record_send (connection->tls_session,
+ &connection->write_buffer[connection->
+
write_buffer_send_offset],
+ connection->write_buffer_append_offset
+ - connection->write_buffer_send_offset);
+ return sent;
}
#endif
/**
- * Check if we are done sending the write-buffer.
- * If so, transition into "next_state".
- * @return MHY_NO if we are not done, MHD_YES if we are
- */
-static int
-check_write_done (struct MHD_Connection *connection,
- enum MHD_CONNECTION_STATE next_state)
-{
- if (connection->write_buffer_append_offset !=
- connection->write_buffer_send_offset)
- return MHD_NO;
- connection->write_buffer_append_offset = 0;
- connection->write_buffer_send_offset = 0;
- connection->state = next_state;
- MHD_pool_reallocate (connection->pool, connection->write_buffer,
- connection->write_buffer_size, 0);
- connection->write_buffer = NULL;
- connection->write_buffer_size = 0;
- return MHD_YES;
-}
-
-/**
* This function was created to handle writes to sockets when it has
* been determined that the socket can be written to. All
* implementations (multithreaded, external select, internal select)
@@ -1688,13 +1690,28 @@
connection->state = MHD_CONNECTION_NORMAL_BODY_UNREADY;
break;
}
- // TODO clean
- ret = SEND (connection->socket_fd,
- &response->data[connection->response_write_position -
- response->data_start],
- response->data_size -
- (connection->response_write_position -
- response->data_start), MSG_NOSIGNAL);
+ // TODO clean - missing MSG_NOSIGNAL on gnutls record send call
+ if (connection->daemon->options & MHD_USE_SSL)
+ {
+ ret = gnutls_record_send (connection->tls_session,
+ &connection->response->
+ data[connection->
+ response_write_position -
+ response->data_start],
+ response->data_size -
+ (connection->response_write_position -
+ response->data_start));
+ }
+ else
+ {
+ ret = SEND (connection->socket_fd,
+ &response->data[connection->
+ response_write_position -
+ response->data_start],
+ response->data_size -
+ (connection->response_write_position -
+ response->data_start), MSG_NOSIGNAL);
+ }
#if DEBUG_SEND_DATA
if (ret > 0)
fprintf (stderr,
@@ -1777,6 +1794,8 @@
case MHDS_REQUEST_READING:
/* these should go through the idle state at first */
case MHDS_REQUEST_READ:
+ connection->s_state = MHDS_REPLY_SENDING;
+ do_write (connection);
break;
case MHDS_CONNECTION_CLOSED:
@@ -2157,10 +2176,10 @@
case MHDS_REPLY_READY:
/* send data for encryption */
- memcpy (connection->write_buffer,
- connection->tls_session->internals.application_data_buffer.
- data, connection->write_buffer_size);
- connection->s_state = MHDS_REPLY_SENDING;
+ //memcpy (connection->write_buffer,
+ //connection->tls_session->internals.application_data_buffer.
+ // data, connection->write_buffer_size);
+ //connection->s_state = MHDS_REPLY_SENDING;
break;
case MHDS_REQUEST_READING:
@@ -2170,12 +2189,9 @@
case MHDS_REQUEST_READ:
/* pipe data to HTTP state machine */
- msgLength
- =
- connection->tls_session->internals.application_data_buffer.length;
- memcpy (connection->tls_session->internals.application_data_buffer.
- data, connection->read_buffer, msgLength);
- connection->read_buffer_offset = msgLength;
+ // msgLength =
connection->tls_session->internals.application_data_buffer.length;
+ // memcpy
(connection->tls_session->internals.application_data_buffer.data,
connection->read_buffer, msgLength);
+ // connection->read_buffer_offset = msgLength;
/* pass connection to MHD */
MHD_connection_handle_idle (connection);
Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c 2008-06-25 10:21:33 UTC (rev 7323)
+++ libmicrohttpd/src/daemon/daemon.c 2008-06-25 13:59:37 UTC (rev 7324)
@@ -233,7 +233,8 @@
if (ret == 0)
{
- con->state = MHDS_HANDSHAKE_COMPLETE;
+ con->s_state = MHDS_HANDSHAKE_COMPLETE;
+ con->state = MHD_CONNECTION_INIT;
}
else
{
@@ -241,14 +242,14 @@
fprintf (stderr, "*** Handshake has failed (%s)\n\n",
gnutls_strerror (ret));
gnutls_deinit (tls_session);
- con->state = MHDS_HANDSHAKE_FAILED;
+ con->s_state = MHDS_HANDSHAKE_FAILED;
con->socket_fd = 1;
return MHD_NO;
}
// printf ("TLS Handshake completed\n");
- con->s_state = MHDS_HANDSHAKE_COMPLETE;
+
MHD_handle_connection (data);
}
@@ -405,9 +406,6 @@
/* set HTTPS connection handlers */
connection->recv_cls = &MHDS_con_read;
connection->send_cls = &MHDS_con_write;
- connection->read_handler = &MHDS_connection_handle_read;
- connection->write_handler = &MHDS_connection_handle_write;
- connection->idle_handler = &MHDS_connection_handle_idle;
}
#endif
@@ -480,6 +478,7 @@
free (pos->addr);
free (pos);
daemon->max_connections++;
+ // TODO add tls con cleanup
if (prev == NULL)
pos = daemon->connections;
else
Added: libmicrohttpd/src/testcurl/daemon_HTTPS_test_get.c
===================================================================
--- libmicrohttpd/src/testcurl/daemon_HTTPS_test_get.c
(rev 0)
+++ libmicrohttpd/src/testcurl/daemon_HTTPS_test_get.c 2008-06-25 13:59:37 UTC
(rev 7324)
@@ -0,0 +1,276 @@
+/*
+ This file is part of libmicrohttpd
+ (C) 2007 Christian Grothoff
+
+ libmicrohttpd is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ libmicrohttpd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with libmicrohttpd; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file daemon_HTTPS_test_get.c
+ * @brief Testcase for libmicrohttpd GET operations
+ * @author lv-426
+ */
+
+#include "config.h"
+#include "plibc.h"
+#include "microhttpd.h"
+#include <errno.h>
+
+#include <curl/curl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#define BUF_SIZE 1024
+#define MAX_URL_LEN 255
+
+/* Test Certificate */
+const char cert_pem[] =
+ "-----BEGIN CERTIFICATE-----\n"
+ "MIIB5zCCAVKgAwIBAgIERiYdJzALBgkqhkiG9w0BAQUwGTEXMBUGA1UEAxMOR251\n"
+ "VExTIHRlc3QgQ0EwHhcNMDcwNDE4MTMyOTExWhcNMDgwNDE3MTMyOTExWjAZMRcw\n"
+ "FQYDVQQDEw5HbnVUTFMgdGVzdCBDQTCBnDALBgkqhkiG9w0BAQEDgYwAMIGIAoGA\n"
+ "vuyYeh1vfmslnuggeEKgZAVmQ5ltSdUY7H25WGSygKMUYZ0KT74v8C780qtcNt9T\n"
+ "7EPH/N6RvB4BprdssgcQLsthR3XKA84jbjjxNCcaGs33lvOz8A1nf8p3hD+cKfRi\n"
+ "kfYSW2JazLrtCC4yRCas/SPOUxu78of+3HiTfFm/oXUCAwEAAaNDMEEwDwYDVR0T\n"
+ "AQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMDBwQAMB0GA1UdDgQWBBTpPBz7rZJu5gak\n"
+ "Viyi4cBTJ8jylTALBgkqhkiG9w0BAQUDgYEAiaIRqGfp1jPpNeVhABK60SU0KIAy\n"
+ "njuu7kHq5peUgYn8Jd9zNzExBOEp1VOipGsf6G66oQAhDFp2o8zkz7ZH71zR4HEW\n"
+ "KoX6n5Emn6DvcEH/9pAhnGxNHJAoS7czTKv/JDZJhkqHxyrE1fuLsg5Qv25DTw7+\n"
+ "PfqUpIhz5Bbm7J4=\n" "-----END CERTIFICATE-----\n";
+
+const char key_pem[] =
+ "-----BEGIN RSA PRIVATE KEY-----\n"
+ "MIICXAIBAAKBgQC7ZkP18sXXtozMxd/1iDuxyUtqDqGtIFBACIChT1yj0Phsz+Y8\n"
+ "9+wEdhMXi2SJIlvA3VN8O+18BLuAuSi+jpvGjqClEsv1Vx6i57u3M0mf47tKrmpN\n"
+ "aP/JEeIyjc49gAuNde/YAIGPKAQDoCKNYQQH+rY3fSEHSdIJYWmYkKNYqQIDAQAB\n"
+ "AoGADpmARG5CQxS+AesNkGmpauepiCz1JBF/JwnyiX6vEzUh0Ypd39SZztwrDxvF\n"
+ "PJjQaKVljml1zkJpIDVsqvHdyVdse8M+Qn6hw4x2p5rogdvhhIL1mdWo7jWeVJTF\n"
+ "RKB7zLdMPs3ySdtcIQaF9nUAQ2KJEvldkO3m/bRJFEp54k0CQQDYy+RlTmwRD6hy\n"
+ "7UtMjR0H3CSZJeQ8svMCxHLmOluG9H1UKk55ZBYfRTsXniqUkJBZ5wuV1L+pR9EK\n"
+ "ca89a+1VAkEA3UmBelwEv2u9cAU1QjKjmwju1JgXbrjEohK+3B5y0ESEXPAwNQT9\n"
+ "TrDM1m9AyxYTWLxX93dI5QwNFJtmbtjeBQJARSCWXhsoaDRG8QZrCSjBxfzTCqZD\n"
+ "ZXtl807ymCipgJm60LiAt0JLr4LiucAsMZz6+j+quQbSakbFCACB8SLV1QJBAKZQ\n"
+ "YKf+EPNtnmta/rRKKvySsi3GQZZN+Dt3q0r094XgeTsAqrqujVNfPhTMeP4qEVBX\n"
+ "/iVX2cmMTSh3w3z8MaECQEp0XJWDVKOwcTW6Ajp9SowtmiZ3YDYo1LF9igb4iaLv\n"
+ "sWZGfbnU3ryjvkb6YuFjgtzbZDZHWQCo8/cOtOBmPdk=\n"
+ "-----END RSA PRIVATE KEY-----\n";
+
+struct CBC
+{
+ char *buf;
+ size_t pos;
+ size_t size;
+};
+
+static size_t
+copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
+{
+ struct CBC *cbc = ctx;
+
+ if (cbc->pos + size * nmemb > cbc->size)
+ return 0; /* overflow */
+ memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb);
+ cbc->pos += size * nmemb;
+ return size * nmemb;
+}
+
+static int
+file_reader (void *cls, size_t pos, char *buf, int max)
+{
+ FILE *file = cls;
+ fseek (file, pos, SEEK_SET);
+ return fread (buf, 1, max, file);
+}
+
+/* HTTP access handler call back */
+static int
+http_ahc (void *cls,
+ struct MHD_Connection *connection,
+ const char *url,
+ const char *method,
+ const char *upload_data,
+ const char *version, unsigned int *upload_data_size, void **ptr)
+{
+ static int aptr;
+ static char full_url[MAX_URL_LEN];
+ struct MHD_Response *response;
+ int ret;
+ FILE *file;
+ struct stat buf;
+
+ // TODO never respond on first call
+ if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
+ return MHD_NO; /* unexpected method */
+ if (&aptr != *ptr)
+ {
+ /* do never respond on first call */
+ *ptr = &aptr;
+ return MHD_YES;
+ }
+ *ptr = NULL; /* reset when done */
+
+ file = fopen (url, "r");
+ if (file == NULL)
+ {
+ return 1;
+ }
+ else
+ {
+ stat (&url[1], &buf);
+ response = MHD_create_response_from_callback (buf.st_size, 32 * 1024,
/* 32k PAGE_NOT_FOUND size */
+ &file_reader, file,
+
(MHD_ContentReaderFreeCallback)
+ & fclose);
+ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+ MHD_destroy_response (response);
+ }
+ return ret;
+}
+
+static int
+test_HTTPS_Get ()
+{
+ struct MHD_Daemon *d;
+ CURL *c;
+ struct CBC cbc;
+ CURLcode errornum;
+ char *doc_path;
+ char *url;
+ /* currently use self as test file - consider better alternatives */
+ char *test_file_name = "daemon_HTTPS_test_get";
+ struct stat test_file_stat;
+ FILE *key_file, *cert_file, *test_file;
+
+ /* used to memcmp local copy & deamon supplied copy */
+ unsigned char *mem_test_file_local;
+ unsigned char *mem_test_file_recv;
+
+ /* setup test file path, url */
+ doc_path = get_current_dir_name ();
+
+ /* construct url - this might use doc_path */
+ url =
+ (char *) malloc (sizeof (char) *
+ (strlen (test_file_name) +
+ strlen ("https://127.0.0.1:42433/";)));
+ strncat (url, "https://127.0.0.1:42433/";, strlen
("https://127.0.0.1:42433/";));
+ strncat (url, test_file_name, strlen (test_file_name));
+
+ /* look for test file used for testing */
+ key_file = fopen ("key_file", "w");
+ cert_file = fopen ("cert_file", "w");
+ test_file = fopen (test_file_name, "r");
+ if ( key_file == NULL)
+ {
+ fprintf (stderr, "Error : failed to open key_file. errno:%d\n", errno);
+ return 1;
+ }
+ if (!cert_file)
+ {
+ fprintf (stderr, "Error : failed to open cert_file. errno:%d\n", errno);
+ return 1;
+ }
+ if (!test_file)
+ {
+ fprintf (stderr, "Error : failed to open test_file. errno:%d\n", errno);
+ return 1;
+ }
+ if (stat (test_file_name, &test_file_stat) == -1)
+ return 1;
+
+ /* create test cert & key */
+ fwrite (key_pem, 1, sizeof (key_pem), key_file);
+ fwrite (cert_pem, 1, sizeof (cert_pem), cert_file);
+ mem_test_file_local = malloc (test_file_stat.st_size);
+ mem_test_file_recv = malloc (test_file_stat.st_size);
+ fread (mem_test_file_local, 1, test_file_stat.st_size, test_file);
+
+ fclose (key_file);
+ fclose (cert_file);
+ fclose (test_file);
+
+ cbc.buf = mem_test_file_recv;
+ cbc.size = test_file_stat.st_size;
+ cbc.pos = 0;
+
+ /* setup test */
+ d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG,
+ 42433, NULL, NULL, &http_ahc, NULL,
+ MHD_OPTION_DOC_ROOT, doc_path, MHD_OPTION_END);
+ if (d == NULL)
+ return 1;
+
+ c = curl_easy_init ();
+ curl_easy_setopt (c, CURLOPT_URL, url);
+ curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+ curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L);
+ curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L);
+ curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer);
+ curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
+ /* TLS options */
+ curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
+ curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, "AES256-SHA");
+ /* currently skip peer authentication */
+ curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0);
+ // curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
+
+ // NOTE: use of CONNECTTIMEOUT without also
+ // setting NOSIGNAL results in really weird
+ // crashes on my system!
+ curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1);
+ 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 2;
+ }
+ curl_easy_cleanup (c);
+ MHD_stop_daemon (d);
+ if (remove ("key_file") != 0)
+ fprintf (stderr, "Error : failed to remove key_file.\n");
+ if (remove ("cert_file") != 0)
+ fprintf (stderr, "Error : failed to remove cert_file.\n");
+
+ fprintf (stderr, "file = %s.\n" , mem_test_file_recv );
+ if (memcmp (cbc.buf, mem_test_file_local, test_file_stat.st_size) == 0)
+ {
+ // TODO find proper error code
+ return 1;
+ }
+ return 0;
+}
+
+int
+main (int argc, char *const *argv)
+{
+
+ unsigned int errorCount = 0;
+
+ if (0 != curl_global_init (CURL_GLOBAL_WIN32))
+ return 2;
+ errorCount += test_HTTPS_Get ();
+ if (errorCount != 0)
+ fprintf (stderr, "Error (code: %u)\n", errorCount);
+ curl_global_cleanup ();
+ return errorCount == 0; /* 0 == pass */
+}
Property changes on: libmicrohttpd/src/testcurl/daemon_HTTPS_test_get.c
___________________________________________________________________
Name: svn:mime-type
+ text/plain
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7324 - in libmicrohttpd/src: daemon testcurl,
gnunet <=