[GNUnet-SVN] r20578 - gnunet/src/gns

[gnunet]

Author: schanzen
Date: 2012-03-16 18:47:23 +0100 (Fri, 16 Mar 2012)
New Revision: 20578

Added:
   gnunet/src/gns/test_gns_simple_mx_lookup.c
Modified:
   gnunet/src/gns/Makefile.am
   gnunet/src/gns/gnunet-service-gns_resolver.c
Log:
-mx,cname,ns postprocessing + test


Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2012-03-16 16:53:14 UTC (rev 20577)
+++ gnunet/src/gns/Makefile.am  2012-03-16 17:47:23 UTC (rev 20578)
@@ -35,6 +35,7 @@
   test_gns_simple_get_authority \
   test_gns_simple_lookup \
   test_gns_simple_delegated_lookup \
+  test_gns_simple_mx_lookup \
   test_gns_dht_delegated_lookup \
   test_gns_pseu_shorten
 
@@ -84,6 +85,19 @@
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
+test_gns_simple_mx_lookup_SOURCES = \
+  test_gns_simple_mx_lookup.c
+test_gns_simple_mx_lookup_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_gns_simple_mx_lookup_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+
 test_gns_dht_delegated_lookup_SOURCES = \
   test_gns_dht_delegated_lookup.c
 test_gns_dht_delegated_lookup_LDADD = \

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2012-03-16 16:53:14 UTC 
(rev 20577)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2012-03-16 17:47:23 UTC 
(rev 20578)
@@ -946,7 +946,9 @@
  * finish lookup
  */
 static void
-finish_lookup(struct RecordLookupHandle* rlh, unsigned int rd_count,
+finish_lookup(struct ResolverHandle *rh,
+              struct RecordLookupHandle* rlh,
+              unsigned int rd_count,
               const struct GNUNET_NAMESTORE_RecordData *rd)
 {
   int i;
@@ -954,6 +956,8 @@
   char new_s_value[256];
   int s_len;
   struct GNUNET_NAMESTORE_RecordData p_rd[rd_count];
+  char* pos;
+  char* trailer;
 
   if (rd_count > 0)
     memcpy(p_rd, rd, rd_count*sizeof(struct GNUNET_NAMESTORE_RecordData));
@@ -968,7 +972,6 @@
       p_rd[i].data = rd[i].data;
       continue;
     }
-    
 
     /**
      * for all those records we 'should'
@@ -984,13 +987,26 @@
       continue;
     }
 
-    if (0 == strcmp(s_value+s_len-2, ".+"))
+    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+               "Postprocessing %s\n", s_value);
+
+    if (0 == strcmp(s_value+s_len-3, ".+"))
     {
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Expanding .+ for %s\n", s_value);
-      memset(new_s_value, 0, s_len+strlen(GNUNET_GNS_TLD));
+                 "Expanding .+ in %s\n", s_value);
+      if (strcmp(rh->name, "+") == 0)
+      {
+        trailer = rlh->name;
+      }
+      else
+      {
+        trailer = rlh->name+strlen(rh->name)+1;
+      }
+      memset(new_s_value, 0, s_len+strlen(trailer)+strlen(GNUNET_GNS_TLD));
       strcpy(new_s_value, s_value);
-      memcpy(new_s_value+s_len-1, GNUNET_GNS_TLD, strlen(GNUNET_GNS_TLD));
+      pos = new_s_value+s_len-2;
+      strcpy(pos, trailer);
+      pos += strlen(trailer);
       p_rd[i].data = new_s_value;
       p_rd[i].data_size = strlen(new_s_value)+1;
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
@@ -1026,7 +1042,7 @@
                "No records for %s found in DHT. Aborting\n",
                rh->name);
     /* give up, cannot resolve */
-    finish_lookup(rlh, 0, NULL);
+    finish_lookup(rh, rlh, 0, NULL);
     free_resolver_handle(rh);
     return;
   }
@@ -1035,7 +1051,7 @@
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
              "Record resolved from DHT!");
 
