/*
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 access distributed GNS
* @author Christian Grothoff
- *
*/
#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 GNS service.
+ * Configuration we are using.
*/
-static struct GNUNET_GNS_Handle *gns;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * GNS name to shorten. (-s option)
+ * Handle to GNS service.
*/
-static char *shorten_name;
+static struct GNUNET_GNS_Handle *gns;
/**
* GNS name to lookup. (-u option)
static char *lookup_type;
/**
- * name to look up authority for (-a option)
+ * Identity of the zone to use for the lookup (-z option)
+ */
+static char *zone_ego_name;
+
+/**
+ * Public key of the zone to use for the lookup (-p option)
*/
-static char *auth_name;
+static char *public_key;
/**
* raw output
/**
* Requested record type.
*/
-static enum GNUNET_GNS_RecordType rtype;
+static int rtype;
/**
- * Handle to lookup request
+ * Handle to lookup request
*/
static struct GNUNET_GNS_LookupRequest *lookup_request;
/**
- * Handle to shorten request
+ * Lookup an ego with the identity service.
*/
-static struct GNUNET_GNS_ShortenRequest *shorten_request;
+static struct GNUNET_IDENTITY_EgoLookup *el;
/**
- * Handle to get authority request
+ * Handle for identity service.
*/
-static struct GNUNET_GNS_GetAuthRequest *getauth_request;
+static struct GNUNET_IDENTITY_Handle *identity;
+
+/**
+ * Active operation on identity service.
+ */
+static struct GNUNET_IDENTITY_Operation *id_op;
/**
do_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != lookup_request)
+ if (NULL != el)
{
- GNUNET_GNS_cancel_lookup_request (lookup_request);
- lookup_request = NULL;
+ GNUNET_IDENTITY_ego_lookup_cancel (el);
+ el = NULL;
+ }
+ if (NULL != id_op)
+ {
+ GNUNET_IDENTITY_cancel (id_op);
+ id_op = NULL;
}
- if (NULL != shorten_request)
+ if (NULL != lookup_request)
{
- GNUNET_GNS_cancel_shorten_request (shorten_request);
- shorten_request = NULL;
+ GNUNET_GNS_lookup_cancel (lookup_request);
+ lookup_request = NULL;
}
- if (NULL != getauth_request)
+ if (NULL != identity)
{
- GNUNET_GNS_cancel_get_auth_request (getauth_request);
- getauth_request = NULL;
+ GNUNET_IDENTITY_disconnect (identity);
+ identity = NULL;
}
if (NULL != gns)
{
/**
- * Function called with the result of a shorten operation.
- * Prints the result.
- *
- * @param cls a 'const char *' with the original (long) name
- * @param nshort the shortened name
- */
-static void
-process_shorten_result (void* cls, const char *nshort)
-{
- 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 ();
-}
-
-
-/**
- * Function called with the result of a GADS lookup.
+ * Function called with the result of a GNS lookup.
*
* @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
+ * @param rd array of @a rd_count records with the results
*/
static void
-process_lookup_result (void* cls, uint32_t rd_count,
+process_lookup_result (void *cls, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
- const char* name = cls;
+ const char *name = cls;
uint32_t i;
- const char* typename;
+ const char *typename;
char* string_val;
- lookup_request = NULL;
- if (!raw)
+ lookup_request = NULL;
+ if (!raw)
{
if (0 == rd_count)
- printf("No results.\n");
+ printf ("No results.\n");
else
- printf("%s:\n", name);
+ 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);
+ printf ("%s\n",
+ string_val);
else
- printf ("Got `%s' record: %s\n", typename, string_val);
- GNUNET_free_non_null (string_val);
+ printf ("Got `%s' record: %s\n",
+ typename,
+ string_val);
+ GNUNET_free (string_val);
}
GNUNET_SCHEDULER_shutdown ();
}
/**
- * Function called with the result of an authority lookup.
+ * Perform the actual resolution, starting with the zone
+ * identified by the given public key and the shorten zone.
*
- * @param cls the 'const char *' with the name for which the
- * authority was resolved
- * @param auth name of the authority
+ * @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
-process_auth_result (void* cls,
- const char *auth)
+lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey,
+ const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key)
{
- getauth_request = NULL;
- printf ("%s\n", auth);
- GNUNET_SCHEDULER_shutdown ();
+ 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,
+ _("Please specify name to lookup!\n"));
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ return;
+ }
+}
+
+
+/**
+ * Method called to with the ego we are to use for shortening
+ * during the lookup.
+ *
+ * @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
+identity_shorten_cb (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *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)
+ {
+ GNUNET_break (0);
+ lookup_with_keys (pkey, NULL);
+ }
+}
+
+
+/**
+ * Method called to with the ego we are to use for the lookup,
+ * when the ego is determined by a name.
+ *
+ * @param cls closure (NULL, unused)
+ * @param ego ego handle, NULL if not found
+ */
+static void
+identity_zone_cb (void *cls,
+ const struct GNUNET_IDENTITY_Ego *ego)
+{
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+
+ el = NULL;
+ if (NULL == ego)
+ {
+ fprintf (stderr,
+ _("Ego for `%s' not found, cannot perform lookup.\n"),
+ zone_ego_name);
+ GNUNET_SCHEDULER_shutdown ();
+ }
+ else
+ {
+ GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
+ lookup_with_public_key (&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)
+ {
+ fprintf (stderr,
+ _("Ego for `master-zone' not found, cannot perform lookup. Did you run gnunet-gns-import.sh?\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
+ lookup_with_public_key (&pkey);
}
* @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 c configuration
*/
static void
run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
- 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;
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+ cfg = c;
gns = GNUNET_GNS_connect (cfg);
+ identity = GNUNET_IDENTITY_connect (cfg, NULL, NULL);
if (NULL == gns)
{
fprintf (stderr,
_("Failed to connect to GNS\n"));
return;
}
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
- "ZONEKEY", &keyfile))
- {
- if (! raw)
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "No private key for root zone found, using default!\n");
- }
- else
- {
- 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);
- }
-
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
- "SHORTEN_ZONEKEY", &keyfile))
- {
- if (! raw)
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "No shorten key found!\n");
- }
- else
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &do_shutdown, NULL);
+ if (NULL != public_key)
{
- 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 (GNUNET_OK !=
+ GNUNET_CRYPTO_ecc_public_sign_key_from_string (public_key,
+ strlen (public_key),
+ &pkey))
+ {
+ fprintf (stderr,
+ _("Public key `%s' is not well-formed\n"),
+ public_key);
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ lookup_with_public_key (&pkey);
+ return;
}
-
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
- "PRIVATE_ZONEKEY", &keyfile))
+ if (NULL != zone_ego_name)
{
- if (! raw)
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "No private zone key file name specified in configuration!\n");
+ el = GNUNET_IDENTITY_ego_lookup (cfg,
+ zone_ego_name,
+ &identity_zone_cb,
+ NULL);
+ return;
}
- else
+ if ( (NULL != lookup_name) &&
+ (strlen (lookup_name) > 4) &&
+ (0 == strcmp (".zkey",
+ &lookup_name[strlen (lookup_name) - 4])) )
{
- 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);
+ /* 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 (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) )
- {
- shorten_request = GNUNET_GNS_shorten_zone (gns, shorten_name,
- private_zone,
- shorten_zone,
- zone,
- &process_shorten_result,
- shorten_name);
- }
- if (NULL != lookup_name)
{
- lookup_request = GNUNET_GNS_lookup_zone (gns, lookup_name,
- zone,
- rtype,
- GNUNET_NO, /* Use DHT */
- shorten_key,
- &process_lookup_result,
- lookup_name);
+ id_op = GNUNET_IDENTITY_get (identity,
+ "master-zone",
+ &identity_master_cb,
+ NULL);
+ GNUNET_assert (NULL != id_op);
}
- if (NULL != auth_name)
- {
- getauth_request = GNUNET_GNS_get_authority (gns, auth_name,
- &process_auth_result, auth_name);
- }
-
- 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))
- {
- 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[] = {
- {'s', "shorten", NULL,
- gettext_noop ("try to shorten a given name"), 1,
- &GNUNET_GETOPT_set_string, &shorten_name},
- {'u', "lookup", NULL,
+ {'u', "lookup", "NAME",
gettext_noop ("Lookup a record for the given name"), 1,
&GNUNET_GETOPT_set_string, &lookup_name},
- {'a', "authority", NULL,
- gettext_noop ("Get the authority of a particular name"), 1,
- &GNUNET_GETOPT_set_string, &auth_name},
- {'t', "type", NULL,
+ {'t', "type", "TYPE",
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;
ret =
(GNUNET_OK ==
GNUNET_PROGRAM_run (argc, argv, "gnunet-gns",
- _("GNUnet GNS access tool"),
+ _("GNUnet GNS resolver tool"),
options,
&run, NULL)) ? 0 : 1;
-
+ GNUNET_free ((void*) argv);
return ret;
}
projects / oweals / gnunet.git / blobdiff