[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated (977c3d47 -> c2f92c42)
|
From: |
gnunet |
|
Subject: |
[taler-merchant] branch master updated (977c3d47 -> c2f92c42) |
|
Date: |
Wed, 04 Aug 2021 18:27:07 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository merchant.
from 977c3d47 -work on #6975, still does not pass
new 99eb36e4 -implement #6953 + #6948
new c2f92c42 finish fix for #6953
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
contrib/merchant-backoffice | 2 +-
src/backend/taler-merchant-httpd_helper.c | 166 ++++++++++++++++++++-
src/backend/taler-merchant-httpd_helper.h | 40 ++++-
.../taler-merchant-httpd_private-post-orders.c | 40 ++++-
src/lib/merchant_api_post_orders.c | 3 +
5 files changed, 241 insertions(+), 10 deletions(-)
diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 03c8c9b7..fe987187 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 03c8c9b794905878175d07366267bdc01c3795b9
+Subproject commit fe987187e178816d42ed12178d430c8771cb5a75
diff --git a/src/backend/taler-merchant-httpd_helper.c
b/src/backend/taler-merchant-httpd_helper.c
index 374751d1..585a491a 100644
--- a/src/backend/taler-merchant-httpd_helper.c
+++ b/src/backend/taler-merchant-httpd_helper.c
@@ -92,11 +92,173 @@ TMH_payto_uri_array_valid (const json_t *payto_uris)
bool
TMH_location_object_valid (const json_t *location)
{
- return true; // FIXME
+ const char *country;
+ const char *subdivision;
+ const char *district;
+ const char *town;
+ const char *town_loc;
+ const char *postcode;
+ const char *street;
+ const char *building;
+ const char *building_no;
+ json_t *lines = NULL;
+ struct GNUNET_JSON_Specification spec[] = {
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("country",
+ &country)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("country_subdivision",
+ &subdivision)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("district",
+ &district)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("town",
+ &town)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("town_location",
+ &town_loc)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("post_code",
+ &postcode)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("street",
+ &street)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("building_name",
+ &building)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("building_number",
+ &building_no)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_json ("address_lines",
+ &lines)),
+ GNUNET_JSON_spec_end ()
+ };
+ const char *ename;
+ unsigned int eline;
+
+ if (GNUNET_OK !=
+ GNUNET_JSON_parse (location,
+ spec,
+ &ename,
+ &eline))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid location for field %s\n",
+ ename);
+ return false;
+ }
+ if (NULL != lines)
+ {
+ size_t idx;
+ json_t *line;
+
+ if (! json_is_array (lines))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid location for field %s\n",
+ "lines");
+ return false;
+ }
+ json_array_foreach (lines, idx, line)
+ {
+ if (! json_is_string (line))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid address line #%u in location\n",
+ (unsigned int) idx);
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+
+bool
+TMH_products_array_valid (const json_t *products)
+{
+ const json_t *product;
+ size_t idx;
+ bool valid = true;
+
+ if (! json_is_array (products))
+ return false;
+ json_array_foreach ((json_t *) products, idx, product)
+ {
+ const char *product_id;
+ const char *description;
+ json_t *description_i18n = NULL;
+ uint64_t quantity;
+ const char *unit;
+ struct TALER_Amount price;
+ const char *image_data_url = NULL;
+ json_t *taxes = NULL;
+ struct GNUNET_TIME_Absolute delivery_date;
+ struct GNUNET_JSON_Specification spec[] = {
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("product_id",
+ &product_id)),
+ GNUNET_JSON_spec_string ("description",
+ &description),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_json ("description_i18n",
+ &description_i18n)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_uint64 ("quantity",
+ &quantity)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("unit",
+ &unit)),
+ GNUNET_JSON_spec_mark_optional (
+ TALER_JSON_spec_amount ("price",
+ TMH_currency,
+ &price)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("image",
+ &image_data_url)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_json ("taxes",
+ &taxes)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_absolute_time ("delivery_date",
+ &delivery_date)),
+ GNUNET_JSON_spec_end ()
+ };
+ const char *ename;
+ unsigned int eline;
+
+ if (GNUNET_OK !=
+ GNUNET_JSON_parse (product,
+ spec,
+ &ename,
+ &eline))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid product #%u for field %s\n",
+ (unsigned int) idx,
+ ename);
+ return false;
+ }
+ if ( (NULL != image_data_url) &&
+ (! TMH_image_data_url_valid (image_data_url)) )
+ valid = false;
+ if ( (NULL != taxes) &&
+ (! TMH_taxes_array_valid (taxes)) )
+ valid = false;
+ if ( (NULL != description_i18n) &&
+ (! TALER_JSON_check_i18n (description_i18n)) )
+ valid = false;
+ GNUNET_JSON_parse_free (spec);
+ if (! valid)
+ break;
+ }
+
+ return valid;
}
-// FIXME
bool
TMH_image_data_url_valid (const char *image_data_url)
{
diff --git a/src/backend/taler-merchant-httpd_helper.h
b/src/backend/taler-merchant-httpd_helper.h
index 4c353942..dc7c08b1 100644
--- a/src/backend/taler-merchant-httpd_helper.h
+++ b/src/backend/taler-merchant-httpd_helper.h
@@ -38,21 +38,55 @@ TMH_payto_uri_array_valid (const json_t *payto_uris);
/**
- * FIXME.
+ * Check if @a taxes is an array of valid Taxes in the sense of
+ * Taler's API definition.
+ *
+ * @param taxes array to check
+ * @return true if @a taxes is an array and all
+ * entries are valid Taxes.
*/
bool
TMH_taxes_array_valid (const json_t *taxes);
-// FIXME
+/**
+ * Check if @a location is a valid Location object in the sense of Taler's API
+ * definition.
+ *
+ * @param location object to check
+ * @return true if @a location is an object
+ * representing a Location.
+ */
bool
TMH_location_object_valid (const json_t *location);
-// FIXME
+/**
+ * Check if @a products is an array of valid Product(s) in the sense of
+ * Taler's API definition.
+ *
+ * @param products array to check
+ * @return true if @a products is an array and all
+ * entries are valid Products.
+ */
+bool
+TMH_products_array_valid (const json_t *products);
+
+
+/**
+ * Check if @a image_data_url is a valid image
+ * data URL. Does not validate the actual payload,
+ * only the syntax and that it properly claims to
+ * be an image.
+ *
+ * @param image_data_url string to check
+ * @return true if @a image_data_url is a data
+ * URL with an "image/" mime-type
+ */
bool
TMH_image_data_url_valid (const char *image_data_url);
+
/**
* Setup new wire method for the given @ payto_uri.
*
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c
b/src/backend/taler-merchant-httpd_private-post-orders.c
index 403036af..20a50d23 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -327,10 +327,13 @@ execute_order (struct MHD_Connection *connection,
struct TALER_Amount total;
const char *order_id;
const char *summary;
+ const char *fulfillment_msg = NULL;
json_t *products;
json_t *merchant;
+ json_t *summary_i18n = NULL;
+ json_t *fulfillment_i18n = NULL;
struct GNUNET_TIME_Absolute timestamp;
- struct GNUNET_TIME_Absolute refund_deadline;
+ struct GNUNET_TIME_Absolute refund_deadline = { 0 };
struct GNUNET_TIME_Absolute wire_transfer_deadline;
struct GNUNET_TIME_Absolute pay_deadline;
struct GNUNET_JSON_Specification spec[] = {
@@ -348,10 +351,20 @@ execute_order (struct MHD_Connection *connection,
&products),
GNUNET_JSON_spec_json ("merchant",
&merchant),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_json ("summary_i18n",
+ &summary_i18n)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("fulfillment_message",
+ &fulfillment_msg)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_json ("fulfillment_message_i18n",
+ &fulfillment_i18n)),
TALER_JSON_spec_absolute_time ("timestamp",
×tamp),
- TALER_JSON_spec_absolute_time ("refund_deadline",
- &refund_deadline),
+ GNUNET_JSON_spec_mark_optional (
+ TALER_JSON_spec_absolute_time ("refund_deadline",
+ &refund_deadline)),
TALER_JSON_spec_absolute_time ("pay_deadline",
&pay_deadline),
TALER_JSON_spec_absolute_time ("wire_transfer_deadline",
@@ -387,6 +400,25 @@ execute_order (struct MHD_Connection *connection,
"order:products");
}
+ if ( (NULL != fulfillment_i18n) &&
+ (! TALER_JSON_check_i18n (fulfillment_i18n)) )
+ {
+ GNUNET_JSON_parse_free (spec);
+ return TALER_MHD_reply_with_error (connection,
+ MHD_HTTP_BAD_REQUEST,
+ TALER_EC_GENERIC_PARAMETER_MALFORMED,
+ "order:fulfillment_message_i18n");
+ }
+ if ( (NULL != summary_i18n) &&
+ (! TALER_JSON_check_i18n (summary_i18n)) )
+ {
+ GNUNET_JSON_parse_free (spec);
+ return TALER_MHD_reply_with_error (connection,
+ MHD_HTTP_BAD_REQUEST,
+ TALER_EC_GENERIC_PARAMETER_MALFORMED,
+ "order:summary_i18n");
+ }
+
/* Test if we already have an order with this id */
{
struct TALER_ClaimTokenP token;
@@ -1169,7 +1201,7 @@ merge_inventory (struct MHD_Connection *connection,
"products",
json_array ()));
}
- else if (! json_is_array (jprod))
+ else if (! TMH_products_array_valid (jprod))
{
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST,
diff --git a/src/lib/merchant_api_post_orders.c
b/src/lib/merchant_api_post_orders.c
index ae804ddf..b7e406f4 100644
--- a/src/lib/merchant_api_post_orders.c
+++ b/src/lib/merchant_api_post_orders.c
@@ -127,6 +127,9 @@ handle_post_order_finished (void *cls,
}
break;
case MHD_HTTP_BAD_REQUEST:
+ json_dumpf (json,
+ stderr,
+ JSON_INDENT (2));
por.hr.ec = TALER_JSON_get_error_code (json);
por.hr.hint = TALER_JSON_get_error_hint (json);
/* This should never happen, either us or
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] branch master updated (977c3d47 -> c2f92c42),
gnunet <=