/*
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
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @author Martin Schanzenbach
#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 API_NAMESPACE "/identity"
-
-#define EGO_NAMESPACE "/identity/egos"
+/**
+ * REST root namespace
+ */
+#define GNUNET_REST_API_NS_IDENTITY "/identity"
+/**
+ * State while collecting all egos
+ */
#define ID_REST_STATE_INIT 0
+/**
+ * Done collecting egos
+ */
#define ID_REST_STATE_POST_INIT 1
-#define URL_PARAM_SUBSYS "service"
-
+/**
+ * Resource type
+ */
#define GNUNET_REST_JSONAPI_IDENTITY_EGO "ego"
-#define GNUNET_REST_JSONAPI_IDENTITY_KEY "key"
+/**
+ * Name attribute
+ */
+#define GNUNET_REST_JSONAPI_IDENTITY_NAME "name"
+
+/**
+ * Attribute to rename "name" TODO we changed id to the pubkey
+ * so this can be unified with "name"
+ */
+#define GNUNET_REST_JSONAPI_IDENTITY_NEWNAME "newname"
+/**
+ * URL parameter to change the subsytem for ego
+ */
#define GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM "subsystem"
+
+/**
+ * Error messages
+ */
+#define GNUNET_REST_ERROR_RESOURCE_INVALID "Resource location invalid"
+#define GNUNET_REST_ERROR_NO_DATA "No data"
+
+/**
+ * GNUid token lifetime
+ */
+#define GNUNET_GNUID_TOKEN_EXPIRATION_MICROSECONDS 300000000
+
+/**
+ * The configuration handle
+ */
+const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * HTTP methods allows for this plugin
+ */
+static char* allow_methods;
+
/**
* @brief struct returned by the initialization function of the plugin
*/
const struct GNUNET_CONFIGURATION_Handle *cfg;
};
-const struct GNUNET_CONFIGURATION_Handle *cfg;
-
+/**
+ * The ego list
+ */
struct EgoEntry
{
/**
* DLL
*/
struct EgoEntry *next;
-
+
/**
* DLL
*/
struct EgoEntry *prev;
-
+
/**
* Ego Identifier
*/
char *identifier;
-
+
/**
- * Ego Pkey
+ * Public key string
*/
- struct GNUNET_CRYPTO_EcdsaPublicKey pk;
+ char *keystring;
/**
* The Ego
struct GNUNET_IDENTITY_Ego *ego;
};
+
struct RequestHandle
{
/**
*/
struct EgoEntry *ego_tail;
+ /**
+ * 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;
-
- /**
- * The root of the received JSON or NULL
- */
- json_t *json_root;
+ struct GNUNET_SCHEDULER_Task * timeout_task;
/**
* The plugin result processor
*/
const char* method;
+ /**
+ * Error response message
+ */
+ char *emsg;
+
};
/**
* 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)
GNUNET_free (handle->subsys);
if (NULL != handle->url)
GNUNET_free (handle->url);
+ if (NULL != handle->emsg)
+ GNUNET_free (handle->emsg);
for (ego_entry = handle->ego_head;
NULL != ego_entry;)
{
ego_tmp = ego_entry;
ego_entry = ego_entry->next;
GNUNET_free (ego_tmp->identifier);
+ GNUNET_free (ego_tmp->keystring);
GNUNET_free (ego_tmp);
}
GNUNET_free (handle);
/**
- * 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 = GNUNET_REST_create_json_response (NULL);
- handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST);
+ struct MHD_Response *resp;
+ char *json_error;
+
+ GNUNET_asprintf (&json_error,
+ "{Error while processing request: %s}",
+ &handle->emsg);
+
+ resp = GNUNET_REST_create_json_response (json_error);
+ handle->proc (handle->proc_cls,
+ resp,
+ MHD_HTTP_BAD_REQUEST);
cleanup_handle (handle);
+ GNUNET_free (json_error);
}
+
/**
* Callback for IDENTITY_get()
*
* @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 GNUNET_JSONAPI_Object *json_object;
+ struct GNUNET_JSONAPI_Resource *json_resource;
struct EgoEntry *ego_entry;
struct MHD_Response *resp;
- json_t *key_json;
+ json_t *name_json;
char *result_str;
- char *keystring;
- json_object = GNUNET_REST_jsonapi_object_new ();
-
+ json_object = GNUNET_JSONAPI_object_new ();
+
for (ego_entry = handle->ego_head;
NULL != ego_entry;
ego_entry = ego_entry->next)
continue;
if (NULL == name)
continue;
- 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);
- 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);
+ json_resource = GNUNET_JSONAPI_resource_new
+ (GNUNET_REST_JSONAPI_IDENTITY_EGO, ego_entry->keystring);
+ name_json = json_string (ego_entry->identifier);
+ GNUNET_JSONAPI_resource_add_attr (json_resource,
+ GNUNET_REST_JSONAPI_IDENTITY_NAME,
+ name_json);
+ json_decref (name_json);
+ 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);
/**
* Create a response with requested ego(s)
*
- * @param handle the RequestHandle
+ * @param con the Rest handle
+ * @param url the requested url
+ * @param cls the request handle
*/
-void
+static void
ego_info_response (struct RestConnectionDataHandle *con,
const char *url,
void *cls)
{
const char *egoname;
- char *keystring;
char *result_str;
char *subsys_val;
+ 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;
- json_t *key_str;
+ struct GNUNET_JSONAPI_Object *json_object;
+ struct GNUNET_JSONAPI_Resource *json_resource;
+ json_t *name_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;
}
- if ( (strlen (EGO_NAMESPACE) == strlen (handle->url) )) {
- GNUNET_CRYPTO_hash (URL_PARAM_SUBSYS, strlen (URL_PARAM_SUBSYS), &key);
+ egoname = NULL;
+ keystring = NULL;
+ if (strlen (GNUNET_REST_API_NS_IDENTITY) < strlen (handle->url))
+ {
+ keystring = &handle->url[strlen (GNUNET_REST_API_NS_IDENTITY)+1];
+ //Return all egos
+ for (ego_entry = handle->ego_head;
+ NULL != ego_entry;
+ ego_entry = ego_entry->next)
+ {
+ if ( (NULL != keystring) && (0 != strcmp (keystring, ego_entry->keystring)) )
+ continue;
+ egoname = ego_entry->identifier;
+ }
+ }
+
+ if ( NULL == egoname ) {
+ 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_object = GNUNET_REST_jsonapi_object_new ();
- egoname = &handle->url[strlen (EGO_NAMESPACE)+1];
- if (strlen (EGO_NAMESPACE) == strlen (handle->url))
- {
- egoname = NULL;
- }
+ 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;
- keystring = GNUNET_CRYPTO_ecdsa_public_key_to_string (&ego_entry->pk);
- json_resource = GNUNET_REST_jsonapi_resource_new (GNUNET_REST_JSONAPI_IDENTITY_EGO, ego_entry->identifier);
- key_str = json_string (keystring);
- GNUNET_REST_jsonapi_resource_add_attr (json_resource,
- GNUNET_REST_JSONAPI_IDENTITY_KEY,
- key_str);
- json_decref (key_str);
- GNUNET_free (keystring);
- GNUNET_REST_jsonapi_object_resource_add (json_object, json_resource);
+ json_resource = GNUNET_JSONAPI_resource_new (GNUNET_REST_JSONAPI_IDENTITY_EGO,
+ ego_entry->keystring);
+ name_str = json_string (ego_entry->identifier);
+ GNUNET_JSONAPI_resource_add_attr (
+ json_resource,
+ GNUNET_REST_JSONAPI_IDENTITY_NAME,
+ name_str);
+ json_decref (name_str);
+ GNUNET_JSONAPI_object_resource_add (json_object, json_resource);
}
-
- GNUNET_REST_jsonapi_data_serialize (json_object, &result_str);
+ if (0 == GNUNET_JSONAPI_object_resource_count (json_object))
+ {
+ GNUNET_JSONAPI_object_delete (json_object);
+ handle->emsg = GNUNET_strdup ("No identities found!");
+ GNUNET_SCHEDULER_add_now (&do_error, handle);
+ return;
+ }
+ 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);
}
+/**
+ * Processing finished
+ *
+ * @param cls request handle
+ * @param emsg error message
+ */
static void
do_finished (void *cls, const char *emsg)
{
handle->op = NULL;
if (NULL != emsg)
{
+ handle->emsg = GNUNET_strdup (emsg);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
cleanup_handle (handle);
}
-static void
-set_finished (void *cls, const char *emsg)
-{
- struct RequestHandle *handle = cls;
- struct MHD_Response *resp;
-
- handle->op = NULL;
- if (NULL != emsg)
- {
- GNUNET_SCHEDULER_add_now (&do_error, handle);
- return;
- }
- resp = GNUNET_REST_create_json_response (NULL);
- handle->proc (handle->proc_cls, resp, MHD_HTTP_NO_CONTENT);
- cleanup_handle (handle);
-}
-
-static void
-create_finished (void *cls, const char *emsg)
-{
- struct RequestHandle *handle = cls;
- struct MHD_Response *resp;
-
- handle->op = NULL;
- if (NULL != emsg)
- {
- GNUNET_SCHEDULER_add_now (&do_error, handle);
- return;
- }
- resp = GNUNET_REST_create_json_response (NULL);
- handle->proc (handle->proc_cls, resp, MHD_HTTP_NO_CONTENT);
- cleanup_handle (handle);
-}
-
+/**
+ * Create a new ego
+ *
+ * @param con rest handle
+ * @param url url
+ * @param cls request handle
+ */
static void
ego_create_cont (struct RestConnectionDataHandle *con,
const char *url,
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;
- char term_data[handle->data_size+1];
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))
{
+ handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_RESOURCE_INVALID);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
if (0 >= handle->data_size)
{
+ handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_NO_DATA);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
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_KEY_ID);
+ 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))
{
- json_decref (egoname_json);
- 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);
- json_decref (egoname_json);
- GNUNET_REST_jsonapi_object_delete (json_obj);
+ GNUNET_JSONAPI_object_delete (json_obj);
handle->op = GNUNET_IDENTITY_create (handle->identity_handle,
handle->name,
- &create_finished,
+ &do_finished,
handle);
}
-void
-subsys_set_cont (struct RestConnectionDataHandle *con,
- const char *url,
- void *cls)
+
+/**
+ * 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)
{
- struct JsonApiObject *json_obj;
- struct JsonApiResource *json_res;
- const char *egoname;
- const char *subsys;
+ struct GNUNET_JSONAPI_Object *json_obj;
+ struct GNUNET_JSONAPI_Resource *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 *subsys_json;
-
- if (strlen (API_NAMESPACE) > strlen (handle->url))
+ json_t *name_json;
+ const char *keystring;
+ 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))
{
+ handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_RESOURCE_INVALID);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- egoname = &handle->url[strlen(EGO_NAMESPACE)+1];
+ keystring = &handle->url[strlen(GNUNET_REST_API_NS_IDENTITY)+1];
+
for (ego_entry = handle->ego_head;
NULL != ego_entry;
ego_entry = ego_entry->next)
{
- if (0 == strcasecmp (egoname, ego_entry->identifier))
- {
- ego_exists = GNUNET_YES;
- break;
- }
+ if (0 != strcasecmp (keystring, ego_entry->keystring))
+ continue;
+ ego_exists = GNUNET_YES;
+ break;
}
+
if (GNUNET_NO == ego_exists)
{
resp = GNUNET_REST_create_json_response (NULL);
if (0 >= handle->data_size)
{
+ handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_NO_DATA);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
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)
{
+ handle->emsg = GNUNET_strdup ("Data invalid");
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 ("Resource amount invalid");
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
+ json_res = GNUNET_JSONAPI_object_get_resource (json_obj, 0);
- json_res = GNUNET_REST_jsonapi_object_get_resource (json_obj, 0);
- if (GNUNET_NO == GNUNET_REST_jsonapi_resource_check_id (json_res, egoname))
+ 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;
}
-
- if (GNUNET_NO == GNUNET_REST_jsonapi_resource_check_id (json_res, GNUNET_REST_JSONAPI_IDENTITY_EGO))
+
+ //This is a rename
+ name_json = GNUNET_JSONAPI_resource_read_attr (json_res,
+ GNUNET_REST_JSONAPI_IDENTITY_NEWNAME);
+ if ((NULL != name_json) && json_is_string (name_json))
{
- GNUNET_REST_jsonapi_object_delete (json_obj);
- GNUNET_SCHEDULER_add_now (&do_error, handle);
+ newname = json_string_value (name_json);
+ for (ego_entry = handle->ego_head;
+ NULL != ego_entry;
+ ego_entry = ego_entry->next)
+ {
+ if (0 == strcasecmp (newname, ego_entry->identifier) &&
+ 0 != strcasecmp (keystring, ego_entry->keystring))
+ {
+ //Ego with same name not allowed
+ 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;
+ }
+ }
+ handle->op = GNUNET_IDENTITY_rename (handle->identity_handle,
+ ego_entry->identifier,
+ newname,
+ &do_finished,
+ handle);
+ GNUNET_JSONAPI_object_delete (json_obj);
return;
}
- subsys_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM);
- if (!json_is_string (subsys_json))
+ //Set subsystem
+ subsys_json = GNUNET_JSONAPI_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM);
+ if ( (NULL != subsys_json) && json_is_string (subsys_json))
{
- json_decref (subsys_json);
- GNUNET_REST_jsonapi_object_delete (json_obj);
- GNUNET_SCHEDULER_add_now (&do_error, handle);
+ subsys = json_string_value (subsys_json);
+ GNUNET_asprintf (&handle->subsys, "%s", subsys);
+ GNUNET_JSONAPI_object_delete (json_obj);
+ handle->op = GNUNET_IDENTITY_set (handle->identity_handle,
+ handle->subsys,
+ ego_entry->ego,
+ &do_finished,
+ handle);
return;
}
- subsys = json_string_value (subsys_json);
- GNUNET_asprintf (&handle->subsys, "%s", subsys);
- json_decref (subsys_json);
- GNUNET_REST_jsonapi_object_delete (json_obj);
- handle->op = GNUNET_IDENTITY_set (handle->identity_handle,
- handle->subsys,
- ego_entry->ego,
- &set_finished,
- handle);
+ 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)
{
- const char *egoname;
+ const char *keystring;
struct EgoEntry *ego_entry;
struct MHD_Response *resp;
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))
{
+ handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_RESOURCE_INVALID);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- egoname = &handle->url[strlen(API_NAMESPACE)+1];
+ keystring = &handle->url[strlen(GNUNET_REST_API_NS_IDENTITY)+1];
for (ego_entry = handle->ego_head;
NULL != ego_entry;
ego_entry = ego_entry->next)
{
- if (0 == strcasecmp (egoname, ego_entry->identifier))
- {
- ego_exists = GNUNET_YES;
- break;
- }
+ if (0 != strcasecmp (keystring, ego_entry->keystring))
+ continue;
+ ego_exists = GNUNET_YES;
+ break;
}
if (GNUNET_NO == ego_exists)
{
return;
}
handle->op = GNUNET_IDENTITY_delete (handle->identity_handle,
- egoname,
+ ego_entry->identifier,
&do_finished,
handle);
}
-void
+
+/**
+ * Respond to OPTIONS request
+ *
+ * @param con_handle the connection handle
+ * @param url the url
+ * @param cls the RequestHandle
+ */
+static void
+options_cont (struct RestConnectionDataHandle *con_handle,
+ const char* url,
+ void *cls)
+{
+ struct MHD_Response *resp;
+ struct RequestHandle *handle = cls;
+
+ //For now, independent of path return all options
+ resp = GNUNET_REST_create_json_response (NULL);
+ MHD_add_response_header (resp,
+ "Access-Control-Allow-Methods",
+ allow_methods);
+ handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
+ cleanup_handle (handle);
+ return;
+}
+
+/**
+ * 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},
+ {MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_IDENTITY, &options_cont},
GNUNET_REST_HANDLER_END
};
if (GNUNET_NO == GNUNET_REST_handle_request (handle->conndata_handle, handlers, handle))
+ {
+ handle->emsg = GNUNET_strdup ("Request unsupported");
GNUNET_SCHEDULER_add_now (&do_error, handle);
+ }
}
/**
{
struct RequestHandle *handle = cls;
struct EgoEntry *ego_entry;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pk;
if ((NULL == ego) && (ID_REST_STATE_INIT == handle->state))
{
}
if (ID_REST_STATE_INIT == handle->state) {
ego_entry = GNUNET_new (struct EgoEntry);
- GNUNET_IDENTITY_ego_get_public_key (ego, &(ego_entry->pk));
+ GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
+ ego_entry->keystring =
+ GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
ego_entry->ego = ego;
GNUNET_asprintf (&ego_entry->identifier, "%s", identifier);
GNUNET_CONTAINER_DLL_insert_tail(handle->ego_head,handle->ego_tail, ego_entry);
* @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)
"Connecting...\n");
handle->identity_handle = GNUNET_IDENTITY_connect (cfg,
&list_ego,
- handle);
+ handle);
handle->timeout_task =
GNUNET_SCHEDULER_add_delayed (handle->timeout,
&do_error,
libgnunet_plugin_rest_identity_init (void *cls)
{
static struct Plugin plugin;
- cfg = cls;
struct GNUNET_REST_Plugin *api;
+ cfg = cls;
if (NULL != plugin.cfg)
return NULL; /* can only initialize once! */
memset (&plugin, 0, sizeof (struct Plugin));
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_asprintf (&allow_methods,
+ "%s, %s, %s, %s, %s",
+ MHD_HTTP_METHOD_GET,
+ MHD_HTTP_METHOD_POST,
+ MHD_HTTP_METHOD_PUT,
+ MHD_HTTP_METHOD_DELETE,
+ MHD_HTTP_METHOD_OPTIONS);
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Identity REST API initialized\n"));
return api;
struct Plugin *plugin = api->cls;
plugin->cfg = NULL;
+ GNUNET_free_non_null (allow_methods);
GNUNET_free (api);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Identity REST plugin is finished\n");
projects / oweals / gnunet.git / blobdiff