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 "platform.h"
#include "gnunet_rest_plugin.h"
#include "gnunet_identity_service.h"
+#include "gnunet_rest_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"
+
+/**
+ * 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"
+
+
+/**
+ * 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
+ */
+#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_SECONDS 360
-#define JSON_API_TYPE_EGO "ego"
+/**
+ * The configuration handle
+ */
+const struct GNUNET_CONFIGURATION_Handle *cfg;
-#define JSON_API_TYPE_DATA "data"
+/**
+ * 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
{
/**
* 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;
/**
*/
struct GNUNET_SCHEDULER_Task * timeout_task;
- /**
- * The root of the received JSON or NULL
- */
- json_t *json_root;
-
/**
* 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);
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct RequestHandle *handle = cls;
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
+ 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);
}
-void
+/**
+ * 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;
+ char *header_str;
+ char *payload_str;
+ char *header_base64;
+ char *payload_base64;
+ char *sig_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;
+ 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, "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_SECONDS));
+ 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);
+ json_decref (header);
+ json_decref (payload);
+}
+
+/**
+ * Callback for IDENTITY_get()
+ *
+ * @param cls the RequestHandle
+ * @param ego the Ego found
+ * @param ctx the context
+ * @param name the id of the ego
+ */
+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 *name_json;
char *result_str;
- char *keystring;
- json_t *ego_json;
- json_t *root_json;
- root_json = json_object ();
+ json_object = GNUNET_REST_jsonapi_object_new ();
- //Return all egos
for (ego_entry = handle->ego_head;
NULL != ego_entry;
ego_entry = ego_entry->next)
continue;
if (NULL == name)
continue;
- ego_json = json_object ();
- 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 (JSON_API_TYPE_EGO));
- json_object_set_new (ego_json, "key", json_string (keystring));
- GNUNET_free (keystring);
+ json_resource = GNUNET_REST_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_REST_JSONAPI_IDENTITY_NAME,
+ name_json);
+ json_decref (name_json);
+ 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);
+ handle->emsg = GNUNET_strdup("No identity matches results!");
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- json_object_set (root_json, JSON_API_TYPE_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);
- handle->proc (handle->proc_cls, result_str, strlen (result_str), GNUNET_OK);
+ 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);
}
-int
-check_namespace (const char *url, const char *ns)
-{
- if (0 != strncmp (EGO_NAMESPACE, url, strlen (EGO_NAMESPACE)))
- {
- return GNUNET_NO;
- }
-
- if ((strlen (EGO_NAMESPACE) < strlen (url)) &&
- (url[strlen (EGO_NAMESPACE)] != '/'))
- {
- return GNUNET_NO;
- }
- return GNUNET_YES;
-
-
-}
-
-void
-ego_info_response (struct RequestHandle *handle)
+/**
+ * Create a response with requested ego(s)
+ *
+ * @param con the Rest handle
+ * @param url the requested url
+ * @param cls the request handle
+ */
+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 *create_token_for;
+ char *token;
+ char *keystring;
+ struct RequestHandle *handle = cls;
struct EgoEntry *ego_entry;
struct GNUNET_HashCode key;
- json_t *ego_arr;
- json_t *ego_json;
- json_t *root_json;
+ struct MHD_Response *resp;
+ struct JsonApiObject *json_object;
+ struct JsonApiResource *json_resource;
+ json_t *name_str;
+ json_t *token_str;
- if (GNUNET_NO == check_namespace (handle->url, EGO_NAMESPACE))
+ if (GNUNET_NO == GNUNET_REST_namespace_match (handle->url, GNUNET_REST_API_NS_IDENTITY))
{
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
+ 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) )
}
}
}
- ego_arr = json_array ();
- root_json = json_object ();
- egoname = &handle->url[strlen (EGO_NAMESPACE)+1];
- if (strlen (EGO_NAMESPACE) == strlen (handle->url))
- {
- egoname = NULL;
- }
+ 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 ();
//Return all egos
for (ego_entry = handle->ego_head;
{
if ( (NULL != egoname) && (0 != strcmp (egoname, ego_entry->identifier)) )
continue;
- ego_json = json_object ();
- 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, "key", json_string (keystring));
- json_object_set_new (ego_json, "type", json_string (JSON_API_TYPE_EGO));
- GNUNET_free (keystring);
- if (NULL == egoname)
+ json_resource = GNUNET_REST_jsonapi_resource_new (GNUNET_REST_JSONAPI_IDENTITY_EGO,
+ ego_entry->keystring);
+ name_str = json_string (ego_entry->identifier);
+ GNUNET_REST_jsonapi_resource_add_attr (
+ json_resource,
+ GNUNET_REST_JSONAPI_IDENTITY_NAME,
+ name_str);
+ json_decref (name_str);
+ if (NULL != create_token_for)
{
- GNUNET_break (0);
- json_array_append (ego_arr, ego_json);
- json_decref (ego_json);
+ 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);
}
- else
- break;
+ GNUNET_REST_jsonapi_object_resource_add (json_object, json_resource);
}
- GNUNET_break (0);
- if (NULL == egoname)
- json_object_set (root_json, JSON_API_TYPE_DATA, ego_arr);
- else
- json_object_set (root_json, JSON_API_TYPE_DATA, ego_json);
-
- result_str = json_dumps (root_json, JSON_COMPACT);
- json_decref (ego_arr);
- if (NULL != egoname)
- json_decref (ego_json);
-
+ if (0 == GNUNET_REST_jsonapi_object_resource_count (json_object))
+ {
+ GNUNET_REST_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_log (GNUNET_ERROR_TYPE_DEBUG, "Result %s\n", result_str);
- handle->proc (handle->proc_cls, result_str, strlen (result_str), MHD_HTTP_OK);
+ 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);
-
}
+/**
+ * Processing finished
+ *
+ * @param cls request handle
+ * @param emsg error message
+ */
static void
do_finished (void *cls, const char *emsg)
{
struct RequestHandle *handle = cls;
+ struct MHD_Response *resp;
handle->op = NULL;
if (NULL != emsg)
{
+ handle->emsg = GNUNET_strdup (emsg);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_OK);
+ 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
-set_finished (void *cls, const char *emsg)
+ego_create_cont (struct RestConnectionDataHandle *con,
+ const char *url,
+ void *cls)
{
struct RequestHandle *handle = cls;
+ struct EgoEntry *ego_entry;
+ struct MHD_Response *resp;
+ struct JsonApiObject *json_obj;
+ struct JsonApiResource *json_res;
+ json_t *egoname_json;
+ const char* egoname;
+ char term_data[handle->data_size+1];
- handle->op = NULL;
- if (NULL != emsg)
+ 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;
}
- handle->proc (handle->proc_cls, NULL, 0, MHD_HTTP_NO_CONTENT);
- cleanup_handle (handle);
-}
-
-static void
-create_finished (void *cls, const char *emsg)
-{
- struct RequestHandle *handle = cls;
-
- handle->op = NULL;
- if (NULL != emsg)
+ if (0 >= handle->data_size)
{
+ handle->emsg = GNUNET_strdup (GNUNET_REST_ERROR_NO_DATA);
GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- handle->proc (handle->proc_cls, NULL, 0, MHD_HTTP_NO_CONTENT);
- cleanup_handle (handle);
-}
-
-static void
-ego_create_cont (struct RequestHandle *handle)
-{
- const char* egoname;
- char term_data[handle->data_size+1];
- json_t *egoname_json;
- json_t *root_json;
- json_error_t error;
- struct EgoEntry *ego_entry;
-
- if (strlen (API_NAMESPACE) != strlen (handle->url))
+ term_data[handle->data_size] = '\0';
+ memcpy (term_data, handle->data, handle->data_size);
+ json_obj = GNUNET_REST_jsonapi_object_parse (term_data);
+ if (NULL == json_obj)
{
- GNUNET_break(0);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
- if (0 >= handle->data_size)
+ if (1 != GNUNET_REST_jsonapi_object_resource_count (json_obj))
{
- GNUNET_break(0);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
+ handle->emsg = GNUNET_strdup ("Provided resource count invalid");
+ 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_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))
{
- GNUNET_break(0);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
+ 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;
}
- egoname_json = json_object_get (root_json, "ego");
+ egoname_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_NAME);
if (!json_is_string (egoname_json))
{
- GNUNET_break(0);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
+ handle->emsg = GNUNET_strdup ("No name provided");
+ GNUNET_SCHEDULER_add_now (&do_error, handle);
return;
}
egoname = json_string_value (egoname_json);
{
if (0 == strcasecmp (egoname, ego_entry->identifier))
{
- json_decref (egoname_json);
- json_decref (root_json);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
+ 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;
}
}
GNUNET_asprintf (&handle->name, "%s", egoname);
- json_decref (egoname_json);
- json_decref (root_json);
+ GNUNET_REST_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 RequestHandle *handle)
+
+/**
+ * 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;
+ struct JsonApiObject *json_obj;
+ struct JsonApiResource *json_res;
+ struct RequestHandle *handle = cls;
+ struct EgoEntry *ego_entry;
+ struct MHD_Response *resp;
+ json_t *subsys_json;
+ json_t *name_json;
+ const char *keystring;
const char *subsys;
+ const char *newname;
char term_data[handle->data_size+1];
- struct EgoEntry *ego_entry;
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))
+ if (strlen (GNUNET_REST_API_NS_IDENTITY) > strlen (handle->url))
{
- GNUNET_break(0);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ 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)
{
- GNUNET_break(0);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
+ resp = GNUNET_REST_create_json_response (NULL);
+ handle->proc (handle->proc_cls, resp, MHD_HTTP_NOT_FOUND);
cleanup_handle (handle);
return;
}
if (0 >= handle->data_size)
{
- GNUNET_break(0);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ 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);
- 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)
{
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ handle->emsg = GNUNET_strdup ("Data invalid");
+ 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);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
+ handle->emsg = GNUNET_strdup ("Resource amount invalid");
+ 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);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ GNUNET_REST_jsonapi_object_delete (json_obj);
+ handle->emsg = GNUNET_strdup ("Resource type invalid");
+ 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 (JSON_API_TYPE_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_is_string (name_json))
{
- json_decref (root_json);
- json_decref (data_json);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
- GNUNET_break (0);
+ 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_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;
+ }
+ }
+ handle->op = GNUNET_IDENTITY_rename (handle->identity_handle,
+ ego_entry->identifier,
+ newname,
+ &do_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))
+ //Set subsystem
+ subsys_json = GNUNET_REST_jsonapi_resource_read_attr (json_res, GNUNET_REST_JSONAPI_IDENTITY_SUBSYSTEM);
+ if ( (NULL != subsys_json) && json_is_string (subsys_json))
{
- json_decref (root_json);
- json_decref (data_json);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ 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,
+ &do_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);
+ handle->emsg = GNUNET_strdup ("Subsystem not provided");
+ GNUNET_SCHEDULER_add_now (&do_error, handle);
}
void
-ego_delete_cont (struct RequestHandle *handle)
+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))
{
- GNUNET_break(0);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
- cleanup_handle (handle);
+ 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)
{
- GNUNET_break(0);
- handle->proc (handle->proc_cls, NULL, 0, GNUNET_SYSERR);
+ resp = GNUNET_REST_create_json_response (NULL);
+ handle->proc (handle->proc_cls, resp, MHD_HTTP_NOT_FOUND);
cleanup_handle (handle);
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)
{
- if (0 == strcasecmp (handle->method, MHD_HTTP_METHOD_GET))
- ego_info_response (handle);
- else if (0 == strcasecmp (handle->method, MHD_HTTP_METHOD_POST))
- ego_create_cont (handle);
- else if (0 == strcasecmp (handle->method, MHD_HTTP_METHOD_PUT))
- subsys_set_cont (handle);
- else if (0 == strcasecmp (handle->method, MHD_HTTP_METHOD_DELETE))
- ego_delete_cont (handle);
- else
+ static const struct GNUNET_REST_RestConnectionHandler handlers[] = {
+ {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);
+ GNUNET_strdup ("Timeout");
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