#include "microhttpd.h"
#include <jansson.h>
-#define API_NAMESPACE "/identity"
-
-#define EGO_NAMESPACE "/identity/egos"
+#define GNUNET_REST_API_NS_IDENTITY "/identity"
#define ID_REST_STATE_INIT 0
#define ID_REST_STATE_POST_INIT 1
-#define URL_PARAM_SUBSYS "service"
-
#define GNUNET_REST_JSONAPI_IDENTITY_EGO "ego"
#define GNUNET_REST_JSONAPI_IDENTITY_KEY "key"
+#define GNUNET_REST_JSONAPI_IDENTITY_NEWNAME "newname"
+
+#define GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM "subsystem"
+
/**
* @brief struct returned by the initialization function of the plugin
*/
struct GNUNET_IDENTITY_Ego *ego;
};
+
struct RequestHandle
{
/**
/**
* Cleanup lookup handle
- * @praram handle Handle to clean up
+ * @param handle Handle to clean up
*/
-void
+static void
cleanup_handle (struct RequestHandle *handle)
{
struct EgoEntry *ego_entry;
struct EgoEntry *ego_tmp;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Cleaning up\n");
- if (NULL != handle->json_root)
- json_decref (handle->json_root);
if (NULL != handle->name)
GNUNET_free (handle->name);
if (NULL != handle->timeout_task)
* @param ctx the context
* @param name the id of the ego
*/
-void
+static void
get_ego_for_subsys (void *cls,
struct GNUNET_IDENTITY_Ego *ego,
void **ctx,
const char *name)
{
struct RequestHandle *handle = cls;
+ struct JsonApiObject *json_object;
+ struct JsonApiResource *json_resource;
struct EgoEntry *ego_entry;
struct MHD_Response *resp;
+ json_t *key_json;
char *result_str;
char *keystring;
- json_t *ego_json;
- json_t *root_json;
- root_json = json_object ();
-
- //Return all egos
+ json_object = GNUNET_REST_jsonapi_object_new ();
+
for (ego_entry = handle->ego_head;
NULL != ego_entry;
ego_entry = ego_entry->next)
continue;
if (NULL == name)
continue;
- ego_json = json_object ();
+ json_resource = GNUNET_REST_jsonapi_resource_new (GNUNET_REST_JSONAPI_IDENTITY_EGO, ego_entry->identifier);
keystring = GNUNET_CRYPTO_ecdsa_public_key_to_string (&ego_entry->pk);
- json_object_set_new (ego_json, "id", json_string (ego_entry->identifier));
- json_object_set_new (ego_json, "type", json_string (GNUNET_REST_JSONAPI_IDENTITY_EGO));
- json_object_set_new (ego_json, "key", json_string (keystring));
+ key_json = json_string (keystring);
+ GNUNET_REST_jsonapi_resource_add_attr (json_resource, GNUNET_REST_JSONAPI_IDENTITY_KEY, key_json);
+ json_decref (key_json);
GNUNET_free (keystring);
+ GNUNET_REST_jsonapi_object_resource_add (json_object, json_resource);
break;
}
- if (NULL == ego_json)
+ if (0 == GNUNET_REST_jsonapi_object_resource_count (json_object))
{
- json_decref (root_json);
+ GNUNET_REST_jsonapi_object_delete (json_object);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- json_object_set (root_json, GNUNET_REST_JSONAPI_KEY_DATA, ego_json);
- result_str = json_dumps (root_json, JSON_COMPACT);
+ GNUNET_REST_jsonapi_data_serialize (json_object, &result_str);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result %s\n", result_str);
- json_decref (ego_json);
- json_decref (root_json);
resp = GNUNET_REST_create_json_response (result_str);
+ GNUNET_REST_jsonapi_object_delete (json_object);
handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
GNUNET_free (result_str);
cleanup_handle (handle);
*
* @param handle the RequestHandle
*/
-void
+static void
ego_info_response (struct RestConnectionDataHandle *con,
const char *url,
void *cls)
struct EgoEntry *ego_entry;
struct GNUNET_HashCode key;
struct MHD_Response *resp;
- struct JsonApiResponse *json_response;
+ struct JsonApiObject *json_object;
struct JsonApiResource *json_resource;
json_t *key_str;
-
- if (GNUNET_NO == GNUNET_REST_namespace_match (handle->url, EGO_NAMESPACE))
+ if (GNUNET_NO == GNUNET_REST_namespace_match (handle->url, GNUNET_REST_API_NS_IDENTITY))
{
resp = GNUNET_REST_create_json_response (NULL);
handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST);
cleanup_handle (handle);
- GNUNET_break (0);
return;
}
- json_response = GNUNET_REST_jsonapi_response_new ();
- if ( (strlen (EGO_NAMESPACE) == strlen (handle->url) )) {
- GNUNET_CRYPTO_hash (URL_PARAM_SUBSYS, strlen (URL_PARAM_SUBSYS), &key);
+ if ( (strlen (GNUNET_REST_API_NS_IDENTITY) == strlen (handle->url) )) {
+ GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM, strlen (GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM), &key);
if ( GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_contains (handle->conndata_handle->url_param_map,
&key) )
}
}
}
- json_response = GNUNET_REST_jsonapi_response_new ();
- egoname = &handle->url[strlen (EGO_NAMESPACE)+1];
+ json_object = GNUNET_REST_jsonapi_object_new ();
+ egoname = &handle->url[strlen (GNUNET_REST_API_NS_IDENTITY)+1];
- if (strlen (EGO_NAMESPACE) == strlen (handle->url))
+ if (strlen (GNUNET_REST_API_NS_IDENTITY) == strlen (handle->url))
{
egoname = NULL;
}
-
//Return all egos
for (ego_entry = handle->ego_head;
NULL != ego_entry;
key_str);
json_decref (key_str);
GNUNET_free (keystring);
- GNUNET_REST_jsonapi_response_resource_add (json_response, json_resource);
+ GNUNET_REST_jsonapi_object_resource_add (json_object, json_resource);
}
-
- GNUNET_REST_jsonapi_data_serialize (json_response, &result_str);
-
+ if (0 == GNUNET_REST_jsonapi_object_resource_count (json_object))
+ {
+ GNUNET_REST_jsonapi_object_delete (json_object);
+ GNUNET_SCHEDULER_add_now (&do_error, handle);
+ return;
+ }
+ GNUNET_REST_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);
handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
GNUNET_free (result_str);
cleanup_handle (handle);
}
static void
-set_finished (void *cls, const char *emsg)
+edit_finished (void *cls, const char *emsg)
{
struct RequestHandle *handle = cls;
struct MHD_Response *resp;
-
+
handle->op = NULL;
if (NULL != emsg)
{
const char *url,
void *cls)
{
- const char* egoname;
struct RequestHandle *handle = cls;
- char term_data[handle->data_size+1];
struct EgoEntry *ego_entry;
struct MHD_Response *resp;
- json_t *root_json;
- json_t *data_json;
- json_t *type_json;
+ struct JsonApiObject *json_obj;
+ struct JsonApiResource *json_res;
json_t *egoname_json;
- json_error_t error;
+ const char* egoname;
+ char term_data[handle->data_size+1];
- if (strlen (API_NAMESPACE) != strlen (handle->url))
+ if (strlen (GNUNET_REST_API_NS_IDENTITY) != strlen (handle->url))
{
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
-
term_data[handle->data_size] = '\0';
memcpy (term_data, handle->data, handle->data_size);
- root_json = json_loads (term_data, 0, &error);
-
- if ((NULL == root_json) || !json_is_object (root_json))
+ json_obj = GNUNET_REST_jsonapi_object_parse (term_data);
+ if (NULL == json_obj)
{
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- data_json = json_object_get (root_json, GNUNET_REST_JSONAPI_KEY_DATA);
- if ((NULL == data_json) || !json_is_object (data_json))
+ if (1 != GNUNET_REST_jsonapi_object_resource_count (json_obj))
{
+ GNUNET_REST_jsonapi_object_delete (json_obj);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- type_json = json_object_get (data_json, "type");
- if (!json_is_string (type_json) ||
- (0 != strcmp (GNUNET_REST_JSONAPI_IDENTITY_EGO, json_string_value (type_json))))
+ 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_decref (data_json);
- json_decref (root_json);
+ GNUNET_REST_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;
}
- json_decref (type_json);
- egoname_json = json_object_get (data_json, "id");
+ egoname_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_KEY_ID);
if (!json_is_string (egoname_json))
{
- json_decref (data_json);
- json_decref (root_json);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
-
egoname = json_string_value (egoname_json);
for (ego_entry = handle->ego_head;
NULL != ego_entry;
{
if (0 == strcasecmp (egoname, ego_entry->identifier))
{
- json_decref (egoname_json);
- json_decref (data_json);
- json_decref (root_json);
+ GNUNET_REST_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);
- json_decref (egoname_json);
- json_decref (data_json);
- json_decref (root_json);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
handle->op = GNUNET_IDENTITY_create (handle->identity_handle,
handle->name,
&create_finished,
handle);
}
-void
-subsys_set_cont (struct RestConnectionDataHandle *con,
+
+/**
+ * Handle ego edit request
+ *
+ * @param con rest connection handle
+ * @param url the url that is requested
+ * @param cls the RequestHandle
+ */
+static void
+ego_edit_cont (struct RestConnectionDataHandle *con,
const char *url,
void *cls)
{
- const char *egoname;
- const char *subsys;
+ struct JsonApiObject *json_obj;
+ struct JsonApiResource *json_res;
struct RequestHandle *handle = cls;
- char term_data[handle->data_size+1];
struct EgoEntry *ego_entry;
struct MHD_Response *resp;
- int ego_exists = GNUNET_NO;
- json_t *root_json;
- json_t *data_json;
- json_t *type_json;
- json_t *id_json;
json_t *subsys_json;
- json_error_t error;
-
- if (strlen (API_NAMESPACE) > strlen (handle->url))
+ json_t *name_json;
+ const char *egoname;
+ const char *subsys;
+ const char *newname;
+ char term_data[handle->data_size+1];
+ int ego_exists = GNUNET_NO;
+
+ if (strlen (GNUNET_REST_API_NS_IDENTITY) > strlen (handle->url))
{
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- egoname = &handle->url[strlen(EGO_NAMESPACE)+1];
+ egoname = &handle->url[strlen(GNUNET_REST_API_NS_IDENTITY)+1];
for (ego_entry = handle->ego_head;
NULL != ego_entry;
ego_entry = ego_entry->next)
term_data[handle->data_size] = '\0';
memcpy (term_data, handle->data, handle->data_size);
- root_json = json_loads (term_data, 0, &error);
+ json_obj = GNUNET_REST_jsonapi_object_parse (term_data);
- if ((NULL == root_json) || !json_is_object (root_json))
+ if (NULL == json_obj)
{
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- data_json = json_object_get (root_json, "data");
- if (!json_is_object (data_json))
+ if (1 != GNUNET_REST_jsonapi_object_resource_count (json_obj))
{
- json_decref (root_json);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- id_json = json_object_get (data_json, "id");
- if (!json_is_string (id_json) ||
- (0 != strcmp (egoname, json_string_value (id_json))))
+ 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_decref (root_json);
- json_decref (data_json);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- json_decref (id_json);
-
- type_json = json_object_get (data_json, "type");
- if (!json_is_string (type_json) ||
- (0 != strcmp (GNUNET_REST_JSONAPI_IDENTITY_EGO, json_string_value (type_json))))
+ //This is a rename
+ name_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_NEWNAME);
+ if (NULL != name_json)
{
- json_decref (root_json);
- json_decref (data_json);
- GNUNET_SCHEDULER_add_now (&do_error, handle);
- return;
+ newname = NULL;
+ if (json_is_string (name_json))
+ {
+ newname = json_string_value (name_json);
+ handle->op = GNUNET_IDENTITY_rename (handle->identity_handle,
+ egoname,
+ newname,
+ &edit_finished,
+ handle);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
+ return;
+ }
}
- json_decref (type_json);
- subsys_json = json_object_get (data_json, "subsystem");
- if (!json_is_string (subsys_json))
+ subsys_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM);
+ if (NULL != subsys_json)
{
- json_decref (root_json);
- json_decref (data_json);
- GNUNET_SCHEDULER_add_now (&do_error, handle);
- return;
+ subsys = NULL;
+ if (json_is_string (subsys_json))
+ {
+ subsys = json_string_value (subsys_json);
+ GNUNET_asprintf (&handle->subsys, "%s", subsys);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
+ handle->op = GNUNET_IDENTITY_set (handle->identity_handle,
+ handle->subsys,
+ ego_entry->ego,
+ &edit_finished,
+ handle);
+ return;
+ }
}
- subsys = json_string_value (subsys_json);
- GNUNET_asprintf (&handle->subsys, "%s", subsys);
- json_decref (subsys_json);
- json_decref (root_json);
- handle->op = GNUNET_IDENTITY_set (handle->identity_handle,
- handle->subsys,
- ego_entry->ego,
- &set_finished,
- handle);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_SCHEDULER_add_now (&do_error, handle);
+
}
void
struct RequestHandle *handle = cls;
int ego_exists = GNUNET_NO;
- if (strlen (API_NAMESPACE) >= strlen (handle->url))
+ if (strlen (GNUNET_REST_API_NS_IDENTITY) >= strlen (handle->url))
{
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- egoname = &handle->url[strlen(API_NAMESPACE)+1];
+ egoname = &handle->url[strlen(GNUNET_REST_API_NS_IDENTITY)+1];
for (ego_entry = handle->ego_head;
NULL != ego_entry;
ego_entry = ego_entry->next)
}
-void
+
+/**
+ * Handle rest request
+ *
+ * @param handle the request handle
+ */
+static void
init_cont (struct RequestHandle *handle)
{
static const struct GNUNET_REST_RestConnectionHandler handlers[] = {
- {MHD_HTTP_METHOD_GET, API_NAMESPACE, &ego_info_response},
- {MHD_HTTP_METHOD_POST, API_NAMESPACE, &ego_create_cont},
- {MHD_HTTP_METHOD_PUT, API_NAMESPACE, &subsys_set_cont},
- {MHD_HTTP_METHOD_DELETE, API_NAMESPACE, &ego_delete_cont},
+ {MHD_HTTP_METHOD_GET, GNUNET_REST_API_NS_IDENTITY, &ego_info_response},
+ {MHD_HTTP_METHOD_POST, GNUNET_REST_API_NS_IDENTITY, &ego_create_cont},
+ {MHD_HTTP_METHOD_PUT, GNUNET_REST_API_NS_IDENTITY, &ego_edit_cont},
+ {MHD_HTTP_METHOD_DELETE, GNUNET_REST_API_NS_IDENTITY, &ego_delete_cont},
GNUNET_REST_HANDLER_END
};
* @param proc_cls closure for callback function
* @return GNUNET_OK if request accepted
*/
-void
+static void
rest_identity_process_request(struct RestConnectionDataHandle *conndata_handle,
GNUNET_REST_ResultProcessor proc,
void *proc_cls)
plugin.cfg = cfg;
api = GNUNET_new (struct GNUNET_REST_Plugin);
api->cls = &plugin;
- api->name = API_NAMESPACE;
+ api->name = GNUNET_REST_API_NS_IDENTITY;
api->process_request = &rest_identity_process_request;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Identity REST API initialized\n"));
projects / oweals / gnunet.git / blobdiff