Refactoring reclaim attestations

1 files changed, 119 insertions, 176 deletions

diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
index 741094f21..610f93dbe 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
@@ -428,7 +428,13 @@ struct RequestHandle
   /**
    * Attribute claim list
    */
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attr_list;
+  struct GNUNET_RECLAIM_AttributeList *attr_list;
+
+  /**
+   * Attestation list
+   */
+  struct GNUNET_RECLAIM_AttestationList *attests_list;
+
 
   /**
    * IDENTITY Operation
@@ -523,8 +529,7 @@ struct RequestHandle
 static void
 cleanup_handle (struct RequestHandle *handle)
 {
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *claim_entry;
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *claim_tmp;
+  struct GNUNET_RECLAIM_AttributeListEntry *claim_entry;
   struct EgoEntry *ego_entry;
   struct EgoEntry *ego_tmp;
 
@@ -564,22 +569,9 @@ cleanup_handle (struct RequestHandle *handle)
     json_decref (handle->oidc->response);
     GNUNET_free (handle->oidc);
   }
-  if (NULL != handle->attr_list)
-  {
-    for (claim_entry = handle->attr_list->list_head; NULL != claim_entry;)
-    {
-      claim_tmp = claim_entry;
-      claim_entry = claim_entry->next;
-      if (NULL != claim_tmp->claim)
-        GNUNET_free (claim_tmp->claim);
-      if (NULL != claim_tmp->attest)
-        GNUNET_free (claim_tmp->attest);
-      if (NULL != claim_tmp->reference)
-        GNUNET_free (claim_tmp->reference);
-      GNUNET_free (claim_tmp);
-    }
-    GNUNET_free (handle->attr_list);
-  }
+  GNUNET_RECLAIM_attribute_list_destroy (handle->attr_list);
+  GNUNET_RECLAIM_attestation_list_destroy (handle->attests_list);
+
   for (ego_entry = handle->ego_head; NULL != ego_entry;)
   {
     ego_tmp = ego_entry;
@@ -934,6 +926,7 @@ oidc_ticket_issue_cb (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket)
   code_string = OIDC_build_authz_code (&handle->priv_key,
                                        &handle->ticket,
                                        handle->attr_list,
+                                       handle->attests_list,
                                        handle->oidc->nonce,
                                        handle->oidc->code_challenge);
   if ((NULL != handle->redirect_prefix) && (NULL != handle->redirect_suffix) &&
@@ -991,107 +984,61 @@ oidc_collect_finished_cb (void *cls)
 
 
 /**
- * Collects all attributes/references for an ego if in scope parameter
+ * Collects all attributes for an ego if in scope parameter
  */
 static void
 oidc_attr_collect (void *cls,
                    const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
-                   const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
-                   const struct GNUNET_RECLAIM_ATTESTATION_Claim *attest,
-                   const struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *reference)
+                   const struct GNUNET_RECLAIM_Attribute *attr,
+                   const struct GNUNET_RECLAIM_Attestation *attest)
 {
   struct RequestHandle *handle = cls;
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le;
+  struct GNUNET_RECLAIM_AttributeListEntry *le;
   char *scope_variables;
   char *scope_variable;
   char delimiter[] = " ";
 
-  if ((NULL == attr) && (NULL == reference))
+  scope_variables = GNUNET_strdup (handle->oidc->scope);
+  scope_variable = strtok (scope_variables, delimiter);
+  while (NULL != scope_variable)
   {
-    GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
-    return;
+    if (0 == strcmp (attr->name, scope_variable))
+      break;
+    scope_variable = strtok (NULL, delimiter);
   }
-  if (NULL != reference)
+  if (NULL == scope_variable)
   {
-    if ((NULL == reference->name) || (NULL == reference->reference_value))
-    {
-      return;
-    }
-    scope_variables = GNUNET_strdup (handle->oidc->scope);
-    scope_variable = strtok (scope_variables, delimiter);
-    while (NULL != scope_variable)
-    {
-      if (0 == strcmp (reference->name, scope_variable))
-        break;
-      scope_variable = strtok (NULL, delimiter);
-    }
-    if (NULL == scope_variable)
-    {
-      GNUNET_free (scope_variables);
-      return;
-    }
+    GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
     GNUNET_free (scope_variables);
-    struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le2;
-    le2 = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry);
-    le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry);
-    le->claim = NULL;
-    le->reference = NULL;
-    le->attest = GNUNET_RECLAIM_ATTESTATION_claim_new (attest->name,
+    // We can ignore this
+    return;
+  }
+  GNUNET_free (scope_variables);
+  le = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
+  le->attribute = GNUNET_RECLAIM_attribute_new (attr->name,
+                                                &attr->attestation,
+                                                attr->type,
+                                                attr->data,
+                                                attr->data_size);
+  le->attribute->id = attr->id;
+  le->attribute->flag = attr->flag;
+  le->attribute->attestation = attr->attestation;
+  GNUNET_CONTAINER_DLL_insert (handle->attr_list->list_head,
+                               handle->attr_list->list_tail,
+                               le);
+  if (GNUNET_NO == GNUNET_RECLAIM_id_is_zero (&attr->attestation))
+  {
+    struct GNUNET_RECLAIM_AttestationListEntry *ale;
+    ale = GNUNET_new (struct GNUNET_RECLAIM_AttestationListEntry);
+    ale->attestation = GNUNET_RECLAIM_attestation_new (attest->name,
                                                        attest->type,
                                                        attest->data,
                                                        attest->data_size);
-    le->attest->id = attest->id;
-    le2->attest = NULL;
-    le2->claim = NULL;
-    le2->reference = GNUNET_RECLAIM_ATTESTATION_reference_new (reference->name,
-                                                               reference->
-                                                               reference_value);
-    le2->reference->id = reference->id;
-    le2->reference->id_attest = reference->id_attest;
-    GNUNET_CONTAINER_DLL_insert (handle->attr_list->list_head,
-                                 handle->attr_list->list_tail,
-                                 le);
-    GNUNET_CONTAINER_DLL_insert (handle->attr_list->list_head,
-                                 handle->attr_list->list_tail,
-                                 le2);
-  }
-  else if (NULL != attr)
-  {
-    if ((NULL == attr->name) || (NULL == attr->data))
-    {
-      GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
-      return;
-    }
-    scope_variables = GNUNET_strdup (handle->oidc->scope);
-    scope_variable = strtok (scope_variables, delimiter);
-    while (NULL != scope_variable)
-    {
-      if (0 == strcmp (attr->name, scope_variable))
-        break;
-      scope_variable = strtok (NULL, delimiter);
-    }
-    if (NULL == scope_variable)
-    {
-      GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
-      GNUNET_free (scope_variables);
-      return;
-    }
-    GNUNET_free (scope_variables);
-    le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry);
-    le->reference = NULL;
-    le->attest = NULL;
-    le->claim = GNUNET_RECLAIM_ATTRIBUTE_claim_new (attr->name,
-                                                    attr->type,
-                                                    attr->data,
-                                                    attr->data_size);
-    le->claim->id = attr->id;
-    le->claim->flag = attr->flag;
-
-    GNUNET_CONTAINER_DLL_insert (handle->attr_list->list_head,
-                                 handle->attr_list->list_tail,
-                                 le);
-    GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
+    GNUNET_CONTAINER_DLL_insert (handle->attests_list->list_head,
+                                 handle->attests_list->list_tail,
+                                 ale);
   }
