/*
This file is part of GNUnet.
- Copyright (C) 2012-2015 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012-2015 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "gnunet_rest_plugin.h"
#include "gnunet_identity_service.h"
#include "gnunet_rest_lib.h"
+#include "gnunet_jsonapi_lib.h"
#include "microhttpd.h"
#include <jansson.h>
#include "gnunet_signatures.h"
#define GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM "subsystem"
-/**
- * URL parameter to create a GNUid token for a specific audience
- */
-#define GNUNET_REST_JSONAPI_IDENTITY_CREATE_TOKEN "create_token_for"
-
-/**
- * Attribute containing the GNUid token if
- * GNUNET_REST_JSONAPI_IDENTITY_CREATE_TOKEN was requested
- */
-#define GNUNET_REST_JSONAPI_IDENTITY_GNUID "gnuid_token"
-
/**
* Error messages
*/
* DLL
*/
struct EgoEntry *next;
-
+
/**
* DLL
*/
struct EgoEntry *prev;
-
+
/**
* Ego Identifier
*/
* Public key string
*/
char *keystring;
-
+
/**
* The Ego
*/
* Handle to the rest connection
*/
struct RestConnectionDataHandle *conndata_handle;
-
+
/**
* The processing state
*/
/**
* ID of a task associated with the resolution process.
*/
- struct GNUNET_SCHEDULER_Task * timeout_task;
+ struct GNUNET_SCHEDULER_Task * timeout_task;
/**
* The plugin result processor
/**
- * Task run on shutdown. Cleans up everything.
+ * Task run on errors. Reports an error and cleans up everything.
*
- * @param cls unused
- * @param tc scheduler context
+ * @param cls the `struct RequestHandle`
*/
static void
-do_error (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_error (void *cls)
{
struct RequestHandle *handle = cls;
struct MHD_Response *resp;
&handle->emsg);
resp = GNUNET_REST_create_json_response (json_error);
- handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST);
+ handle->proc (handle->proc_cls,
+ resp,
+ MHD_HTTP_BAD_REQUEST);
cleanup_handle (handle);
GNUNET_free (json_error);
}
-/**
- * Build a GNUid token for identity
- * @param handle the handle
- * @param ego_entry the ego to build the token for
- * @param name name of the ego
- * @param token_aud token audience
- * @param token the resulting gnuid token
- */
-static void
-make_gnuid_token (struct RequestHandle *handle,
- struct EgoEntry *ego_entry,
- const char *name,
- const char *token_aud,
- char **token)
-{
- uint64_t time;
- uint64_t lbl;
- char *header_str;
- char *payload_str;
- char *header_base64;
- char *payload_base64;
- char *sig_str;
- char *lbl_str;
- json_t *header;
- json_t *payload;
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key;
- struct GNUNET_CRYPTO_EcdsaSignature sig;
- struct GNUNET_CRYPTO_EccSignaturePurpose *purpose;
-
- time = GNUNET_TIME_absolute_get().abs_value_us;
- lbl = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX);
- GNUNET_STRINGS_base64_encode ((char*)&lbl, sizeof (uint64_t), &lbl_str);
-
- header = json_object ();
- json_object_set_new (header, "alg", json_string ("ED512"));
- json_object_set_new (header, "typ", json_string ("JWT"));
-
- payload = json_object ();
- json_object_set_new (payload, "iss", json_string (ego_entry->keystring));
- json_object_set_new (payload, "lbl", json_string (lbl_str));
- json_object_set_new (payload, "sub", json_string (name));
- json_object_set_new (payload, "nbf", json_integer (time));
- json_object_set_new (payload, "iat", json_integer (time));
- json_object_set_new (payload, "exp", json_integer (time+GNUNET_GNUID_TOKEN_EXPIRATION_MICROSECONDS));
- json_object_set_new (payload, "aud", json_string (token_aud));
- header_str = json_dumps (header, JSON_COMPACT);
- GNUNET_STRINGS_base64_encode (header_str,
- strlen (header_str),
- &header_base64);
- char* padding = strtok(header_base64, "=");
- while (NULL != padding)
- padding = strtok(NULL, "=");
-
- payload_str = json_dumps (payload, JSON_COMPACT);
- GNUNET_STRINGS_base64_encode (payload_str,
- strlen (payload_str),
- &payload_base64);
- padding = strtok(payload_base64, "=");
- while (NULL != padding)
- padding = strtok(NULL, "=");
-
- GNUNET_asprintf (token, "%s,%s", header_base64, payload_base64);
- priv_key = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
- purpose =
- GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
- strlen (*token));
- purpose->size =
- htonl (strlen (*token) + sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose));
- purpose->purpose = htonl(GNUNET_SIGNATURE_PURPOSE_GNUID_TOKEN);
- memcpy (&purpose[1], *token, strlen (*token));
- if (GNUNET_OK != GNUNET_CRYPTO_ecdsa_sign (priv_key,
- purpose,
- &sig))
- GNUNET_break(0);
- GNUNET_free (*token);
- sig_str = GNUNET_STRINGS_data_to_string_alloc (&sig,
- sizeof (struct GNUNET_CRYPTO_EcdsaSignature));
- GNUNET_asprintf (token, "%s.%s.%s",
- header_base64, payload_base64, sig_str);
- GNUNET_free (sig_str);
- GNUNET_free (header_str);
- GNUNET_free (header_base64);
- GNUNET_free (payload_str);
- GNUNET_free (payload_base64);
- GNUNET_free (purpose);
- GNUNET_free (lbl_str);
- json_decref (header);
- json_decref (payload);
-}
/**
* Callback for IDENTITY_get()
const char *name)
{
struct RequestHandle *handle = cls;
- struct JsonApiObject *json_object;
- struct JsonApiResource *json_resource;
+ struct GNUNET_JSONAPI_Object *json_object;
+ struct GNUNET_JSONAPI_Resource *json_resource;
struct EgoEntry *ego_entry;
struct MHD_Response *resp;
json_t *name_json;
char *result_str;
- json_object = GNUNET_REST_jsonapi_object_new ();
+ json_object = GNUNET_JSONAPI_object_new ();
for (ego_entry = handle->ego_head;
NULL != ego_entry;
continue;
if (NULL == name)
continue;
- json_resource = GNUNET_REST_jsonapi_resource_new
+ json_resource = GNUNET_JSONAPI_resource_new
(GNUNET_REST_JSONAPI_IDENTITY_EGO, ego_entry->keystring);
name_json = json_string (ego_entry->identifier);
- GNUNET_REST_jsonapi_resource_add_attr (json_resource,
+ GNUNET_JSONAPI_resource_add_attr (json_resource,
GNUNET_REST_JSONAPI_IDENTITY_NAME,
name_json);
json_decref (name_json);
- GNUNET_REST_jsonapi_object_resource_add (json_object, json_resource);
+ GNUNET_JSONAPI_object_resource_add (json_object, json_resource);
break;
}
- if (0 == GNUNET_REST_jsonapi_object_resource_count (json_object))
+ if (0 == GNUNET_JSONAPI_object_resource_count (json_object))
{
- GNUNET_REST_jsonapi_object_delete (json_object);
+ GNUNET_JSONAPI_object_delete (json_object);
handle->emsg = GNUNET_strdup("No identity matches results!");
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- GNUNET_REST_jsonapi_data_serialize (json_object, &result_str);
+ GNUNET_JSONAPI_data_serialize (json_object, &result_str);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result %s\n", result_str);
resp = GNUNET_REST_create_json_response (result_str);
- GNUNET_REST_jsonapi_object_delete (json_object);
+ GNUNET_JSONAPI_object_delete (json_object);
handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
GNUNET_free (result_str);
cleanup_handle (handle);
const char *egoname;
char *result_str;
char *subsys_val;
- char *create_token_for;
- char *token;
char *keystring;
struct RequestHandle *handle = cls;
struct EgoEntry *ego_entry;
struct GNUNET_HashCode key;
struct MHD_Response *resp;
- struct JsonApiObject *json_object;
- struct JsonApiResource *json_resource;
+ struct GNUNET_JSONAPI_Object *json_object;
+ struct GNUNET_JSONAPI_Resource *json_resource;
json_t *name_str;
- json_t *token_str;
if (GNUNET_NO == GNUNET_REST_namespace_match (handle->url, GNUNET_REST_API_NS_IDENTITY))
{
}
}
- GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_IDENTITY_CREATE_TOKEN,
- strlen (GNUNET_REST_JSONAPI_IDENTITY_CREATE_TOKEN),
- &key);
-
- //Token audience
- create_token_for = NULL;
- if ( GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_contains (handle->conndata_handle->url_param_map,
- &key) )
- create_token_for = GNUNET_CONTAINER_multihashmap_get (handle->conndata_handle->url_param_map,
- &key);
-
- json_object = GNUNET_REST_jsonapi_object_new ();
+ json_object = GNUNET_JSONAPI_object_new ();
//Return all egos
for (ego_entry = handle->ego_head;
{
if ( (NULL != egoname) && (0 != strcmp (egoname, ego_entry->identifier)) )
continue;
- json_resource = GNUNET_REST_jsonapi_resource_new (GNUNET_REST_JSONAPI_IDENTITY_EGO,
+ json_resource = GNUNET_JSONAPI_resource_new (GNUNET_REST_JSONAPI_IDENTITY_EGO,
ego_entry->keystring);
name_str = json_string (ego_entry->identifier);
- GNUNET_REST_jsonapi_resource_add_attr (
+ GNUNET_JSONAPI_resource_add_attr (
json_resource,
GNUNET_REST_JSONAPI_IDENTITY_NAME,
name_str);
json_decref (name_str);
- if (NULL != create_token_for)
- {
- make_gnuid_token (handle,
- ego_entry,
- ego_entry->identifier,
- create_token_for,
- &token);
- token_str = json_string (token);
- GNUNET_free (token);
- GNUNET_REST_jsonapi_resource_add_attr (json_resource,
- GNUNET_REST_JSONAPI_IDENTITY_GNUID,
- token_str);
- json_decref (token_str);
- }
- GNUNET_REST_jsonapi_object_resource_add (json_object, json_resource);
+ GNUNET_JSONAPI_object_resource_add (json_object, json_resource);
}
- if (0 == GNUNET_REST_jsonapi_object_resource_count (json_object))
+ if (0 == GNUNET_JSONAPI_object_resource_count (json_object))
{
- GNUNET_REST_jsonapi_object_delete (json_object);
+ GNUNET_JSONAPI_object_delete (json_object);
handle->emsg = GNUNET_strdup ("No identities found!");
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- GNUNET_REST_jsonapi_data_serialize (json_object, &result_str);
+ GNUNET_JSONAPI_data_serialize (json_object, &result_str);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result %s\n", result_str);
resp = GNUNET_REST_create_json_response (result_str);
- GNUNET_REST_jsonapi_object_delete (json_object);
+ GNUNET_JSONAPI_object_delete (json_object);
handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
GNUNET_free (result_str);
cleanup_handle (handle);
struct RequestHandle *handle = cls;
struct EgoEntry *ego_entry;
struct MHD_Response *resp;
- struct JsonApiObject *json_obj;
- struct JsonApiResource *json_res;
+ struct GNUNET_JSONAPI_Object *json_obj;
+ struct GNUNET_JSONAPI_Resource *json_res;
json_t *egoname_json;
const char* egoname;
char term_data[handle->data_size+1];
}
term_data[handle->data_size] = '\0';
memcpy (term_data, handle->data, handle->data_size);
- json_obj = GNUNET_REST_jsonapi_object_parse (term_data);
+ json_obj = GNUNET_JSONAPI_object_parse (term_data);
if (NULL == json_obj)
{
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- if (1 != GNUNET_REST_jsonapi_object_resource_count (json_obj))
+ if (1 != GNUNET_JSONAPI_object_resource_count (json_obj))
{
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
handle->emsg = GNUNET_strdup ("Provided resource count invalid");
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- json_res = GNUNET_REST_jsonapi_object_get_resource (json_obj, 0);
- if (GNUNET_NO == GNUNET_REST_jsonapi_resource_check_type (json_res, GNUNET_REST_JSONAPI_IDENTITY_EGO))
+ json_res = GNUNET_JSONAPI_object_get_resource (json_obj, 0);
+ if (GNUNET_NO == GNUNET_JSONAPI_resource_check_type (json_res, GNUNET_REST_JSONAPI_IDENTITY_EGO))
{
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
resp = GNUNET_REST_create_json_response (NULL);
handle->proc (handle->proc_cls, resp, MHD_HTTP_CONFLICT);
cleanup_handle (handle);
return;
}
- egoname_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_NAME);
+ egoname_json = GNUNET_JSONAPI_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_NAME);
if (!json_is_string (egoname_json))
{
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
handle->emsg = GNUNET_strdup ("No name provided");
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
{
if (0 == strcasecmp (egoname, ego_entry->identifier))
{
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
resp = GNUNET_REST_create_json_response (NULL);
handle->proc (handle->proc_cls, resp, MHD_HTTP_CONFLICT);
cleanup_handle (handle);
}
}
GNUNET_asprintf (&handle->name, "%s", egoname);
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
handle->op = GNUNET_IDENTITY_create (handle->identity_handle,
handle->name,
&do_finished,
* @param url the url that is requested
* @param cls the RequestHandle
*/
-static void
+static void
ego_edit_cont (struct RestConnectionDataHandle *con,
const char *url,
void *cls)
{
- struct JsonApiObject *json_obj;
- struct JsonApiResource *json_res;
+ struct GNUNET_JSONAPI_Object *json_obj;
+ struct GNUNET_JSONAPI_Resource *json_res;
struct RequestHandle *handle = cls;
struct EgoEntry *ego_entry;
struct MHD_Response *resp;
term_data[handle->data_size] = '\0';
memcpy (term_data, handle->data, handle->data_size);
- json_obj = GNUNET_REST_jsonapi_object_parse (term_data);
+ json_obj = GNUNET_JSONAPI_object_parse (term_data);
if (NULL == json_obj)
{
return;
}
- if (1 != GNUNET_REST_jsonapi_object_resource_count (json_obj))
+ if (1 != GNUNET_JSONAPI_object_resource_count (json_obj))
{
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
handle->emsg = GNUNET_strdup ("Resource amount invalid");
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- json_res = GNUNET_REST_jsonapi_object_get_resource (json_obj, 0);
+ json_res = GNUNET_JSONAPI_object_get_resource (json_obj, 0);
- if (GNUNET_NO == GNUNET_REST_jsonapi_resource_check_type (json_res, GNUNET_REST_JSONAPI_IDENTITY_EGO))
+ if (GNUNET_NO == GNUNET_JSONAPI_resource_check_type (json_res, GNUNET_REST_JSONAPI_IDENTITY_EGO))
{
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
handle->emsg = GNUNET_strdup ("Resource type invalid");
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
//This is a rename
- name_json = GNUNET_REST_jsonapi_resource_read_attr (json_res,
+ name_json = GNUNET_JSONAPI_resource_read_attr (json_res,
GNUNET_REST_JSONAPI_IDENTITY_NEWNAME);
if ((NULL != name_json) && json_is_string (name_json))
{
0 != strcasecmp (keystring, ego_entry->keystring))
{
//Ego with same name not allowed
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
resp = GNUNET_REST_create_json_response (NULL);
handle->proc (handle->proc_cls, resp, MHD_HTTP_CONFLICT);
cleanup_handle (handle);
newname,
&do_finished,
handle);
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
return;
}
//Set subsystem
- subsys_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM);
+ subsys_json = GNUNET_JSONAPI_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM);
if ( (NULL != subsys_json) && json_is_string (subsys_json))
{
subsys = json_string_value (subsys_json);
GNUNET_asprintf (&handle->subsys, "%s", subsys);
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
handle->op = GNUNET_IDENTITY_set (handle->identity_handle,
handle->subsys,
ego_entry->ego,
handle);
return;
}
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
handle->emsg = GNUNET_strdup ("Subsystem not provided");
GNUNET_SCHEDULER_add_now (&do_error, handle);
}
-void
+void
ego_delete_cont (struct RestConnectionDataHandle *con_handle,
const char* url,
void *cls)
if (ID_REST_STATE_INIT == handle->state) {
ego_entry = GNUNET_new (struct EgoEntry);
GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
- ego_entry->keystring =
+ ego_entry->keystring =
GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
ego_entry->ego = ego;
GNUNET_asprintf (&ego_entry->identifier, "%s", identifier);
handle->identity_handle = GNUNET_IDENTITY_connect (cfg,
&list_ego,
handle);
- GNUNET_strdup ("Timeout");
handle->timeout_task =
GNUNET_SCHEDULER_add_delayed (handle->timeout,
&do_error,
projects / oweals / gnunet.git / blobdiff