*/
/**
* @file gnunet-gns.c
- * @brief command line tool to manipulate the local zone
+ * @brief command line tool to access distributed GNS
* @author Christian Grothoff
*
- * TODO:
- * - printing records
- * - allow users to set record options (not just 'RF_AUTHORITY')
- * - test
- * - parsing SOA, PTR and MX value specifications (and define format!)
- * - add options to list/lookup individual records
- * - add option to shorten name (lookup PKEY, then lookup name by zone,
- * then possibly lookup PSEU for the zone and update our zone)
*/
#include "platform.h"
#include <gnunet_util_lib.h>
#include <gnunet_dnsparser_lib.h>
#include <gnunet_namestore_service.h>
+#include <gnunet_gns_service.h>
/**
- * Handle to the namestore.
+ * Handle to GNS service.
*/
-static struct GNUNET_NAMESTORE_Handle *ns;
+static struct GNUNET_GNS_Handle *gns;
/**
- * Hash of the public key of our zone.
+ * GNS name to shorten. (-s option)
*/
-static GNUNET_HashCode zone;
+static char *shorten_name;
/**
- * Private key for the our zone.
+ * GNS name to lookup. (-u option)
*/
-static struct GNUNET_CRYPTO_RsaPrivateKey *zone_pkey;
+static char *lookup_name;
/**
- * Keyfile to manipulate.
+ * record type to look up (-t option)
*/
-static char *keyfile;
+static char *lookup_type;
/**
- * Desired action is to add a record.
+ * name to look up authority for (-a option)
*/
-static int add;
+static char *auth_name;
/**
- * Queue entry for the 'add' operation.
+ * raw output
*/
-static struct GNUNET_NAMESTORE_QueueEntry *add_qe;
+static int raw;
/**
- * Desired action is to list records.
+ * Requested record type.
*/
-static int list;
+static enum GNUNET_GNS_RecordType rtype;
/**
- * List iterator for the 'list' operation.
+ * Handle to lookup request
*/
-static struct GNUNET_NAMESTORE_ZoneIterator *list_it;
+static struct GNUNET_GNS_LookupRequest *lookup_request;
/**
- * Desired action is to remove a record.
+ * Handle to shorten request
*/
-static int del;
+static struct GNUNET_GNS_ShortenRequest *shorten_request;
/**
- * Queue entry for the 'del' operation.
+ * Handle to get authority request
*/
-static struct GNUNET_NAMESTORE_QueueEntry *del_qe;
+static struct GNUNET_GNS_GetAuthRequest *getauth_request;
-/**
- * Name of the records to add/list/remove.
- */
-static char *name;
-
-/**
- * Value of the record to add/remove.
- */
-static char *value;
-
-/**
- * Type of the record to add/remove, NULL to remove all.
- */
-static char *typestring;
-
-/**
- * Desired expiration time.
- */
-static char *expirationstring;
-
/**
* Task run on shutdown. Cleans up everything.
do_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != ns)
+ if (NULL != lookup_request)
+ {
+ GNUNET_GNS_cancel_lookup_request (lookup_request);
+ lookup_request = NULL;
+ }
+ if (NULL != shorten_request)
{
- GNUNET_NAMESTORE_disconnect (ns, GNUNET_NO);
- ns = NULL;
+ GNUNET_GNS_cancel_shorten_request (shorten_request);
+ shorten_request = NULL;
}
- if (NULL != zone_pkey)
+ if (NULL != getauth_request)
{
- GNUNET_CRYPTO_rsa_key_free (zone_pkey);
- zone_pkey = NULL;
+ GNUNET_GNS_cancel_get_auth_request (getauth_request);
+ getauth_request = NULL;
+ }
+ if (NULL != gns)
+ {
+ GNUNET_GNS_disconnect (gns);
+ gns = NULL;
}
}
/**
- * Continuation called to notify client about result of the
- * operation.
+ * Function called with the result of a shorten operation.
+ * Prints the result.
*
- * @param cls closure, unused
- * @param success GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
- * GNUNET_NO if content was already there
- * GNUNET_YES (or other positive value) on success
- * @param emsg NULL on success, otherwise an error message
+ * @param cls a 'const char *' with the original (long) name
+ * @param nshort the shortened name
*/
static void
-add_continuation (void *cls,
- int32_t success,
- const char *emsg)
+process_shorten_result (void* cls, const char *nshort)
{
- add_qe = NULL;
- if (success != GNUNET_YES)
- fprintf (stderr,
- _("Adding record failed: %s\n"),
- (success == GNUNET_NO) ? "record exists" : emsg);
- if ( (NULL == del_qe) &&
- (NULL == list_it) )
- GNUNET_SCHEDULER_shutdown ();
+ const char *original_name = cls;
+
+ shorten_request = NULL;
+ if (raw)
+ printf("%s", nshort);
+ else
+ printf("%s shortened to %s\n", original_name, nshort);
+ GNUNET_SCHEDULER_shutdown ();
}
/**
- * Continuation called to notify client about result of the
- * operation.
+ * Function called with the result of a GADS lookup.
*
- * @param cls closure, unused
- * @param success GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
- * GNUNET_NO if content was already there
- * GNUNET_YES (or other positive value) on success
- * @param emsg NULL on success, otherwise an error message
+ * @param cls the 'const char *' name that was resolved
+ * @param rd_count number of records returned
+ * @param rd array of 'rd_count' records with the results
*/
static void
-del_continuation (void *cls,
- int32_t success,
- const char *emsg)
+process_lookup_result (void* cls, uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- del_qe = NULL;
- if (success != GNUNET_YES)
- fprintf (stderr,
- _("Deleting record failed: %s\n"),
- emsg);
- if ( (NULL == add_qe) &&
- (NULL == list_it) )
- GNUNET_SCHEDULER_shutdown ();
+ const char* name = cls;
+ uint32_t i;
+ const char* typename;
+ char* string_val;
+
+ lookup_request = NULL;
+ if (!raw)
+ {
+ if (0 == rd_count)
+ printf("No results.\n");
+ else
+ printf("%s:\n", name);
+ }
+ for (i=0; i<rd_count; i++)
+ {
+ typename = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
+ string_val = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+ rd[i].data,
+ rd[i].data_size);
+ if (raw)
+ printf ("%s\n", string_val);
+ else
+ printf ("Got `%s' record: %s\n", typename, string_val);
+ GNUNET_free_non_null (string_val);
+ }
+ GNUNET_SCHEDULER_shutdown ();
}
/**
- * Process a record that was stored in the namestore.
+ * Function called with the result of an authority lookup.
*
- * @param cls closure
- * @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)?;
- * GNUNET_TIME_UNIT_ZERO_ABS if there are no records of any type in the namestore,
- * or the expiration time of the block in the namestore (even if there are zero
- * records matching the desired record type)
- * @param name name that is being mapped (at most 255 characters long)
- * @param rd_count number of entries in '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)
+ * @param cls the 'const char *' with the name for which the
+ * authority was resolved
+ * @param auth name of the authority
*/
static void
-display_record (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+process_auth_result (void* cls,
+ const char *auth)
{
- if (NULL == name)
- {
- list_it = NULL;
- if ( (NULL == del_qe) &&
- (NULL == add_qe) )
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- // FIXME: display record!
- GNUNET_NAMESTORE_zone_iterator_next (list_it);
+ getauth_request = NULL;
+ printf ("%s\n", auth);
+ GNUNET_SCHEDULER_shutdown ();
}
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
- uint32_t type;
- const void *data;
- size_t data_size;
- struct in_addr value_a;
- struct in6_addr value_aaaa;
- struct GNUNET_TIME_Relative etime;
- struct GNUNET_NAMESTORE_RecordData rd;
-
- if (NULL == keyfile)
+ char* keyfile;
+ struct GNUNET_CRYPTO_RsaPrivateKey *key = NULL;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+ struct GNUNET_CRYPTO_ShortHashCode *zone = NULL;
+ struct GNUNET_CRYPTO_ShortHashCode user_zone;
+ struct GNUNET_CRYPTO_ShortHashAsciiEncoded zonename;
+ struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key = NULL;
+ struct GNUNET_CRYPTO_RsaPrivateKey *private_key = NULL;
+ struct GNUNET_CRYPTO_ShortHashCode *private_zone = NULL;
+ struct GNUNET_CRYPTO_ShortHashCode *shorten_zone = NULL;
+
+ gns = GNUNET_GNS_connect (cfg);
+ if (NULL == gns)
{
fprintf (stderr,
- _("Option `%s' not given, but I need a zone key file!\n"),
- "z");
+ _("Failed to connect to GNS\n"));
return;
}
- zone_pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- GNUNET_free (keyfile);
- keyfile = NULL;
- if (! (add|del|list))
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "ZONEKEY", &keyfile))
{
- /* nothing more to be done */
- GNUNET_CRYPTO_rsa_key_free (zone_pkey);
- zone_pkey = NULL;
- return;
+ if (! raw)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "No private key for root zone found, using default!\n");
}
- if (NULL == zone_pkey)
+ else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to read or create private zone key\n"));
- return;
+ key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
+ GNUNET_CRYPTO_short_hash (&pkey,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &user_zone);
+ zone = &user_zone;
+ GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
+ if (!raw)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Using zone: %s!\n", &zonename);
+ GNUNET_CRYPTO_rsa_key_free (key);
+ GNUNET_free(keyfile);
}
- GNUNET_CRYPTO_rsa_key_get_public (zone_pkey,
- &pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (pub), &zone);
-
- ns = GNUNET_NAMESTORE_connect (cfg);
- if (NULL == ns)
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "SHORTEN_ZONEKEY", &keyfile))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to connect to namestore\n"));
- return;
+ if (! raw)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "No shorten key found!\n");
}
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &do_shutdown, NULL);
- if (NULL == typestring)
- type = 0;
else
- type = GNUNET_NAMESTORE_typename_to_number (typestring);
- if (UINT32_MAX == type)
- {
- fprintf (stderr, _("Unsupported type `%s'\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- } else if (add | del)
{
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-t", _("add/del"));
- GNUNET_SCHEDULER_shutdown ();
- return;
+ shorten_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_rsa_key_get_public (shorten_key, &pkey);
+ shorten_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+ GNUNET_CRYPTO_short_hash(&pkey,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ shorten_zone);
+ GNUNET_CRYPTO_short_hash_to_enc (shorten_zone, &zonename);
+ if (! raw)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Using shorten zone: %s!\n", &zonename);
+ GNUNET_free (keyfile);
}
- if (NULL != value)
- {
- switch (type)
- {
- case 0:
- fprintf (stderr, _("Need a record type to interpret value `%s'\n"), value);
- GNUNET_SCHEDULER_shutdown ();
- break;
- case GNUNET_DNSPARSER_TYPE_A:
- if (1 != inet_pton (AF_INET, value, &value_a))
- {
- fprintf (stderr, _("Value `%s' invalid for record type `%s'\n"),
- value,
- typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- data = &value_a;
- data_size = sizeof (value_a);
- break;
- case GNUNET_DNSPARSER_TYPE_NS:
- data = value;
- data_size = strlen (value);
- break;
- case GNUNET_DNSPARSER_TYPE_CNAME:
- data = value;
- data_size = strlen (value);
- break;
- case GNUNET_DNSPARSER_TYPE_SOA:
- // FIXME
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_DNSPARSER_TYPE_PTR:
- // FIXME
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_DNSPARSER_TYPE_MX:
- // FIXME
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_DNSPARSER_TYPE_TXT:
- data = value;
- data_size = strlen (value);
- break;
- case GNUNET_DNSPARSER_TYPE_AAAA:
- if (1 != inet_pton (AF_INET6, value, &value_aaaa))
- {
- fprintf (stderr, _("Value `%s' invalid for record type `%s'\n"),
- value,
- typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- data = &value_aaaa;
- data_size = sizeof (value_aaaa);
- break;
- case GNUNET_GNS_TYPE_PKEY:
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_GNS_TYPE_PSEU:
- data = value;
- data_size = strlen (value);
- break;
- default:
- GNUNET_assert (0);
- }
- } else if (add | del)
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "PRIVATE_ZONEKEY", &keyfile))
{
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-V", _("add/del"));
- GNUNET_SCHEDULER_shutdown ();
- return;
+ if (! raw)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "No private zone key file name specified in configuration!\n");
}
- if (NULL != expirationstring)
+ else
{
- if (GNUNET_OK !=
- GNUNET_STRINGS_fancy_time_to_relative (expirationstring,
- &etime))
- {
- fprintf (stderr,
- _("Invalid time format `%s'\n"),
- expirationstring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- } else if (add | del)
+ private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_rsa_key_get_public (private_key, &pkey);
+ private_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+ GNUNET_CRYPTO_short_hash(&pkey,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ private_zone);
+ GNUNET_CRYPTO_short_hash_to_enc (private_zone, &zonename);
+ if (! raw)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Using private zone: %s!\n", &zonename);
+ GNUNET_CRYPTO_rsa_key_free (private_key);
+ }
+
+ if (NULL != lookup_type)
+ rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type);
+ else
+ rtype = GNUNET_GNS_RECORD_A;
+
+ if ( (NULL != shorten_name) &&
+ (NULL != shorten_zone) &&
+ (NULL != private_zone) )
{
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-e", _("add/del"));
- GNUNET_SCHEDULER_shutdown ();
- return;
+ shorten_request = GNUNET_GNS_shorten_zone (gns, shorten_name,
+ private_zone,
+ shorten_zone,
+ zone,
+ &process_shorten_result,
+ shorten_name);
}
- if (add)
+ if (NULL != lookup_name)
{
- if (NULL == name)
- {
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-n", _("add"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- rd.data = data;
- rd.data_size = data_size;
- rd.record_type = type;
- rd.expiration = GNUNET_TIME_relative_to_absolute (etime);
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always...
- add_qe = GNUNET_NAMESTORE_record_create (ns,
- zone_pkey,
- name,
- &rd,
- &add_continuation,
- NULL);
+ lookup_request = GNUNET_GNS_lookup_zone (gns, lookup_name,
+ zone,
+ rtype,
+ GNUNET_NO, /* Use DHT */
+ shorten_key,
+ &process_lookup_result,
+ lookup_name);
}
- if (del)
+ if (NULL != auth_name)
{
- if (NULL == name)
- {
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-n", _("del"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- rd.data = data;
- rd.data_size = data_size;
- rd.record_type = type;
- rd.expiration = GNUNET_TIME_relative_to_absolute (etime);
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always...
- del_qe = GNUNET_NAMESTORE_record_create (ns,
- zone_pkey,
- name,
- &rd,
- &del_continuation,
- NULL);
+ getauth_request = GNUNET_GNS_get_authority (gns, auth_name,
+ &process_auth_result, auth_name);
}
- if (list)
+
+ if (NULL != shorten_key)
+ GNUNET_CRYPTO_rsa_key_free (shorten_key);
+ if (NULL != shorten_zone)
+ GNUNET_free (shorten_zone);
+ if (NULL != private_zone)
+ GNUNET_free (private_zone);
+
+ if ( (NULL == auth_name) &&
+ (NULL == shorten_name) &&
+ (NULL == lookup_name))
{
- list_it = GNUNET_NAMESTORE_zone_iteration_start (ns,
- &zone,
- 0, 0,
- &display_record,
- NULL);
+ fprintf (stderr,
+ _("Please specify lookup, shorten or authority operation!\n"));
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ return;
}
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &do_shutdown, NULL);
}
main (int argc, char *const *argv)
{
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'a', "add", NULL,
- gettext_noop ("add record"), 0,
- &GNUNET_GETOPT_set_one, &add},
- {'d', "delete", NULL,
- gettext_noop ("delete record"), 0,
- &GNUNET_GETOPT_set_one, &del},
- {'D', "display", NULL,
- gettext_noop ("display records"), 0,
- &GNUNET_GETOPT_set_one, &list},
- {'e', "expiration", "TIME",
- gettext_noop ("expiration time to use (for adding only)"), 1,
- &GNUNET_GETOPT_set_string, &expirationstring},
- {'n', "name", "NAME",
- gettext_noop ("name of the record to add/delete/display"), 1,
- &GNUNET_GETOPT_set_string, &name},
+ {'s', "shorten", "NAME",
+ gettext_noop ("try to shorten a given name"), 1,
+ &GNUNET_GETOPT_set_string, &shorten_name},
+ {'u', "lookup", "NAME",
+ gettext_noop ("Lookup a record for the given name"), 1,
+ &GNUNET_GETOPT_set_string, &lookup_name},
+ {'a', "authority", "NAME",
+ gettext_noop ("Get the authority of a particular name"), 1,
+ &GNUNET_GETOPT_set_string, &auth_name},
{'t', "type", "TYPE",
- gettext_noop ("type of the record to add/delete/display"), 1,
- &GNUNET_GETOPT_set_string, &typestring},
- {'V', "value", "VALUE",
- gettext_noop ("value of the record to add/delete"), 1,
- &GNUNET_GETOPT_set_string, &value},
- {'z', "zonekey", "FILENAME",
- gettext_noop ("filename with the zone key"), 1,
- &GNUNET_GETOPT_set_string, &keyfile},
+ gettext_noop ("Specify the type of the record to lookup"), 1,
+ &GNUNET_GETOPT_set_string, &lookup_type},
+ {'r', "raw", NULL,
+ gettext_noop ("No unneeded output"), 0,
+ &GNUNET_GETOPT_set_one, &raw},
GNUNET_GETOPT_OPTION_END
};
-
int ret;
+ if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ return 2;
+
GNUNET_log_setup ("gnunet-gns", "WARNING", NULL);
ret =
(GNUNET_OK ==
GNUNET_PROGRAM_run (argc, argv, "gnunet-gns",
- _("GNUnet GNS zone manipulation tool"),
+ _("GNUnet GNS access tool"),
options,
&run, NULL)) ? 0 : 1;
-
+ GNUNET_free ((void*) argv);
return ret;
}
projects / oweals / gnunet.git / blobdiff