[GNUnet-SVN] r7380 - libmicrohttpd/src/testcurl/https

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7380 - libmicrohttpd/src/testcurl/https

From:	gnunet
Subject:	[GNUnet-SVN] r7380 - libmicrohttpd/src/testcurl/https
Date:	Thu, 3 Jul 2008 21:23:55 -0600 (MDT)
Author: lv-426
Date: 2008-07-03 21:23:55 -0600 (Thu, 03 Jul 2008)
New Revision: 7380

Modified:
   libmicrohttpd/src/testcurl/https/daemon_https_test_get.c
Log:
fixed cURL test

Modified: libmicrohttpd/src/testcurl/https/daemon_https_test_get.c
===================================================================
--- libmicrohttpd/src/testcurl/https/daemon_https_test_get.c    2008-07-03 
02:39:07 UTC (rev 7379)
+++ libmicrohttpd/src/testcurl/https/daemon_https_test_get.c    2008-07-04 
03:23:55 UTC (rev 7380)
@@ -34,9 +34,9 @@
 #include <string.h>
 #include <time.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #define BUF_SIZE 1024
 #define MAX_URL_LEN 255
@@ -44,35 +44,57 @@
 #define PAGE_NOT_FOUND "<html><head><title>File not 
found</title></head><body>File not found</body></html>"
 
 /* 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 cert_pem[] =
+  "-----BEGIN CERTIFICATE-----\n"
+  "MIICpjCCAZCgAwIBAgIESEPtjjALBgkqhkiG9w0BAQUwADAeFw0wODA2MDIxMjU0\n"
+  "MzhaFw0wOTA2MDIxMjU0NDZaMAAwggEfMAsGCSqGSIb3DQEBAQOCAQ4AMIIBCQKC\n"
+  "AQC03TyUvK5HmUAirRp067taIEO4bibh5nqolUoUdo/LeblMQV+qnrv/RNAMTx5X\n"
+  "fNLZ45/kbM9geF8qY0vsPyQvP4jumzK0LOJYuIwmHaUm9vbXnYieILiwCuTgjaud\n"
+  "3VkZDoQ9fteIo+6we9UTpVqZpxpbLulBMh/VsvX0cPJ1VFC7rT59o9hAUlFf9jX/\n"
+  "GmKdYI79MtgVx0OPBjmmSD6kicBBfmfgkO7bIGwlRtsIyMznxbHu6VuoX/eVxrTv\n"
+  "rmCwgEXLWRZ6ru8MQl5YfqeGXXRVwMeXU961KefbuvmEPccgCxm8FZ1C1cnDHFXh\n"
+  "siSgAzMBjC/b6KVhNQ4KnUdZAgMBAAGjLzAtMAwGA1UdEwEB/wQCMAAwHQYDVR0O\n"
+  "BBYEFJcUvpjvE5fF/yzUshkWDpdYiQh/MAsGCSqGSIb3DQEBBQOCAQEARP7eKSB2\n"
+  "RNd6XjEjK0SrxtoTnxS3nw9sfcS7/qD1+XHdObtDFqGNSjGYFB3Gpx8fpQhCXdoN\n"
+  "8QUs3/5ZVa5yjZMQewWBgz8kNbnbH40F2y81MHITxxCe1Y+qqHWwVaYLsiOTqj2/\n"
+  "0S3QjEJ9tvklmg7JX09HC4m5QRYfWBeQLD1u8ZjA1Sf1xJriomFVyRLI2VPO2bNe\n"
+  "JDMXWuP+8kMC7gEvUnJ7A92Y2yrhu3QI3bjPk8uSpHea19Q77tul1UVBJ5g+zpH3\n"
+  "OsF5p0MyaVf09GTzcLds5nE/osTdXGUyHJapWReVmPm3Zn6gqYlnzD99z+DPIgIV\n"
+  "RhZvQx74NQnS6g==\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"
+const char key_pem[] =
+  "-----BEGIN RSA PRIVATE KEY-----\n"
+  "MIIEowIBAAKCAQEAtN08lLyuR5lAIq0adOu7WiBDuG4m4eZ6qJVKFHaPy3m5TEFf\n"
+  "qp67/0TQDE8eV3zS2eOf5GzPYHhfKmNL7D8kLz+I7psytCziWLiMJh2lJvb2152I\n"
+  "niC4sArk4I2rnd1ZGQ6EPX7XiKPusHvVE6VamacaWy7pQTIf1bL19HDydVRQu60+\n"
+  "faPYQFJRX/Y1/xpinWCO/TLYFcdDjwY5pkg+pInAQX5n4JDu2yBsJUbbCMjM58Wx\n"
+  "7ulbqF/3lca0765gsIBFy1kWeq7vDEJeWH6nhl10VcDHl1PetSnn27r5hD3HIAsZ\n"
+  "vBWdQtXJwxxV4bIkoAMzAYwv2+ilYTUOCp1HWQIDAQABAoIBAArOQv3R7gmqDspj\n"
+  "lDaTFOz0C4e70QfjGMX0sWnakYnDGn6DU19iv3GnX1S072ejtgc9kcJ4e8VUO79R\n"
+  "EmqpdRR7k8dJr3RTUCyjzf/C+qiCzcmhCFYGN3KRHA6MeEnkvRuBogX4i5EG1k5l\n"
+  "/5t+YBTZBnqXKWlzQLKoUAiMLPg0eRWh+6q7H4N7kdWWBmTpako7TEqpIwuEnPGx\n"
+  "u3EPuTR+LN6lF55WBePbCHccUHUQaXuav18NuDkcJmCiMArK9SKb+h0RqLD6oMI/\n"
+  "dKD6n8cZXeMBkK+C8U/K0sN2hFHACsu30b9XfdnljgP9v+BP8GhnB0nCB6tNBCPo\n"
+  "32srOwECgYEAxWh3iBT4lWqL6bZavVbnhmvtif4nHv2t2/hOs/CAq8iLAw0oWGZc\n"
+  "+JEZTUDMvFRlulr0kcaWra+4fN3OmJnjeuFXZq52lfMgXBIKBmoSaZpIh2aDY1Rd\n"
+  "RbEse7nQl9hTEPmYspiXLGtnAXW7HuWqVfFFP3ya8rUS3t4d07Hig8ECgYEA6ou6\n"
+  "OHiBRTbtDqLIv8NghARc/AqwNWgEc9PelCPe5bdCOLBEyFjqKiT2MttnSSUc2Zob\n"
+  "XhYkHC6zN1Mlq30N0e3Q61YK9LxMdU1vsluXxNq2rfK1Scb1oOlOOtlbV3zA3VRF\n"
+  "hV3t1nOA9tFmUrwZi0CUMWJE/zbPAyhwWotKyZkCgYEAh0kFicPdbABdrCglXVae\n"
+  "SnfSjVwYkVuGd5Ze0WADvjYsVkYBHTvhgRNnRJMg+/vWz3Sf4Ps4rgUbqK8Vc20b\n"
+  "AU5G6H6tlCvPRGm0ZxrwTWDHTcuKRVs+pJE8C/qWoklE/AAhjluWVoGwUMbPGuiH\n"
+  "6Gf1bgHF6oj/Sq7rv/VLZ8ECgYBeq7ml05YyLuJutuwa4yzQ/MXfghzv4aVyb0F3\n"
+  "QCdXR6o2IYgR6jnSewrZKlA9aPqFJrwHNR6sNXlnSmt5Fcf/RWO/qgJQGLUv3+rG\n"
+  "7kuLTNDR05azSdiZc7J89ID3Bkb+z2YkV+6JUiPq/Ei1+nDBEXb/m+/HqALU/nyj\n"
+  "P3gXeQKBgBusb8Rbd+KgxSA0hwY6aoRTPRt8LNvXdsB9vRcKKHUFQvxUWiUSS+L9\n"
+  "/Qu1sJbrUquKOHqksV5wCnWnAKyJNJlhHuBToqQTgKXjuNmVdYSe631saiI7PHyC\n"
+  "eRJ6DxULPxABytJrYCRrNqmXi5TCiqR2mtfalEMOPxz8rUU8dYyx\n"
   "-----END RSA PRIVATE KEY-----\n";
 
+const char *test_file_name = "https_test_file";
+
+const char test_file_data[] = "Hello World\n";
+
 struct CBC
 {
   char *buf;
@@ -146,8 +168,12 @@
   return ret;
 }
 
+/*
+ * test HTTPS transfer
+ * @param test_fd: file to attempt transfering
+ */
 static int
