9 files changed, 122 insertions, 82 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8e3d02993..ea3852cec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,7 +65,6 @@ SUBDIRS = \
   peerinfo \
   $(MYSQL_DIR) \
   $(POSTGRES_DIR) \
-  $(REST_DIR) \
   datacache \
   datastore \
   template \
@@ -99,6 +98,7 @@ SUBDIRS = \
   fs \
   exit \
   pt \
+  $(REST_DIR) \
   integration-tests \
   $(EXP_DIR)
 
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index d4c65031e..728b5636c 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -85,27 +85,11 @@ bin_PROGRAMS += gnunet-bcd
 endif
 endif
 
-if HAVE_REST
-REST_PLUGIN = libgnunet_plugin_rest_gns.la
-endif
-
 bin_SCRIPTS = gnunet-gns-proxy-setup-ca
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_block_gns.la \
-  libgnunet_plugin_gnsrecord_gns.la \
-  $(REST_PLUGIN)
-
-libgnunet_plugin_rest_gns_la_SOURCES = \
-  plugin_rest_gns.c
-libgnunet_plugin_rest_gns_la_LIBADD = \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-        $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_gns_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
+  libgnunet_plugin_gnsrecord_gns.la
 
 libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
   plugin_gnsrecord_gns.c
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index af4ad5821..f1f0c3851 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -19,39 +19,9 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   identity.conf
 
-if HAVE_REST
-REST_PLUGIN = libgnunet_plugin_rest_identity.la
-plugin_LTLIBRARIES = ${REST_PLUGIN}
-endif
-
 lib_LTLIBRARIES = \
-        libgnunetidentity.la 
-
-if HAVE_REST
-plugin_LTLIBRARIES += \
-  libgnunet_plugin_gnsrecord_identity.la
-
-
-libgnunet_plugin_gnsrecord_identity_la_SOURCES = \
-  plugin_gnsrecord_identity.c
-libgnunet_plugin_gnsrecord_identity_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_identity_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-libgnunet_plugin_rest_identity_la_SOURCES = \
-  plugin_rest_identity.c
-libgnunet_plugin_rest_identity_la_LIBADD = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-        $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_identity_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
+        libgnunetidentity.la \
+        libgnunet_plugin_gnsrecord_identity.la
 
 libgnunetidentity_la_SOURCES = \
   identity_api.c \
@@ -69,10 +39,12 @@ bin_PROGRAMS = \
 
 libexec_PROGRAMS = \
  gnunet-service-identity 
+
 if HAVE_REST
 bin_PROGRAMS += \
                                                                 gnunet-identity-token
 endif
+
 gnunet_service_identity_SOURCES = \
  gnunet-service-identity.c         
 gnunet_service_identity_LDADD = \
@@ -80,6 +52,15 @@ gnunet_service_identity_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
+libgnunet_plugin_gnsrecord_identity_la_SOURCES = \
+  plugin_gnsrecord_identity.c
+libgnunet_plugin_gnsrecord_identity_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_gnsrecord_identity_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
 gnunet_identity_SOURCES = \
  gnunet-identity.c         
 gnunet_identity_LDADD = \
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 221e88a91..8ebcac0a1 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -106,21 +106,6 @@ libexec_PROGRAMS += \
  gnunet-namestore-fcfsd
 endif
 
-if HAVE_REST
-REST_PLUGIN = libgnunet_plugin_rest_namestore.la
-endif
-
-libgnunet_plugin_rest_namestore_la_SOURCES = \
-  plugin_rest_namestore.c
-libgnunet_plugin_rest_namestore_la_LIBADD = \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-        $(top_builddir)/src/identity/libgnunetidentity.la \
-        $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_namestore_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
 
 gnunet_namestore_SOURCES = \
  gnunet-namestore.c
@@ -158,8 +143,7 @@ gnunet_service_namestore_LDADD = \
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
   $(POSTGRES_PLUGIN) \
