[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 44/70: -add comments
|
From: |
gnunet |
|
Subject: |
[gnunet] 44/70: -add comments |
|
Date: |
Wed, 31 Aug 2022 18:00:38 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 0d605eac2b1024590bcf2a858f162bd733c9bb6d
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Dec 21 18:03:29 2021 +0100
-add comments
---
src/did/gnunet-did.c | 1050 +++++++++++++++++++++++++++-----------------------
1 file changed, 575 insertions(+), 475 deletions(-)
diff --git a/src/did/gnunet-did.c b/src/did/gnunet-did.c
index e2b32c272..3792c9f7a 100644
--- a/src/did/gnunet-did.c
+++ b/src/did/gnunet-did.c
@@ -42,6 +42,10 @@
*/
static int ret;
+/* FIXME-MSC: Why does it say "Attribute"? More concise comments?
+ * The attr_ Does not really add anything.
+ * */
+
/**
* Attribute replace
*/
@@ -92,70 +96,83 @@ static char *attr_name;
*/
static char *attr_expire;
-static struct GNUNET_GNS_Handle * gns_handle;
-static struct GNUNET_NAMESTORE_Handle * namestore_handle;
-static struct GNUNET_IDENTITY_Handle * identity_handle;
-const static struct GNUNET_CONFIGURATION_Handle * my_cfg;
+static struct GNUNET_GNS_Handle *gns_handle;
+static struct GNUNET_NAMESTORE_Handle *namestore_handle;
+static struct GNUNET_IDENTITY_Handle *identity_handle;
+const static struct GNUNET_CONFIGURATION_Handle *my_cfg;
/**
* @brief Disconnect and shutdown
* @param cls closure
*/
static void
-cleanup(void * cls)
+cleanup (void *cls)
{
- GNUNET_GNS_disconnect(gns_handle);
- GNUNET_NAMESTORE_disconnect(namestore_handle);
- GNUNET_IDENTITY_disconnect(identity_handle);
- GNUNET_SCHEDULER_shutdown();
+ /* FIXME-MSC: I would expect a lot more cleanup here (string attributes
+ * from CLI are allocated, for example */
+ GNUNET_GNS_disconnect (gns_handle);
+ GNUNET_NAMESTORE_disconnect (namestore_handle);
+ GNUNET_IDENTITY_disconnect (identity_handle);
+ GNUNET_SCHEDULER_shutdown ();
}
/**
* @brief Callback for ego loockup of get_did_for_ego()
- *
+ *
* @param cls closure
* @param ego the returned ego
*/
static void
-get_did_for_ego_lookup_cb(void *cls, struct GNUNET_IDENTITY_Ego * ego)
+get_did_for_ego_lookup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
{
struct GNUNET_IDENTITY_PublicKey pkey; // Get Public key
- const char * pkey_str;
+ const char *pkey_str;
+ /* FIXME-MSC: This should to be calculated dynamically taking
+ * the result from GNUNET_IDENTITY_public_key_to_string into account.
+ * I know, only Eddsa, but its cleaner.
+ **/
char did_str[71]; // 58 + 12 + 1= 71
- if(ego == NULL) {
- printf("EGO not found\n");
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+ if (ego == NULL)
+ {
+ printf ("EGO not found\n");
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 1;
return;
}
- GNUNET_IDENTITY_ego_get_public_key(ego, &pkey);
+ GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
- pkey_str = GNUNET_IDENTITY_public_key_to_string(&pkey); // Convert public
key to string
- sprintf(did_str, "did:reclaim:%s", pkey_str); // Convert the public key to a
DID str
+ pkey_str = GNUNET_IDENTITY_public_key_to_string (&pkey); // Convert public
key to string
+ /* FIXME-MSC: Maybe
+ * #define GNUNET_DID_METHOD_RECLAIM_PREFIX "did:reclaim:"
+ * somewhere.
+ */
+ sprintf (did_str, "did:reclaim:%s", pkey_str); // Convert the public key to
a DID str
- printf("%s\n", did_str);
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+ printf ("%s\n", did_str);
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 0;
return;
}
/**
* @brief Get the DID for a given EGO
- *
+ *
*/
static void
-get_did_for_ego()
+get_did_for_ego ()
{
- if(attr_ego != NULL){
- GNUNET_IDENTITY_ego_lookup(my_cfg,
- attr_ego,
- &get_did_for_ego_lookup_cb,
- NULL);
- } else {
- printf("Set the EGO argument to get the DID for a given EGO\n");
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+ if (attr_ego != NULL)
+ {
+ GNUNET_IDENTITY_ego_lookup (my_cfg,
+ attr_ego,
+ &get_did_for_ego_lookup_cb,
+ NULL);
+ }
+ else {
+ printf ("Set the EGO argument to get the DID for a given EGO\n");
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 1;
return;
}
@@ -164,445 +181,504 @@ get_did_for_ego()
/**
* @brief Get the public key from did attribute given by the user
- *
+ *
* @param pkey place to write the public key to
*/
static void
-get_pkey_from_attr_did(struct GNUNET_IDENTITY_PublicKey * pkey)
+get_pkey_from_attr_did (struct GNUNET_IDENTITY_PublicKey *pkey)
{
- char id_str[59];
-
- if ((1 != (sscanf (attr_did, "did:reclaim:%58s", id_str))) ||
- (GNUNET_OK != GNUNET_IDENTITY_public_key_from_string (id_str,
pkey)))
- {
- fprintf (stderr, _ ("Invalid DID `%s'\n"), id_str);
- GNUNET_SCHEDULER_add_now(cleanup, NULL);
- ret = 1;
- return;
- }
+ /* FIXME-MSC: I suggest introducing a
+ * #define MAX_DID_LENGTH <something>
+ * here and use it for parsing
+ */
+ char id_str[59];
+
+ if ((1 != (sscanf (attr_did, "did:reclaim:%58s", id_str))) ||
+ (GNUNET_OK != GNUNET_IDENTITY_public_key_from_string (id_str, pkey)))
+ {
+ fprintf (stderr, _ ("Invalid DID `%s'\n"), id_str);
+ GNUNET_SCHEDULER_add_now (cleanup, NULL);
+ ret = 1;
+ return;
+ }
}
/**
- * @brief GNS lookup callback. Prints the DID Document to standard out.
+ * @brief GNS lookup callback. Prints the DID Document to standard out.
* Fails if there is more than one DID record.
- *
- * @param cls closure
+ *
+ * @param cls closure
* @param rd_count number of records in @a rd
* @param rd the records in the reply
*/
static void
-print_did_document(
- void *cls,
- uint32_t rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
+print_did_document (
+ void *cls,
+ uint32_t rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- if (rd_count != 1)
- {
- printf("An ego should only have one DID Document");
- GNUNET_SCHEDULER_add_now(cleanup, NULL);
- ret = 1;
- return;
- }
-
- printf("%s\n", (char *) rd[0].data);
-
- GNUNET_SCHEDULER_add_now(cleanup, NULL);
- ret = 0;
- return;
+ /*
+ * FIXME-MSC: The user may decide to put other records here.
+ * In general I am fine with the constraint here, but not when
+ * we move it to "@"
+ */
+ if (rd_count != 1)
+ {
+ printf ("An ego should only have one DID Document");
+ GNUNET_SCHEDULER_add_now (cleanup, NULL);
+ ret = 1;
+ return;
+ }
+
+ /* FIXME-MSC: DANGER ZONE! You do not know what the data is */
+ printf ("%s\n", (char *) rd[0].data);
+
+ GNUNET_SCHEDULER_add_now (cleanup, NULL);
+ ret = 0;
+ return;
}
/**
- * @brief Resolve a DID given by the user.
+ * @brief Resolve a DID given by the user.
*/
static void
-resolve_did_document()
+resolve_did_document ()
{
- struct GNUNET_IDENTITY_PublicKey pkey;
+ struct GNUNET_IDENTITY_PublicKey pkey;
- if (attr_did == NULL) {
- printf("Set DID option to resolve DID\n");
- GNUNET_SCHEDULER_add_now(cleanup, NULL);
- ret = 1;
- return;
- }
+ if (attr_did == NULL)
+ {
+ printf ("Set DID option to resolve DID\n");
+ GNUNET_SCHEDULER_add_now (cleanup, NULL);
+ ret = 1;
+ return;
+ }
- get_pkey_from_attr_did(&pkey);
+ get_pkey_from_attr_did (&pkey);
- // TODO: Check the type of returned records
- GNUNET_GNS_lookup(gns_handle, "didd", &pkey, GNUNET_DNSPARSER_TYPE_TXT,
GNUNET_GNS_LO_DEFAULT, &print_did_document, NULL);
+ // TODO: Check the type of returned records
+ /* FIXME-MSC: Use "@" */
+ GNUNET_GNS_lookup (gns_handle, "didd", &pkey, GNUNET_DNSPARSER_TYPE_TXT,
+ GNUNET_GNS_LO_DEFAULT, &print_did_document, NULL);
}
+/* FIXME-MSC: I am not sure (at this point in the review)
+ * if this is necessary.
+ * But if it is, it needs comments. */
typedef void
-(*remove_did_document_callback) (void * cls);
+(*remove_did_document_callback) (void *cls);
-struct event {
- remove_did_document_callback cont;
- void * cls;
+struct event
+{
+ remove_did_document_callback cont;
+ void *cls;
};
/**
* @brief Implements the GNUNET_NAMESTORE_ContinuationWithStatus
- * Calls the callback function and cls in the event struct
- *
- * @param cls closure containing the event struct
+ * Calls the callback function and cls in the event struct
+ *
+ * @param cls closure containing the event struct
* @param success
- * @param emgs
+ * @param emgs
*/
static void
-remove_did_document_namestore_cb(void * cls, int32_t success, const char
*emgs){
- struct event * blob;
-
- if(success == GNUNET_YES){
- printf("DID Document has been removed\n");
-
- blob = (struct event *) cls;
-
- if(blob->cont != NULL)
- {
- blob->cont(blob->cls);
- free(blob);
- } else {
- free(blob);
- GNUNET_SCHEDULER_add_now(cleanup, NULL);
- ret = 0;
- return;
- }
- } else {
- printf("Something went wrong when deleting the DID Document\n");
-
- if(emgs != NULL) {
- printf("%s\n", emgs);
- }
-
- GNUNET_SCHEDULER_add_now(cleanup, NULL);
- ret = 0;
- return;
- }
+remove_did_document_namestore_cb (void *cls, int32_t success, const char *emgs)
+{
+ /* FIXME-MSC: Why not call teh struct Event and the variable "event"? */
+ struct event *blob;
+
+ if (success == GNUNET_YES)
+ {
+ printf ("DID Document has been removed\n");
+
+ blob = (struct event *) cls;
+
+ if (blob->cont != NULL)
+ {
+ blob->cont (blob->cls);
+ free (blob);
+ }
+ else {
+ free (blob);
+ GNUNET_SCHEDULER_add_now (cleanup, NULL);
+ ret = 0;
+ return;
+ }
+ }
+ else {
+ printf ("Something went wrong when deleting the DID Document\n");
+
+ if (emgs != NULL)
+ {
+ printf ("%s\n", emgs);
+ }
+
+ GNUNET_SCHEDULER_add_now (cleanup, NULL);
+ ret = 0;
+ return;
+ }
}
/**
* @brief Callback called after the ego has been locked up
- *
+ *
* @param cls closure
- * @param ego the ego returned by the identity service
+ * @param ego the ego returned by the identity service
*/
static void
-remove_did_document_ego_lookup_cb(void * cls, struct GNUNET_IDENTITY_Ego *
ego){
- const struct GNUNET_IDENTITY_PrivateKey * skey =
GNUNET_IDENTITY_ego_get_private_key(ego);
- const int emp[0];
- struct GNUNET_GNSRECORD_Data rd = {
- .data = &emp,
- .expiration_time = 0,
- .data_size = 0,
- .record_type = 0,
- .flags = GNUNET_GNSRECORD_RF_NONE
- };
-
- GNUNET_NAMESTORE_records_store (namestore_handle,
- skey,
- "didd",
- 0,
- &rd,
- &remove_did_document_namestore_cb,
- cls);
+remove_did_document_ego_lookup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
+{
+ const struct GNUNET_IDENTITY_PrivateKey *skey =
+ GNUNET_IDENTITY_ego_get_private_key (ego);
+ const int emp[0];
+ struct GNUNET_GNSRECORD_Data rd = {
+ .data = &emp,
+ .expiration_time = 0,
+ .data_size = 0,
+ .record_type = 0,
+ .flags = GNUNET_GNSRECORD_RF_NONE
+ };
+
+ /* FIXME-MSC: YOu can just pass NULL als record data with a rd_count of 0 */
+ GNUNET_NAMESTORE_records_store (namestore_handle,
+ skey,
+ "didd",
+ 0,
+ &rd,
+ &remove_did_document_namestore_cb,
+ cls);
}
/**
* @brief Remove a DID Document
*/
static void
-remove_did_document(remove_did_document_callback cont, void * cls)
+remove_did_document (remove_did_document_callback cont, void *cls)
{
- struct event * blob;
-
- if(attr_ego == NULL) {
- printf("Remove requieres an ego option\n");
- GNUNET_SCHEDULER_add_now(cleanup, NULL);
- ret = 1;
- return;
- } else {
- blob = malloc(sizeof(* blob));
- blob->cont = cont;
- blob->cls = cls;
-
- GNUNET_IDENTITY_ego_lookup(my_cfg,
- attr_ego,
- &remove_did_document_ego_lookup_cb,
- (void *) blob);
- }
+ struct event *blob;
+
+ if (attr_ego == NULL)
+ {
+ printf ("Remove requieres an ego option\n");
+ GNUNET_SCHEDULER_add_now (cleanup, NULL);
+ ret = 1;
+ return;
+ }
+ else {
+ blob = malloc (sizeof(*blob));
+ blob->cont = cont;
+ blob->cls = cls;
+
+ GNUNET_IDENTITY_ego_lookup (my_cfg,
+ attr_ego,
+ &remove_did_document_ego_lookup_cb,
+ (void *) blob);
+ }
}
/**
* @brief Create a did generate did object
- *
- * @param pkey
+ *
+ * @param pkey
* @return void* Return pointer to the DID Document
*/
char *
-create_did_generate(struct GNUNET_IDENTITY_PublicKey pkey)
+create_did_generate (struct GNUNET_IDENTITY_PublicKey pkey)
{
- char * pkey_str; // Convert public key to string
+ /* FIXME-MSC: I would prefer constants instead of magic numbers */
+ char *pkey_str; // Convert public key to string
char did_str[71]; // 58 + 12 + 1 = 71
- char * didd_str;
- char verify_id_str[77]; // did_str len + "#key-1" = 71 + 6 = 77
- char * pkey_multibase_str;
-
- char * b64;
- char pkx[34];
- pkx[0] = 0xed;
- pkx[1] = 0x01;
- memcpy(pkx+2, &(pkey.eddsa_key), sizeof(pkey.eddsa_key));
- GNUNET_STRINGS_base64_encode(pkx, sizeof(pkx), &b64);
-
- GNUNET_asprintf(&pkey_multibase_str, "u%s", b64);
-
- json_t * didd;
- json_t * did_json;
- json_t * pkey_multibase_json;
- json_t * context_json;
- json_t * context_1_json;
- json_t * context_2_json;
- json_t * verify_json;
- json_t * verify_1_json;
- json_t * verify_1_type_json;
- json_t * verify_1_id_json;
- json_t * verify_relative_ref_json;
- json_t * auth_json;
- json_t * assert_json;
-
- pkey_str = GNUNET_IDENTITY_public_key_to_string(&pkey); // Convert public
key to string
- sprintf(did_str, "did:reclaim:%s", pkey_str); // Convert the public key to a
DID str
- sprintf(verify_id_str, "did:reclaim:%s#key-1", pkey_str); // Convert the
public key to a DID str
+ char *didd_str;
+ char verify_id_str[77]; // did_str len + "#key-1" = 71 + 6 = 77
+ char *pkey_multibase_str;
+
+ /* FIXME-MSC: This screams for a GNUNET_DID_identity_key_to_string() */
+ char *b64;
+ char pkx[34];
+ pkx[0] = 0xed;
+ pkx[1] = 0x01;
+ memcpy (pkx + 2, &(pkey.eddsa_key), sizeof(pkey.eddsa_key));
+ GNUNET_STRINGS_base64_encode (pkx, sizeof(pkx), &b64);
+
+ GNUNET_asprintf (&pkey_multibase_str, "u%s", b64);
+
+ json_t *didd;
+ json_t *did_json;
+ json_t *pkey_multibase_json;
+ json_t *context_json;
+ json_t *context_1_json;
+ json_t *context_2_json;
+ json_t *verify_json;
+ json_t *verify_1_json;
+ json_t *verify_1_type_json;
+ json_t *verify_1_id_json;
+ json_t *verify_relative_ref_json;
+ json_t *auth_json;
+ json_t *assert_json;
+
+ /* FIXME-MSC: This screams for GNUNET_DID_identity_to_did() */
+ pkey_str = GNUNET_IDENTITY_public_key_to_string (&pkey); // Convert public
key to string
+ sprintf (did_str, "did:reclaim:%s", pkey_str); // Convert the public key to
a DID str
+ sprintf (verify_id_str, "did:reclaim:%s#key-1", pkey_str); // Convert the
public key to a DID str
// sprintf(pkey_multibase_str, "V%s", pkey_str); // Convert the public key
to MultiBase data format
- // Create Json Strings
- did_json = json_string(did_str);
- pkey_multibase_json = json_string(pkey_multibase_str);
-
- context_1_json = json_string("https://www.w3.org/ns/did/v1";);
- context_2_json =
json_string("https://w3id.org/security/suites/ed25519-2020/v1";);
- verify_1_id_json = json_string(verify_id_str);
- verify_1_type_json = json_string("Ed25519VerificationKey2020");
-
- // Add a relative DID URL to reference a verifiation method
- // https://www.w3.org/TR/did-core/#relative-did-urls`
- verify_relative_ref_json = json_string("#key-1");
-
- // Create DID Document
- didd = json_object();
-
- // Add context
- context_json = json_array();
- json_array_append(context_json, context_1_json);
- json_array_append(context_json, context_2_json);
- json_object_set(didd, "@context", context_json);
-
- // Add id
- json_object_set(didd, "id", did_json);
-
- // Add verification method
- verify_json = json_array();
- verify_1_json = json_object();
- json_object_set(verify_1_json, "id", verify_1_id_json);
- json_object_set(verify_1_json, "type", verify_1_type_json);
- json_object_set(verify_1_json, "controller", did_json);
- json_object_set(verify_1_json, "publicKeyMultiBase", pkey_multibase_json);
- json_array_append(verify_json, verify_1_json);
- json_object_set(didd, "verificationMethod", verify_json);
-
- // Add authentication method
- auth_json = json_array();
- json_array_append(auth_json, verify_relative_ref_json);
- json_object_set(didd, "authentication", auth_json);
-
- // Add assertion method to issue a Verifiable Credential
- assert_json = json_array();
- json_array_append(assert_json, verify_relative_ref_json);
- json_object_set(didd, "assertionMethod", assert_json);
+ /* FIXME-MSC: This is effectively creating a DID Document default template
for
+ * the initial document.
+ * Maybe this can be refactored to generate such a template for an identity?
+ * Even if higher layers add/modify it, there should probably still be a
+ * GNUNET_DID_document_template_from_identity()
+ */
+ // Create Json Strings
+ did_json = json_string (did_str);
+ pkey_multibase_json = json_string (pkey_multibase_str);
+
+ context_1_json = json_string ("https://www.w3.org/ns/did/v1";);
+ context_2_json = json_string (
+ "https://w3id.org/security/suites/ed25519-2020/v1";);
+ verify_1_id_json = json_string (verify_id_str);
+ verify_1_type_json = json_string ("Ed25519VerificationKey2020");
+
+ // Add a relative DID URL to reference a verifiation method
+ // https://www.w3.org/TR/did-core/#relative-did-urls`
+ verify_relative_ref_json = json_string ("#key-1");
+
+ // Create DID Document
+ didd = json_object ();
+
+ // Add context
+ context_json = json_array ();
+ json_array_append (context_json, context_1_json);
+ json_array_append (context_json, context_2_json);
+ json_object_set (didd, "@context", context_json);
+
+ // Add id
+ json_object_set (didd, "id", did_json);
+
+ // Add verification method
+ verify_json = json_array ();
+ verify_1_json = json_object ();
+ json_object_set (verify_1_json, "id", verify_1_id_json);
+ json_object_set (verify_1_json, "type", verify_1_type_json);
+ json_object_set (verify_1_json, "controller", did_json);
+ json_object_set (verify_1_json, "publicKeyMultiBase", pkey_multibase_json);
+ json_array_append (verify_json, verify_1_json);
+ json_object_set (didd, "verificationMethod", verify_json);
+
+ // Add authentication method
+ auth_json = json_array ();
+ json_array_append (auth_json, verify_relative_ref_json);
+ json_object_set (didd, "authentication", auth_json);
+
+ // Add assertion method to issue a Verifiable Credential
+ assert_json = json_array ();
+ json_array_append (assert_json, verify_relative_ref_json);
+ json_object_set (didd, "assertionMethod", assert_json);
// Encode DID Document as JSON string
- didd_str = json_dumps(didd, JSON_INDENT(2));
- if(didd_str == NULL)
+ didd_str = json_dumps (didd, JSON_INDENT (2));
+ if (didd_str == NULL)
{
- printf("DID Document could not be encoded");
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+ printf ("DID Document could not be encoded");
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 1;
return NULL;
}
-
- // TODO: MORE FREEEEEEEE
- free(pkey_multibase_str);
- free(b64);
-
- free(didd);
- free(did_json);
- free(pkey_multibase_json);
- free(context_json);
- free(context_1_json);
- free(context_2_json);
- free(verify_json);
- free(verify_1_json);
- free(verify_1_type_json);
- free(verify_1_id_json);
- free(auth_json);
- free(assert_json);
- free(verify_relative_ref_json);
-
- return didd_str;
+
+ // TODO: MORE FREEEEEEEE
+ /* FIXME-MSC: json_t's are free'd using "json_decref". Also json_t usually
+ * keeps a reference counter. Check jansson docs for how to use it.
+ * Also: Use valgrind to find leaks.
+ */
+ free (pkey_multibase_str);
+ free (b64);
+
+ free (didd);
+ free (did_json);
+ free (pkey_multibase_json);
+ free (context_json);
+ free (context_1_json);
+ free (context_2_json);
+ free (verify_json);
+ free (verify_1_json);
+ free (verify_1_type_json);
+ free (verify_1_id_json);
+ free (auth_json);
+ free (assert_json);
+ free (verify_relative_ref_json);
+
+ return didd_str;
}
/**
- * @brief Create a DID. Store DID in Namestore cb
- *
+ * @brief Create a DID. Store DID in Namestore cb
+ *
*/
static void
-create_did_store_cb(void *cls, int32_t success, const char *emsg){
- printf("DID Document has been stored to namestore\n");
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+create_did_store_cb (void *cls, int32_t success, const char *emsg)
+{
+ printf ("DID Document has been stored to namestore\n");
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 0;
return;
}
/**
- * @brief Create a did. Store DID in Namestore
- *
- * @param didd_str String endoced DID Docuement
+ * @brief Create a did. Store DID in Namestore
+ *
+ * @param didd_str String endoced DID Docuement
* @param ego Identity whos DID Document is stored
*/
static void
-create_did_store(char * didd_str, struct GNUNET_IDENTITY_Ego * ego)
+create_did_store (char *didd_str, struct GNUNET_IDENTITY_Ego *ego)
{
- struct GNUNET_TIME_Relative expire_time;
+ struct GNUNET_TIME_Relative expire_time;
struct GNUNET_GNSRECORD_Data record_data;
- const struct GNUNET_IDENTITY_PrivateKey * skey;
-
- if(GNUNET_STRINGS_fancy_time_to_relative(attr_expire, &expire_time) !=
GNUNET_OK)
- {
- record_data.data = (void *) didd_str;
- record_data.expiration_time = expire_time.rel_value_us;
- record_data.data_size = strlen(didd_str);
- record_data.record_type =
GNUNET_GNSRECORD_typename_to_number("TXT"),
- record_data.flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
-
- skey = GNUNET_IDENTITY_ego_get_private_key(ego);
-
- GNUNET_NAMESTORE_records_store( namestore_handle,
- skey,
- "didd",
- 1,
- &record_data,
- &create_did_store_cb,
- NULL);
- } else {
- printf("Failed to read given expiration time\n");
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
- ret = 1;
- return;
- }
+ const struct GNUNET_IDENTITY_PrivateKey *skey;
+
+ if (GNUNET_STRINGS_fancy_time_to_relative (attr_expire, &expire_time) ==
+ GNUNET_OK)
+ {
+ record_data.data = (void *) didd_str;
+ record_data.expiration_time = expire_time.rel_value_us;
+ record_data.data_size = strlen (didd_str);
+ record_data.record_type = GNUNET_GNSRECORD_typename_to_number ("TXT"),
+ record_data.flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
+
+ skey = GNUNET_IDENTITY_ego_get_private_key (ego);
+
+ GNUNET_NAMESTORE_records_store (namestore_handle,
+ skey,
+ "didd",
+ 1,
+ &record_data,
+ &create_did_store_cb,
+ NULL);
+ }
+ else {
+ /* FIXME-MSC: Use a default expiration if not given. Only fail if given
+ * and invalid */
+ printf ("Failed to read given expiration time\n");
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
+ ret = 1;
+ return;
+ }
}
/**
* @brief Create a did ego lockup cb
- *
- * @param cls
- * @param ego
+ *
+ * @param cls
+ * @param ego
*/
-static void
-create_did_ego_lockup_cb(void *cls, struct GNUNET_IDENTITY_Ego * ego)
+static void
+create_did_ego_lockup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
{
struct GNUNET_IDENTITY_PublicKey pkey;
- char * didd_str;
+ char *didd_str;
- if(ego == NULL)
+ if (ego == NULL)
{
- printf("EGO not found\n");
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+ printf ("EGO not found\n");
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 1;
return;
}
- GNUNET_IDENTITY_ego_get_public_key(ego, &pkey);
+ GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
- if (ntohl(pkey.type) != GNUNET_GNSRECORD_TYPE_EDKEY)
- {
- printf("The EGO has to have an EDDSA key pair\n");
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
- ret = 1;
- return;
- }
+ if (ntohl (pkey.type) != GNUNET_GNSRECORD_TYPE_EDKEY)
+ {
+ printf ("The EGO has to have an EDDSA key pair\n");
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
+ ret = 1;
+ return;
+ }
- if(attr_didd != NULL)
- {
- // TODO: Check if given DIDD is valid
- printf("DID Docuement is read from \"did-document\" argument
(EXPERIMENTAL)\n");
- didd_str = attr_didd;
- } else {
- // Generate DID Docuement from public key
- didd_str = create_did_generate(pkey);
- }
+ if (attr_didd != NULL)
+ {
+ // TODO: Check if given DIDD is valid
+ printf (
+ "DID Docuement is read from \"did-document\" argument (EXPERIMENTAL)\n");
+ didd_str = attr_didd;
+ }
+ else {
+ // Generate DID Docuement from public key
+ didd_str = create_did_generate (pkey);
+ }
// Print DID Docuement to stdout
- printf("%s\n", didd_str);
+ printf ("%s\n", didd_str);
- // Store the DID Docuement
- create_did_store(didd_str, ego);
+ // Store the DID Docuement
+ create_did_store (didd_str, ego);
+ /* FIXME-MSC: Comment does not match code.
+ * Also unsure of you want to free this. You may want to free
+ * attr_didd on shutdown instead*/
// Save DID Document String to GNS
- free(didd_str);
+ free (didd_str);
}
/**
* @brief Create a did document - Create a new identity first
*/
-static void
-create_did_document_ego_create_cb(void *cls,
- const struct
GNUNET_IDENTITY_PrivateKey *pk,
- const char
*emsg)
+static void
+create_did_document_ego_create_cb (void *cls,
+ const struct GNUNET_IDENTITY_PrivateKey *pk,
+ const char *emsg)
{
- const char * ego_name;
+ const char *ego_name;
- if (emsg != NULL){
- printf("Something went wrong during the creation of a new
identity\n");
- printf("%s\n", emsg);
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+ if (emsg != NULL)
+ {
+ printf ("%s\n", emsg);
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 1;
return;
- }
+ }
- ego_name = (char *) cls;
+ ego_name = (char *) cls;
- GNUNET_IDENTITY_ego_lookup(my_cfg,
- ego_name,
- &create_did_ego_lockup_cb,
- NULL);
+ GNUNET_IDENTITY_ego_lookup (my_cfg,
+ ego_name,
+ &create_did_ego_lockup_cb,
+ NULL);
}
/**
* @brief Create a did document
- *
+ *
*/
-static void
-create_did_document()
+static void
+create_did_document ()
{
- if(attr_name != NULL && attr_expire != NULL){
- GNUNET_IDENTITY_create(identity_handle,
-
attr_name,
-
NULL,
-
GNUNET_IDENTITY_TYPE_EDDSA,
-
&create_did_document_ego_create_cb,
-
(void *) attr_name);
- } else if (attr_ego != NULL && attr_expire != NULL) {
- GNUNET_IDENTITY_ego_lookup(my_cfg,
- attr_ego,
- &create_did_ego_lockup_cb,
- NULL);
- } else {
- printf("Set the NAME or the EGO and the Expiration-time argument to create
a new DID(-Document)\n");
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+ if ((attr_name != NULL)&& (attr_expire != NULL))
+ {
+ GNUNET_IDENTITY_create (identity_handle,
+ attr_name,
+ NULL,
+ GNUNET_IDENTITY_TYPE_EDDSA,
+ &create_did_document_ego_create_cb,
+ (void *) attr_name);
+ }
+ else if ((attr_ego != NULL) && (attr_expire != NULL) )
+ {
+ GNUNET_IDENTITY_ego_lookup (my_cfg,
+ attr_ego,
+ &create_did_ego_lockup_cb,
+ NULL);
+ }
+ else {
+ /* FIXME-MSC: This is confusing. Why name OR ego?
+ * The expiration should be optional */
+ printf (
+ "Set the NAME or the EGO and the Expiration-time argument to create a
new DID(-Document)\n");
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 1;
return;
}
@@ -611,46 +687,48 @@ create_did_document()
/**
* @brief Replace a DID Docuemnt. Callback function after ego lockup
- *
- * @param cls
- * @param ego
+ *
+ * @param cls
+ * @param ego
*/
-static void
-replace_did_document_ego_lookup_cb(void *cls, struct GNUNET_IDENTITY_Ego * ego)
+static void
+replace_did_document_ego_lookup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
{
- create_did_store(attr_didd, ego);
+ create_did_store (attr_didd, ego);
}
/**
* @brief Replace a DID Document. Callback functiona after remove
- *
- * @param cls
+ *
+ * @param cls
*/
-static void
-replace_did_document_remove_cb(void * cls)
+static void
+replace_did_document_remove_cb (void *cls)
{
- GNUNET_IDENTITY_ego_lookup(my_cfg,
- attr_ego,
- &replace_did_document_ego_lookup_cb,
- NULL);
+ GNUNET_IDENTITY_ego_lookup (my_cfg,
+ attr_ego,
+ &replace_did_document_ego_lookup_cb,
+ NULL);
}
/**
- * @brief Replace a DID Docuemnt
- *
+ * @brief Replace a DID Docuemnt
+ *
*/
-static void
-replace_did_document()
+static void
+replace_did_document ()
{
- if (attr_didd != NULL || attr_expire != NULL)
- {
- remove_did_document(&replace_did_document_remove_cb, NULL);
- } else {
- printf("Set the DID Document and expiration time argument to
repalce the DID Document\n");
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
- ret = 1;
- return;
- }
+ if ((attr_didd != NULL)|| (attr_expire != NULL))
+ {
+ remove_did_document (&replace_did_document_remove_cb, NULL);
+ }
+ else {
+ printf (
+ "Set the DID Document and expiration time argument to replace the DID
Document\n");
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
+ ret = 1;
+ return;
+ }
}
@@ -660,108 +738,130 @@ run (void *cls,
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- gns_handle = GNUNET_GNS_connect(c);
- namestore_handle = GNUNET_NAMESTORE_connect(c);
- identity_handle = GNUNET_IDENTITY_connect(c, NULL, NULL);
- my_cfg = c;
-
- // check if GNS_handle could connect
- if(gns_handle == NULL) {
- ret = 1;
- return;
- }
-
- // check if NAMESTORE_handle could connect
- if(namestore_handle == NULL) {
- ret = 1;
- return;
- }
-
- // check if IDENTITY_handle could connect
- if(identity_handle == NULL) {
- ret = 1;
- return;
- }
-
- if (1 == attr_replace) {
- replace_did_document();
- } else if (1 == attr_get) {
- resolve_did_document();
- } else if (1 == attr_remove) {
- remove_did_document(NULL, NULL);
- } else if (1 == attr_create) {
- create_did_document();
- } else if (1 == attr_show) {
- get_did_for_ego();
- } else {
- // No Argument found
- printf("No correct argument combination found. Use gnunet-did
-h for help");
- ret = 1;
- GNUNET_SCHEDULER_add_now(cleanup, NULL);
- return;
- }
+ gns_handle = GNUNET_GNS_connect (c);
+ namestore_handle = GNUNET_NAMESTORE_connect (c);
+ identity_handle = GNUNET_IDENTITY_connect (c, NULL, NULL);
+ my_cfg = c;
+
+ // check if GNS_handle could connect
+ if (gns_handle == NULL)
+ {
+ ret = 1;
+ return;
+ }
+
+ // check if NAMESTORE_handle could connect
+ if (namestore_handle == NULL)
+ {
+ ret = 1;
+ return;
+ }
+
+ // check if IDENTITY_handle could connect
+ if (identity_handle == NULL)
+ {
+ ret = 1;
+ return;
+ }
+
+ if (1 == attr_replace)
+ {
+ replace_did_document ();
+ }
+ else if (1 == attr_get)
+ {
+ resolve_did_document ();
+ }
+ else if (1 == attr_remove)
+ {
+ remove_did_document (NULL, NULL);
+ }
+ else if (1 == attr_create)
+ {
+ create_did_document ();
+ }
+ else if (1 == attr_show)
+ {
+ get_did_for_ego ();
+ }
+ else {
+ // No Argument found
+ printf (
+ "No correct argument combination found. Use gnunet-did -h for help");
+ ret = 1;
+ GNUNET_SCHEDULER_add_now (cleanup, NULL);
+ return;
+ }
}
int
main (int argc, char *const argv[])
{
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_option_flag ('C',
- "create",
- gettext_noop ("Create a DID Document
and display its DID"),
- &attr_create),
- GNUNET_GETOPT_option_flag ('g',
- "get",
- gettext_noop ("Get the DID Document
associated with the given DID"),
- &attr_get),
- GNUNET_GETOPT_option_flag ('s',
- "show",
- gettext_noop ("Show the DID for a
given ego"),
- &attr_show),
- GNUNET_GETOPT_option_flag ('r',
- "remove",
- gettext_noop ("Remove the DID
Document with DID from GNUNET"),
- &attr_remove),
- GNUNET_GETOPT_option_flag ('R',
- "replace",
- gettext_noop ("Replace the DID
Document."),
- &attr_replace),
- GNUNET_GETOPT_option_string ('d',
- "did",
- "DID",
- gettext_noop ("The DID to work
with"),
- &attr_did),
- GNUNET_GETOPT_option_string ('D',
- "did-docuement",
- "JSON",
- gettext_noop ("The DID Document to
store in GNUNET"),
- &attr_didd),
- GNUNET_GETOPT_option_string ('e',
- "ego",
- "EGO",
- gettext_noop ("The EGO to work
with"),
- &attr_ego),
- GNUNET_GETOPT_option_string ('n',
- "name",
- "NAME",
- gettext_noop ("The name of the
created EGO"),
- &attr_name),
- GNUNET_GETOPT_option_string ('t',
- "expiration-time",
- "TIME",
- gettext_noop ("The time until the
DID Document is going to expire (e.g. 5d)"),
- &attr_expire),
- GNUNET_GETOPT_OPTION_END
- };
-
- if (GNUNET_OK != GNUNET_PROGRAM_run (argc,
- argv,
- "gnunet-did",
- ("did command line tool"),
- options,
- &run,
- NULL))
- return 1;
- else
- return ret;
+ /* FIXME-MSC: An option to list all identities (their DIDs) that have a
+ * DID document would be nice.
+ */
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_option_flag ('C',
+ "create",
+ gettext_noop (
+ "Create a DID Document and display its DID"),
+ &attr_create),
+ GNUNET_GETOPT_option_flag ('g',
+ "get",
+ gettext_noop (
+ "Get the DID Document associated with the
given DID"),
+ &attr_get),
+ GNUNET_GETOPT_option_flag ('s',
+ "show",
+ gettext_noop ("Show the DID for a given ego"),
+ &attr_show),
+ GNUNET_GETOPT_option_flag ('r',
+ "remove",
+ gettext_noop (
+ "Remove the DID Document with DID from
GNUnet"),
+ &attr_remove),
+ GNUNET_GETOPT_option_flag ('R',
+ "replace",
+ gettext_noop ("Replace the DID Document."),
+ &attr_replace),
+ GNUNET_GETOPT_option_string ('d',
+ "did",
+ "DID",
+ gettext_noop ("The DID to work with"),
+ &attr_did),
+ GNUNET_GETOPT_option_string ('D',
+ "did-docuement",
+ "JSON",
+ gettext_noop (
+ "The DID Document to store in GNUNET"),
+ &attr_didd),
+ GNUNET_GETOPT_option_string ('e',
+ "ego",
+ "EGO",
+ gettext_noop ("The EGO to work with"),
+ &attr_ego),
+ GNUNET_GETOPT_option_string ('n',
+ "name",
+ "NAME",
+ gettext_noop ("The name of the created EGO"),
+ &attr_name),
+ GNUNET_GETOPT_option_string ('t',
+ "expiration-time",
+ "TIME",
+ gettext_noop (
+ "The time until the DID Document is going
to expire (e.g. 5d)"),
+ &attr_expire),
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ if (GNUNET_OK != GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-did",
+ ("did command line tool"),
+ options,
+ &run,
+ NULL))
+ return 1;
+ else
+ return ret;
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] 49/70: - init did test, (continued)
- [gnunet] 49/70: - init did test, gnunet, 2022/08/31
- [gnunet] 42/70: -did mulitbase key and assert method for VCs, gnunet, 2022/08/31
- [gnunet] 18/70: -did working replace, generalized remove, refactor, gnunet, 2022/08/31
- [gnunet] 21/70: -did key check, gnunet, 2022/08/31
- [gnunet] 33/70: -add test for w3c-ed25519-2020, gnunet, 2022/08/31
- [gnunet] 35/70: -test against mb b64, gnunet, 2022/08/31
- [gnunet] 38/70: -did working replace, generalized remove, refactor, gnunet, 2022/08/31
- [gnunet] 39/70: -did expiration time fix, gnunet, 2022/08/31
- [gnunet] 50/70: - not working test, gnunet, 2022/08/31
- [gnunet] 47/70: -move to reclaim, gnunet, 2022/08/31
- [gnunet] 44/70: -add comments,
gnunet <=
- [gnunet] 43/70: -mergefix, gnunet, 2022/08/31
- [gnunet] 36/70: -did not working remove abstraction, gnunet, 2022/08/31
- [gnunet] 45/70: fix bugs, gnunet, 2022/08/31
- [gnunet] 66/70: - DID lib; renamed vars and moved a free, gnunet, 2022/08/31
- [gnunet] 63/70: - remove static variable from did_core, gnunet, 2022/08/31
- [gnunet] 55/70: - finished DID helper with tests, gnunet, 2022/08/31
- [gnunet] 60/70: - started with DID lib create func, gnunet, 2022/08/31
- [gnunet] 54/70: - default did document test without multibase, gnunet, 2022/08/31
- [gnunet] 68/70: - DID lib; simplify closure, gnunet, 2022/08/31
- [gnunet] 30/70: -DID refactor, uncrustify, not working didd create, gnunet, 2022/08/31