-  finish_lookup(rlh, rd_count, rd);
+  finish_lookup(rh, rlh, rd_count, rd);
   free_resolver_handle(rh);
 
 }
@@ -1068,7 +1084,7 @@
       return;
     }
     /* give up, cannot resolve */
-    finish_lookup(rlh, 0, NULL);
+    finish_lookup(rh, rlh, 0, NULL);
     free_resolver_handle(rh);
     return;
   }
@@ -1077,7 +1093,7 @@
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
              "Record resolved from namestore!");
 
-  finish_lookup(rlh, rd_count, rd);
+  finish_lookup(rh, rlh, rd_count, rd);
   free_resolver_handle(rh);
 
 }
@@ -1158,9 +1174,20 @@
   
   if (strcmp(rh->name, "") == 0)
   {
+    if ((rlh->record_type == GNUNET_GNS_RECORD_PKEY))
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Resolved queried PKEY via DHT.\n");
+      finish_lookup(rh, rlh, rd_count, rd);
+      free_resolver_handle(rh);
+      return;
+    }
     /* We resolved full name for delegation. resolving record */
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
       "Resolved full name for delegation via DHT. resolving record '' in 
ns\n");
+    GNUNET_free(rh->name);
+    rh->name = GNUNET_malloc(strlen("+")+1);
+    strcpy(rh->name, "+\0");
     rh->proc = &handle_record_ns;
     resolve_record_ns(rh);
     return;
@@ -1181,9 +1208,7 @@
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
              "Cannot fully resolve delegation for %s via DHT!\n",
              rh->name);
-  rlh->proc(rlh->proc_cls, 0, NULL);
-  GNUNET_free(rlh->name);
-  GNUNET_free(rlh);
+  finish_lookup(rh, rlh, 0, NULL);
   free_resolver_handle(rh);
 }
 
@@ -1244,9 +1269,20 @@
   
   if (strcmp(rh->name, "") == 0)
   {
+    if ((rlh->record_type == GNUNET_GNS_RECORD_PKEY))
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Resolved queried PKEY in NS.\n");
+      finish_lookup(rh, rlh, rd_count, rd);
+      free_resolver_handle(rh);
+      return;
+    }
     /* We resolved full name for delegation. resolving record */
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-               "Resolved full name for delegation. resolving record ''\n");
+               "Resolved full name for delegation. resolving record '+'\n");
+    GNUNET_free(rh->name);
+    rh->name = GNUNET_malloc(strlen("+")+1);
+    strcpy(rh->name, "+\0");
     rh->proc = &handle_record_ns;
     resolve_record_ns(rh);
     return;