-test_HTTPS_Get ()
+test_HTTPS_Get (FILE * test_fd)
 {
   struct MHD_Daemon *d;
   CURL *c;
@@ -155,77 +181,65 @@
   CURLcode errornum;
   char *doc_path;
   char url[255];
-  char **file_path;
-  /* currently use hard coded certificate as test file - consider better 
alternatives */
-  const char *test_file_name = "cert.pem";
-  struct stat test_file_stat;
-  int key_file, cert_file, test_file;
+  size_t len = fseek (test_fd, 0, SEEK_END);
 
+
   /* used to memcmp local copy & deamon supplied copy */
   unsigned char *mem_test_file_local;
 
   /* setup test file path, url */
   doc_path = get_current_dir_name ();
 
-  test_file = open (test_file_name, O_RDONLY);
-  if (!test_file)
+  mem_test_file_local = malloc (len);
+  fseek (test_fd, 0, SEEK_SET);
+  if (fread (mem_test_file_local, sizeof(char), len, test_fd) != len)
     {
-      fprintf (stderr, "Error: failed to open `%s': %s\n",
-              test_file_name,
-              strerror(errno));
-      return 1;
+      fclose (test_fd);
+      fprintf (stderr, "Error: failed to read test file. %s\n",
+               strerror (errno));
+      return -1;
     }
-  if (stat (test_file_name, &test_file_stat) == -1)
+
+  if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
     {
-      fprintf (stderr, "Error: failed to stat `%s': %s\n", 
-              test_file_name,
-              strerror(errno));
-      return 2;
-    }
-  mem_test_file_local = malloc (sizeof (char) * test_file_stat.st_size);
-  if (read (test_file, mem_test_file_local, test_file_stat.st_size)
-      != test_file_stat.st_size)
-    {
-      close (test_file);
-      fprintf (stderr, "Error: failed to read test file\n",
-               curl_easy_strerror (errornum));
-      return 4;
-    }
-  close (test_file);
-
-  if (NULL == (cbc.buf = malloc (sizeof (char) * test_file_stat.st_size)))
-    return 8;
-  cbc.size = test_file_stat.st_size;
+         fclose (test_fd);
+         fprintf (stderr, "Error: failed to read test file. %s\n",
+                  strerror (errno));
+         return -1;
+       }
+  cbc.size = len;
   cbc.pos = 0;
 
   /* setup test */
   d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