-        $(FLAT_PLUGIN) \
-        $(REST_PLUGIN)
+        $(FLAT_PLUGIN)
 
 libgnunet_plugin_namestore_flat_la_SOURCES = \
   plugin_namestore_flat.c
diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am
index 8ea87fc6a..cd429abc1 100644
--- a/src/rest/Makefile.am
+++ b/src/rest/Makefile.am
@@ -20,12 +20,18 @@ if USE_COVERAGE
   XLIBS = -lgcov
 endif
 
+REST_PLUGINS = libgnunet_plugin_rest_gns.la \
+                                                         libgnunet_plugin_rest_identity.la \
+                                                         libgnunet_plugin_rest_namestore.la
+
 lib_LTLIBRARIES = \
-        libgnunetrest.la
+        libgnunetrest.la \
+        $(REST_PLUGINS)
 
 libexec_PROGRAMS = \
  gnunet-rest-server
 
+
 gnunet_rest_server_SOURCES = \
  gnunet-rest-server.c
 
@@ -41,3 +47,34 @@ libgnunetrest_la_LIBADD = \
 libgnunetrest_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0
+
+libgnunet_plugin_rest_gns_la_SOURCES = \
+  plugin_rest_gns.c
+libgnunet_plugin_rest_gns_la_LIBADD = \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_gns_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+libgnunet_plugin_rest_identity_la_SOURCES = \
+  plugin_rest_namestore.c
+libgnunet_plugin_rest_identity_la_LIBADD = \
+        $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_identity_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+libgnunet_plugin_rest_namestore_la_SOURCES = \
+  plugin_rest_namestore.c
+libgnunet_plugin_rest_namestore_la_LIBADD = \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+        $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_namestore_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
diff --git a/src/gns/plugin_rest_gns.c b/src/rest/plugin_rest_gns.c
index 3ebbfb925..3ebbfb925 100644
--- a/src/gns/plugin_rest_gns.c
+++ b/src/rest/plugin_rest_gns.c
diff --git a/src/identity/plugin_rest_identity.c b/src/rest/plugin_rest_identity.c
index 870ed3446..e5abe00ee 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/rest/plugin_rest_identity.c
@@ -89,7 +89,7 @@
 /**
  * GNUid token lifetime
  */
-#define GNUNET_GNUID_TOKEN_EXPIRATION_SECONDS 360
+#define GNUNET_GNUID_TOKEN_EXPIRATION_MICROSECONDS 300000000
 
 /**
  * The configuration handle
@@ -307,11 +307,13 @@ make_gnuid_token (struct RequestHandle *handle,
                   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;
@@ -319,16 +321,20 @@ make_gnuid_token (struct RequestHandle *handle,
   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_SECONDS));
+  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,
@@ -370,6 +376,7 @@ make_gnuid_token (struct RequestHandle *handle,
   GNUNET_free (payload_str);
   GNUNET_free (payload_base64);
   GNUNET_free (purpose);
+  GNUNET_free (lbl_str);
   json_decref (header);
   json_decref (payload);
 }
diff --git a/src/namestore/plugin_rest_namestore.c b/src/rest/plugin_rest_namestore.c
index 9b6b5c57c..5ece83064 100644
--- a/src/namestore/plugin_rest_namestore.c
+++ b/src/rest/plugin_rest_namestore.c
@@ -60,6 +60,12 @@ struct Plugin
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 };
 
+
+/**
+ * HTTP methods allows for this plugin
+ */
+static char* allow_methods;
+
 const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 struct RecordEntry
@@ -409,13 +415,16 @@ namestore_list_response (void *cls,
     json_array_append (result_array, record_obj);
     json_decref (record_obj);
   }
