along with this program. If not, see <http://www.gnu.org/licenses/>.
SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
/**
* @file gnunet-namestore.c
* @brief command line tool to manipulate the local zone
GNUNET_NAMESTORE_disconnect (ns);
ns = NULL;
}
- memset (&zone_pkey, 0, sizeof (zone_pkey));
+ memset (&zone_pkey, 0, sizeof(zone_pkey));
if (NULL != uri)
{
GNUNET_free (uri);
}
if (GNUNET_NO == have_record)
return;
- FPRINTF (stdout, "%s:\n", rname);
+ fprintf (stdout, "%s:\n", rname);
if (NULL != typestring)
type = GNUNET_GNSRECORD_typename_to_number (typestring);
else
rd[i].data_size);
if (NULL == s)
{
- FPRINTF (stdout,
+ fprintf (stdout,
_ ("\tCorrupt or unsupported record of type %u\n"),
(unsigned int) rd[i].record_type);
continue;
at.abs_value_us = rd[i].expiration_time;
ets = GNUNET_STRINGS_absolute_time_to_string (at);
}
- FPRINTF (stdout,
+ fprintf (stdout,
"\t%s: %s (%s)\t%s\t%s\n",
typestr,
s,
ets,
(0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE)) ? "PRIVATE"
- : "PUBLIC",
+ : "PUBLIC",
(0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)) ? "SHADOW"
- : "");
+ : "");
GNUNET_free (s);
}
- FPRINTF (stdout, "%s", "\n");
+ fprintf (stdout, "%s", "\n");
}
sync_cb (void *cls)
{
(void) cls;
- FPRINTF (stdout, "%s", "Monitor is now in sync.\n");
+ fprintf (stdout, "%s", "Monitor is now in sync.\n");
}
monitor_error_cb (void *cls)
{
(void) cls;
- FPRINTF (stderr, "%s", "Monitor disconnected and out of sync.\n");
+ fprintf (stderr, "%s", "Monitor disconnected and out of sync.\n");
}
{
(void) cls;
get_qe = NULL;
- FPRINTF (stderr, "%s", "Failed to lookup record.\n");
+ fprintf (stderr, "%s", "Failed to lookup record.\n");
test_finished ();
}
ret = 1;
test_finished ();
return;
+
case GNUNET_GNSRECORD_TYPE_PKEY:
fprintf (
stderr,
ret = 1;
test_finished ();
return;
+
case GNUNET_DNSPARSER_TYPE_SOA:
if (GNUNET_DNSPARSER_TYPE_SOA == type)
{
return;
}
break;
+
case GNUNET_GNSRECORD_TYPE_PKEY:
if (0 != rd_count)
{
return;
}
break;
+
case GNUNET_GNSRECORD_TYPE_GNS2DNS:
for (unsigned int i = 0; i < rd_count; i++)
if (GNUNET_GNSRECORD_TYPE_GNS2DNS != rd[i].record_type)
}
break;
}
- memset (rdn, 0, sizeof (struct GNUNET_GNSRECORD_Data));
- GNUNET_memcpy (&rdn[1], rd, rd_count * sizeof (struct GNUNET_GNSRECORD_Data));
+ memset (rdn, 0, sizeof(struct GNUNET_GNSRECORD_Data));
+ GNUNET_memcpy (&rdn[1], rd, rd_count * sizeof(struct GNUNET_GNSRECORD_Data));
rde = &rdn[0];
rde->data = data;
rde->data_size = data_size;
{
(void) cls;
reverse_qe = NULL;
- FPRINTF (stdout, "%s.zkey\n", reverse_pkey);
+ fprintf (stdout, "%s.zkey\n", reverse_pkey);
}
(void) rd;
reverse_qe = NULL;
if (NULL == label)
- FPRINTF (stdout, "%s\n", reverse_pkey);
+ fprintf (stdout, "%s\n", reverse_pkey);
else
- FPRINTF (stdout, "%s.%s\n", label, ego_name);
+ fprintf (stdout, "%s.%s\n", label, ego_name);
test_finished ();
}
del_qe = NULL;
if (0 == rd_count)
{
- FPRINTF (stderr,
+ fprintf (stderr,
_ (
"There are no records under label `%s' that could be deleted.\n"),
label);
if (rd_count == rd_left)
{
/* nothing got deleted */
- FPRINTF (
+ fprintf (
stderr,
_ (
"There are no records under label `%s' that match the request for deletion.\n"),
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
_ ("Failed to replace records: %s\n"),
emsg);
- ret = 1; /* fail from 'main' */
+ ret = 1; /* fail from 'main' */
}
GNUNET_SCHEDULER_shutdown ();
}
/**
- * Callback invoked from identity service with ego information.
- * An @a ego of NULL means the ego was not found.
+ * We have obtained the zone's private key, so now process
+ * the main commands using it.
*
- * @param cls closure with the configuration
- * @param ego an ego known to identity service, or NULL
+ * @param cfg configuration to use
*/
static void
-identity_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
+run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
- struct GNUNET_CRYPTO_EcdsaPublicKey pub;
struct GNUNET_GNSRECORD_Data rd;
- el = NULL;
- if ((NULL != name) && (0 != strchr (name, '.')))
- {
- fprintf (stderr,
- _ ("Label `%s' contains `.' which is not allowed\n"),
- name);
- GNUNET_SCHEDULER_shutdown ();
- ret = -1;
- return;
- }
-
- if (NULL == ego)
- {
- if (NULL != ego_name)
- {
- fprintf (stderr,
- _ ("Ego `%s' not known to identity service\n"),
- ego_name);
- }
- GNUNET_SCHEDULER_shutdown ();
- ret = -1;
- return;
- }
- zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
- GNUNET_free_non_null (ego_name);
- ego_name = NULL;
-
- if (! (add | del | list | (NULL != nickstring) | (NULL != uri) |
- (NULL != reverse_pkey) | (NULL != recordset)))
+ if (! (add | del | list | (NULL != nickstring) | (NULL != uri)
+ | (NULL != reverse_pkey) | (NULL != recordset)))
{
/* nothing more to be done */
fprintf (stderr, _ ("No options given\n"));
GNUNET_SCHEDULER_shutdown ();
return;
}
- GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey, &pub);
ns = GNUNET_NAMESTORE_connect (cfg);
if (NULL == ns)
{
ret = 1;
return;
}
- memset (&rd, 0, sizeof (rd));
+ memset (&rd, 0, sizeof(rd));
rd.data = &pkey;
- rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
+ rd.data_size = sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey);
rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.expiration_time = etime;
if (GNUNET_YES == etime_is_rel)
}
+/**
+ * Callback invoked from identity service with ego information.
+ * An @a ego of NULL means the ego was not found.
+ *
+ * @param cls closure with the configuration
+ * @param ego an ego known to identity service, or NULL
+ */
+static void
+identity_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
+{
+ const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+
+ el = NULL;
+ if ((NULL != name) && (0 != strchr (name, '.')))
+ {
+ fprintf (stderr,
+ _ ("Label `%s' contains `.' which is not allowed\n"),
+ name);
+ GNUNET_SCHEDULER_shutdown ();
+ ret = -1;
+ return;
+ }
+
+ if (NULL == ego)
+ {
+ if (NULL != ego_name)
+ {
+ fprintf (stderr,
+ _ ("Ego `%s' not known to identity service\n"),
+ ego_name);
+ }
+ GNUNET_SCHEDULER_shutdown ();
+ ret = -1;
+ return;
+ }
+ zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
+ GNUNET_free_non_null (ego_name);
+ ego_name = NULL;
+ run_with_zone_pkey (cfg);
+}
+
+
+/**
+ * Function called with the default ego to be used for GNS
+ * operations. Used if the user did not specify a zone via
+ * command-line or environment variables.
+ *
+ * @param cls NULL
+ * @param ego default ego, NULL for none
+ * @param ctx NULL
+ * @param name unused
+ */
static void
default_ego_cb (void *cls,
struct GNUNET_IDENTITY_Ego *ego,
void **ctx,
const char *name)
{
- (void) cls;
+ const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+
(void) ctx;
(void) name;
get_default = NULL;
}
else
{
- identity_cb (cls, ego);
+ identity_cb ((void *) cfg, ego);
}
}
+/**
+ * Function called with ALL of the egos known to the
+ * identity service, used on startup if the user did
+ * not specify a zone on the command-line.
+ * Once the iteration is done (@a ego is NULL), we
+ * ask for the default ego for "namestore".
+ *
+ * @param cls a `struct GNUNET_CONFIGURATION_Handle`
+ * @param ego an ego, NULL for end of iteration
+ * @param ctx NULL
+ * @param name name associated with @a ego
+ */
static void
id_connect_cb (void *cls,
struct GNUNET_IDENTITY_Ego *ego,
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
- (void) cls;
(void) ctx;
(void) name;
- if (NULL == ego)
- {
- get_default =
- GNUNET_IDENTITY_get (idh, "namestore", &default_ego_cb, (void *) cfg);
- }
+ if (NULL != ego)
+ return;
+ get_default =
+ GNUNET_IDENTITY_get (idh, "namestore", &default_ego_cb, (void *) cfg);
}
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
+ const char *pkey_str;
+
(void) cls;
(void) args;
(void) cfgfile;
uri = GNUNET_strdup (args[0]);
GNUNET_SCHEDULER_add_shutdown (&do_shutdown, (void *) cfg);
-
+ pkey_str = getenv ("GNUNET_NAMESTORE_EGO_PRIVATE_KEY");
+ if (NULL != pkey_str)
+ {
+ if (GNUNET_OK != GNUNET_STRINGS_string_to_data (pkey_str,
+ strlen (pkey_str),
+ &zone_pkey,
+ sizeof(zone_pkey)))
+ {
+ fprintf (stderr,
+ "Malformed private key `%s' in $%s\n",
+ pkey_str,
+ "GNUNET_NAMESTORE_EGO_PRIVATE_KEY");
+ ret = 1;
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ run_with_zone_pkey (cfg);
+ return;
+ }
if (NULL == ego_name)
{
idh = GNUNET_IDENTITY_connect (cfg, &id_connect_cb, (void *) cfg);
return GNUNET_SYSERR;
}
- r = GNUNET_malloc (sizeof (struct RecordSetEntry) + record.data_size);
+ r = GNUNET_malloc (sizeof(struct RecordSetEntry) + record.data_size);
r->next = *head;
record.data = &r[1];
memcpy (&r[1], raw_data, record.data_size);
const char *description,
struct RecordSetEntry **rs)
{
- struct GNUNET_GETOPT_CommandLineOption clo = {.shortName = shortName,
- .name = name,
- .argumentHelp = argumentHelp,
- .description = description,
- .require_argument = 1,
- .processor =
- &multirecord_process,
- .scls = (void *) rs};
+ struct GNUNET_GETOPT_CommandLineOption clo = { .shortName = shortName,
+ .name = name,
+ .argumentHelp = argumentHelp,
+ .description = description,
+ .require_argument = 1,
+ .processor =
+ &multirecord_process,
+ .scls = (void *) rs };
return clo;
}
main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] =
- {GNUNET_GETOPT_option_flag ('a', "add", gettext_noop ("add record"), &add),
- GNUNET_GETOPT_option_flag ('d',
- "delete",
- gettext_noop ("delete record"),
- &del),
- GNUNET_GETOPT_option_flag ('D',
- "display",
- gettext_noop ("display records"),
- &list),
- GNUNET_GETOPT_option_string (
- 'e',
- "expiration",
- "TIME",
- gettext_noop (
- "expiration time for record to use (for adding only), \"never\" is possible"),
- &expirationstring),
- GNUNET_GETOPT_option_string ('i',
- "nick",
- "NICKNAME",
- gettext_noop (
- "set the desired nick name for the zone"),
- &nickstring),
- GNUNET_GETOPT_option_flag ('m',
- "monitor",
- gettext_noop (
- "monitor changes in the namestore"),
- &monitor),
- GNUNET_GETOPT_option_string ('n',
- "name",
- "NAME",
- gettext_noop (
- "name of the record to add/delete/display"),
- &name),
- GNUNET_GETOPT_option_string ('r',
- "reverse",
- "PKEY",
- gettext_noop (
- "determine our name for the given PKEY"),
- &reverse_pkey),
- multirecord_option (
- 'R',
- "replace",
- "RECORDLINE",
- gettext_noop (
- "set record set to values given by (possibly multiple) RECORDLINES; can be specified multiple times"),
- &recordset),
- GNUNET_GETOPT_option_string ('t',
- "type",
- "TYPE",
- gettext_noop (
- "type of the record to add/delete/display"),
- &typestring),
- GNUNET_GETOPT_option_string ('u',
- "uri",
- "URI",
- gettext_noop ("URI to import into our zone"),
- &uri),
- GNUNET_GETOPT_option_string ('V',
- "value",
- "VALUE",
- gettext_noop (
- "value of the record to add/delete"),
- &value),
- GNUNET_GETOPT_option_flag ('p',
- "public",
- gettext_noop ("create or list public record"),
- &is_public),
- GNUNET_GETOPT_option_flag (
- 's',
- "shadow",
- gettext_noop (
- "create shadow record (only valid if all other records of the same type have expired"),
- &is_shadow),
- GNUNET_GETOPT_option_string ('z',
- "zone",
- "EGO",
- gettext_noop (
- "name of the ego controlling the zone"),
- &ego_name),
- GNUNET_GETOPT_OPTION_END};
+ { GNUNET_GETOPT_option_flag ('a', "add", gettext_noop ("add record"), &add),
+ GNUNET_GETOPT_option_flag ('d',
+ "delete",
+ gettext_noop ("delete record"),
+ &del),
+ GNUNET_GETOPT_option_flag ('D',
+ "display",
+ gettext_noop ("display records"),
+ &list),
+ GNUNET_GETOPT_option_string (
+ 'e',
+ "expiration",
+ "TIME",
+ gettext_noop (
+ "expiration time for record to use (for adding only), \"never\" is possible"),
+ &expirationstring),
+ GNUNET_GETOPT_option_string ('i',
+ "nick",
+ "NICKNAME",
+ gettext_noop (
+ "set the desired nick name for the zone"),
+ &nickstring),
+ GNUNET_GETOPT_option_flag ('m',
+ "monitor",
+ gettext_noop (
+ "monitor changes in the namestore"),
+ &monitor),
+ GNUNET_GETOPT_option_string ('n',
+ "name",
+ "NAME",
+ gettext_noop (
+ "name of the record to add/delete/display"),
+ &name),
+ GNUNET_GETOPT_option_string ('r',
+ "reverse",
+ "PKEY",
+ gettext_noop (
+ "determine our name for the given PKEY"),
+ &reverse_pkey),
+ multirecord_option (
+ 'R',
+ "replace",
+ "RECORDLINE",
+ gettext_noop (
+ "set record set to values given by (possibly multiple) RECORDLINES; can be specified multiple times"),
+ &recordset),
+ GNUNET_GETOPT_option_string ('t',
+ "type",
+ "TYPE",
+ gettext_noop (
+ "type of the record to add/delete/display"),
+ &typestring),
+ GNUNET_GETOPT_option_string ('u',
+ "uri",
+ "URI",
+ gettext_noop ("URI to import into our zone"),
+ &uri),
+ GNUNET_GETOPT_option_string ('V',
+ "value",
+ "VALUE",
+ gettext_noop (
+ "value of the record to add/delete"),
+ &value),
+ GNUNET_GETOPT_option_flag ('p',
+ "public",
+ gettext_noop ("create or list public record"),
+ &is_public),
+ GNUNET_GETOPT_option_flag (
+ 's',
+ "shadow",
+ gettext_noop (
+ "create shadow record (only valid if all other records of the same type have expired"),
+ &is_shadow),
+ GNUNET_GETOPT_option_string ('z',
+ "zone",
+ "EGO",
+ gettext_noop (
+ "name of the ego controlling the zone"),
+ &ego_name),
+ GNUNET_GETOPT_OPTION_END };
+ int lret;
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
is_public = -1;
is_shadow = -1;
GNUNET_log_setup ("gnunet-namestore", "WARNING", NULL);
- if (GNUNET_OK != GNUNET_PROGRAM_run (argc,
- argv,
- "gnunet-namestore",
- _ ("GNUnet zone manipulation tool"),
- options,
- &run,
- NULL))
+ if (GNUNET_OK !=
+ (lret = GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-namestore",
+ _ ("GNUnet zone manipulation tool"),
+ options,
+ &run,
+ NULL)))
{
GNUNET_free ((void *) argv);
GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
- return 1;
+ return lret;
}
GNUNET_free ((void *) argv);
GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
return ret;
}
+
/* end of gnunet-namestore.c */
projects / oweals / gnunet.git / blobdiff