/*
This file is part of GNUnet
- Copyright (C) 2010-2015 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-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.
*/
/**
#include "gnunet_util_lib.h"
#include "gnunet_rest_lib.h"
#include "microhttpd.h"
-#include <jansson.h>
-
-
-struct JsonApiResource
-{
- /**
- * DLL
- */
- struct JsonApiResource *next;
-
- /**
- * DLL
- */
- struct JsonApiResource *prev;
-
- /**
- * Resource content
- */
- json_t *res_obj;
-};
-
-
-struct JsonApiObject
-{
- /**
- * DLL Resource
- */
- struct JsonApiResource *res_list_head;
-
- /**
- * DLL Resource
- */
- struct JsonApiResource *res_list_tail;
-
- /**
- * num resources
- */
- int res_count;
-};
-
-
-/**
- * JSON API
- */
-
-/**
- * Create a JSON API resource
- *
- * @param type the JSON API resource type
- * @param id the JSON API resource id
- * @return a new JSON API resource or NULL on error.
- */
-struct JsonApiResource*
-GNUNET_REST_jsonapi_resource_new (const char *type, const char *id)
-{
- struct JsonApiResource *res;
-
- if ( (NULL == type) || (0 == strlen (type)) )
- return NULL;
- if ( (NULL == id) || (0 == strlen (id)) )
- return NULL;
-
- res = GNUNET_new (struct JsonApiResource);
- res->prev = NULL;
- res->next = NULL;
-
- res->res_obj = json_object ();
-
- json_object_set_new (res->res_obj, GNUNET_REST_JSONAPI_KEY_ID, json_string (id));
- json_object_set_new (res->res_obj, GNUNET_REST_JSONAPI_KEY_TYPE, json_string (type));
-
- return res;
-}
-
-/**
- * Delete a JSON API resource
- *
- * @param res the JSON resource
- * @param result Pointer where the resource should be stored
- */
-void
-GNUNET_REST_jsonapi_resource_delete (struct JsonApiResource *resource)
-{
- json_decref (resource->res_obj);
- GNUNET_free (resource);
-}
-
-/**
- * Add a JSON API attribute
- *
- * @param res the JSON resource
- * @param key the key for the attribute
- * @param json the json_t attribute to add
- * @return #GNUNET_OK if added successfully
- * #GNUNET_SYSERR if not
- */
-int
-GNUNET_REST_jsonapi_resource_add_attr (const struct JsonApiResource *resource,
- const char* key,
- json_t *json)
-{
- if ( (NULL == resource) ||
- (NULL == key) ||
- (NULL == json) )
- return GNUNET_SYSERR;
- json_object_set (resource->res_obj, key, json);
- return GNUNET_OK;
-}
-
-/**
- * Read a JSON API attribute
- *
- * @param res the JSON resource
- * @param key the key for the attribute
- * @return the json_t object
- */
-json_t*
-GNUNET_REST_jsonapi_resource_read_attr (const struct JsonApiResource *resource,
- const char* key)
-{
- if ( (NULL == resource) ||
- (NULL == key))
- return NULL;
- return json_object_get (resource->res_obj, key);
-}
-
-int
-check_resource_attr_str (const struct JsonApiResource *resource,
- const char* key,
- const char* attr)
-{
- json_t *value;
- if ( (NULL == resource) ||
- (NULL == key) ||
- (NULL == attr))
- return GNUNET_NO;
- value = json_object_get (resource->res_obj, key);
- if (NULL == value)
- return GNUNET_NO;
- if (!json_is_string (value) ||
- (0 != strcmp (attr, json_string_value(value))))
- {
- return GNUNET_NO;
- }
- return GNUNET_YES;
-}
-
-/**
- * Check a JSON API resource id
- *
- * @param res the JSON resource
- * @param id the expected id
- * @return GNUNET_YES if id matches
- */
-int
-GNUNET_REST_jsonapi_resource_check_id (const struct JsonApiResource *resource,
- const char* id)
-{
- return check_resource_attr_str (resource, GNUNET_REST_JSONAPI_KEY_ID, id);
-}
-
-
-/**
- * Check a JSON API resource type
- *
- * @param res the JSON resource
- * @param type the expected type
- * @return GNUNET_YES if id matches
- */
-int
-GNUNET_REST_jsonapi_resource_check_type (const struct JsonApiResource *resource,
- const char* type)
-{
- return check_resource_attr_str (resource, GNUNET_REST_JSONAPI_KEY_TYPE, type);
-}
-
-
-/**
- * Create a JSON API primary data
- *
- * @return a new JSON API resource or NULL on error.
- */
-struct JsonApiObject*
-GNUNET_REST_jsonapi_object_new ()
-{
- struct JsonApiObject *result;
-
- result = GNUNET_new (struct JsonApiObject);
- result->res_count = 0;
- return result;
-}
-
-
-static void
-add_json_resource (struct JsonApiObject *obj,
- const json_t *res_json)
-{
- struct JsonApiResource *res;
- json_t *type_json;
- json_t *id_json;
-
- id_json = json_object_get (res_json, GNUNET_REST_JSONAPI_KEY_ID);
- type_json = json_object_get (res_json, GNUNET_REST_JSONAPI_KEY_TYPE);
- if (!json_is_string (id_json) || !json_is_string (type_json))
- return;
- res = GNUNET_new (struct JsonApiResource);
- res->next = NULL;
- res->prev = NULL;
- res->res_obj = json_deep_copy (res_json);
- GNUNET_REST_jsonapi_object_resource_add (obj, res);
-}
-
-/**
- * Create a JSON API primary data from a string
- *
- * @param data the string of the JSON API data
- * @return a new JSON API resource or NULL on error.
- */
-struct JsonApiObject*
-GNUNET_REST_jsonapi_object_parse (const char* data)
-{
- struct JsonApiObject *result;
- json_t *root_json;
- json_t *data_json;
- json_error_t error;
- int res_count = 0;
- int i;
- if (NULL == data)
- return NULL;
- root_json = json_loads (data, 0, &error);
-
- if ( (NULL == root_json) || !json_is_object (root_json))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "json error: %s", error.text);
- return NULL;
- }
- data_json = json_object_get (root_json, GNUNET_REST_JSONAPI_KEY_DATA);
- if (NULL == data_json)
- {
- json_decref (root_json);
- return NULL;
- }
-
- result = GNUNET_new (struct JsonApiObject);
- result->res_count = 0;
- if (json_is_object (data_json))
- add_json_resource (result, data_json);
- else if (json_is_array (data_json))
- {
- res_count = json_array_size (data_json);
- for (i = 0; i < res_count; i++)
- add_json_resource (result, json_array_get (data_json, i));
- }
- json_decref (root_json);
- if (0 == result->res_count)
- {
- GNUNET_free (result);
- result = NULL;
- }
- return result;
-}
-
-
-/**
- * Delete a JSON API primary data
- *
- * @param type the JSON API resource type
- * @param id the JSON API resource id
- * @return a new JSON API resource or NULL on error.
- */
-void
-GNUNET_REST_jsonapi_object_delete (struct JsonApiObject *resp)
-{
- struct JsonApiResource *res;
- struct JsonApiResource *res_next;
-
- for (res = resp->res_list_head;
- res != NULL;)
- {
- GNUNET_CONTAINER_DLL_remove (resp->res_list_head,
- resp->res_list_tail,
- res);
- res_next = res->next;
- GNUNET_REST_jsonapi_resource_delete (res);
- res = res_next;
- }
- GNUNET_free (resp);
-}
-
-/**
- * Add a JSON API object to primary data
- *
- * @param data The JSON API data to add to
- * @param res the JSON API resource to add
- * @return the new number of resources
- */
-void
-GNUNET_REST_jsonapi_object_resource_add (struct JsonApiObject *resp,
- struct JsonApiResource *res)
-{
- GNUNET_CONTAINER_DLL_insert (resp->res_list_head,
- resp->res_list_tail,
- res);
-
- resp->res_count++;
-}
-
-
-/**
- * Get a JSON API object resource count
- *
- * @param resp the JSON API object
- * @return the number of resources
- */
-int
-GNUNET_REST_jsonapi_object_resource_count (struct JsonApiObject *resp)
-{
- return resp->res_count;
-}
-
-/**
- * Get a JSON API object resource num
- *
- * @param resp the JSON API object
- * @param num the number of the resource
- * @return the resource
- */
-struct JsonApiResource*
-GNUNET_REST_jsonapi_object_get_resource (struct JsonApiObject *resp, int num)
-{
- struct JsonApiResource *res;
- int i;
-
- if ((0 == resp->res_count) ||
- (num >= resp->res_count))
- return NULL;
- res = resp->res_list_head;
- for (i = 0; i < num; i++)
- {
- res = res->next;
- }
- return res;
-}
-
-
-/**
- * Add a JSON API resource to primary data
- *
- * @param data The JSON API data to add to
- * @param res the JSON API resource to add
- * @return the new number of resources
- */
-void
-GNUNET_REST_jsonapi_data_resource_remove (struct JsonApiObject *resp,
- struct JsonApiResource *res)
-{
- GNUNET_CONTAINER_DLL_remove (resp->res_list_head,
- resp->res_list_tail,
- res);
- resp->res_count--;
-}
-
-/**
- * String serialze jsonapi primary data
- *
- * @param data the JSON API primary data
- * @param result where to store the result
- * @return GNUNET_SYSERR on error else GNUNET_OK
- */
-int
-GNUNET_REST_jsonapi_data_serialize (const struct JsonApiObject *resp,
- char **result)
-{
- struct JsonApiResource *res;
- json_t *root_json;
- json_t *res_arr;
-
- if ( (NULL == resp) ||
- (0 == resp->res_count) )
- return GNUNET_SYSERR;
-
- root_json = json_object ();
- if (1 == resp->res_count)
- {
- json_object_set (root_json, GNUNET_REST_JSONAPI_KEY_DATA, resp->res_list_head->res_obj);
- }
- else
- {
- res_arr = json_array ();
- for (res = resp->res_list_head;
- res != NULL;
- res = res->next)
- {
- json_array_append (res_arr, res->res_obj);
- }
- json_object_set (root_json, GNUNET_REST_JSONAPI_KEY_DATA, res_arr);
- }
- *result = json_dumps (root_json, JSON_INDENT(2));
- return GNUNET_OK;
-}
/**
* REST Utilities
*/
-/**
- * Check if namespace is in URL.
- *
- * @param url URL to check
- * @param namespace namespace to check against
- * @retun GNUNET_YES if namespace matches
- */
+ /**
+ * Check if namespace is in URL.
+ *
+ * @param url URL to check
+ * @param namespace namespace to check against
+ * @retun GNUNET_YES if namespace matches
+ */
int
GNUNET_REST_namespace_match (const char *url, const char *namespace)
{
- if (0 != strncmp (namespace, url, strlen (namespace)))
- return GNUNET_NO;
-
- if ((strlen (namespace) < strlen (url)) &&
- (url[strlen (namespace)] != '/'))
- return GNUNET_NO;
-
- return GNUNET_YES;
+ return 0 == strncmp (namespace, url, strlen (namespace));
}
/**
- * Create JSON API MHD response
+ * Create MHD response
*
- * @param data JSON result
+ * @param data result
* @retun MHD response
*/
struct MHD_Response*
-GNUNET_REST_create_json_response (const char *data)
+GNUNET_REST_create_response (const char *data)
{
struct MHD_Response *resp;
size_t len;
resp = MHD_create_response_from_buffer (len,
(void*)data,
MHD_RESPMEM_MUST_COPY);
- MHD_add_response_header (resp,MHD_HTTP_HEADER_CONTENT_TYPE,"application/json");
return resp;
}
int
-GNUNET_REST_handle_request (struct RestConnectionDataHandle *conn,
- const struct GNUNET_REST_RestConnectionHandler *handlers,
+GNUNET_REST_handle_request (struct GNUNET_REST_RequestHandle *conn,
+ const struct GNUNET_REST_RequestHandler *handlers,
+ struct GNUNET_REST_RequestHandlerError *err,
void *cls)
{
int count;
return GNUNET_YES;
}
GNUNET_free (url);
+ err->error_code = MHD_HTTP_BAD_REQUEST;
return GNUNET_NO;
}
projects / oweals / gnunet.git / blobdiff