Merge branch 'master' into identity_oidc

4 files changed, 150 insertions, 0 deletions

diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index c12badcd9..49120982a 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -248,6 +248,16 @@ struct GNUNET_JSON_Specification
 GNUNET_JSON_spec_uint64 (const char *name,
                          uint64_t *u64);
 
+/**
+ * Boolean (true mapped to GNUNET_YES, false mapped to GNUNET_NO).
+ *
+ * @param name name of the JSON field
+ * @param[out] boolean where to store the boolean found under @a name
+ */
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_boolean (const char *name,
+                          int *boolean);
+
 
 /* ************ GNUnet-specific parser specifications ******************* */
 
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 194ec5c76..c7eca97ec 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -943,4 +943,52 @@ GNUNET_JSON_spec_rsa_signature (const char *name,
 }
 
 
+/**
+ * Parse given JSON object to an int as a boolean.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static int
+parse_boolean (void *cls,
+               json_t *root,
+               struct GNUNET_JSON_Specification *spec)
+{
+  int *bp = spec->ptr;
+
+  if (! json_is_boolean (root))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  *bp = json_boolean_value (root) ? GNUNET_YES : GNUNET_NO;
+  return GNUNET_OK;
+}
+
+
+/**
+ * Boolean (true mapped to GNUNET_YES, false mapped to GNUNET_NO).
+ *
+ * @param name name of the JSON field
+ * @param[out] boolean where to store the boolean found under @a name
+ */
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_boolean (const char *name,
+                          int *boolean)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_boolean,
+    .cleaner = NULL,
+    .cls = NULL,
+    .field = name,
+    .ptr = boolean,
+    .ptr_size = sizeof (int),
+    .size_ptr = NULL
+  };
+  return ret;
+}
+
+
 /* end of json_helper.c */
diff --git a/src/json/test_json.c b/src/json/test_json.c
index 09a154678..adab817b9 100644
--- a/src/json/test_json.c
+++ b/src/json/test_json.c
@@ -195,6 +195,44 @@ test_rsa ()
 }
 
 
+/**
+ * Test rsa conversions from/to JSON.
+ *
+ * @return 0 on success
+ */
+static int
+test_boolean ()
+{
+  int b1;
+  int b2;
+  json_t *json;
+  struct GNUNET_JSON_Specification pspec[] = {
+    GNUNET_JSON_spec_boolean ("b1", &b1),
+    GNUNET_JSON_spec_boolean ("b2", &b2),
+    GNUNET_JSON_spec_end()
+  };
+
+  json = json_object ();
+  json_object_set_new (json, "b1", json_true ());
+  json_object_set_new (json, "b2", json_false ());
+
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_JSON_parse (json, pspec,
+                                    NULL, NULL));
+
+  GNUNET_assert (GNUNET_YES == b1);
+  GNUNET_assert (GNUNET_NO == b2);
+
+  json_object_set_new (json, "b1", json_integer (42));
+
+  GNUNET_assert (GNUNET_OK !=
+                 GNUNET_JSON_parse (json, pspec,
+                                    NULL, NULL));
+
+  return 0;
+}
+
+
 int
 main(int argc,
      const char *const argv[])
@@ -210,6 +248,8 @@ main(int argc,
     return 1;
   if (0 != test_rsa ())
     return 1;
+  if (0 != test_boolean ())
+    return 1;
   /* FIXME: test EdDSA signature conversion... */
   return 0;
 }
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c
index c14b09819..a67b3203a 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -131,6 +131,8 @@ struct MhdConnectionHandle
 
   struct GNUNET_REST_RequestHandle *data_handle;
 
+  struct MHD_PostProcessor *pp;
+
   int status;
 
   int state;
@@ -272,6 +274,40 @@ url_iterator (void *cls,
   return MHD_YES;
 }
 
+static int
+post_data_iter (void *cls,
+                         enum MHD_ValueKind kind,
+                         const char *key,
+                         const char *filename,
+                         const char *content_type,
+                         const char *transfer_encoding,
+                         const char *data,
+                         uint64_t off,
+                         size_t size)
+{
+  struct GNUNET_REST_RequestHandle *handle = cls;
+  struct GNUNET_HashCode hkey;
+  char *val;
+
+  if (MHD_POSTDATA_KIND != kind)
+    return MHD_YES;
+
+  GNUNET_CRYPTO_hash (key, strlen (key), &hkey);
+  GNUNET_asprintf (&val, "%s", data);
+  if (GNUNET_OK !=
+      GNUNET_CONTAINER_multihashmap_put (handle->url_param_map,
+                                         &hkey,
+                                         val,
+                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not load add url param `%s'=%s\n",
+                key, data);
+  }
+  return MHD_YES;
+
+}
+
 /* ********************************* MHD response generation ******************* */
 
 /**
@@ -343,6 +379,7 @@ create_response (void *cls,
                                  MHD_HTTP_NOT_FOUND,
                                  failure_response);
     }
+
     return MHD_YES;
   }
   if (GN_REST_STATE_INIT == con_handle->state)
@@ -361,10 +398,25 @@ create_response (void *cls,
                                MHD_GET_ARGUMENT_KIND,
                                &url_iterator,
                                rest_conndata_handle);
+<<<<<<< HEAD
     MHD_get_connection_values (con,
                                MHD_HEADER_KIND,
                                &header_iterator,
                                rest_conndata_handle);
+=======
+    con_handle->pp = MHD_create_post_processor(con,
+                                               4000,
+                                               post_data_iter,
+                                               rest_conndata_handle);
+    if (*upload_data_size)
+    {
+      MHD_post_process(con_handle->pp, upload_data, *upload_data_size);
+    }
+    else
+    {
+      MHD_destroy_post_processor(con_handle->pp);
+    }
+>>>>>>> master
     con_handle->state = GN_REST_STATE_PROCESSING;
     con_handle->plugin->process_request (rest_conndata_handle,
                                          &plugin_callback,