/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ (C) 2012-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
*/
/**
* @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_identity_service.h>
#include <gnunet_namestore_service.h>
+#include <gnunet_gns_service.h>
/**
- * Handle to the namestore.
- */
-static struct GNUNET_NAMESTORE_Handle *ns;
-
-/**
- * Hash of the public key of our zone.
+ * Configuration we are using.
*/
-static GNUNET_HashCode zone;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Private key for the our zone.
+ * Handle to GNS service.
*/
-static struct GNUNET_CRYPTO_RsaPrivateKey *zone_pkey;
+static struct GNUNET_GNS_Handle *gns;
/**
- * Keyfile to manipulate.
+ * GNS name to lookup. (-u option)
*/
-static char *keyfile;
+static char *lookup_name;
/**
- * Desired action is to add a record.
+ * record type to look up (-t option)
*/
-static int add;
+static char *lookup_type;
/**
- * Queue entry for the 'add' operation.
+ * Identity of the zone to use for the lookup (-z option)
*/
-static struct GNUNET_NAMESTORE_QueueEntry *add_qe;
+static char *zone_ego_name;
/**
- * Desired action is to list records.
+ * Public key of the zone to use for the lookup (-p option)
*/
-static int list;
+static char *public_key;
/**
- * List iterator for the 'list' operation.
+ * raw output
*/
-static struct GNUNET_NAMESTORE_ZoneIterator *list_it;
+static int raw;
/**
- * Desired action is to remove a record.
+ * Requested record type.
*/
-static int del;
+static int rtype;
/**
- * Queue entry for the 'del' operation.
+ * Handle to lookup request
*/
-static struct GNUNET_NAMESTORE_QueueEntry *del_qe;
+static struct GNUNET_GNS_LookupRequest *lookup_request;
/**
- * Name of the records to add/list/remove.
+ * Lookup an ego with the identity service.
*/
-static char *name;
+static struct GNUNET_IDENTITY_EgoLookup *el;
/**
- * Value of the record to add/remove.
+ * Handle for identity service.
*/
-static char *value;
+static struct GNUNET_IDENTITY_Handle *identity;
/**
- * Type of the record to add/remove, NULL to remove all.
+ * Active operation on identity service.
*/
-static char *typestring;
+static struct GNUNET_IDENTITY_Operation *id_op;
-/**
- * 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 != el)
+ {
+ GNUNET_IDENTITY_ego_lookup_cancel (el);
+ el = NULL;
+ }
+ if (NULL != id_op)
{
- GNUNET_NAMESTORE_disconnect (ns, GNUNET_NO);
- ns = NULL;
+ GNUNET_IDENTITY_cancel (id_op);
+ id_op = NULL;
}
- if (NULL != zone_pkey)
+ if (NULL != lookup_request)
{
- GNUNET_CRYPTO_rsa_key_free (zone_pkey);
- zone_pkey = NULL;
+ GNUNET_GNS_lookup_cancel (lookup_request);
+ lookup_request = NULL;
+ }
+ if (NULL != identity)
+ {
+ GNUNET_IDENTITY_disconnect (identity);
+ identity = 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 GNS 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 @a rd_count records with the results
*/
static void
-add_continuation (void *cls,
- int32_t success,
- const char *emsg)
+process_lookup_result (void *cls, uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- 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 *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++)
+ {
+ if ( (rd[i].record_type != rtype) &&
+ (GNUNET_NAMESTORE_TYPE_ANY != rtype) )
+ continue;
+ 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 (NULL == string_val)
+ {
+ fprintf (stderr,
+ "Record %u of type %d malformed, skipping\n",
+ (unsigned int) i,
+ (int) rd[i].record_type);
+ continue;
+ }
+ if (raw)
+ printf ("%s\n",
+ string_val);
+ else
+ printf ("Got `%s' record: %s\n",
+ typename,
+ string_val);
+ GNUNET_free (string_val);
+ }
+ GNUNET_SCHEDULER_shutdown ();
}
/**
- * Continuation called to notify client about result of the
- * operation.
+ * Perform the actual resolution, starting with the zone
+ * identified by the given public key and the shorten zone.
*
- * @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 pkey public key to use for the zone, can be NULL
+ * @param shorten_key private key used for shortening, can be NULL
*/
static void
-del_continuation (void *cls,
- int32_t success,
- const char *emsg)
+lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey,
+ const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key)
{
- del_qe = NULL;
- if (success != GNUNET_YES)
+ if (NULL != lookup_type)
+ rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type);
+ else
+ rtype = GNUNET_DNSPARSER_TYPE_A;
+
+ if (NULL != lookup_name)
+ {
+ lookup_request = GNUNET_GNS_lookup (gns,
+ lookup_name,
+ pkey,
+ rtype,
+ GNUNET_NO, /* Use DHT */
+ shorten_key,
+ &process_lookup_result,
+ lookup_name);
+ }
+ else
+ {
fprintf (stderr,
- _("Deleting record failed: %s\n"),
- emsg);
- if ( (NULL == add_qe) &&
- (NULL == list_it) )
- GNUNET_SCHEDULER_shutdown ();
+ _("Please specify name to lookup!\n"));
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ return;
+ }
}
/**
- * Process a record that was stored in the namestore.
+ * Method called to with the ego we are to use for shortening
+ * during the 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 closure contains the public key to use
+ * @param ego ego handle, NULL if not found
+ * @param ctx context for application to store data for this ego
+ * (during the lifetime of this process, initially NULL)
+ * @param name name assigned by the user for this ego,
+ * NULL if the user just deleted the ego and it
+ * must thus no longer be used
*/
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)
+identity_shorten_cb (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *name)
{
- if (NULL == name)
+ struct GNUNET_CRYPTO_EccPublicSignKey *pkeym = cls;
+
+ id_op = NULL;
+ if (NULL == ego)
+ lookup_with_keys (pkeym, NULL);
+ else
+ lookup_with_keys (pkeym,
+ GNUNET_IDENTITY_ego_get_private_key (ego));
+ GNUNET_free (pkeym);
+}
+
+
+/**
+ * Perform the actual resolution, starting with the zone
+ * identified by the given public key.
+ *
+ * @param pkey public key to use for the zone
+ */
+static void
+lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey)
+{
+ struct GNUNET_CRYPTO_EccPublicSignKey *pkeym;
+
+ GNUNET_assert (NULL != pkey);
+ pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicSignKey);
+ *pkeym = *pkey;
+ id_op = GNUNET_IDENTITY_get (identity,
+ "gns-short",
+ &identity_shorten_cb,
+ pkeym);
+ if (NULL == id_op)
{
- list_it = NULL;
- if ( (NULL == del_qe) &&
- (NULL == add_qe) )
- GNUNET_SCHEDULER_shutdown ();
- return;
+ GNUNET_break (0);
+ lookup_with_keys (pkey, NULL);
}
- // FIXME: display record!
- GNUNET_NAMESTORE_zone_iterator_next (list_it);
}
/**
- * Main function that will be run.
+ * Method called to with the ego we are to use for the lookup,
+ * when the ego is determined by a name.
*
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
+ * @param cls closure (NULL, unused)
+ * @param ego ego handle, NULL if not found
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+identity_zone_cb (void *cls,
+ const struct GNUNET_IDENTITY_Ego *ego)
{
- 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)
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+
+ el = NULL;
+ if (NULL == ego)
{
fprintf (stderr,
- _("Option `%s' not given, but I need a zone key file!\n"),
- "z");
- return;
+ _("Ego for `%s' not found, cannot perform lookup.\n"),
+ zone_ego_name);
+ GNUNET_SCHEDULER_shutdown ();
}
- zone_pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- GNUNET_free (keyfile);
- keyfile = NULL;
- if (! (add|del|list))
+ else
{
- /* nothing more to be done */
- GNUNET_CRYPTO_rsa_key_free (zone_pkey);
- zone_pkey = NULL;
- return;
+ GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
+ lookup_with_public_key (&pkey);
}
- if (NULL == zone_pkey)
+ GNUNET_free_non_null (zone_ego_name);
+ zone_ego_name = NULL;
+}
+
+
+/**
+ * Method called to with the ego we are to use for the lookup,
+ * when the ego is the one for the default master zone.
+ *
+ * @param cls closure (NULL, unused)
+ * @param ego ego handle, NULL if not found
+ * @param ctx context for application to store data for this ego
+ * (during the lifetime of this process, initially NULL)
+ * @param name name assigned by the user for this ego,
+ * NULL if the user just deleted the ego and it
+ * must thus no longer be used
+ */
+static void
+identity_master_cb (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *name)
+{
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+
+ id_op = NULL;
+ if (NULL == ego)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to read or create private zone key\n"));
+ fprintf (stderr,
+ _("Ego for `master-zone' not found, cannot perform lookup. Did you run gnunet-gns-import.sh?\n"));
+ GNUNET_SCHEDULER_shutdown ();
return;
}
- GNUNET_CRYPTO_rsa_key_get_public (zone_pkey,
- &pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (pub), &zone);
+ GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
+ lookup_with_public_key (&pkey);
+}
+
+
+/**
+ * Main function that will be run.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param c configuration
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
+{
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
- ns = GNUNET_NAMESTORE_connect (cfg);
- if (NULL == ns)
+ cfg = c;
+ gns = GNUNET_GNS_connect (cfg);
+ identity = GNUNET_IDENTITY_connect (cfg, NULL, NULL);
+ if (NULL == gns)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to connect to namestore\n"));
+ fprintf (stderr,
+ _("Failed to connect to GNS\n"));
return;
}
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;
- }
- 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)
- {
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-V", _("add/del"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- if (NULL != expirationstring)
+ if (NULL != public_key)
{
if (GNUNET_OK !=
- GNUNET_STRINGS_fancy_time_to_relative (expirationstring,
- &etime))
+ GNUNET_CRYPTO_ecc_public_sign_key_from_string (public_key,
+ strlen (public_key),
+ &pkey))
{
fprintf (stderr,
- _("Invalid time format `%s'\n"),
- expirationstring);
+ _("Public key `%s' is not well-formed\n"),
+ public_key);
GNUNET_SCHEDULER_shutdown ();
- return;
+ return;
}
- } else if (add | del)
- {
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-e", _("add/del"));
- GNUNET_SCHEDULER_shutdown ();
- return;
+ lookup_with_public_key (&pkey);
+ return;
}
- if (add)
+ if (NULL != zone_ego_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);
+ el = GNUNET_IDENTITY_ego_lookup (cfg,
+ zone_ego_name,
+ &identity_zone_cb,
+ NULL);
+ return;
}
- if (del)
+ if ( (NULL != lookup_name) &&
+ (strlen (lookup_name) > 4) &&
+ (0 == strcmp (".zkey",
+ &lookup_name[strlen (lookup_name) - 4])) )
{
- 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);
+ /* no zone required, use 'anonymous' zone */
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (),
+ &pkey);
+ lookup_with_public_key (&pkey);
}
- if (list)
+ else
{
- list_it = GNUNET_NAMESTORE_zone_iteration_start (ns,
- &zone,
- 0, 0,
- &display_record,
- NULL);
+ id_op = GNUNET_IDENTITY_get (identity,
+ "master-zone",
+ &identity_master_cb,
+ NULL);
+ GNUNET_assert (NULL != id_op);
}
}
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},
+ {'u', "lookup", "NAME",
+ gettext_noop ("Lookup a record for the given name"), 1,
+ &GNUNET_GETOPT_set_string, &lookup_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},
+ {'p', "public-key", "PKEY",
+ gettext_noop ("Specify the public key of the zone to lookup the record in"), 1,
+ &GNUNET_GETOPT_set_string, &public_key},
+ {'z', "zone", "NAME",
+ gettext_noop ("Specify the name of the ego of the zone to lookup the record in"), 1,
+ &GNUNET_GETOPT_set_string, &zone_ego_name},
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 resolver tool"),
options,
&run, NULL)) ? 0 : 1;
-
+ GNUNET_free ((void*) argv);
return ret;
}
projects / oweals / gnunet.git / blobdiff