-                        MHD_USE_DEBUG, 42433, NULL, NULL, &http_ahc, NULL,
+                        MHD_USE_DEBUG, 42433,
+                        NULL, NULL, &http_ahc, NULL,
                         MHD_OPTION_HTTPS_MEM_KEY, key_pem,
                         MHD_OPTION_HTTPS_MEM_CERT, cert_pem, MHD_OPTION_END);
 
   if (d == NULL)
-    return 16;
+    return 2;
 
   /* construct url - this might use doc_path */
-  sprintf (url, "%s%s/%s", "https://localhost:42433";, doc_path,
-           test_file_name);
-  fprintf (stderr, "URL: %s\n", url);
+  sprintf (url, "%s%s/%s", "https://localhost:42433";,
+           doc_path, test_file_name);
 
   c = curl_easy_init ();
-  curl_easy_setopt (c, CURLOPT_VERBOSE, 1);
+  //curl_easy_setopt (c, CURLOPT_VERBOSE, 1);
   curl_easy_setopt (c, CURLOPT_URL, url);
   curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
-  curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L);
-  curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L);
+  curl_easy_setopt (c, CURLOPT_TIMEOUT, 10L);
+  curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 10L);
   curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
   curl_easy_setopt (c, CURLOPT_FILE, &cbc);
   /* TLS options */
