[GNUnet-SVN] [taler-merchant] 01/02: do more order validation (fixes #5290)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

commit 09a73e13a6c163d0de9594e20f34b73f6d170524
Author: Florian Dold <address@hidden>
AuthorDate: Sun Mar 11 17:55:22 2018 +0100

    do more order validation (fixes #5290)
---
 src/backend/taler-merchant-httpd_proposal.c | 4 ++++
 src/lib/test_merchant_api.c                 | 5 +++++
 src/lib/test_merchant_api_new.c             | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/src/backend/taler-merchant-httpd_proposal.c 
b/src/backend/taler-merchant-httpd_proposal.c
index 1dffaf5..60f8941 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -137,6 +137,8 @@ proposal_put (struct MHD_Connection *connection,
   struct MerchantInstance *mi;
   struct TALER_Amount total;
   const char *order_id;
+  const char *summary;
+  const char *fulfillment_url;
   json_t *products;
   json_t *merchant;
   struct GNUNET_TIME_Absolute timestamp;
@@ -145,6 +147,8 @@ proposal_put (struct MHD_Connection *connection,
   struct GNUNET_JSON_Specification spec[] = {
     TALER_JSON_spec_amount ("amount", &total),
     GNUNET_JSON_spec_string ("order_id", &order_id),
+    GNUNET_JSON_spec_string ("summary", &summary),
+    GNUNET_JSON_spec_string ("fulfillment_url", &fulfillment_url),
     /**
      * The following entries we don't actually need,
      * except to check that the order is well-formed */
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index c968168..807376c 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -4233,6 +4233,7 @@ run (void *cls)
            \"value\":5,\
            \"fraction\":0},\
        \"summary\": \"merchant-lib testcase\",\
+       \"fulfillment_url\": \"https://example.com/\",\
         \"products\":\
           [ {\"description\":\"ice cream\",\
              \"value\":\"{EUR:5}\"} ] }"},
@@ -4295,6 +4296,7 @@ run (void *cls)
            \"value\":5,\
            \"fraction\":0},\
         \"summary\":\"useful product\",\
+       \"fulfillment_url\": \"https://example.com/\",\
         \"products\":\
           [ {\"description\":\"ice cream\",\
              \"value\":\"{EUR:5}\"} ] }" },
@@ -4646,6 +4648,7 @@ run (void *cls)
            \"value\":5,\
            \"fraction\":0},\
        \"summary\": \"merchant-lib testcase\",\
+       \"fulfillment_url\": \"https://example.com/\",\
         \"products\":\
           [ {\"description\":\"ice cream tip\",\
              \"value\":\"{EUR:5}\"} ] }"},
@@ -4738,6 +4741,7 @@ run (void *cls)
            \"value\":10,\
            \"fraction\":0},\
        \"summary\": \"merchant-lib testcase\",\
+       \"fulfillment_url\": \"https://example.com/\",\
         \"products\":\
           [ {\"description\":\"ice cream\",\
              \"value\":\"{EUR:10}\"} ] }"},
@@ -4844,6 +4848,7 @@ run (void *cls)
            \"value\":10,\
            \"fraction\":0},\
        \"summary\": \"merchant-lib testcase\",\
+       \"fulfillment_url\": \"https://example.com/\",\
         \"products\":\
           [ {\"description\":\"ice cream\",\
              \"value\":\"{EUR:10}\"} ] }"},
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
index f7b94c7..b2979fa 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_new.c
@@ -202,6 +202,7 @@ run (void *cls,
            \"value\":5,\
            \"fraction\":0},\
         \"summary\": \"merchant-lib testcase\",\
+        \"fulfillment_url\": \"https://example.com/\",\
         \"products\": [ {\"description\":\"ice cream\",\
                          \"value\":\"{EUR:5}\"} ] }",
         NULL),
@@ -263,6 +264,7 @@ run (void *cls,
            \"value\":5,\
            \"fraction\":0},\
         \"summary\": \"useful product\",\
+        \"fulfillment_url\": \"https://example.com/\",\
         \"products\": [ {\"description\":\"ice cream\",\
                          \"value\":\"{EUR:5}\"} ] }",
         NULL),
@@ -516,6 +518,7 @@ run (void *cls,
            \"value\":10,\
            \"fraction\":0},\
         \"summary\": \"merchant-lib testcase\",\
+        \"fulfillment_url\": \"https://example.com/\",\
         \"products\": [ {\"description\":\"ice cream\",\
                          \"value\":\"{EUR:10}\"} ] }",
         NULL),
@@ -595,6 +598,7 @@ run (void *cls,
            \"value\":10,\
            \"fraction\":0},\
         \"summary\": \"merchant-lib testcase\",\
+        \"fulfillment_url\": \"https://example.com/\",\
         \"products\": [ {\"description\":\"ice cream\",\
                          \"value\":\"{EUR:10}\"} ] }",
         NULL),

-- 
To stop receiving notification emails like this one, please contact
address@hidden