implemented new DHT path signing with origin authentication

5 files changed, 42 insertions, 19 deletions

diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c
index a2b60c8da..0dd8e47f8 100644
--- a/src/datacache/plugin_datacache_heap.c
+++ b/src/datacache/plugin_datacache_heap.c
@@ -196,10 +196,13 @@ heap_plugin_put (void *cls,
   else
     val->distance = xor_distance;
   if (0 != block->put_path_length)
-    val->block.put_path
+  {
+    val->put_path
       = GNUNET_memdup (block->put_path,
                        block->put_path_length
                        * sizeof (struct GNUNET_DHT_PathElement));
+    val->block.put_path = val->put_path;
+  }
   (void) GNUNET_CONTAINER_multihashmap_put (plugin->map,
                                             &val->block.key,
                                             val,
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c
index d9e25992b..b1f9a1b8e 100644
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -71,11 +71,12 @@ init_connection (struct Plugin *plugin)
       "CREATE TEMPORARY SEQUENCE IF NOT EXISTS gn180dc_oid_seq"),
     GNUNET_PQ_make_execute ("CREATE TEMPORARY TABLE IF NOT EXISTS gn180dc ("
                             "  oid OID NOT NULL DEFAULT nextval('gn180dc_oid_seq'),"
-                            "  type INTEGER NOT NULL,"
-                            "  ro INTEGER NOT NULL,"
-                            "  prox INTEGER NOT NULL,"
-                            "  expiration_time BIGINT NOT NULL,"
-                            "  key BYTEA NOT NULL,"
+                            "  type INT4 NOT NULL,"
+                            "  ro INT4 NOT NULL,"
+                            "  prox INT4 NOT NULL,"
+                            "  expiration_time INT8 NOT NULL,"
+                            "  key BYTEA NOT NULL CHECK(LENGTH(key)=64),"
+                            "  trunc BYTEA NOT NULL CHECK(LENGTH(trunc)=32),"
                             "  value BYTEA NOT NULL,"
                             "  path BYTEA DEFAULT NULL)"),
     GNUNET_PQ_make_try_execute (
@@ -93,11 +94,11 @@ init_connection (struct Plugin *plugin)
   };
   struct GNUNET_PQ_PreparedStatement ps[] = {
     GNUNET_PQ_make_prepare ("getkt",
-                            "SELECT expiration_time,type,ro,value,path FROM gn180dc "
+                            "SELECT expiration_time,type,ro,value,trunc,path FROM gn180dc "
                             "WHERE key=$1 AND type=$2 AND expiration_time >= $3",
                             3),
     GNUNET_PQ_make_prepare ("getk",
-                            "SELECT expiration_time,type,ro,value,path FROM gn180dc "
+                            "SELECT expiration_time,type,ro,value,trunc,path FROM gn180dc "
                             "WHERE key=$1 AND expiration_time >= $2",
                             2),
     GNUNET_PQ_make_prepare ("getex",
@@ -110,14 +111,14 @@ init_connection (struct Plugin *plugin)
                             " ORDER BY prox ASC, expiration_time ASC LIMIT 1",
                             0),
     GNUNET_PQ_make_prepare ("get_closest",
-                            "(SELECT expiration_time,type,ro,value,path,key FROM gn180dc"
+                            "(SELECT expiration_time,type,ro,value,trunc,path,key FROM gn180dc"
                             " WHERE key >= $1"
                             "   AND expiration_time >= $2"
                             "   AND ( (type = $3) OR ( 0 = $3) )"
                             " ORDER BY key ASC"
                             " LIMIT $4)"
                             " UNION "
-                            "(SELECT expiration_time,type,ro,value,path,key FROM gn180dc"
+                            "(SELECT expiration_time,type,ro,value,trunc,path,key FROM gn180dc"
                             " WHERE key <= $1"
                             "   AND expiration_time >= $2"
                             "   AND ( (type = $3) OR ( 0 = $3) )"
@@ -129,9 +130,9 @@ init_connection (struct Plugin *plugin)
                             1),
     GNUNET_PQ_make_prepare ("put",
                             "INSERT INTO gn180dc"
-                            " (type, ro, prox, expiration_time, key, value, path) "
-                            "VALUES ($1, $2, $3, $4, $5, $6, $7)",
-                            7),
+                            " (type, ro, prox, expiration_time, key, value, trunc, path) "
+                            "VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
+                            8),
     GNUNET_PQ_PREPARED_STATEMENT_END
   };
 