Added: gnunet/src/gns/test_gns_simple_mx_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_mx_lookup.c                          (rev 0)
+++ gnunet/src/gns/test_gns_simple_mx_lookup.c  2012-03-16 17:47:23 UTC (rev 
20578)
@@ -0,0 +1,384 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009 Christian Grothoff (and other contributing authors)
+
+     GNUnet 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 3, or (at your
+     option) any later version.
+
+     GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file gns/test_gns_simple_mx_lookup.c
+ * @brief base testcase for testing GNS MX lookups
+ *
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_core_service.h"
+#include "block_dns.h"
+#include "gnunet_signatures.h"
+#include "gnunet_namestore_service.h"
+#include "../namestore/namestore.h"
+#include "gnunet_dnsparser_lib.h"
+#include "gnunet_gns_service.h"
+
+/* DEFINES */
+#define VERBOSE GNUNET_YES
+
+/* Timeout for entire testcase */
+#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5)
+
+/* If number of peers not in config file, use this number */
+#define DEFAULT_NUM_PEERS 2
+
+/* test records to resolve */
+#define TEST_DOMAIN "bob.gnunet"
+#define TEST_IP "127.0.0.1"
+#define TEST_RECORD_NAME "mail"
+#define TEST_MX_NAME "mail.+"
+#define TEST_EXPECTED_MX "mail.bob.gnunet"
+
+#define TEST_AUTHORITY_NAME "bob"
+
+/* Globals */
+
+/**
+ * Directory to store temp data in, defined in config file
+ */
+static char *test_directory;
+
+struct GNUNET_TESTING_Daemon *d1;
+
+
+/* Task handle to use to schedule test failure */
+GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+/* Global return value (0 for success, anything else for failure) */
+static int ok;
+
+static struct GNUNET_NAMESTORE_Handle *namestore_handle;
+
+static struct GNUNET_GNS_Handle *gns_handle;
+
+const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Check whether peers successfully shut down.
+ */
+void
+shutdown_callback (void *cls, const char *emsg)
+{
+  if (emsg != NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error on shutdown! ret=%d\n", ok);
+    if (ok == 0)
+      ok = 2;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok);
+}
+
+static void
+on_lookup_result(void *cls, uint32_t rd_count,
+                 const struct GNUNET_NAMESTORE_RecordData *rd)
+{
+  struct in_addr a;
+  int i;
+  char* addr;
+  int mx_found = 0;
+  int ip_found = 0;
+  char* mx;
+  
+  if (rd_count == 0)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Lookup failed, rp_filtering?\n");
+    ok = 2;
+  }
+  else
+  {
+    ok = 1;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
+    for (i=0; i<rd_count; i++)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
+      if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+      {
+        memcpy(&a, rd[i].data, sizeof(a));
+        addr = inet_ntoa(a);
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
+        if (0 == strcmp(addr, TEST_IP))
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "%s correctly resolved to %s!\n", TEST_DOMAIN, addr);
+          ip_found = 1;
+        }
+      }
+      else if (rd[i].record_type == GNUNET_GNS_RECORD_MX)
+      {
+        mx = (char*)rd[i].data;
+        if (0 == strcmp(mx, TEST_EXPECTED_MX))
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                      "%s correctly resolved to %s!\n", TEST_DOMAIN,
+                      TEST_EXPECTED_MX);
+          mx_found = 1;
+        }
+      }
+    }
+  }
+
+  if (ip_found && mx_found)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Test succeeded!\n");
+    ok = 0;
+  }
+
+  if (!ip_found && mx_found)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  "Test partially succeeded: A record not passed along!(NOT IMPLEMENTED)\n");
+    ok = 0;
+  }
+
+  GNUNET_GNS_disconnect(gns_handle);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
+  GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
+                              GNUNET_YES, GNUNET_NO);
+}
+
+
+/**
+ * Function scheduled to be run on the successful start of services
+ * tries to look up the dns record for TEST_DOMAIN
+ */
+static void
+commence_testing (void *cls, int32_t success, const char *emsg)
+{
+  GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES);
+
+  gns_handle = GNUNET_GNS_connect(cfg);
+
+  if (NULL == gns_handle)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to connect to GNS!\n");
+  }
+
+  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_MX,
+                    &on_lookup_result, TEST_DOMAIN);
+}
+
+/**
+ * Continuation for the GNUNET_DHT_get_stop call, so that we don't shut
+ * down the peers without freeing memory associated with GET request.
+ */
+static void
+end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+
+  if (d1 != NULL)
+    GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
+                                GNUNET_YES, GNUNET_NO);
+  GNUNET_SCHEDULER_cancel (die_task);
+}
+
+/**
+ * Check if the get_handle is being used, if so stop the request.  Either
+ * way, schedule the end_badly_cont function which actually shuts down the
+ * test.
+ */
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test with error: `%s'!\n",
+              (char *) cls);
+  GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL);
+  ok = 1;
+}
+
+static void
+do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
+          const struct GNUNET_CONFIGURATION_Handle *cfg,
+          struct GNUNET_TESTING_Daemon *d, const char *emsg)
+{
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
+  struct GNUNET_CRYPTO_RsaPrivateKey *bob_key;
+  GNUNET_HashCode bob_hash;
+  struct GNUNET_CRYPTO_RsaSignature *sig;
+  char* alice_keyfile;
+
+  GNUNET_SCHEDULER_cancel (die_task);
+
+  /* put records into namestore */
+  namestore_handle = GNUNET_NAMESTORE_connect(cfg);
+  if (NULL == namestore_handle)
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
+    ok = -1;
+    return;
+  }
+
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+                                                          "ZONEKEY",
+                                                          &alice_keyfile))
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
+    ok = -1;
+    return;
+  }
+
+  alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
+  bob_key = GNUNET_CRYPTO_rsa_key_create ();
+
+  GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
+  GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey);
+
+  struct GNUNET_NAMESTORE_RecordData rd;
+  char* ip = TEST_IP;
+  struct in_addr *mail = GNUNET_malloc(sizeof(struct in_addr));
+  rd.expiration = GNUNET_TIME_absolute_get_forever ();
+  GNUNET_assert(1 == inet_pton (AF_INET, ip, mail));
+  
+  GNUNET_CRYPTO_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
+
+  rd.data_size = sizeof(GNUNET_HashCode);
+  rd.data = &bob_hash;
+  rd.record_type = GNUNET_GNS_RECORD_PKEY;
+
+  GNUNET_NAMESTORE_record_create (namestore_handle,
+                                  alice_key,
+                                  TEST_AUTHORITY_NAME,
+                                  &rd,
+                                  NULL,
+                                  NULL);
+
+  rd.data_size = sizeof(struct in_addr);
+  rd.data = mail;
+  rd.record_type = GNUNET_DNSPARSER_TYPE_A;
+  sig = GNUNET_NAMESTORE_create_signature(bob_key,
+                                          GNUNET_TIME_absolute_get_forever(),
+                                          TEST_RECORD_NAME,
+                                          &rd, 1);
+
+  GNUNET_NAMESTORE_record_put (namestore_handle,
+                               &bob_pkey,
+                               TEST_RECORD_NAME,
+                               rd.expiration,
+                               1,
+                               &rd,
+                               sig,
+                               NULL,
+                               NULL);
+
+  rd.data_size = strlen(TEST_MX_NAME)+1;
+  rd.data = TEST_MX_NAME;
+  rd.record_type = GNUNET_GNS_RECORD_MX;
+  sig = GNUNET_NAMESTORE_create_signature(bob_key,
+                                          GNUNET_TIME_absolute_get_forever(),
+                                          "+",
+                                          &rd, 1);
+  GNUNET_NAMESTORE_record_put (namestore_handle,
+                               &bob_pkey,
+                               "+",
+                               rd.expiration,
+                               1,
+                               &rd,
+                               sig,
+                               &commence_testing,
+                               NULL);
+  GNUNET_free(mail);
+  GNUNET_free(sig);
+  GNUNET_CRYPTO_rsa_key_free(bob_key);
+  GNUNET_CRYPTO_rsa_key_free(alice_key);
+}
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  cfg = c;
+   /* Get path from configuration file */
+  if (GNUNET_YES !=
+      GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
+                                             &test_directory))
+  {
+    ok = 404;
+    return;
+  }
+
+    
+  /* Set up a task to end testing if peer start fails */
+  die_task =
+      GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
+                                    "didn't start all daemons in reasonable 
amount of time!!!");
+  
+  /* Start alice */
+  d1 = GNUNET_TESTING_daemon_start(cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0,
+                                   NULL, NULL, NULL, &do_lookup, NULL);
+}
+
+static int
+check ()
+{
+  int ret;
+
+  /* Arguments for GNUNET_PROGRAM_run */
+  char *const argv[] = { "test-gns-simple-delegated-lookup", /* Name to give 
running binary */
+    "-c",
+    "test_gns_simple_lookup.conf",       /* Config file to use */
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  /* Run the run function as a new program */
+  ret =
+      GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+                          "test-gns-simple-delegated-lookup", "nohelp", 
options, &run,
+                          &ok);
+  if (ret != GNUNET_OK)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "`test-gns-simple-delegated-lookup': Failed with error code 
%d\n", ret);
+  }
+  return ok;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int ret;
+
+  GNUNET_log_setup ("test-gns-simple-lookup",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  ret = check ();
+  /**
+   * Need to remove base directory, subdirectories taken care
+   * of by the testing framework.
+   */
+  return ret;
+}
+
+/* end of test_gns_twopeer.c */