X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Fplugin_namestore_sqlite.c;h=836aa4d37d3c66ec51ca6f9f5863b91a243889d3;hb=392baa82fc240d76b31a353c2d729a6f83f10b2c;hp=ba8f8bca6585f41428603d32c63cc53283bafb72;hpb=37488aed2cecebf4472d8e7bef0ebea2a92c9c01;p=oweals%2Fgnunet.git diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index ba8f8bca6..836aa4d37 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c @@ -1,6 +1,6 @@ /* * This file is part of GNUnet - * (C) 2009, 2011, 2012 Christian Grothoff (and other contributing authors) + * Copyright (C) 2009-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 @@ -14,8 +14,8 @@ * * 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. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. */ /** @@ -26,17 +26,20 @@ #include "platform.h" #include "gnunet_namestore_plugin.h" +#include "gnunet_namestore_service.h" +#include "gnunet_gnsrecord_lib.h" +#include "namestore.h" #include /** - * After how many ms "busy" should a DB operation fail for good? - * A low value makes sure that we are more responsive to requests - * (especially PUTs). A high value guarantees a higher success - * rate (SELECTs in iterate can take several seconds despite LIMIT=1). + * After how many ms "busy" should a DB operation fail for good? A + * low value makes sure that we are more responsive to requests + * (especially PUTs). A high value guarantees a higher success rate + * (SELECTs in iterate can take several seconds despite LIMIT=1). * * The default value of 1s should ensure that users do not experience - * huge latencies while at the same time allowing operations to succeed - * with reasonable probability. + * huge latencies while at the same time allowing operations to + * succeed with reasonable probability. */ #define BUSY_TIMEOUT_MS 1000 @@ -70,69 +73,34 @@ struct Plugin sqlite3 *dbh; /** - * Precompiled SQL for put record + * Precompiled SQL to store records. */ - sqlite3_stmt *put_records; + sqlite3_stmt *store_records; /** - * Precompiled SQL for remove record + * Precompiled SQL to deltete existing records. */ - sqlite3_stmt *remove_records; + sqlite3_stmt *delete_records; /** - * Precompiled SQL for iterate over all records. + * Precompiled SQL for iterate records within a zone. */ - sqlite3_stmt *iterate_all; + sqlite3_stmt *iterate_zone; /** - * Precompiled SQL for iterate records with same name. + * Precompiled SQL for iterate all records within all zones. */ - sqlite3_stmt *iterate_by_name; + sqlite3_stmt *iterate_all_zones; /** - * Precompiled SQL for iterate records with same zone. + * Precompiled SQL to for reverse lookup based on PKEY. */ - sqlite3_stmt *iterate_by_zone; + sqlite3_stmt *zone_to_name; /** - * Precompiled SQL for iterate records with same name and zone. + * Precompiled SQL to lookup records based on label. */ - sqlite3_stmt *iterate_records; - - /** - * Precompiled SQL for delete zone - */ - sqlite3_stmt *delete_zone; - -}; - - -/** - * Internal format of a record in the BLOB in the database. - */ -struct DbRecord -{ - - /** - * Expiration time for the DNS record. - */ - struct GNUNET_TIME_AbsoluteNBO expiration; - - /** - * Number of bytes in 'data', network byte order. - */ - uint32_t data_size; - - /** - * Type of the GNS/DNS record, network byte order. - */ - uint32_t record_type; - - /** - * Flags for the record, network byte order. - */ - uint32_t flags; - + sqlite3_stmt *lookup_label; }; @@ -153,7 +121,7 @@ sq_prepare (sqlite3 * dbh, const char *zSql, sqlite3_stmt ** ppStmt) result = sqlite3_prepare_v2 (dbh, zSql, strlen (zSql), ppStmt, (const char **) &dummy); - LOG (GNUNET_ERROR_TYPE_DEBUG, + LOG (GNUNET_ERROR_TYPE_DEBUG, "Prepared `%s' / %p: %d\n", zSql, *ppStmt, result); return result; } @@ -169,21 +137,15 @@ create_indices (sqlite3 * dbh) { /* create indices */ if ( (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_zone_name_rv ON ns090records (zone_hash,record_name_hash,rvalue)", - NULL, NULL, NULL)) || - (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_zone_rv ON ns090records (zone_hash,rvalue)", + sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_reverse ON ns097records (zone_private_key,pkey)", NULL, NULL, NULL)) || (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_zone ON ns090records (zone_hash)", + sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_iter ON ns097records (zone_private_key,rvalue)", NULL, NULL, NULL)) || (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_name_rv ON ns090records (record_name_hash,rvalue)", - NULL, NULL, NULL)) || - (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_rv ON ns090records (rvalue)", - NULL, NULL, NULL)) ) - LOG (GNUNET_ERROR_TYPE_ERROR, + sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS it_iter ON ns097records (rvalue)", + NULL, NULL, NULL)) ) + LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create indices: %s\n", sqlite3_errmsg (dbh)); } @@ -194,7 +156,7 @@ create_indices (sqlite3 * dbh) #else #define ENULL &e #define ENULL_DEFINED 1 -#define CHECK(a) if (! a) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "%s\n", e); sqlite3_free(e); } +#define CHECK(a) if (! (a)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "%s\n", e); sqlite3_free(e); } #endif @@ -204,7 +166,7 @@ create_indices (sqlite3 * dbh) * as needed as well). * * @param plugin the plugin context (state for this module) - * @return GNUNET_OK on success + * @return #GNUNET_OK on success */ static int database_setup (struct Plugin *plugin) @@ -218,10 +180,9 @@ database_setup (struct Plugin *plugin) 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)) @@ -233,13 +194,8 @@ database_setup (struct Plugin *plugin) 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) @@ -267,9 +223,6 @@ database_setup (struct Plugin *plugin) CHECK (SQLITE_OK == sqlite3_exec (plugin->dbh, "PRAGMA locking_mode=EXCLUSIVE", NULL, NULL, ENULL)); - CHECK (SQLITE_OK == - sqlite3_exec (plugin->dbh, "PRAGMA count_changes=OFF", NULL, NULL, - ENULL)); CHECK (SQLITE_OK == sqlite3_exec (plugin->dbh, "PRAGMA page_size=4092", NULL, NULL, ENULL)); @@ -277,25 +230,22 @@ database_setup (struct Plugin *plugin) CHECK (SQLITE_OK == sqlite3_busy_timeout (plugin->dbh, BUSY_TIMEOUT_MS)); - /* Create tables */ + /* Create table */ CHECK (SQLITE_OK == sq_prepare (plugin->dbh, - "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns090records'", + "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns097records'", &stmt)); if ((sqlite3_step (stmt) == SQLITE_DONE) && (sqlite3_exec (plugin->dbh, - "CREATE TABLE ns090records (" - " zone_key BLOB NOT NULL DEFAULT ''," - " zone_hash BLOB NOT NULL DEFAULT ''," + "CREATE TABLE ns097records (" + " zone_private_key BLOB NOT NULL DEFAULT ''," + " pkey BLOB," + " rvalue INT8 NOT NULL DEFAULT ''," " record_count INT NOT NULL DEFAULT 0," " record_data BLOB NOT NULL DEFAULT ''," - " block_expiration_time INT8 NOT NULL DEFAULT 0," - " signature BLOB NOT NULL DEFAULT ''," - " record_name TEXT NOT NULL DEFAULT ''," - " record_name_hash BLOB NOT NULL DEFAULT ''," - " rvalue INT8 NOT NULL DEFAULT ''" - ")", + " label TEXT NOT NULL DEFAULT ''" + ")", NULL, NULL, NULL) != SQLITE_OK)) { LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite3_exec"); @@ -306,45 +256,40 @@ database_setup (struct Plugin *plugin) 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 ns090records (" ALL ", zone_hash, record_name_hash, rvalue) VALUES " - "(?, ?, ?, ?, ?, ?, ?, ?, ?)", - &plugin->put_records) != SQLITE_OK) || + "INSERT INTO ns097records (zone_private_key, pkey, rvalue, record_count, record_data, label)" + " VALUES (?, ?, ?, ?, ?, ?)", + &plugin->store_records) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "DELETE FROM ns090records WHERE zone_hash=? AND record_name_hash=?", - &plugin->remove_records) != SQLITE_OK) || + "DELETE FROM ns097records WHERE zone_private_key=? AND label=?", + &plugin->delete_records) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "SELECT " ALL - " FROM ns090records WHERE zone_hash=? AND record_name_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?", - &plugin->iterate_records) != SQLITE_OK) || + "SELECT record_count,record_data,label" + " FROM ns097records WHERE zone_private_key=? AND pkey=?", + &plugin->zone_to_name) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "SELECT " ALL - " FROM ns090records WHERE zone_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?", - &plugin->iterate_by_zone) != SQLITE_OK) || + "SELECT record_count,record_data,label" + " FROM ns097records WHERE zone_private_key=? ORDER BY rvalue LIMIT 1 OFFSET ?", + &plugin->iterate_zone) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "SELECT " ALL - " FROM ns090records WHERE record_name_hash=? ORDER BY rvalue LIMIT 1 OFFSET ?", - &plugin->iterate_by_name) != SQLITE_OK) || - (sq_prepare - (plugin->dbh, - "SELECT " ALL - " FROM ns090records ORDER BY rvalue LIMIT 1 OFFSET ?", - &plugin->iterate_all) != SQLITE_OK) || + "SELECT record_count,record_data,label,zone_private_key" + " FROM ns097records ORDER BY rvalue LIMIT 1 OFFSET ?", + &plugin->iterate_all_zones) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "DELETE FROM ns090records WHERE zone_hash=?", - &plugin->delete_zone) != SQLITE_OK) ) + "SELECT record_count,record_data,label,zone_private_key" + " FROM ns097records WHERE zone_private_key=? AND label=?", + &plugin->lookup_label) != SQLITE_OK) + ) { LOG_SQLITE (plugin,GNUNET_ERROR_TYPE_ERROR, "precompiling"); return GNUNET_SYSERR; } -#undef ALL return GNUNET_OK; } @@ -360,20 +305,18 @@ database_shutdown (struct Plugin *plugin) int result; sqlite3_stmt *stmt; - if (NULL != plugin->put_records) - sqlite3_finalize (plugin->put_records); - if (NULL != plugin->remove_records) - sqlite3_finalize (plugin->remove_records); - if (NULL != plugin->iterate_records) - sqlite3_finalize (plugin->iterate_records); - if (NULL != plugin->iterate_records) - sqlite3_finalize (plugin->iterate_by_zone); - if (NULL != plugin->iterate_records) - sqlite3_finalize (plugin->iterate_by_name); - if (NULL != plugin->iterate_records) - sqlite3_finalize (plugin->iterate_all); - if (NULL != plugin->delete_zone) - sqlite3_finalize (plugin->delete_zone); + if (NULL != plugin->store_records) + sqlite3_finalize (plugin->store_records); + if (NULL != plugin->delete_records) + sqlite3_finalize (plugin->delete_records); + if (NULL != plugin->iterate_zone) + sqlite3_finalize (plugin->iterate_zone); + if (NULL != plugin->iterate_all_zones) + sqlite3_finalize (plugin->iterate_all_zones); + if (NULL != plugin->zone_to_name) + sqlite3_finalize (plugin->zone_to_name); + if (NULL != plugin->zone_to_name) + sqlite3_finalize (plugin->lookup_label); result = sqlite3_close (plugin->dbh); if (result == SQLITE_BUSY) { @@ -399,101 +342,43 @@ database_shutdown (struct Plugin *plugin) } -/** - * Removes any existing record in the given zone with the same name. - * - * @param cls closure (internal context for the plugin) - * @param zone hash of the public key of the zone - * @param name name to remove (at most 255 characters long) - * @return GNUNET_OK on success - */ -static int -namestore_sqlite_remove_records (void *cls, - const GNUNET_HashCode *zone, - const char *name) -{ - struct Plugin *plugin = cls; - GNUNET_HashCode nh; - size_t name_len; - int n; - - name_len = strlen (name); - GNUNET_CRYPTO_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))) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->remove_records)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; - } - n = sqlite3_step (plugin->remove_records); - if (SQLITE_OK != sqlite3_reset (plugin->remove_records)) - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - switch (n) - { - case SQLITE_DONE: - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Record removed\n"); - return GNUNET_OK; - case SQLITE_BUSY: - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - return GNUNET_NO; - default: - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - return GNUNET_SYSERR; - } -} - - /** * Store a record in the datastore. Removes any existing record in the * same zone with the same name. * * @param cls closure (internal context for the plugin) - * @param zone_key public key of the zone - * @param expire when does the corresponding block in the DHT expire (until - * when should we never do a DHT lookup for the same name again)? - * @param name name that is being mapped (at most 255 characters long) - * @param rd_count number of entries in 'rd' array + * @param zone_key private key of the zone + * @param label name that is being mapped (at most 255 characters long) + * @param rd_count number of entries in @a rd array * @param rd array of records with data to store - * @param signature signature of the record block, NULL if signature is unavailable (i.e. - * because the user queried for a particular record type only) - * @return GNUNET_OK on success + * @return #GNUNET_OK on success, else #GNUNET_SYSERR */ -static int -namestore_sqlite_put_records (void *cls, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, - struct GNUNET_TIME_Absolute expire, - const char *name, - unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd, - const struct GNUNET_CRYPTO_RsaSignature *signature) +static int +namestore_sqlite_store_records (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, + const char *label, + unsigned int rd_count, + const struct GNUNET_GNSRECORD_Data *rd) { struct Plugin *plugin = cls; int n; - GNUNET_HashCode zone; - GNUNET_HashCode nh; - size_t name_len; + struct GNUNET_CRYPTO_EcdsaPublicKey pkey; uint64_t rvalue; size_t data_size; - size_t off; unsigned int i; - GNUNET_CRYPTO_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); + memset (&pkey, 0, sizeof (pkey)); + for (i=0;i 64 * 65536) { GNUNET_break (0); @@ -501,50 +386,67 @@ namestore_sqlite_put_records (void *cls, } { char data[data_size]; - struct DbRecord *rec; - - rec = (struct DbRecord *) data; - off = rd_count * sizeof (struct DbRecord); - for (i=0;iput_records, 1, zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_text (plugin->put_records, 2, name, -1, SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_int (plugin->put_records, 3, rd_count)) || - (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, sizeof (GNUNET_HashCode), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 8, &nh, sizeof (GNUNET_HashCode), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_int64 (plugin->put_records, 9, rvalue)) ) + + /* First delete 'old' records */ + if ((SQLITE_OK != sqlite3_bind_blob (plugin->delete_records, 1, + zone_key, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), SQLITE_STATIC)) || + (SQLITE_OK != sqlite3_bind_text (plugin->delete_records, 2, label, -1, SQLITE_STATIC))) { - LOG_SQLITE (plugin, + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->put_records)) - LOG_SQLITE (plugin, + if (SQLITE_OK != sqlite3_reset (plugin->delete_records)) + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_reset"); return GNUNET_SYSERR; - + } - n = sqlite3_step (plugin->put_records); - if (SQLITE_OK != sqlite3_reset (plugin->put_records)) + n = sqlite3_step (plugin->delete_records); + if (SQLITE_OK != sqlite3_reset (plugin->delete_records)) LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_reset"); + + if (0 != rd_count) + { + if ((SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 1, + zone_key, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), SQLITE_STATIC)) || + (SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 2, + &pkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey), SQLITE_STATIC)) || + (SQLITE_OK != sqlite3_bind_int64 (plugin->store_records, 3, rvalue)) || + (SQLITE_OK != sqlite3_bind_int (plugin->store_records, 4, rd_count)) || + (SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 5, data, data_size, SQLITE_STATIC)) || + (SQLITE_OK != sqlite3_bind_text (plugin->store_records, 6, label, -1, SQLITE_STATIC))) + { + LOG_SQLITE (plugin, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_bind_XXXX"); + if (SQLITE_OK != sqlite3_reset (plugin->store_records)) + LOG_SQLITE (plugin, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_reset"); + return GNUNET_SYSERR; + } + n = sqlite3_step (plugin->store_records); + if (SQLITE_OK != sqlite3_reset (plugin->store_records)) + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_reset"); + } } switch (n) { case SQLITE_DONE: - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Record stored\n"); + if (0 != rd_count) + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Record stored\n"); + else + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Record deleted\n"); return GNUNET_OK; case SQLITE_BUSY: LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, @@ -553,146 +455,87 @@ namestore_sqlite_put_records (void *cls, default: LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_step"); - return GNUNET_SYSERR; + return GNUNET_SYSERR; } } - - + + /** - * Iterate over the results for a particular key and zone in the - * datastore. Will return at most one result to the iterator. + * The given 'sqlite' statement has been prepared to be run. + * It will return a record which should be given to the iterator. + * Runs the statement and parses the returned record. * - * @param cls closure (internal context for the plugin) - * @param zone hash of public key of the zone, NULL to iterate over all zones - * @param name_hash hash of name, NULL to iterate over all records of the zone - * @param offset offset in the list of all matching records - * @param iter function to call with the result - * @param iter_cls closure for iter - * @return GNUNET_OK on success, GNUNET_NO if there were no results, GNUNET_SYSERR on error + * @param plugin plugin context + * @param stmt to run (and then clean up) + * @param zone_key private key of the zone + * @param iter iterator to call with the result + * @param iter_cls closure for @a iter + * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error */ -static int -namestore_sqlite_iterate_records (void *cls, - const GNUNET_HashCode *zone, - const GNUNET_HashCode *name_hash, - uint64_t offset, - GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) +static int +get_record_and_call_iterator (struct Plugin *plugin, + sqlite3_stmt *stmt, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, + GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) { - struct Plugin *plugin = cls; - sqlite3_stmt *stmt; - unsigned int boff; + unsigned int record_count; + size_t data_size; + const char *data; + const char *label; int ret; int sret; - if (NULL == zone) - if (NULL == name_hash) - stmt = plugin->iterate_all; - else - stmt = plugin->iterate_by_name; - else - if (NULL == name_hash) - stmt = plugin->iterate_by_zone; - else - stmt = plugin->iterate_records; - - boff = 0; - if ( (NULL != zone) && - (SQLITE_OK != sqlite3_bind_blob (stmt, ++boff, - zone, sizeof (GNUNET_HashCode), - SQLITE_STATIC)) ) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (stmt)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; - } - if ( (NULL != name_hash) && - (SQLITE_OK != sqlite3_bind_blob (stmt, ++boff, - name_hash, sizeof (GNUNET_HashCode), - SQLITE_STATIC)) ) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (stmt)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; - } - - if (SQLITE_OK != sqlite3_bind_int64 (stmt, ++boff, - offset)) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (stmt)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; - } ret = GNUNET_NO; if (SQLITE_ROW == (sret = sqlite3_step (stmt))) { - unsigned int record_count; - size_t data_size; - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key; - const struct GNUNET_CRYPTO_RsaSignature *sig; - struct GNUNET_TIME_Absolute expiration; - const char *data; - const char *name; - - ret = GNUNET_YES; - zone_key = sqlite3_column_blob (stmt, 0); - name = (const char*) sqlite3_column_text (stmt, 1); - record_count = sqlite3_column_int (stmt, 2); - data_size = sqlite3_column_bytes (stmt, 3); - data = sqlite3_column_blob (stmt, 3); - expiration.abs_value = (uint64_t) sqlite3_column_int64 (stmt, 4); - sig = sqlite3_column_blob (stmt, 5); - - if ( (sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) != sqlite3_column_bytes (stmt, 0)) || - (sizeof (struct GNUNET_CRYPTO_RsaSignature) != sqlite3_column_bytes (stmt, 5)) || - (sizeof (struct DbRecord) * record_count > data_size) ) + record_count = sqlite3_column_int (stmt, 0); + data_size = sqlite3_column_bytes (stmt, 1); + data = sqlite3_column_blob (stmt, 1); + label = (const char*) sqlite3_column_text (stmt, 2); + if (NULL == zone_key) { + /* must be "iterate_all_zones", got one extra return value */ + if (sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey) != + sqlite3_column_bytes (stmt, 3)) + { + GNUNET_break (0); + ret = GNUNET_SYSERR; + } + else + { + zone_key = sqlite3_column_blob (stmt, 3); + } + } + 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 { - const struct DbRecord *db = (const struct DbRecord*) data; - struct GNUNET_NAMESTORE_RecordData rd[record_count]; - unsigned int i; - size_t off; + struct GNUNET_GNSRECORD_Data rd[record_count]; - off = record_count * sizeof (struct DbRecord); - for (i=0;i data_size) - { - GNUNET_break (0); - ret = GNUNET_SYSERR; - record_count = i; - break; - } - rd[i].expiration = GNUNET_TIME_absolute_ntoh (db[i].expiration); - rd[i].data_size = ntohl (db[i].data_size); - rd[i].data = &data[off]; - rd[i].record_type = ntohl (db[i].record_type); - rd[i].flags = ntohl (db[i].flags); - off += rd[i].data_size; - } - iter (iter_cls, zone_key, expiration, name, - record_count, rd, sig); + if (NULL != iter) + iter (iter_cls, zone_key, label, record_count, rd); + ret = GNUNET_YES; + } } } else { if (SQLITE_DONE != sret) LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite_step"); - iter (iter_cls, NULL, GNUNET_TIME_UNIT_ZERO_ABS, NULL, 0, NULL, NULL); } if (SQLITE_OK != sqlite3_reset (stmt)) LOG_SQLITE (plugin, @@ -701,22 +544,39 @@ namestore_sqlite_iterate_records (void *cls, return ret; } - /** - * Delete an entire zone (all records). Not used in normal operation. + * Lookup records in the datastore for which we are the authority. * * @param cls closure (internal context for the plugin) - * @param zone zone to delete + * @param zone private key of the zone + * @param label name of the record in the zone + * @param iter function to call with the result + * @param iter_cls closure for @a iter + * @return #GNUNET_OK on success, else #GNUNET_SYSERR */ -static void -namestore_sqlite_delete_zone (void *cls, - const GNUNET_HashCode *zone) +static int +namestore_sqlite_lookup_records (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, const char *label, + GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) { struct Plugin *plugin = cls; - sqlite3_stmt *stmt = plugin->delete_zone; - int n; + sqlite3_stmt *stmt; + int err; - if (SQLITE_OK != sqlite3_bind_blob (stmt, 1, zone, sizeof (GNUNET_HashCode), SQLITE_STATIC)) + if (NULL == zone) + { + return GNUNET_SYSERR; + } + else + { + stmt = plugin->lookup_label; + err = ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, + zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), + SQLITE_STATIC)) || + (SQLITE_OK != sqlite3_bind_text (stmt, 2, + label, -1, SQLITE_STATIC)) ); + } + if (err) { LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_bind_XXXX"); @@ -724,26 +584,103 @@ namestore_sqlite_delete_zone (void *cls, LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_reset"); - return; + return GNUNET_SYSERR; } - n = sqlite3_step (stmt); - if (SQLITE_OK != sqlite3_reset (stmt)) + return get_record_and_call_iterator (plugin, stmt, zone, iter, iter_cls); +} + + +/** + * Iterate over the results for a particular key and zone in the + * datastore. Will return at most one result to the iterator. + * + * @param cls closure (internal context for the plugin) + * @param zone hash of public key of the zone, NULL to iterate over all zones + * @param offset offset in the list of all matching records + * @param iter function to call with the result + * @param iter_cls closure for @a iter + * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error + */ +static int +namestore_sqlite_iterate_records (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, + uint64_t offset, + GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) +{ + struct Plugin *plugin = cls; + sqlite3_stmt *stmt; + int err; + + if (NULL == zone) + { + stmt = plugin->iterate_all_zones; + err = (SQLITE_OK != sqlite3_bind_int64 (stmt, 1, + offset)); + } + else + { + stmt = plugin->iterate_zone; + err = ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, + zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), + SQLITE_STATIC)) || + (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, + offset)) ); + } + if (err) + { LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - switch (n) + "sqlite3_bind_XXXX"); + if (SQLITE_OK != sqlite3_reset (stmt)) + LOG_SQLITE (plugin, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_reset"); + return GNUNET_SYSERR; + } + return get_record_and_call_iterator (plugin, stmt, zone, iter, iter_cls); +} + + +/** + * Look for an existing PKEY delegation record for a given public key. + * Returns at most one result to the iterator. + * + * @param cls closure (internal context for the plugin) + * @param zone private key of the zone to look up in, never NULL + * @param value_zone public key of the target zone (value), never NULL + * @param iter function to call with the result + * @param iter_cls closure for @a iter + * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error + */ +static int +namestore_sqlite_zone_to_name (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, + const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone, + GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) +{ + struct Plugin *plugin = cls; + sqlite3_stmt *stmt; + + stmt = plugin->zone_to_name; + if ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, + zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), + SQLITE_STATIC)) || + (SQLITE_OK != sqlite3_bind_blob (stmt, 2, + value_zone, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey), + SQLITE_STATIC)) ) { - case SQLITE_DONE: - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Values deleted\n"); - break; - case SQLITE_BUSY: - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - break; - default: LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - break; + "sqlite3_bind_XXXX"); + if (SQLITE_OK != sqlite3_reset (stmt)) + LOG_SQLITE (plugin, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_reset"); + return GNUNET_SYSERR; } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Performing reverse lookup for `%s'\n", + GNUNET_GNSRECORD_z2s (value_zone)); + + return get_record_and_call_iterator (plugin, stmt, zone, iter, iter_cls); } @@ -751,7 +688,7 @@ namestore_sqlite_delete_zone (void *cls, * Entry point for the plugin. * * @param cls the "struct GNUNET_NAMESTORE_PluginEnvironment*" - * @return NULL on error, othrewise the plugin context + * @return NULL on error, otherwise the plugin context */ void * libgnunet_plugin_namestore_sqlite_init (void *cls) @@ -763,19 +700,19 @@ libgnunet_plugin_namestore_sqlite_init (void *cls) if (NULL != plugin.cfg) return NULL; /* can only initialize once! */ memset (&plugin, 0, sizeof (struct Plugin)); - plugin.cfg = cfg; + plugin.cfg = cfg; if (GNUNET_OK != database_setup (&plugin)) { database_shutdown (&plugin); return NULL; } - api = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_PluginFunctions)); + api = GNUNET_new (struct GNUNET_NAMESTORE_PluginFunctions); api->cls = &plugin; - api->put_records = &namestore_sqlite_put_records; - api->remove_records = &namestore_sqlite_remove_records; + api->store_records = &namestore_sqlite_store_records; api->iterate_records = &namestore_sqlite_iterate_records; - api->delete_zone = &namestore_sqlite_delete_zone; - LOG (GNUNET_ERROR_TYPE_INFO, + api->zone_to_name = &namestore_sqlite_zone_to_name; + api->lookup_records = &namestore_sqlite_lookup_records; + LOG (GNUNET_ERROR_TYPE_INFO, _("Sqlite database running\n")); return api; } @@ -793,12 +730,10 @@ libgnunet_plugin_namestore_sqlite_done (void *cls) struct GNUNET_NAMESTORE_PluginFunctions *api = cls; struct Plugin *plugin = api->cls; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "sqlite plugin is done\n"); database_shutdown (plugin); plugin->cfg = NULL; GNUNET_free (api); - LOG (GNUNET_ERROR_TYPE_DEBUG, + LOG (GNUNET_ERROR_TYPE_DEBUG, "sqlite plugin is finished\n"); return NULL; }