gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r31772 - gnunet/src/testbed


From: gnunet
Subject: [GNUnet-SVN] r31772 - gnunet/src/testbed
Date: Sun, 29 Dec 2013 22:49:53 +0100

Author: harsha
Date: 2013-12-29 22:49:53 +0100 (Sun, 29 Dec 2013)
New Revision: 31772

Added:
   gnunet/src/testbed/gnunet-daemon-testbed-underlay.c
Modified:
   gnunet/src/testbed/
   gnunet/src/testbed/Makefile.am
Log:
- testbed underlay daemon


Index: gnunet/src/testbed
===================================================================
--- gnunet/src/testbed  2013-12-29 21:11:00 UTC (rev 31771)
+++ gnunet/src/testbed  2013-12-29 21:49:53 UTC (rev 31772)

Property changes on: gnunet/src/testbed
___________________________________________________________________
Modified: svn:ignore
## -49,3 +49,4 ##
 gnunet-service-test-barriers
 buildvars.py
 test_testbed_api_barriers
+gnunet-daemon-testbed-underlay
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am      2013-12-29 21:11:00 UTC (rev 31771)
+++ gnunet/src/testbed/Makefile.am      2013-12-29 21:49:53 UTC (rev 31772)
@@ -16,11 +16,16 @@
 pkgcfg_DATA = \
   testbed.conf
 
+if HAVE_SQLITE
+  underlay_daemon = gnunet-daemon-testbed-underlay
+endif
+
 libexec_PROGRAMS = \
   gnunet-service-testbed \
   gnunet-helper-testbed \
   gnunet-service-testbed-logger \
-  gnunet-daemon-testbed-blacklist
+  gnunet-daemon-testbed-blacklist \
+  $(underlay_daemon)
 
 bin_PROGRAMS = \
   gnunet-testbed-profiler
@@ -83,6 +88,15 @@
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+gnunet_daemon_testbed_underlay_SOURCES = gnunet-daemon-testbed-underlay.c
+gnunet_daemon_testbed_underlay_LDADD = $(XLIB) \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL) -lsqlite3
+gnunet_daemon_testbed_underlay_DEPENDENCIES = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 lib_LTLIBRARIES = \
   libgnunettestbed.la \
   libgnunettestbedlogger.la