@@ -170,6 +171,7 @@ postgres_plugin_put (void *cls,
     GNUNET_PQ_query_param_auto_from_type (&block->key),
     GNUNET_PQ_query_param_fixed_size (block->data,
                                       block->data_size),
+    GNUNET_PQ_query_param_auto_from_type (&block->trunc_peer),
     GNUNET_PQ_query_param_fixed_size (block->put_path,
                                       block->put_path_length
                                       * sizeof(struct GNUNET_DHT_PathElement)),
@@ -243,6 +245,8 @@ handle_results (void *cls,
       GNUNET_PQ_result_spec_variable_size ("value",
                                            &data,
                                            &block.data_size),
+      GNUNET_PQ_result_spec_auto_from_type ("trunc",
+                                            &block.trunc_peer),
       GNUNET_PQ_result_spec_variable_size ("path",
                                            &path,
                                            &path_size),
@@ -465,6 +469,8 @@ extract_result_cb (void *cls,
       GNUNET_PQ_result_spec_variable_size ("value",
                                            &data,
                                            &block.data_size),
+      GNUNET_PQ_result_spec_auto_from_type ("trunc",
+                                            &block.trunc_peer),
       GNUNET_PQ_result_spec_variable_size ("path",
                                            &path,
                                            &path_size),
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c
index 22ae5c0f5..0753d87ce 100644
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -207,6 +207,7 @@ sqlite_plugin_put (void *cls,
     GNUNET_SQ_query_param_fixed_size (block->put_path,
                                       block->put_path_length
                                       * sizeof(struct GNUNET_DHT_PathElement)),
+    GNUNET_SQ_query_param_auto_from_type (&block->trunc_peer),
     GNUNET_SQ_query_param_end
   };
 
@@ -290,6 +291,7 @@ get_any (void *cls,
     GNUNET_SQ_result_spec_absolute_time (&block.expiration_time),
     GNUNET_SQ_result_spec_variable_size (&path,
                                          &path_size),
+    GNUNET_SQ_result_spec_auto_from_type (&block.trunc_peer),
     GNUNET_SQ_result_spec_uint32 (&btype32),
     GNUNET_SQ_result_spec_uint32 (&bro32),
     GNUNET_SQ_result_spec_end
@@ -451,6 +453,7 @@ get_typed (void *cls,
     GNUNET_SQ_result_spec_absolute_time (&block.expiration_time),
     GNUNET_SQ_result_spec_variable_size (&path,
                                          &path_size),
+    GNUNET_SQ_result_spec_auto_from_type (&block.trunc_peer),
     GNUNET_SQ_result_spec_uint32 (&bro32),
     GNUNET_SQ_result_spec_end
   };
@@ -749,6 +752,7 @@ sqlite_plugin_get_closest (void *cls,
     GNUNET_SQ_result_spec_absolute_time (&block.expiration_time),
     GNUNET_SQ_result_spec_variable_size (&path,
                                          &path_size),
+    GNUNET_SQ_result_spec_auto_from_type (&block.trunc_peer),
     GNUNET_SQ_result_spec_uint32 (&rtype32),
     GNUNET_SQ_result_spec_uint32 (&bro32),
     GNUNET_SQ_result_spec_auto_from_type (&block.key),
@@ -882,6 +886,7 @@ libgnunet_plugin_datacache_sqlite_init (void *cls)
                 "  key BLOB NOT NULL DEFAULT '',"
                 "  prox INTEGER NOT NULL,"
                 "  value BLOB NOT NULL,"
+                "  trunc BLOB NOT NULL,"
                 "  path BLOB DEFAULT '')");
   SQLITE3_EXEC (dbh,
                 "CREATE INDEX idx_hashidx"
@@ -900,8 +905,8 @@ libgnunet_plugin_datacache_sqlite_init (void *cls)
   if ((SQLITE_OK !=
        sq_prepare (plugin->dbh,
                    "INSERT INTO ds180"
-                   " (type, ro, expire, key, prox, value, path)"
-                   " VALUES (?, ?, ?, ?, ?, ?, ?)",
+                   " (type, ro, expire, key, prox, value, path, trunc)"
+                   " VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
                    &plugin->insert_stmt)) ||
       (SQLITE_OK !=
        sq_prepare (plugin->dbh,
@@ -917,7 +922,7 @@ libgnunet_plugin_datacache_sqlite_init (void *cls)
                    &plugin->get_count_any_stmt)) ||
       (SQLITE_OK !=
        sq_prepare (plugin->dbh,
-                   "SELECT value,expire,path,ro"
+                   "SELECT value,expire,path,trunc,ro"
                    " FROM ds180"
                    " WHERE key=?"
                    " AND type=?"
@@ -926,7 +931,7 @@ libgnunet_plugin_datacache_sqlite_init (void *cls)
                    &plugin->get_stmt)) ||
       (SQLITE_OK !=
        sq_prepare (plugin->dbh,
-                   "SELECT value,expire,path,type,ro"
+                   "SELECT value,expire,path,trunc,type,ro"
                    " FROM ds180"
                    " WHERE key=?"
                    " AND expire >= ?"
@@ -950,7 +955,7 @@ libgnunet_plugin_datacache_sqlite_init (void *cls)
       (SQLITE_OK !=
        sq_prepare (plugin->dbh,
                    "SELECT * FROM ("
-                   " SELECT value,expire,path,type,ro,key"
+                   " SELECT value,expire,path,trunc,type,ro,key"
                    " FROM ds180 "
                    " WHERE key>=?1 "
                    "  AND expire >= ?2"
@@ -958,7 +963,7 @@ libgnunet_plugin_datacache_sqlite_init (void *cls)
                    " ORDER BY KEY ASC LIMIT ?4)"
                    "UNION "
                    "SELECT * FROM ("
-                   " SELECT value,expire,path,type,ro,key"
+                   " SELECT value,expire,path,trunc,type,ro,key"
                    " FROM ds180 "
                    " WHERE key<=?1 "
                    "  AND expire >= ?2"
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index b5d978995..fd5a5f54c 100644
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -97,6 +97,9 @@ run (void *cls,
     block.key = k;
     block.data = &n;
     block.data_size = sizeof (n);
+    memset (&block.trunc_peer,
+            43,
+            sizeof (block.trunc_peer));
     block.ro = 42;
     block.type = (enum GNUNET_BLOCK_Type) (1 + i % 16);
     block.put_path = NULL;
@@ -134,6 +137,9 @@ run (void *cls,
   block.data = &n;
   block.data_size = sizeof (n);
   block.ro = 42;
+  memset (&block.trunc_peer,
+          44,
+          sizeof (block.trunc_peer));
   block.type = (enum GNUNET_BLOCK_Type) 792;
   block.put_path = NULL;
   block.put_path_length = 0;
diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c
index 0b647ee99..994147a64 100644
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -92,6 +92,9 @@ run (void *cls,
       block.key = k;
       block.data = buf;
       block.data_size = j;
+      memset (&block.trunc_peer,
+              43,
+              sizeof (block.trunc_peer));
       block.ro = 42;
       block.type = (enum GNUNET_BLOCK_Type) (1 + i);
       block.put_path = NULL;