-  curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
+  curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3);
   curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, "AES256-SHA");
-  /* currently skip any peer authentication */
-  curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0L);
-  curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0L);
+
+  // TODO rm : currently skip any peer authentication */
+  curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0);
+  curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0);
+
   curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
 
   // NOTE: use of CONNECTTIMEOUT without also
@@ -238,35 +252,71 @@
                curl_easy_strerror (errornum));
       curl_easy_cleanup (c);
       MHD_stop_daemon (d);
-      return 32;
+      return 4;
     }
 
   curl_easy_cleanup (c);
   MHD_stop_daemon (d);
 
-  if (memcmp (cbc.buf, mem_test_file_local, test_file_stat.st_size) != 0)
+  if (memcmp (cbc.buf, mem_test_file_local, len) != 0)
     {
-      // TODO find proper error code
-      return 64;
+      fprintf (stderr, "Error: local file & received file differ. %s\n");
+      return 8;
     }
   return 0;
 }
 
+/* setup a temporary transfer test file */
+FILE *
+setupTestFile ()
+{
+  FILE *test_fd;
+
+  if ( NULL == (test_fd = fopen (test_file_name, "w+")))
+    {
+      fprintf (stderr, "Error: failed to open `%s': %s\n",
+               test_file_name, strerror (errno));
+      return NULL;
+    }
+  if (fwrite (test_file_data, sizeof(char), strlen (test_file_data), test_fd) 
!=
+      strlen (test_file_data))
+    {
+      fprintf (stderr, "Error: failed to write `%s. %s'\n",
+               test_file_name, strerror (errno));
+      return NULL;
+    }
+  if (fflush (test_fd))
+    {
+      fprintf (stderr, "Error: failed to flush test file stream. %s\n",
+               strerror (errno));
+      return NULL;
+    }
+
+  return test_fd;
+}
+
 int
 main (int argc, char *const *argv)
 {
-
+  FILE *test_fd;
   unsigned int errorCount = 0;
+  if ((test_fd = setupTestFile ()) == NULL )
+    {
+      return 16;
+    }
 
   if (0 != curl_global_init (CURL_GLOBAL_ALL))
     {
       fprintf (stderr, "Error (code: %u)\n", errorCount);
-      return 2;
+      return 32;
     }
 
-  errorCount += test_HTTPS_Get ();
+  errorCount += test_HTTPS_Get (test_fd);
   if (errorCount != 0)
     fprintf (stderr, "Error (code: %u)\n", errorCount);
+
   curl_global_cleanup ();
+  fclose (test_fd);
+
   return errorCount != 0;
 }
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r7380 - libmicrohttpd/src/testcurl/https, gnunet <=
Prev by Date: [GNUnet-SVN] r7379 - in GNUnet: doc/man src/setup
Next by Date: [GNUnet-SVN] r7381 - in libmicrohttpd/src: daemon daemon/https daemon/https/includes daemon/https/tls daemon/https/x509 examples include testcurl testcurl/https
Previous by thread: [GNUnet-SVN] r7379 - in GNUnet: doc/man src/setup
Next by thread: [GNUnet-SVN] r7381 - in libmicrohttpd/src: daemon daemon/https daemon/https/includes daemon/https/tls daemon/https/x509 examples include testcurl testcurl/https
Index(es):
- Date
- Thread