Added: gnunet/src/testbed/gnunet-daemon-testbed-underlay.c
===================================================================
--- gnunet/src/testbed/gnunet-daemon-testbed-underlay.c                         
(rev 0)
+++ gnunet/src/testbed/gnunet-daemon-testbed-underlay.c 2013-12-29 21:49:53 UTC 
(rev 31772)
@@ -0,0 +1,490 @@
+/*
+      This file is part of GNUnet
+      (C) 2008--2013 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 testbed/gnunet-daemon-testbed-blacklist.c
+ * @brief daemon to restrict incoming connections from other peers at the
+ *          transport layer of a peer
+ * @author Sree Harsha Totakura <address@hidden>
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_transport_service.h"
+#include "gnunet_testing_lib.h"
+#include <sqlite3.h>
+
+/**
+ * Logging shorthand
+ */
+#define LOG(type,...)                           \
+  GNUNET_log (type, __VA_ARGS__)
+
+/**
+ * Debug logging shorthand
+ */
+#define DEBUG(...)                              \
+  LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
+
+
+#define LOG_SQLITE_ERROR(ret)                                           \
+  LOG (GNUNET_ERROR_TYPE_ERROR, "sqlite error: %s", sqlite3_errstr (ret))
+
+
+/**
+ * Allow access from the peers read from the whitelist
+ */
+#define ACCESS_ALLOW 1
+
+/**
+ * Deny access from the peers read from the blacklist
+ */
+#define ACCESS_DENY 0
+
+/**
+ * The map to store the peer identities to allow/deny
+ */
+static struct GNUNET_CONTAINER_MultiPeerMap *map;
+
+
+/**
+ * The map to store the peer identities to allow/deny
+ */
+static struct GNUNET_CONTAINER_MultiPeerMap *blacklist_map;
+
+/**
+ * The database connection
+ */
+static struct sqlite3 *db;
+
+/**
+ * The array of peer identities we read from whitelist/blacklist
+ */
+static struct GNUNET_PeerIdentity *ilist;
+
+/**
+ * The blacklist handle we obtain from transport when we register ourselves for
+ * access control
+ */
+struct GNUNET_TRANSPORT_Blacklist *bh;
+
+/**
+ * The peer ID map
+ */
+static struct GNUNET_DISK_MapHandle *idmap;
+
+/**
+ * The hostkeys data
+ */
+static struct GNUNET_PeerIdentity *hostkeys;
+
+/**
+ * The number of hostkeys in the hostkeys array
+ */
+static unsigned int num_hostkeys;
+
+/**
+ * Task for shutdown
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
+/**
+ * Are we allowing or denying access from peers
+ */
+static int mode;
+
+
+/**
+ * @ingroup hashmap
+ * Iterator over hash map entries.
+ *
+ * @param cls closure
+ * @param key current key code
+ * @param value value in the hash map
+ * @return #GNUNET_YES if we should continue to
+ *         iterate,
+ *         #GNUNET_NO if not.
+ */
+static int
+iterator (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
+{
+  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (map, key,
+                                                                     value));
+  return GNUNET_YES;
+}
+
+
+/**
+ * Cleaup and destroy the map
+ */
+static void
+cleanup_map ()
+{
+  if (NULL != map)
+  {
+    GNUNET_assert (GNUNET_SYSERR != GNUNET_CONTAINER_multipeermap_iterate (map,
+                                                                           
&iterator,
+                                                                           
NULL));
+    GNUNET_CONTAINER_multipeermap_destroy (map);
+    map = NULL;
+  }
+}
+
+
+/**
+ * Shutdown task to cleanup our resources and exit.
+ *
+ * @param cls NULL
+ * @param tc scheduler task context
+ */
+static void
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  cleanup_map ();
+  if (NULL != bh)
+    GNUNET_TRANSPORT_blacklist_cancel (bh);
+}
+
+
+/**
+ * Function that decides if a connection is acceptable or not.
+ *
+ * @param cls closure
+ * @param pid peer to approve or disapproave
+ * @return GNUNET_OK if the connection is allowed, GNUNET_SYSERR if not
+ */
+static int
+check_access (void *cls, const struct GNUNET_PeerIdentity * pid)
+{
+  int contains;
+
+  if (NULL != map)
+    contains = GNUNET_CONTAINER_multipeermap_contains (map, pid);
+  else
+    contains = GNUNET_NO;
+  if (ACCESS_DENY == mode)
+    return (contains) ? GNUNET_SYSERR : GNUNET_OK;
+  return (contains) ? GNUNET_OK : GNUNET_SYSERR;
+}
+
+
+/**
+ * Setup the access control by reading the given file containing peer 
identities
+ * and then establishing blacklist handler with the peer's transport service
+ *
+ * @param fname the filename to read the list of peer identities
+ * @param cfg the configuration for connecting to the peer's transport service
+ */
+static void
+setup_ac (const char *fname, const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  uint64_t fsize;
+  unsigned int npeers;
+  unsigned int cnt;
+
+  GNUNET_assert (GNUNET_OK != GNUNET_DISK_file_size (fname, &fsize, GNUNET_NO,
+                                                     GNUNET_YES));
+  if (0 != (fsize % sizeof (struct GNUNET_PeerIdentity)))
+  {
+    GNUNET_break (0);
+    return;
+  }
+  npeers = fsize / sizeof (struct GNUNET_PeerIdentity);
+  if (0 != npeers)
+  {
+    map = GNUNET_CONTAINER_multipeermap_create (npeers, GNUNET_YES);
+    ilist = GNUNET_malloc_large (fsize);
+    GNUNET_assert (fsize == GNUNET_DISK_fn_read (fname, ilist, fsize));
+  }
+  for (cnt = 0; cnt < npeers; cnt++)
+  {
+    if (GNUNET_SYSERR == GNUNET_CONTAINER_multipeermap_put (map, &ilist[cnt],
+                                                            &ilist[cnt],
+                                                            
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+    {
+      cleanup_map ();
+      GNUNET_free (ilist);
+      return;
+    }
+  }
+  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                &do_shutdown, NULL);
+  bh = GNUNET_TRANSPORT_blacklist (cfg, &check_access, NULL);
+}
+
+
+/**
+ * Function to blacklist a peer
+ *
+ * @param offset the offset where to find the peer's hostkey in the array of 
hostkeys
+ */
+static void
+blacklist_peer (unsigned int offset)
+{
+  struct GNUNET_CRYPTO_EddsaPrivateKey private_key;
+  struct GNUNET_PeerIdentity id;
+
+  (void) memcpy (&private_key, &hostkeys[offset], sizeof (private_key));
+  GNUNET_CRYPTO_eddsa_key_get_public (&private_key, &id.public_key);
+  GNUNET_break (GNUNET_OK == 
+                GNUNET_CONTAINER_multipeermap_put (map, &id, &id,
+                                                   
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  
+}
+
+/**
+ * Blacklist peer
+ */
+struct ListRow
+{
+  /**
+   * Next ptr
+   */
+  struct ListRow *next;
+  
+  /**
+   * The offset where to find the hostkey for the peer
+   */
+  unsigned int id;
+};
+
+
+/**
+ * Function to add a peer to the blacklist
+ *
+ * @param head the head of the list
+ * @param id the id of the peer to add
+ */
+static void
+listrow_add (struct ListRow *head, unsigned int id)
+{
+  struct ListRow *bp;
+                                               
+  bp = GNUNET_new (struct ListRow);
+  bp->id = id;
+  bp->next = head;
+  head = bp;
+}
+
+
+/**
+ * Add peers in the blacklist to the blacklist map
+ */
+static int
+map_populate (struct ListRow *head,
+              struct GNUNET_CONTAINER_MultiPeerMap *map,
+              const struct GNUNET_PeerIdentity *hostkeys)
+{
+  struct ListRow *row;
+  int ret;
+
+  while (NULL != (row = head))
+  {
+    if (head->id >= num_hostkeys)
+    {
+      LOG (GNUNET_ERROR_TYPE_WARNING, "Hostkey index %u out of max range %u\n",
+           row->id, num_hostkeys);
+    }
+    head = row->next;
+    ret = GNUNET_CONTAINER_multipeermap_put (blacklist_map, &hostkeys[row->id],
+                                       (void *) &hostkeys[row->id],
+                                       
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+    if (GNUNET_OK != ret)
+      return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function to load keys
+ */
+static int
+load_keys (const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  char *data_dir;
+  char *idfile;
+  struct GNUNET_DISK_FileHandle *fd;
+  uint64_t fsize;
+  
+  data_dir = NULL;
+  idfile = NULL;
+  fd = NULL;
+  fsize = 0;
+  data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+  GNUNET_asprintf (&idfile, "%s/testing_hostkeys.ecc", data_dir);
+  GNUNET_free (data_dir);
+  data_dir = NULL;
+  if (GNUNET_OK !=
+      GNUNET_DISK_file_size (idfile, &fsize, GNUNET_YES, GNUNET_YES))
+  {
+    GNUNET_free (idfile);
+    return GNUNET_SYSERR;
+  }
+  if (0 != (fsize % GNUNET_TESTING_HOSTKEYFILESIZE))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _("Incorrect hostkey file format: %s\n"), idfile);
+    GNUNET_free (idfile);
+    return GNUNET_SYSERR;
+  }
+  fd = GNUNET_DISK_file_open (idfile, GNUNET_DISK_OPEN_READ,
+                              GNUNET_DISK_PERM_NONE);
+  if (NULL == fd)
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", idfile);
+    GNUNET_free (idfile);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (idfile);
+  idfile = NULL;
+  hostkeys = (struct GNUNET_PeerIdentity *)
+      GNUNET_DISK_file_map (fd, &idmap, GNUNET_DISK_MAP_TYPE_READ, fsize);
+  if (NULL == hostkeys)
+    num_hostkeys = fsize / GNUNET_TESTING_HOSTKEYFILESIZE;
+  return GNUNET_OK;
+}
+
+
+static int
+db_read_blacklist (sqlite3 *dbfile, unsigned int pid, struct ListRow 
**blacklist_rows)
+{
+  static const char *query_bl = "SELECT (id, oid) FROM blacklist WHERE (id == 
?);";
+  static struct sqlite3_stmt *stmt_bl;
+  int nrows;
+  int peer_id;
+  int ret;
+
+  if (SQLITE_OK != (ret = sqlite3_prepare_v2 (db, query_bl, -1, &stmt_bl, 
NULL)))
+  {
+    LOG_SQLITE_ERROR (ret);
+    return GNUNET_SYSERR;
+  }
+  if (SQLITE_OK != (ret = sqlite3_bind_int (stmt_bl, 1, pid)))
+  {
+    LOG_SQLITE_ERROR (ret);
+    sqlite3_finalize (stmt_bl);
+    return GNUNET_SYSERR;
+  }
+  nrows = 0;
+  do
+  {
+    ret = sqlite3_step (stmt_bl);
+    if (SQLITE_ROW != ret)
+      break;
+    peer_id = sqlite3_column_int (stmt_bl, 1);
+    listrow_add (*blacklist_rows, peer_id);
+    nrows++;
+  } while (1);
+  sqlite3_finalize (stmt_bl);
+  stmt_bl = NULL;
+  return nrows;
+}
+
+
+/**
+ * Main function that will be run.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be 
NULL!)
+ * @param c configuration
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  char *dbfile;
+  struct ListRow *blacklist_rows;
+  unsigned long long pid;
+  unsigned int nrows;
+  int ret;
+  
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (c, "TESTBED",
+                                                            "PEERID", &pid))
+  {
+    GNUNET_break (0);
+    return;
+  }
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "TESTBED",
+                                                            "UNDERLAY_DB",
+                                                            &dbfile))
+  {
+    GNUNET_break (0);
+    return;
+  }
+  if (SQLITE_OK != (ret = sqlite3_open_v2 (dbfile, &db, SQLITE_OPEN_READONLY, 
NULL)))
+  {
+    LOG_SQLITE_ERROR (ret);
+    GNUNET_free (dbfile);
+    return;
+  }
+  DEBUG ("Opened database %s\n", dbfile);
+  GNUNET_free (dbfile);
+  dbfile = NULL;
+  blacklist_rows = NULL;
+  nrows = db_read_blacklist (db, pid, &blacklist_rows);
+  if (-1 == nrows)
+    goto close_db;
+  if (nrows > 0)
+  {
+    blacklist_map = GNUNET_CONTAINER_multipeermap_create (nrows, GNUNET_YES);
+    if (GNUNET_OK != load_keys (c))
+    {
+      goto close_db;
+    }
+  }
+  /* process whitelist */
+  GNUNET_break (0);             /* TODO */
+
+ close_db:
+  GNUNET_break (GNUNET_OK == sqlite3_close (db));
+  return;
+}
+
+
+/**
+ * The main function.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  int ret;
+
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
+  (void) sqlite3_config (SQLITE_CONFIG_MMAP_SIZE, 512000, 256000000);
+  ret =
+      (GNUNET_OK ==
+       GNUNET_PROGRAM_run (argc, argv, "gnunet-daemon-testbed-underlay",
+                           _
+                           ("Daemon to restrict underlay network in testbed 
deployments"),
+                           options, &run, NULL)) ? 0 : 1;
+  GNUNET_free ((void*) argv);
+  return ret;
+}




reply via email to

[Prev in Thread] Current Thread [Next in Thread]