+  GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
 }
 
 
@@ -1149,7 +1096,7 @@ code_redirect (void *cls)
             *GNUNET_IDENTITY_ego_get_private_key (handle->ego_entry->ego);
           handle->idp = GNUNET_RECLAIM_connect (cfg);
           handle->attr_list =
-            GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList);
+            GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
           handle->attr_it =
             GNUNET_RECLAIM_get_attributes_start (handle->idp,
                                                  &handle->priv_key,
@@ -1784,7 +1731,8 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
   struct RequestHandle *handle = cls;
   const struct EgoEntry *ego_entry;
   struct GNUNET_TIME_Relative expiration_time;
-  struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *cl;
+  struct GNUNET_RECLAIM_AttributeList *cl;
+  struct GNUNET_RECLAIM_AttestationList *al;
   struct GNUNET_RECLAIM_Ticket ticket;
   struct GNUNET_CRYPTO_EcdsaPublicKey cid;
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
@@ -1872,7 +1820,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
 
   // decode code
   if (GNUNET_OK != OIDC_parse_authz_code (privkey, code, code_verifier, &ticket,
-                                          &cl, &nonce))
+                                          &cl, &al, &nonce))
   {
     handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
     handle->edesc = GNUNET_strdup ("invalid code");
@@ -1912,6 +1860,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
   id_token = OIDC_id_token_new (&ticket.audience,
                                 &ticket.identity,
                                 cl,
+                                al,
                                 &expiration_time,
                                 (NULL != nonce) ? nonce : NULL,
                                 jwt_secret);
@@ -1927,7 +1876,8 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
   MHD_add_response_header (resp, "Pragma", "no-cache");
   MHD_add_response_header (resp, "Content-Type", "application/json");
   handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_RECLAIM_ATTRIBUTE_list_destroy (cl);
+  GNUNET_RECLAIM_attribute_list_destroy (cl);
+  GNUNET_RECLAIM_attestation_list_destroy (al);
   GNUNET_free (access_token);
   GNUNET_free (json_response);
   GNUNET_free (id_token);
@@ -1936,14 +1886,13 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
 
 
 /**
-     * Collects claims and stores them in handle
-     */
+ * Collects claims and stores them in handle
+ */
 static void
 consume_ticket (void *cls,
                 const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
-                const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
-                const struct GNUNET_RECLAIM_ATTESTATION_Claim *attest,
-                const struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *reference)
+                const struct GNUNET_RECLAIM_Attribute *attr,
+                const struct GNUNET_RECLAIM_Attestation *attest)
 {
   struct RequestHandle *handle = cls;
   if (NULL == identity)
@@ -1951,82 +1900,76 @@ consume_ticket (void *cls,
     GNUNET_SCHEDULER_add_now (&return_userinfo_response, handle);
     return;
   }
-  if (NULL != attr)
+  if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&attr->attestation))
   {
     char *tmp_value;
     json_t *value;
-    tmp_value = GNUNET_RECLAIM_ATTRIBUTE_value_to_string (attr->type,
+    tmp_value = GNUNET_RECLAIM_attribute_value_to_string (attr->type,
                                                           attr->data,
                                                           attr->data_size);
     value = json_string (tmp_value);
     json_object_set_new (handle->oidc->response, attr->name, value);
     GNUNET_free (tmp_value);
+    return;
   }
-  else if ((NULL != attest) && (NULL != reference))
-  {
-    json_t *claim_sources;
-    json_t *claim_sources_jwt;
-    json_t *claim_names;
-    char *attest_val_str;
-    claim_sources=json_object_get(handle->oidc->response,"_claim_sources");
-    claim_names=json_object_get(handle->oidc->response,"_claim_names");
-    attest_val_str = GNUNET_RECLAIM_ATTESTATION_value_to_string (attest->type,
-                                                                 attest->data,
-                                                                 attest->
-                                                                 data_size);
-    if ((NULL == claim_sources) && (NULL == claim_names) )
-    {
-      claim_sources = json_object ();
-      claim_names = json_object ();
-    }
-    char *source_name;
-    int i = 0;
-    GNUNET_asprintf (&source_name,"src%d",i);
-    while (NULL != (claim_sources_jwt = json_object_get (claim_sources,
-                                                         source_name)))
+  json_t *claim_sources;
+  json_t *claim_sources_jwt;
+  json_t *claim_names;
+  char *attest_val_str;
+  claim_sources = json_object_get (handle->oidc->response,"_claim_sources");
+  claim_names = json_object_get (handle->oidc->response,"_claim_names");
+  attest_val_str =
+    GNUNET_RECLAIM_attestation_value_to_string (attest->type,
+                                                attest->data,
+                                                attest->data_size);
+  if ((NULL == claim_sources) && (NULL == claim_names) )
+  {
+    claim_sources = json_object ();
+    claim_names = json_object ();
+  }
+  char *source_name;
+  int i = 0;
+  GNUNET_asprintf (&source_name, "src%d", i);
+  while (NULL != (claim_sources_jwt = json_object_get (claim_sources,
+                                                       source_name)))
+  {
+    if (0 == strcmp (json_string_value (json_object_get (claim_sources_jwt,
+                                                         "JWT")),
+                     attest_val_str))
     {
-      if (0 == strcmp (json_string_value (json_object_get (claim_sources_jwt,
-                                                           "JWT")),
-                       attest_val_str))
-      {
-        // Adapt only the claim names
-        json_object_set_new (claim_names, reference->name, json_string (
-                               source_name));
-        json_object_set (handle->oidc->response, "_claim_names",claim_names);
-        handle->oidc->response = json_deep_copy(handle->oidc->response);
-        break;
-      }
-      i++;
-      GNUNET_asprintf (&source_name,"src%d",i);
-    }
-
-    // Create new one
-    if (NULL == claim_sources_jwt)
-    {
-      claim_sources_jwt = json_object ();
-      // Set the JWT for names
-      json_object_set_new (claim_names, reference->name, json_string (
-                             source_name));
-      // Set the JWT for the inner source
-      json_object_set_new (claim_sources_jwt, "JWT", json_string (
-                             attest_val_str));
-      // Set the JWT for the source
-      json_object_set_new (claim_sources, source_name,claim_sources_jwt);
-      // Set as claims
-      json_object_set (handle->oidc->response, "_claim_names", claim_names);
-      json_object_set (handle->oidc->response, "_claim_sources",claim_sources);
-      handle->oidc->response = json_deep_copy(handle->oidc->response);
+      // Adapt only the claim names
+      json_object_set_new (claim_names, attr->data,
+                           json_string (source_name));
+      json_object_set (handle->oidc->response,
+                       "_claim_names", claim_names);
+      break;
     }
-
-    json_decref (claim_sources);
-    json_decref (claim_names);
-    json_decref (claim_sources_jwt);
-    GNUNET_free (attest_val_str);
-  }
-  else
-  {
-    // REMARK: We should not find any claim, one of attest/ref is NULL
-  }
+    i++;
+    GNUNET_free (source_name);
+    GNUNET_asprintf (&source_name, "src%d", i);
+  }
+
+  // Create new one
+  if (NULL == claim_sources_jwt)
+  {
+    claim_sources_jwt = json_object ();
+    // Set the JWT for names
+    json_object_set_new (claim_names, attr->data,
+                         json_string (source_name));
+    // Set the JWT for the inner source
+    json_object_set_new (claim_sources_jwt, "JWT",
+                         json_string (attest_val_str));
+    // Set the JWT for the source
+    json_object_set_new (claim_sources, source_name, claim_sources_jwt);
+    // Set as claims
+    json_object_set (handle->oidc->response, "_claim_names", claim_names);
+    json_object_set (handle->oidc->response, "_claim_sources",claim_sources);
+  }
+
+  json_decref (claim_sources);
+  json_decref (claim_names);
+  json_decref (claim_sources_jwt);
+  GNUNET_free (attest_val_str);
 }