#include "platform.h"
#include "gnunet_namestore_plugin.h"
#include "gnunet_namestore_service.h"
+#include "namestore.h"
#include <sqlite3.h>
/**
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (plugin->cfg, "namestore-sqlite",
"FILENAME", &afsdir))
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _ ("Option `%s' in section `%s' missing in configuration!\n"),
- "FILENAME", "namestore-sqlite");
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "namestore-sqlite", "FILENAME");
return GNUNET_SYSERR;
}
if (GNUNET_OK != GNUNET_DISK_file_test (afsdir))
return GNUNET_SYSERR;
}
}
-#ifdef ENABLE_NLS
- plugin->fn =
- GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir), nl_langinfo (CODESET));
-#else
- plugin->fn = GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir), "UTF-8"); /* good luck */
-#endif
- GNUNET_free (afsdir);
+ /* afsdir should be UTF-8-encoded. If it isn't, it's a bug */
+ plugin->fn = afsdir;
/* Open database and precompile statements */
if (sqlite3_open (plugin->fn, &plugin->dbh) != SQLITE_OK)
create_indices (plugin->dbh);
-#define ALL "zone_key, record_name, record_count, record_data, block_expiration_time, signature"
if ((sq_prepare
(plugin->dbh,
- "INSERT INTO ns091records (" ALL ", zone_delegation, zone_hash, record_name_hash, rvalue) VALUES "
+ "INSERT INTO ns091records (zone_key, record_name, record_count, record_data, block_expiration_time, signature, zone_delegation, zone_hash, record_name_hash, rvalue) VALUES "
"(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
&plugin->put_records) != SQLITE_OK) ||
(sq_prepare
&plugin->remove_records) != SQLITE_OK) ||
(sq_prepare
(plugin->dbh,
- "SELECT " ALL
+ "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature"
" FROM ns091records WHERE zone_hash=? AND record_name_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?",
&plugin->iterate_records) != SQLITE_OK) ||
(sq_prepare
(plugin->dbh,
- "SELECT " ALL
+ "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature"
" FROM ns091records WHERE zone_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?",
&plugin->iterate_by_zone) != SQLITE_OK) ||
(sq_prepare
(plugin->dbh,
- "SELECT " ALL
+ "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature"
" FROM ns091records WHERE record_name_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?",
&plugin->iterate_by_name) != SQLITE_OK) ||
(sq_prepare
(plugin->dbh,
- "SELECT " ALL
+ "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature"
" FROM ns091records ORDER BY rvalue LIMIT 1 OFFSET ?",
&plugin->iterate_all) != SQLITE_OK) ||
(sq_prepare
(plugin->dbh,
- "SELECT " ALL
+ "SELECT zone_key, record_name, record_count, record_data, block_expiration_time, signature"
" FROM ns091records WHERE zone_hash=? AND zone_delegation=?",
&plugin->zone_to_name) != SQLITE_OK) ||
(sq_prepare
LOG_SQLITE (plugin,GNUNET_ERROR_TYPE_ERROR, "precompiling");
return GNUNET_SYSERR;
}
-#undef ALL
return GNUNET_OK;
}
*/
static int
namestore_sqlite_remove_records (void *cls,
- const GNUNET_HashCode *zone,
+ const struct GNUNET_CRYPTO_ShortHashCode *zone,
const char *name)
{
struct Plugin *plugin = cls;
- GNUNET_HashCode nh;
+ struct GNUNET_CRYPTO_ShortHashCode nh;
size_t name_len;
int n;
name_len = strlen (name);
- GNUNET_CRYPTO_hash (name, name_len, &nh);
+ GNUNET_CRYPTO_short_hash (name, name_len, &nh);
- if ((SQLITE_OK != sqlite3_bind_blob (plugin->remove_records, 1, zone, sizeof (GNUNET_HashCode), SQLITE_STATIC)) ||
- (SQLITE_OK != sqlite3_bind_blob (plugin->remove_records, 2, &nh, sizeof (GNUNET_HashCode), SQLITE_STATIC)))
+ if ((SQLITE_OK != sqlite3_bind_blob (plugin->remove_records, 1, zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode), SQLITE_STATIC)) ||
+ (SQLITE_OK != sqlite3_bind_blob (plugin->remove_records, 2, &nh, sizeof (struct GNUNET_CRYPTO_ShortHashCode), SQLITE_STATIC)))
{
LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_bind_XXXX");
{
struct Plugin *plugin = cls;
int n;
- GNUNET_HashCode zone;
- GNUNET_HashCode zone_delegation;
- GNUNET_HashCode nh;
+ struct GNUNET_CRYPTO_ShortHashCode zone;
+ struct GNUNET_CRYPTO_ShortHashCode zone_delegation;
+ struct GNUNET_CRYPTO_ShortHashCode nh;
size_t name_len;
uint64_t rvalue;
size_t data_size;
unsigned int i;
- GNUNET_CRYPTO_hash (zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone);
+ GNUNET_CRYPTO_short_hash (zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone);
(void) namestore_sqlite_remove_records (plugin, &zone, name);
name_len = strlen (name);
- GNUNET_CRYPTO_hash (name, name_len, &nh);
+ GNUNET_CRYPTO_short_hash (name, name_len, &nh);
memset (&zone_delegation, 0, sizeof (zone_delegation));
for (i=0;i<rd_count;i++)
if (rd[i].record_type == GNUNET_NAMESTORE_TYPE_PKEY)
{
- GNUNET_assert (sizeof (GNUNET_HashCode) == rd[i].data_size);
+ GNUNET_assert (sizeof (struct GNUNET_CRYPTO_ShortHashCode) == rd[i].data_size);
memcpy (&zone_delegation,
rd[i].data,
- sizeof (GNUNET_HashCode));
+ sizeof (struct GNUNET_CRYPTO_ShortHashCode));
break;
}
rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
(SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 4, data, data_size, SQLITE_STATIC)) ||
(SQLITE_OK != sqlite3_bind_int64 (plugin->put_records, 5, expire.abs_value)) ||
(SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 6, signature, sizeof (struct GNUNET_CRYPTO_RsaSignature), SQLITE_STATIC)) ||
- (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 7, &zone_delegation, sizeof (GNUNET_HashCode), SQLITE_STATIC)) ||
- (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 8, &zone, sizeof (GNUNET_HashCode), SQLITE_STATIC)) ||
- (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 9, &nh, sizeof (GNUNET_HashCode), SQLITE_STATIC)) ||
+ (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 7, &zone_delegation, sizeof (struct GNUNET_CRYPTO_ShortHashCode), SQLITE_STATIC)) ||
+ (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 8, &zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode), SQLITE_STATIC)) ||
+ (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 9, &nh, sizeof (struct GNUNET_CRYPTO_ShortHashCode), SQLITE_STATIC)) ||
(SQLITE_OK != sqlite3_bind_int64 (plugin->put_records, 10, rvalue)) )
{
LOG_SQLITE (plugin,
GNUNET_break (0);
ret = GNUNET_SYSERR;
}
+ else if (record_count > 64 * 1024)
+ {
+ /* sanity check, don't stack allocate far too much just
+ because database might contain a large value here */
+ GNUNET_break (0);
+ ret = GNUNET_SYSERR;
+ }
else
{
struct GNUNET_NAMESTORE_RecordData rd[record_count];
{
GNUNET_break (0);
ret = GNUNET_SYSERR;
- record_count = 0;
}
else
{
*/
static int
namestore_sqlite_iterate_records (void *cls,
- const GNUNET_HashCode *zone,
+ const struct GNUNET_CRYPTO_ShortHashCode *zone,
const char *name,
uint64_t offset,
GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
{
struct Plugin *plugin = cls;
sqlite3_stmt *stmt;
- GNUNET_HashCode name_hase;
+ struct GNUNET_CRYPTO_ShortHashCode name_hase;
unsigned int boff;
if (NULL == zone)
stmt = plugin->iterate_all;
else
{
- GNUNET_CRYPTO_hash (name, strlen(name), &name_hase);
+ GNUNET_CRYPTO_short_hash (name, strlen(name), &name_hase);
stmt = plugin->iterate_by_name;
}
else
stmt = plugin->iterate_by_zone;
else
{
- GNUNET_CRYPTO_hash (name, strlen(name), &name_hase);
+ GNUNET_CRYPTO_short_hash (name, strlen(name), &name_hase);
stmt = plugin->iterate_records;
}
boff = 0;
if ( (NULL != zone) &&
(SQLITE_OK != sqlite3_bind_blob (stmt, ++boff,
- zone, sizeof (GNUNET_HashCode),
+ zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode),
SQLITE_STATIC)) )
{
LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
}
if ( (NULL != name) &&
(SQLITE_OK != sqlite3_bind_blob (stmt, ++boff,
- &name_hase, sizeof (GNUNET_HashCode),
+ &name_hase, sizeof (struct GNUNET_CRYPTO_ShortHashCode),
SQLITE_STATIC)) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ITERATE NAME HASH: `%s'", GNUNET_h2s_full(&name_hase));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ITERATE NAME HASH: `%8s'", GNUNET_short_h2s(&name_hase));
LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_bind_XXXX");
if (SQLITE_OK != sqlite3_reset (stmt))
*/
static int
namestore_sqlite_zone_to_name (void *cls,
- const GNUNET_HashCode *zone,
- const GNUNET_HashCode *value_zone,
+ const struct GNUNET_CRYPTO_ShortHashCode *zone,
+ const struct GNUNET_CRYPTO_ShortHashCode *value_zone,
GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
{
struct Plugin *plugin = cls;
stmt = plugin->zone_to_name;
if ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1,
- zone, sizeof (GNUNET_HashCode),
+ zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode),
SQLITE_STATIC)) ||
(SQLITE_OK != sqlite3_bind_blob (stmt, 2,
- value_zone, sizeof (GNUNET_HashCode),
+ value_zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode),
SQLITE_STATIC)) )
{
LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_reset");
return GNUNET_SYSERR;
}
-
return get_record_and_call_iterator (plugin, stmt, iter, iter_cls);
}
*/
static void
namestore_sqlite_delete_zone (void *cls,
- const GNUNET_HashCode *zone)
+ const struct GNUNET_CRYPTO_ShortHashCode *zone)
{
struct Plugin *plugin = cls;
sqlite3_stmt *stmt = plugin->delete_zone;
int n;
- if (SQLITE_OK != sqlite3_bind_blob (stmt, 1, zone, sizeof (GNUNET_HashCode), SQLITE_STATIC))
+ if (SQLITE_OK != sqlite3_bind_blob (stmt, 1, zone, sizeof (struct GNUNET_CRYPTO_ShortHashCode), SQLITE_STATIC))
{
LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_bind_XXXX");
projects / oweals / gnunet.git / blobdiff