/*
This file is part of GNUnet
- (C) 2010 Christian Grothoff (and other contributing authors)
+ (C) 2010-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
#include "platform.h"
#include "gnunet_block_plugin.h"
#include "gnunet_namestore_service.h"
-#include "block_gns.h"
#include "gnunet_signatures.h"
/**
*/
#define BLOOMFILTER_K 16
-//Not taken until now
-#define GNUNET_BLOCK_TYPE_GNS_NAMERECORD 11
-
/**
* Function called to validate a reply or a request. For
* request evaluation, simply pass "NULL" for the reply_block.
* @param cls closure
* @param type block type
* @param query original query (hash)
- * @param bf pointer to bloom filter associated with query; possibly updated (!)
- * @param bf_mutator mutation value for bf
- * @param xquery extrended query data (can be NULL, depending on type)
- * @param xquery_size number of bytes in xquery
+ * @param bf pointer to bloom filter associated with @a query; possibly updated (!)
+ * @param bf_mutator mutation value for @a bf
+ * @param xquery extrended query data (can be NULL, depending on @a type)
+ * @param xquery_size number of bytes in @a xquery
* @param reply_block response to validate
- * @param reply_block_size number of bytes in reply block
+ * @param reply_block_size number of bytes in @a reply_block
* @return characterization of result
*/
static enum GNUNET_BLOCK_EvaluationResult
block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
- const GNUNET_HashCode * query,
+ const struct GNUNET_HashCode *query,
struct GNUNET_CONTAINER_BloomFilter **bf,
int32_t bf_mutator, const void *xquery,
size_t xquery_size, const void *reply_block,
size_t reply_block_size)
{
+ const struct GNUNET_GNSRECORD_Block *block;
+ struct GNUNET_HashCode h;
+ struct GNUNET_HashCode chash;
+ struct GNUNET_HashCode mhash;
+
if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
-
- char* name;
- GNUNET_HashCode pkey_hash;
- GNUNET_HashCode query_pkey;
- GNUNET_HashCode name_hash;
- struct GNSNameRecordBlock *nrb;
- struct GNSRecordBlock *rb;
- uint32_t rd_count;
-
- nrb = (struct GNSNameRecordBlock *)reply_block;
-
- name = (char*)&nrb[1];
-
- GNUNET_CRYPTO_hash(&nrb->public_key,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &pkey_hash);
-
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
-
- GNUNET_CRYPTO_hash_xor(query, &name_hash, &query_pkey);
-
- //Check query key against public key
- if (0 != GNUNET_CRYPTO_hash_cmp(&query_pkey, &pkey_hash))
- return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
-
- rd_count = ntohl(nrb->rd_count);
-
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- int i = 0;
- rb = (struct GNSRecordBlock*)(&nrb[1] + strlen(name));
-
- for (i=0; i<rd_count; i++)
+ if (NULL == reply_block)
{
- rd[i].record_type = ntohl(rb->type);
- rd[i].expiration =
- GNUNET_TIME_absolute_ntoh(rb->expiration);
- rd[i].data_size = ntohl(rb->data_length);
- rd[i].flags = ntohl(rb->flags);
- rd[i].data = (char*)&rb[1];
- rb = &rb[1] + rd[i].data_size;
+ if (0 != xquery_size)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
+ }
+ return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
}
- if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature (&nrb->public_key,
- name,
- nrb->rd_count,
- rd,
- &nrb->signature))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Signature invalid\n");
- return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
- }
-
- //Cache FIXME we need a static function here to namestore?
- /*GNUNET_NAMESTORE_record_put (handle, //FIXME where do i get this from?
- &pkey_hash,
- name,
- expiration, //FIXME uh where do i get this from?
- rd_count,
- rd,
- signature,
- NULL, //cont
- NULL); //cls*/
- return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+ /* this is a reply */
+ if (reply_block_size < sizeof (struct GNUNET_GNSRECORD_Block))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+ }
+ block = reply_block;
+ if (ntohl (block->purpose.size) + sizeof (struct GNUNET_CRYPTO_EcdsaSignature) + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) !=
+ reply_block_size)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+ }
+ GNUNET_CRYPTO_hash (&block->derived_key,
+ sizeof (block->derived_key),
+ &h);
+ if (0 != memcmp (&h, query, sizeof (struct GNUNET_HashCode)))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+ }
+ if (GNUNET_OK !=
+ GNUNET_GNSRECORD_block_verify (block))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+ }
+ if (NULL != bf)
+ {
+ GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);
+ GNUNET_BLOCK_mingle_hash (&chash, bf_mutator, &mhash);
+ if (NULL != *bf)
+ {
+ if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test(*bf, &mhash))
+ return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
+ }
+ else
+ {
+ *bf = GNUNET_CONTAINER_bloomfilter_init(NULL, 8, BLOOMFILTER_K);
+ }
+ GNUNET_CONTAINER_bloomfilter_add(*bf, &mhash);
+ }
+ return GNUNET_BLOCK_EVALUATION_OK_MORE;
}
*
* @param cls closure
* @param type block type
- * @param block block to get the key for
- * @param block_size number of bytes in block
+ * @param reply_block block to get the key for
+ * @param reply_block_size number of bytes in @a reply_block
* @param key set to the key (query) for the given block
- * @return GNUNET_OK on success, GNUNET_SYSERR if type not supported
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if type not supported
* (or if extracting a key from a block of this type does not work)
*/
static int
block_plugin_gns_get_key (void *cls, enum GNUNET_BLOCK_Type type,
- const void *block, size_t block_size,
- GNUNET_HashCode * key)
+ const void *reply_block, size_t reply_block_size,
+ struct GNUNET_HashCode *key)
{
+ const struct GNUNET_GNSRECORD_Block *block;
+
if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
- return GNUNET_NO;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode pkey_hash;
- struct GNSNameRecordBlock *nrb = (struct GNSNameRecordBlock *)block;
-
- GNUNET_CRYPTO_hash(&nrb[1], strlen((char*)&nrb[1]), &name_hash);
- GNUNET_CRYPTO_hash(&nrb->public_key,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &pkey_hash);
-
- GNUNET_CRYPTO_hash_xor(&name_hash, &pkey_hash, key);
-
- //FIXME calculate key from name and hash(pkey) here
+ return GNUNET_SYSERR;
+ if (reply_block_size < sizeof (struct GNUNET_GNSRECORD_Block))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+ }
+ block = reply_block;
+ GNUNET_CRYPTO_hash (&block->derived_key,
+ sizeof (block->derived_key),
+ key);
return GNUNET_OK;
}
};
struct GNUNET_BLOCK_PluginFunctions *api;
- api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions));
+ api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
api->evaluate = &block_plugin_gns_evaluate;
api->get_key = &block_plugin_gns_get_key;
api->types = types;
projects / oweals / gnunet.git / blobdiff