-
-  json_resource = GNUNET_REST_jsonapi_resource_new (GNUNET_REST_JSONAPI_NAMESTORE_TYPEINFO,
-                                                    rname);
-  GNUNET_REST_jsonapi_resource_add_attr (json_resource,
-                                         GNUNET_REST_JSONAPI_NAMESTORE_RECORD,
-                                         result_array);
-  GNUNET_REST_jsonapi_object_resource_add (handle->resp_object, json_resource);
+  
+  if (0 < json_array_size(result_array))
+  {
+    json_resource = GNUNET_REST_jsonapi_resource_new (GNUNET_REST_JSONAPI_NAMESTORE_TYPEINFO,
+                                                      rname);
+    GNUNET_REST_jsonapi_resource_add_attr (json_resource,
+                                           GNUNET_REST_JSONAPI_NAMESTORE_RECORD,
+                                           result_array);
+    GNUNET_REST_jsonapi_object_resource_add (handle->resp_object, json_resource);
+  }
 
   json_decref (result_array);
   GNUNET_NAMESTORE_zone_iterator_next (handle->list_it);
@@ -789,6 +798,31 @@ get_name_from_url (const char* url)
 }
 
 /**
+ * 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;
+}
+
+/**
  * Function called with the result from the check if the namestore
  * service is actually running.  If it is, we start the actual
  * operation.
@@ -806,6 +840,7 @@ testservice_task (void *cls,
     {MHD_HTTP_METHOD_POST, GNUNET_REST_API_NS_NAMESTORE, &namestore_create_cont}, //create
     //    {MHD_HTTP_METHOD_PUT, GNUNET_REST_API_NS_NAMESTORE, &namestore_edit_cont}, //update. TODO this shoul be PATCH
     {MHD_HTTP_METHOD_DELETE, GNUNET_REST_API_NS_NAMESTORE, &namestore_delete_cont}, //delete
+    {MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_NAMESTORE, &options_cont},
     GNUNET_REST_HANDLER_END
   };
 
@@ -935,7 +970,7 @@ testservice_id_task (void *cls, int result)
                                              &key);
   }
 
-  type = GNUNET_GNSRECORD_TYPE_ANY;
+  handle->type = GNUNET_GNSRECORD_TYPE_ANY;
   GNUNET_CRYPTO_hash (GNUNET_REST_JSONAPI_NAMESTORE_RECORD_TYPE,
                       strlen (GNUNET_REST_JSONAPI_NAMESTORE_RECORD_TYPE),
                       &key);
@@ -945,8 +980,9 @@ testservice_id_task (void *cls, int result)
   {
     type = GNUNET_CONTAINER_multihashmap_get (handle->conndata_handle->url_param_map,
                                               &key);
+
+    handle->type = GNUNET_GNSRECORD_typename_to_number (type);
   }
-  handle->type = GNUNET_GNSRECORD_typename_to_number (type);
   name = get_name_from_url (handle->url);
   if (NULL != ego)
     GNUNET_asprintf (&handle->ego_name, "%s", ego);
@@ -1035,6 +1071,13 @@ libgnunet_plugin_rest_namestore_init (void *cls)
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_NAMESTORE;
   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,
               _("Namestore REST API initialized\n"));
   return api;
@@ -1055,6 +1098,7 @@ libgnunet_plugin_rest_namestore_done (void *cls)
 
   plugin->cfg = NULL;
   GNUNET_free (api);
+  GNUNET_free_non_null (allow_methods);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Namestore REST plugin is finished\n");
   return NULL;
diff --git a/src/rest/rest.c b/src/rest/rest.c
index 3a27c6813..77427ef6c 100644
--- a/src/rest/rest.c
+++ b/src/rest/rest.c
@@ -403,12 +403,15 @@ GNUNET_REST_jsonapi_data_serialize (const struct JsonApiObject *resp,
   json_t *root_json;
   json_t *res_arr;
   
-  if ( (NULL == resp) ||
-       (0 == resp->res_count) )
+  if ((NULL == resp))
     return GNUNET_SYSERR;
 
   root_json = json_object ();
-  if (1 == resp->res_count)
+  if (0 == resp->res_count)
+  {
+    json_object_set (root_json, GNUNET_REST_JSONAPI_KEY_DATA, json_array());
+  }
+  else if (1 == resp->res_count)
   {
     json_object_set (root_json, GNUNET_REST_JSONAPI_KEY_DATA, resp->res_list_head->res_obj);
   }