diff options
| -rw-r--r-- | src/backend/Makefile.am | 4 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 8 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_orders_post.h | 48 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_post-orders.c | 743 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-orders.c | 996 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-orders.h | 42 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-products.h | 2 | ||||
| -rw-r--r-- | src/backenddb/merchant-0001.sql | 2 | ||||
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 95 | ||||
| -rw-r--r-- | src/include/taler_merchant_service.h | 149 | ||||
| -rw-r--r-- | src/include/taler_merchantdb_plugin.h | 12 |
11 files changed, 1205 insertions, 896 deletions
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index bb991a5f..7be26748 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -46,7 +46,9 @@ taler_merchant_httpd_SOURCES = \ taler-merchant-httpd_private-post-products.c \ taler-merchant-httpd_private-post-products.h \ taler-merchant-httpd_private-post-products-ID-lock.c \ - taler-merchant-httpd_private-post-products-ID-lock.h + taler-merchant-httpd_private-post-products-ID-lock.h \ + taler-merchant-httpd_private-post-orders.c \ + taler-merchant-httpd_private-post-orders.h DEAD = \ taler-merchant-httpd_check-payment.c taler-merchant-httpd_check-payment.h \ diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index d5bb87ed..9005b161 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -40,6 +40,8 @@ #include "taler-merchant-httpd_private-post-instances.h" #include "taler-merchant-httpd_private-post-products.h" #include "taler-merchant-httpd_private-post-products-ID-lock.h" +#include "taler-merchant-httpd_private-post-orders.h" + /** * Backlog for listen operation on unix-domain sockets. @@ -796,6 +798,12 @@ url_handler (void *cls, .have_id_segment = true, .handler = &TMH_private_post_products_ID_lock }, + /* POST /orders: */ + { + .url_prefix = "/orders", + .method = MHD_HTTP_METHOD_POST, + .handler = &TMH_private_post_orders + }, { NULL } diff --git a/src/backend/taler-merchant-httpd_orders_post.h b/src/backend/taler-merchant-httpd_orders_post.h deleted file mode 100644 index cf43d1ba..00000000 --- a/src/backend/taler-merchant-httpd_orders_post.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - This file is part of TALER - (C) 2014, 2015, 2019 Taler Systems SA - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - TALER is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> -*/ -/** - * @file backend/taler-merchant-httpd_order.h - * @brief headers for /order handler - * @author Marcello Stanisci - */ -#ifndef TALER_MERCHANT_HTTPD_ORDER_H -#define TALER_MERCHANT_HTTPD_ORDER_H -#include <microhttpd.h> -#include "taler-merchant-httpd.h" - -/** - * Generate a proposal, given its order. In practical terms, it adds the - * fields 'exchanges', 'merchant_pub', and 'H_wire' to the order gotten - * from the frontend. Finally, it signs this data, and returns it to the - * frontend. - * - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @param mi merchant backend instance, never NULL - * @return MHD result code - */ -MHD_RESULT -MH_handler_order_post (struct TMH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size, - struct MerchantInstance *mi); - - -#endif diff --git a/src/backend/taler-merchant-httpd_post-orders.c b/src/backend/taler-merchant-httpd_post-orders.c deleted file mode 100644 index c532c2db..00000000 --- a/src/backend/taler-merchant-httpd_post-orders.c +++ /dev/null @@ -1,743 +0,0 @@ -/* - This file is part of TALER - (C) 2014, 2015, 2016, 2018, 2020 Taler Systems SA - - TALER is free software; you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation; either version 3, - or (at your option) any later version. - - TALER is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with TALER; see the file COPYING. If not, - see <http://www.gnu.org/licenses/> -*/ - -/** - * @file backend/taler-merchant-httpd_order.c - * @brief HTTP serving layer mainly intended to communicate - * with the frontend - * @author Marcello Stanisci - */ -#include "platform.h" -#include <jansson.h> -#include <taler/taler_signatures.h> -#include <taler/taler_json_lib.h> -#include "taler-merchant-httpd.h" -#include "taler-merchant-httpd_auditors.h" -#include "taler-merchant-httpd_exchanges.h" - - -/** - * How often do we retry the simple INSERT database transaction? - */ -#define MAX_RETRIES 3 - -/** - * What is the label under which we find/place the merchant's - * jurisdiction in the locations list by default? - */ -#define STANDARD_LABEL_MERCHANT_JURISDICTION "_mj" - -/** - * What is the label under which we find/place the merchant's - * address in the locations list by default? - */ -#define STANDARD_LABEL_MERCHANT_ADDRESS "_ma" - - -/** - * Check that the given JSON array of products is well-formed. - * - * @param products JSON array to check - * @return #GNUNET_OK if all is fine - */ -static int -check_products (json_t *products) -{ - size_t index; - json_t *value; - - if (! json_is_array (products)) - { - GNUNET_break (0); - return GNUNET_SYSERR; - } - json_array_foreach (products, index, value) { - const char *description; - const char *error_name; - unsigned int error_line; - int res; - struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_string ("description", &description), - /* FIXME: there are other fields in the product specification - that are currently not labeled as optional. Maybe check - those as well, or make them truly optional. */ - GNUNET_JSON_spec_end () - }; - - /* extract fields we need to sign separately */ - res = GNUNET_JSON_parse (value, - spec, - &error_name, - &error_line); - if (GNUNET_OK != res) - { - GNUNET_break (0); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Product description parsing failed at #%u: %s:%u\n", - (unsigned int) index, - error_name, - error_line); - return GNUNET_SYSERR; - } - GNUNET_JSON_parse_free (spec); - } - return GNUNET_OK; -} - - -/** - * Information we keep for individual calls - * to requests that parse JSON, but keep no other state. - */ -struct TMH_JsonParseContext -{ - - /** - * This field MUST be first for handle_mhd_completion_callback() to work - * when it treats this struct as a `struct TM_HandlerContext`. - */ - struct TM_HandlerContext hc; - - /** - * Placeholder for #TALER_MHD_parse_post_json() to keep its internal state. - */ - void *json_parse_context; -}; - - -/** - * Custom cleanup routine for a `struct TMH_JsonParseContext`. - * - * @param hc the `struct TMH_JsonParseContext` to clean up. - */ -static void -json_parse_cleanup (struct TM_HandlerContext *hc) -{ - struct TMH_JsonParseContext *jpc = (struct TMH_JsonParseContext *) hc; - - TALER_MHD_parse_post_cleanup_callback (jpc->json_parse_context); - GNUNET_free (jpc); -} - - -/** - * Generate the base URL for the given merchant instance. - * - * @param connection the MHD connection - * @param instance_id the merchant instance ID - * @returns the merchant instance's base URL - */ -static char * -make_merchant_base_url (struct MHD_Connection *connection, - const char *instance_id) -{ - const char *host; - const char *forwarded_host; - const char *uri_path; - struct GNUNET_Buffer buf = { 0 }; - - if (GNUNET_YES == TALER_mhd_is_https (connection)) - GNUNET_buffer_write_str (&buf, "https://"); - else - GNUNET_buffer_write_str (&buf, "http://"); - - - host = MHD_lookup_connection_value (connection, MHD_HEADER_KIND, "Host"); - forwarded_host = MHD_lookup_connection_value (connection, MHD_HEADER_KIND, - "X-Forwarded-Host"); - - if (NULL != forwarded_host) - { - GNUNET_buffer_write_str (&buf, forwarded_host); - } - else - { - GNUNET_assert (NULL != host); - GNUNET_buffer_write_str (&buf, host); - } - - uri_path = MHD_lookup_connection_value (connection, MHD_HEADER_KIND, - "X-Forwarded-Prefix"); - if (NULL != uri_path) - { - /* Currently the merchant backend is only supported at the root of the path, - this might change in the future. */ - GNUNET_assert (0); - } - - GNUNET_buffer_write_path (&buf, "public"); - - if (0 != strcmp (instance_id, "default")) - { - GNUNET_buffer_write_path (&buf, "/instances/"); - GNUNET_buffer_write_str (&buf, instance_id); - } - GNUNET_buffer_write_path (&buf, ""); - - return GNUNET_buffer_reap_str (&buf); -} - - -/** - * Transform an order into a proposal and store it in the - * database. Write the resulting proposal or an error message - * of a MHD connection. - * - * @param connection connection to write the result or error to - * @param root root of the request - * @param order[in] order to process (can be modified) - * @return MHD result code - */ -static MHD_RESULT -proposal_put (struct MHD_Connection *connection, - json_t *root, - json_t *order, - const 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; - struct GNUNET_TIME_Absolute refund_deadline; - struct GNUNET_TIME_Absolute wire_transfer_deadline; - struct GNUNET_TIME_Absolute pay_deadline; - 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 */ - GNUNET_JSON_spec_json ("products", &products), - GNUNET_JSON_spec_json ("merchant", &merchant), - GNUNET_JSON_spec_absolute_time ("timestamp", - ×tamp), - GNUNET_JSON_spec_absolute_time ("refund_deadline", - &refund_deadline), - GNUNET_JSON_spec_absolute_time ("pay_deadline", - &pay_deadline), - GNUNET_JSON_spec_absolute_time ("wire_transfer_deadline", - &wire_transfer_deadline), - GNUNET_JSON_spec_end () - }; - enum GNUNET_DB_QueryStatus qs; - struct WireMethod *wm; - - /* Add order_id if it doesn't exist. */ - if (NULL == - json_string_value (json_object_get (order, - "order_id"))) - { - char buf[256]; - time_t timer; - struct tm*tm_info; - size_t off; - uint64_t rand; - char *last; - - time (&timer); - tm_info = localtime (&timer); - if (NULL == tm_info) - { - return TALER_MHD_reply_with_error - (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_PROPOSAL_NO_LOCALTIME, - "failed to determine local time"); - } - off = strftime (buf, - sizeof (buf), - "%Y.%j", - tm_info); - buf[off++] = '-'; - rand = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, - UINT64_MAX); - last = GNUNET_STRINGS_data_to_string (&rand, - sizeof (uint64_t), - &buf[off], - sizeof (buf) - off); - *last = '\0'; - json_object_set_new (order, - "order_id", - json_string (buf)); - } - - /* Add timestamp if it doesn't exist */ - if (NULL == json_object_get (order, - "timestamp")) - { - struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); - - (void) GNUNET_TIME_round_abs (&now); - json_object_set_new (order, - "timestamp", - GNUNET_JSON_from_time_abs (now)); - } - - /* If no refund_deadline given, set one as zero. */ - if (NULL == json_object_get (order, - "refund_deadline")) - { - struct GNUNET_TIME_Absolute zero = { 0 }; - - json_object_set_new (order, - "refund_deadline", - GNUNET_JSON_from_time_abs (zero)); - } - - if (NULL == json_object_get (order, - "pay_deadline")) - { - struct GNUNET_TIME_Absolute t; - - t = GNUNET_TIME_relative_to_absolute (default_pay_deadline); - (void) GNUNET_TIME_round_abs (&t); - json_object_set_new (order, - "pay_deadline", - GNUNET_JSON_from_time_abs (t)); - } - - if (NULL == json_object_get (order, - "wire_transfer_deadline")) - { - struct GNUNET_TIME_Absolute t; - t = GNUNET_TIME_relative_to_absolute (default_wire_transfer_delay); - (void) GNUNET_TIME_round_abs (&t); - json_object_set_new (order, - "wire_transfer_deadline", - GNUNET_JSON_from_time_abs (t)); - } - - if (NULL == json_object_get (order, - "max_wire_fee")) - { - json_object_set_new (order, - "max_wire_fee", - TALER_JSON_from_amount - (&default_max_wire_fee)); - } - - if (NULL == json_object_get (order, - "max_fee")) - { - json_object_set_new (order, - "max_fee", - TALER_JSON_from_amount - (&default_max_deposit_fee)); - } - - if (NULL == json_object_get (order, - "wire_fee_amortization")) - { - json_object_set_new - (order, - "wire_fee_amortization", - json_integer - ((json_int_t) default_wire_fee_amortization)); - } - - if (NULL == json_object_get (order, - "merchant_base_url")) - { - char *url; - - url = make_merchant_base_url (connection, mi->id); - json_object_set_new (order, - "merchant_base_url", - json_string (url)); - GNUNET_free (url); - } - - if (NULL == json_object_get (order, - "products")) - { - json_object_set_new (order, - "products", - json_array ()); - } - - /* Fill in merchant information if necessary */ - if (NULL == json_object_get (order, "merchant")) - { - const char *mj = NULL; - const char *ma = NULL; - json_t *locations; - char *label; - json_t *jmerchant; - - jmerchant = json_object (); - json_object_set_new (jmerchant, - "name", - json_string (mi->name)); - json_object_set_new (jmerchant, - "instance", - json_string (mi->id)); - locations = json_object_get (order, - "locations"); - if (NULL != locations) - { - json_t *loca; - json_t *locj; - - /* Handle merchant address */ - GNUNET_assert (0 < GNUNET_asprintf (&label, - "%s-address", - mi->id)); - loca = json_object_get (default_locations, - label); - if (NULL != loca) - { - loca = json_deep_copy (loca); - ma = STANDARD_LABEL_MERCHANT_ADDRESS; - json_object_set_new (locations, - ma, - loca); - json_object_set_new (jmerchant, - "address", - json_string (ma)); - } - GNUNET_free (label); - - /* Handle merchant jurisdiction */ - GNUNET_assert (0 < GNUNET_asprintf (&label, - "%s-jurisdiction", - mi->id)); - locj = json_object_get (default_locations, - label); - if (NULL != locj) - { - if ( (NULL != loca) && - (1 == json_equal (locj, - loca)) ) - { - /* addresses equal, re-use */ - mj = ma; - } - else - { - locj = json_deep_copy (locj); - mj = STANDARD_LABEL_MERCHANT_JURISDICTION; - json_object_set_new (locations, - mj, - locj); - } - json_object_set_new (merchant, - "jurisdiction", - json_string (mj)); - } - GNUNET_free (label); - } /* have locations */ - json_object_set_new (order, - "merchant", - jmerchant); - } /* needed to synthesize merchant info */ - - /* extract fields we need to sign separately */ - { - enum GNUNET_GenericReturnValue res; - - res = TALER_MHD_parse_json_data (connection, - order, - spec); - /* json is malformed */ - if (GNUNET_NO == res) - { - return MHD_YES; - } - /* other internal errors might have occurred */ - if (GNUNET_SYSERR == res) - { - return TALER_MHD_reply_with_error (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_PROPOSAL_ORDER_PARSE_ERROR, - "Impossible to parse the order"); - } - } - if (0 != - strcasecmp (total.currency, - TMH_currency)) - { - GNUNET_break_op (0); - return TALER_MHD_reply_with_error - (connection, - MHD_HTTP_BAD_REQUEST, - TALER_EC_PROPOSAL_ORDER_BAD_CURRENCY, - "Total amount must be in currency supported by backend"); - } - - if (wire_transfer_deadline.abs_value_us < - refund_deadline.abs_value_us) - { - GNUNET_JSON_parse_free (spec); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "invariant failed: wire_transfer_deadline >= refund_deadline\n"); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "wire_transfer_deadline: %s\n", - GNUNET_STRINGS_absolute_time_to_string ( - wire_transfer_deadline)); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "refund_deadline: %s\n", - GNUNET_STRINGS_absolute_time_to_string (refund_deadline)); - return TALER_MHD_reply_with_error - (connection, - MHD_HTTP_BAD_REQUEST, - TALER_EC_PARAMETER_MALFORMED, - "order:wire_transfer_deadline;order:refund_deadline"); - } - - - /* check contract is well-formed */ - if (GNUNET_OK != check_products (products)) - { - GNUNET_JSON_parse_free (spec); - return TALER_MHD_reply_with_error (connection, - MHD_HTTP_BAD_REQUEST, - TALER_EC_PARAMETER_MALFORMED, - "order:products"); - } - - /* add fields to the contract that the backend should provide */ - json_object_set (order, - "exchanges", - TMH_trusted_exchanges); - - json_object_set (order, - "auditors", - j_auditors); - { - const char *target; - - target = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "payment_target"); - wm = mi->wm_head; - if (NULL != target) - { - while ( (NULL != wm) && - (GNUNET_YES == wm->active) && - (0 != strcasecmp (target, - wm->wire_method) ) ) - wm = wm->next; - } - if (GNUNET_YES != wm->active) - wm = NULL; - } - - if (NULL == wm) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "No wire method available for instance '%s'\n", - mi->id); - GNUNET_JSON_parse_free (spec); - return TALER_MHD_reply_with_error (connection, - MHD_HTTP_NOT_FOUND, - TALER_EC_PROPOSAL_INSTANCE_CONFIGURATION_LACKS_WIRE, - "No wire method configured for instance"); - } - json_object_set_new (order, - "h_wire", - GNUNET_JSON_from_data_auto (&wm->h_wire)); - json_object_set_new (order, - "wire_method", - json_string (wm->wire_method)); - json_object_set_new (order, - "merchant_pub", - GNUNET_JSON_from_data_auto (&mi->pubkey)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Inserting order '%s' for instance '%s'\n", - order_id, - mi->id); - - for (unsigned int i = 0; i<MAX_RETRIES; i++) - { - db->preflight (db->cls); - qs = db->insert_order (db->cls, - order_id, - &mi->pubkey, - timestamp, - order); - if (GNUNET_DB_STATUS_SOFT_ERROR != qs) - break; - } - if (0 > qs) - { - /* Special report if retries insufficient */ - if (GNUNET_DB_STATUS_SOFT_ERROR == qs) - { - GNUNET_break (0); - return TALER_MHD_reply_with_error (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_PROPOSAL_STORE_DB_ERROR_SOFT, - "db error: could not check for existing order" - " due to repeated soft transaction failure"); - } - - { - /* Hard error could be constraint violation, - check if order already exists */ - json_t *contract_terms = NULL; - - db->preflight (db->cls); - qs = db->find_order (db->cls, - &contract_terms, - order_id, - &mi->pubkey); - if (0 < qs) - { - /* Yep, indeed uniqueness constraint violation */ - int rv; - char *msg; - - GNUNET_JSON_parse_free (spec); - GNUNET_asprintf (&msg, - "order ID `%s' already exists", - order_id); - { - /* Log plenty of details for the admin */ - char *js; - - js = json_dumps (contract_terms, - JSON_COMPACT); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _ ("Order ID `%s' already exists with proposal `%s'\n"), - order_id, - js); - free (js); - } - json_decref (contract_terms); - - /* contract_terms may be private, only expose - * duplicate order_id to the network */ - rv = TALER_MHD_reply_with_error (connection, - MHD_HTTP_BAD_REQUEST, /* or conflict? */ - TALER_EC_PROPOSAL_STORE_DB_ERROR_ALREADY_EXISTS, - msg); - GNUNET_free (msg); - return rv; - } - } - - /* Other hard transaction error (disk full, etc.) */ - GNUNET_JSON_parse_free (spec); - return TALER_MHD_reply_with_error - (connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - TALER_EC_PROPOSAL_STORE_DB_ERROR_HARD, - "db error: could not store this proposal's data into db"); - } - - /* DB transaction succeeded, generate positive response */ - { - MHD_RESULT ret; - - ret = TALER_MHD_reply_json_pack (connection, - MHD_HTTP_OK, - "{s:s}", - "order_id", - order_id); - GNUNET_JSON_parse_free (spec); - return ret; - } -} - - -/** - * Generate a proposal, given its order. In practical terms, - * it adds the fields 'exchanges', 'merchant_pub', and 'h_wire' - * to the order gotten from the frontend. Finally, it signs this - * data, and returns it to the frontend. - * - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure - * (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in - * @a upload_data - * @param mi merchant backend instance, never NULL - * @return MHD result code - */ -int -MH_handler_order_post (struct TMH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size, - struct MerchantInstance *mi) -{ - struct TMH_JsonParseContext *ctx; - json_t *root; - json_t *order; - - if (NULL == *connection_cls) - { - ctx = GNUNET_new (struct TMH_JsonParseContext); - ctx->hc.cc = &json_parse_cleanup; - *connection_cls = ctx; - } - else - { - ctx = *connection_cls; - } - - { - int res; - - res = TALER_MHD_parse_post_json (connection, - &ctx->json_parse_context, - upload_data, - upload_data_size, - &root); - - if (GNUNET_SYSERR == res) - return MHD_NO; - - - } - order = json_object_get (root, - "order"); - { - MHD_RESULT ret; - - if (NULL == order) - { - ret = TALER_MHD_reply_with_error (connection, - MHD_HTTP_BAD_REQUEST, - TALER_EC_PARAMETER_MISSING, - "order"); - } - else - { - ret = proposal_put (connection, - root, - order, - mi); - } - json_decref (root); - return ret; - } -} - - -/* end of taler-merchant-httpd_order.c */ diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c new file mode 100644 index 00000000..e871f9fd --- /dev/null +++ b/src/backend/taler-merchant-httpd_private-post-orders.c @@ -0,0 +1,996 @@ +/* + This file is part of TALER + (C) 2014, 2015, 2016, 2018, 2020 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation; either version 3, + or (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with TALER; see the file COPYING. If not, + see <http://www.gnu.org/licenses/> +*/ + +/** + * @file backend/taler-merchant-httpd_private-post-orders.c + * @brief the POST /orders handler + * @author Christian Grothoff + * @author Marcello Stanisci + */ +#include "platform.h" +#include <jansson.h> +#include <taler/taler_signatures.h> +#include <taler/taler_json_lib.h> +#include "taler-merchant-httpd_private-post-orders.h" +#include "taler-merchant-httpd_auditors.h" +#include "taler-merchant-httpd_exchanges.h" + + +/** + * How often do we retry the simple INSERT database transaction? + */ +#define MAX_RETRIES 3 + +/** + * What is the label under which we find/place the merchant's + * jurisdiction in the locations list by default? + */ +#define STANDARD_LABEL_MERCHANT_JURISDICTION "_mj" + +/** + * What is the label under which we find/place the merchant's + * address in the locations list by default? + */ +#define STANDARD_LABEL_MERCHANT_ADDRESS "_ma" + + +/** + * Check that the given JSON array of products is well-formed. + * + * @param products JSON array to check + * @return #GNUNET_OK if all is fine + */ +static int +check_products (json_t *products) +{ + size_t index; + json_t *value; + + if (! json_is_array (products)) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + json_array_foreach (products, index, value) { + const char *description; + const char *error_name; + unsigned int error_line; + int res; + struct GNUNET_JSON_Specification spec[] = { + GNUNET_JSON_spec_string ("description", &description), + /* FIXME: there are other fields in the product specification + that are currently not labeled as optional. Maybe check + those as well, or make them truly optional. */ + GNUNET_JSON_spec_end () + }; + + /* extract fields we need to sign separately */ + res = GNUNET_JSON_parse (value, + spec, + &error_name, + &error_line); + if (GNUNET_OK != res) + { + GNUNET_break (0); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Product description parsing failed at #%u: %s:%u\n", + (unsigned int) index, + error_name, + error_line); + return GNUNET_SYSERR; + } + GNUNET_JSON_parse_free (spec); + } + return GNUNET_OK; +} + + +/** + * Generate the base URL for the given merchant instance. + * + * @param connection the MHD connection + * @param instance_id the merchant instance ID + * @returns the merchant instance's base URL + */ +static char * +make_merchant_base_url (struct MHD_Connection *connection, + const char *instance_id) +{ + const char *host; + const char *forwarded_host; + const char *uri_path; + struct GNUNET_Buffer buf = { 0 }; + + if (GNUNET_YES == TALER_mhd_is_https (connection)) + GNUNET_buffer_write_str (&buf, "https://"); + else + GNUNET_buffer_write_str (&buf, "http://"); + host = MHD_lookup_connection_value (connection, + MHD_HEADER_KIND, + "Host"); + forwarded_host = MHD_lookup_connection_value (connection, + MHD_HEADER_KIND, + "X-Forwarded-Host"); + if (NULL != forwarded_host) + { + GNUNET_buffer_write_str (&buf, + forwarded_host); + } + else + { + GNUNET_assert (NULL != host); + GNUNET_buffer_write_str (&buf, + host); + } + uri_path = MHD_lookup_connection_value (connection, + MHD_HEADER_KIND, + "X-Forwarded-Prefix"); + if (NULL != uri_path) + { + /* Currently the merchant backend is only supported at the root of the path, + this might change in the future. */ + GNUNET_assert (0); + } + if (0 != strcmp (instance_id, + "default")) + { + GNUNET_buffer_write_path (&buf, + "/instances/"); + GNUNET_buffer_write_str (&buf, + instance_id); + } + GNUNET_buffer_write_path (&buf, + ""); + return GNUNET_buffer_reap_str (&buf); +} + + +/** + * Information about a product we are supposed to add to the order + * based on what we know it from our inventory. + */ +struct InventoryProduct +{ + /** + * Identifier of the product in the inventory. + */ + const char *product_id; + + /** + * Number of units of the product to add to the order. + */ + uint32_t quantity; +}; + + +/** + * Execute the database transaction to setup the order. + * + * @param hc handler context for the request + * @param[in] order order to process (not modified) + * @param inventory_products_length length of the @a inventory_products array + * @param inventory_products array of products to add to @a order from our inventory + * @param uuids_length length of the @a uuids array + * @param uuids array of UUIDs used to reserve products from @a inventory_products + * @return transaction status + */ +static enum GNUNET_DB_QueryStatus +execute_transaction (struct TMH_HandlerContext *hc, + const char *order_id, + struct GNUNET_TIME_Absolute pay_deadline, + json_t *order, + unsigned int inventory_products_length, + const struct InventoryProduct inventory_products[], + unsigned int uuids_length, + const struct GNUNET_Uuid uuids[]) +{ + enum GNUNET_DB_QueryStatus qs; + + if (GNUNET_OK != + TMH_db->start (TMH_db->cls, + "insert_order")) + { + GNUNET_break (0); + return GNUNET_DB_STATUS_HARD_ERROR; + } + // FIXME: migrate locks from UUIDs to ORDER here! + qs = TMH_db->insert_order (TMH_db->cls, + hc->instance->settings.id, + order_id, + pay_deadline, + order); + if (qs < 0) + { + TMH_db->rollback (TMH_db->cls); + return qs; + } + return TMH_db->commit (TMH_db->cls); +} + + +/** + * Transform an order into a proposal and store it in the + * database. Write the resulting proposal or an error message + * of a MHD connection. + * + * @param connection connection to write the result or error to + * @param hc handler context for the request + * @param[in,out] order order to process (can be modified) + * @param inventory_products_length length of the @a inventory_products array + * @param inventory_products array of products to add to @a order from our inventory + * @param uuids_length length of the @a uuids array + * @param uuids array of UUIDs used to reserve products from @a inventory_products + * @return MHD result code + */ +static MHD_RESULT +execute_order (struct MHD_Connection *connection, + struct TMH_HandlerContext *hc, + json_t *order, + unsigned int inventory_products_length, + const struct InventoryProduct inventory_products[], + unsigned int uuids_length, + const struct GNUNET_Uuid uuids[]) +{ + const struct TALER_MERCHANTDB_InstanceSettings *settings = + &hc->instance->settings; + 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; + struct GNUNET_TIME_Absolute refund_deadline; + struct GNUNET_TIME_Absolute wire_transfer_deadline; + struct GNUNET_TIME_Absolute pay_deadline; + 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 */ + GNUNET_JSON_spec_json ("products", + &products), + GNUNET_JSON_spec_json ("merchant", + &merchant), + GNUNET_JSON_spec_absolute_time ("timestamp", + ×tamp), + GNUNET_JSON_spec_absolute_time ("refund_deadline", + &refund_deadline), + GNUNET_JSON_spec_absolute_time ("pay_deadline", + &pay_deadline), + GNUNET_JSON_spec_absolute_time ("wire_transfer_deadline", + &wire_transfer_deadline), + GNUNET_JSON_spec_end () + }; + enum GNUNET_DB_QueryStatus qs; + + /* extract fields we need to sign separately */ + { + enum GNUNET_GenericReturnValue res; + + res = TALER_MHD_parse_json_data (connection, + order, + spec); + /* json is malformed */ + if (GNUNET_NO == res) + { + return MHD_YES; + } + /* other internal errors might have occurred */ + if (GNUNET_SYSERR == res) + { + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_INTERNAL_SERVER_ERROR, + TALER_EC_PROPOSAL_ORDER_PARSE_ERROR, + "Impossible to parse the order"); + } + } + if (0 != + strcasecmp (total.currency, + TMH_currency)) + { + GNUNET_break_op (0); + return TALER_MHD_reply_with_error ( + connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_PROPOSAL_ORDER_BAD_CURRENCY, + "Total amount must be in currency supported by backend"); + } + + if (wire_transfer_deadline.abs_value_us < + refund_deadline.abs_value_us) + { + GNUNET_JSON_parse_free (spec); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "invariant failed: wire_transfer_deadline >= refund_deadline\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "wire_transfer_deadline: %s\n", + GNUNET_STRINGS_absolute_time_to_string ( + wire_transfer_deadline)); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "refund_deadline: %s\n", + GNUNET_STRINGS_absolute_time_to_string (refund_deadline)); + return TALER_MHD_reply_with_error ( + connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_PARAMETER_MALFORMED, + "order:wire_transfer_deadline;order:refund_deadline"); + } + + + /* check contract is well-formed */ + if (GNUNET_OK != check_products (products)) + { + GNUNET_JSON_parse_free (spec); + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_PARAMETER_MALFORMED, + "order:products"); + } + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Executing database transaction to create order '%s' for instance '%s'\n", + order_id, + settings->id); + for (unsigned int i = 0; i<MAX_RETRIES; i++) + { + TMH_db->preflight (TMH_db->cls); + qs = execute_transaction (hc, + order_id, + pay_deadline, + order, + inventory_products_length, + inventory_products, + uuids_length, + uuids); + if (GNUNET_DB_STATUS_SOFT_ERROR != qs) + break; + } + if (0 > qs) + { + /* Special report if retries insufficient */ + if (GNUNET_DB_STATUS_SOFT_ERROR == qs) + { + GNUNET_break (0); + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_INTERNAL_SERVER_ERROR, + TALER_EC_PROPOSAL_STORE_DB_ERROR_SOFT, + "serialization error, maybe try again?"); + } + + { + /* Hard error could be constraint violation, + check if order already exists */ + TMH_db->preflight (TMH_db->cls); + qs = TMH_db->lookup_order (TMH_db->cls, + settings->id, + order_id, + NULL); + if (0 < qs) + { + /* Yep, indeed uniqueness constraint violation */ + int rv; + char *msg; + + GNUNET_JSON_parse_free (spec); + GNUNET_asprintf (&msg, + "order ID `%s' already exists", + order_id); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Order `%s' already exists\n", + order_id); + /* contract_terms may be private, only expose + * duplicate order_id to the network */ + rv = TALER_MHD_reply_with_error (connection, + MHD_HTTP_BAD_REQUEST, /* or conflict? */ + TALER_EC_PROPOSAL_STORE_DB_ERROR_ALREADY_EXISTS, + msg); + GNUNET_free (msg); + return rv; + } + } + + /* Other hard transaction error (disk full, etc.) */ + GNUNET_JSON_parse_free (spec); + return TALER_MHD_reply_with_error ( + connection, + MHD_HTTP_INTERNAL_SERVER_ERROR, + TALER_EC_PROPOSAL_STORE_DB_ERROR_HARD, + "Failed to store the order in the DB"); + } + /* DB transaction succeeded, generate positive response */ + { + MHD_RESULT ret; + + ret = TALER_MHD_reply_json_pack (connection, + MHD_HTTP_OK, + "{s:s}", + "order_id", + order_id); + GNUNET_JSON_parse_free (spec); + return ret; + } +} + + +/** + * Add missing fields to the order. Upon success, continue + * processing with execute_order(). + * + * @param connection connection to write the result or error to + * @param hc handler context for the request + * @param[in,out] order order to process (can be modified) + * @param inventory_products_length length of the @a inventory_products array + * @param inventory_products array of products to add to @a order from our inventory + * @param uuids_length length of the @a uuids array + * @param uuids array of UUIDs used to reserve products from @a inventory_products + * @return MHD result code + */ +static MHD_RESULT +patch_order (struct MHD_Connection *connection, + struct TMH_HandlerContext *hc, + json_t *order, + unsigned int inventory_products_length, + const struct InventoryProduct inventory_products[], + unsigned int uuids_length, + const struct GNUNET_Uuid uuids[]) +{ + const struct TALER_MERCHANTDB_InstanceSettings *settings = + &hc->instance->settings; + + /* Add order_id if it doesn't exist. */ + if (NULL == + json_string_value (json_object_get (order, + "order_id"))) + { + char buf[256]; + time_t timer; + struct tm*tm_info; + size_t off; + uint64_t rand; + char *last; + + time (&timer); + tm_info = localtime (&timer); + if (NULL == tm_info) + { + return TALER_MHD_reply_with_error + (connection, + MHD_HTTP_INTERNAL_SERVER_ERROR, + TALER_EC_PROPOSAL_NO_LOCALTIME, + "failed to determine local time"); + } + off = strftime (buf, + sizeof (buf), + "%Y.%j", + tm_info); + buf[off++] = '-'; + rand = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, + UINT64_MAX); + last = GNUNET_STRINGS_data_to_string (&rand, + sizeof (uint64_t), + &buf[off], + sizeof (buf) - off); + *last = '\0'; + json_object_set_new (order, + "order_id", + json_string (buf)); + } + + /* Add timestamp if it doesn't exist */ + if (NULL == json_object_get (order, + "timestamp")) + { + struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); + + (void) GNUNET_TIME_round_abs (&now); + GNUNET_assert (0 == + json_object_set_new (order, + "timestamp", + GNUNET_JSON_from_time_abs (now))); + } + + /* If no refund_deadline given, set one as zero. */ + if (NULL == json_object_get (order, + "refund_deadline")) + { + struct GNUNET_TIME_Absolute zero = { 0 }; + + GNUNET_assert (0 == + json_object_set_new (order, + "refund_deadline", + GNUNET_JSON_from_time_abs (zero))); + } + + if (NULL == json_object_get (order, + "pay_deadline")) + { + struct GNUNET_TIME_Absolute t; + + t = GNUNET_TIME_relative_to_absolute (settings->default_pay_delay); + (void) GNUNET_TIME_round_abs (&t); + GNUNET_assert (0 == + json_object_set_new (order, + "pay_deadline", + GNUNET_JSON_from_time_abs (t))); + } + + if (NULL == json_object_get (order, + "wire_transfer_deadline")) + { + struct GNUNET_TIME_Absolute t; + t = GNUNET_TIME_relative_to_absolute ( + settings->default_wire_transfer_delay); + (void) GNUNET_TIME_round_abs (&t); + GNUNET_assert (0 == + json_object_set_new (order, + "wire_transfer_deadline", + GNUNET_JSON_from_time_abs (t))); + } + + if (NULL == json_object_get (order, + "max_wire_fee")) + { + GNUNET_assert (0 == + json_object_set_new (order, + "max_wire_fee", + TALER_JSON_from_amount + (&settings->default_max_wire_fee))); + } + + if (NULL == json_object_get (order, + "max_fee")) + { + GNUNET_assert (0 == + json_object_set_new ( + order, + "max_fee", + TALER_JSON_from_amount + (&settings->default_max_deposit_fee))); + } + + if (NULL == json_object_get (order, + "wire_fee_amortization")) + { + GNUNET_assert (0 == + json_object_set_new ( + order, + "wire_fee_amortization", + json_integer + ((json_int_t) settings->default_wire_fee_amortization))); + } + + if (NULL == json_object_get (order, + "merchant_base_url")) + { + char *url; + + url = make_merchant_base_url (connection, + settings->id); + GNUNET_assert (0 == + json_object_set_new (order, + "merchant_base_url", + json_string (url))); + GNUNET_free (url); + } + + + /* Fill in merchant information if necessary */ + if (NULL == json_object_get (order, + "merchant")) + { + const char *mj = NULL; + const char *ma = NULL; + json_t *locations; + json_t *jmerchant; + + jmerchant = json_object (); + GNUNET_assert (NULL != jmerchant); + GNUNET_assert (0 == + json_object_set_new (jmerchant, + "name", + json_string (settings->name))); + GNUNET_assert (0 == + json_object_set_new (jmerchant, + "instance", + json_string (settings->id))); + locations = json_object_get (order, + "locations"); + if (NULL != locations) + { + json_t *loca; + json_t *locj; + + /* Handle merchant address */ + loca = settings->address; + if (NULL != loca) + { + loca = json_deep_copy (loca); + ma = STANDARD_LABEL_MERCHANT_ADDRESS; + GNUNET_assert (0 == + json_object_set_new (locations, + ma, + loca)); + GNUNET_assert (0 == + json_object_set_new (jmerchant, + "address", + json_string (ma))); + } + + /* Handle merchant jurisdiction */ + locj = settings->jurisdiction; + if (NULL != locj) + { + if ( (NULL != loca) && + (1 == json_equal (locj, + loca)) ) + { + /* addresses equal, re-use */ + mj = ma; + } + else + { + locj = json_deep_copy (locj); + mj = STANDARD_LABEL_MERCHANT_JURISDICTION; + GNUNET_assert (0 == + json_object_set_new (locations, + mj, + locj)); + } + GNUNET_assert (0 == + json_object_set_new (jmerchant, + "jurisdiction", + json_string (mj))); + } + } /* have locations */ + GNUNET_assert (0 == + json_object_set_new (order, + "merchant", + jmerchant)); + } /* needed to synthesize merchant info */ + + /* add fields to the contract that the backend should provide */ + GNUNET_assert (0 == + json_object_set (order, + "exchanges", + TMH_trusted_exchanges)); + GNUNET_assert (0 == + json_object_set (order, + "auditors", + j_auditors)); + GNUNET_assert (0 == + json_object_set_new (order, + "merchant_pub", + GNUNET_JSON_from_data_auto ( + &hc->instance->merchant_pub))); + return execute_order (connection, + hc, + order, + inventory_products_length, + inventory_products, + uuids_length, + uuids); +} + + +/** + * Process the @a payment_target and add the details of how the + * order could be paid to @a order. On success, continue + * processing with patch_order(). + * + * @param connection connection to write the result or error to + * @param hc handler context for the request + * @param[in,out] order order to process (can be modified) + * @param payment_target desired wire method, NULL for no preference + * @param inventory_products_length length of the @a inventory_products array + * @param inventory_products array of products to add to @a order from our inventory + * @param uuids_length length of the @a uuids array + * @param uuids array of UUIDs used to reserve products from @a inventory_products + * @return MHD result code + */ +static MHD_RESULT +add_payment_details (struct MHD_Connection *connection, + struct TMH_HandlerContext *hc, + json_t *order, + const char *payment_target, + unsigned int inventory_products_length, + const struct InventoryProduct inventory_products[], + unsigned int uuids_length, + const struct GNUNET_Uuid uuids[]) +{ + struct TMH_WireMethod *wm; + + wm = hc->instance->wm_head; + if (NULL != payment_target) + { + while ( (NULL != wm) && + (GNUNET_YES == wm->active) && + (0 != strcasecmp (payment_target, + wm->wire_method) ) ) + wm = wm->next; + } + if (GNUNET_YES != wm->active) + wm = NULL; + if (NULL == wm) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "No wire method available for instance '%s'\n", + hc->instance->settings.id); + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_NOT_FOUND, + TALER_EC_PROPOSAL_INSTANCE_CONFIGURATION_LACKS_WIRE, + "No wire method configured for instance"); + } + GNUNET_assert (0 == + json_object_set_new (order, + "h_wire", + GNUNET_JSON_from_data_auto ( + &wm->h_wire))); + GNUNET_assert (0 == + json_object_set_new (order, + "wire_method", + json_string (wm->wire_method))); + return patch_order (connection, + hc, + order, + inventory_products_length, + inventory_products, + uuids_length, + uuids); +} + + +/** + * Merge the inventory products into @a order, querying the + * database about the details of those products. Upon success, + * continue processing by calling add_payment_details(). + * + * @param connection connection to write the result or error to + * @param hc handler context for the request + * @param[in,out] order order to process (can be modified) + * @param inventory_products_length length of the @a inventory_products array + * @param inventory_products array of products to add to @a order from our inventory + * @param uuids_length length of the @a uuids array + * @param uuids array of UUIDs used to reserve products from @a inventory_products + * @return MHD result code + */ +static MHD_RESULT +merge_inventory (struct MHD_Connection *connection, + struct TMH_HandlerContext *hc, + json_t *order, + const char *payment_target, + unsigned int inventory_products_length, + const struct InventoryProduct inventory_products[], + unsigned int uuids_length, + const struct GNUNET_Uuid uuids[]) +{ + if (NULL == json_object_get (order, + "products")) + { + json_object_set_new (order, + "products", + json_array ()); + } + + + // FIXME: merge inventory products into order here! + return add_payment_details (connection, + hc, + order, + payment_target, + inventory_products_length, + inventory_products, + uuids_length, + uuids); + + +} + + +/** + * Generate an order. We add the fields 'exchanges', 'merchant_pub', and + * 'H_wire' to the order gotten from the frontend, as well as possibly other + * fields if the frontend did not provide them. Returns the order_id. + * + * @param rh context of the handler + * @param connection the MHD connection to handle + * @param[in,out] hc context with further information about the request + * @return MHD result code + */ +MHD_RESULT +TMH_private_post_orders (const struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + struct TMH_HandlerContext *hc) +{ + json_t *order; + const char *payment_target; + unsigned int ips_len = 0; + struct InventoryProduct *ips = NULL; + unsigned int uuids_len = 0; + struct GNUNET_Uuid *uuids = NULL; + + order = json_object_get (hc->request_body, + "order"); + if (NULL == order) + { + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_PARAMETER_MISSING, + "order"); + } + + /* parse the payment_target (optionally given) */ + { + const json_t *pt; + + pt = json_object_get (hc->request_body, + "payment_target"); + if (NULL != pt) + { + if (! json_is_string (pt)) + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_PARAMETER_MALFORMED, + "payment_target"); + payment_target = json_string_value (pt); + } + } + /* parse the inventory_products (optionally given) */ + { + const json_t *ip; + + ip = json_object_get (hc->request_body, + "inventory_products"); + if (NULL != ip) + { + if (! json_is_array (ip)) + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_PARAMETER_MALFORMED, + "inventory_products"); + GNUNET_array_grow (ips, + ips_len, + json_array_size (ip)); + for (unsigned int i = 0; i<ips_len; i++) + { + const char *error_name; + unsigned int error_line; + int res; + struct GNUNET_JSON_Specification spec[] = { + GNUNET_JSON_spec_string ("product_id", + &ips[i].product_id), + GNUNET_JSON_spec_uint32 ("quantity", + &ips[i].quantity), + GNUNET_JSON_spec_end () + }; + + res = GNUNET_JSON_parse (json_array_get (ip, + i), + spec, + &error_name, + &error_line); + if (GNUNET_OK != res) + { + GNUNET_break_op (0); + GNUNET_array_grow (ips, + ips_len, + 0); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Product parsing failed at #%u: %s:%u\n", + i, + error_name, + error_line); + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_PARAMETER_MALFORMED, + "inventory_products"); + } + } + } + } + /* parse the lock_uuids (optionally given) */ + { + const json_t *uuid; + + uuid = json_object_get (hc->request_body, + "lock_uuids"); + if (NULL != uuid) + { + if (! json_is_array (uuid)) + { + GNUNET_array_grow (ips, + ips_len, + 0); + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_PARAMETER_MALFORMED, + "lock_uuids"); + } + GNUNET_array_grow (uuids, + uuids_len, + json_array_size (uuid)); + for (unsigned int i = 0; i<uuids_len; i++) + { + const char *error_name; + unsigned int error_line; + int res; + struct GNUNET_JSON_Specification spec[] = { + GNUNET_JSON_spec_fixed_auto ("uuid", + &uuids[i]), + GNUNET_JSON_spec_end () + }; + + res = GNUNET_JSON_parse (json_array_get (uuid, + i), + spec, + &error_name, + &error_line); + if (GNUNET_OK != res) + { + GNUNET_break_op (0); + GNUNET_array_grow (ips, + ips_len, + 0); + GNUNET_array_grow (uuids, + uuids_len, + 0); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "UUID parsing failed at #%u: %s:%u\n", + i, + error_name, + error_line); + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_BAD_REQUEST, + TALER_EC_PARAMETER_MALFORMED, + "lock_uuids"); + } + } + } + } + /* Finally, start by completing the order */ + { + MHD_RESULT res; + + res = merge_inventory (connection, + hc, + order, + payment_target, + ips_len, + ips, + uuids_len, + uuids); + GNUNET_array_grow (ips, + ips_len, + 0); + GNUNET_array_grow (uuids, + uuids_len, + 0); + return res; + } +} + + +/* end of taler-merchant-httpd_private-post-orders.c */ diff --git a/src/backend/taler-merchant-httpd_private-post-orders.h b/src/backend/taler-merchant-httpd_private-post-orders.h new file mode 100644 index 00000000..ff739863 --- /dev/null +++ b/src/backend/taler-merchant-httpd_private-post-orders.h @@ -0,0 +1,42 @@ +/* + This file is part of TALER + (C) 2014, 2015, 2019 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> +*/ +/** + * @file backend/taler-merchant-httpd_private-post-orders.h + * @brief headers for POST /orders handler + * @author Marcello Stanisci + */ +#ifndef TALER_MERCHANT_HTTPD_PRIVATE_POST_ORDERS_H +#define TALER_MERCHANT_HTTPD_PRIVATE_POST_ORDERS_H + +#include "taler-merchant-httpd.h" + +/** + * Generate an order. We add the fields 'exchanges', 'merchant_pub', and + * 'H_wire' to the order gotten from the frontend, as well as possibly other + * fields if the frontend did not provide them. Returns the order_id. + * + * @param rh context of the handler + * @param connection the MHD connection to handle + * @param[in,out] hc context with further information about the request + * @return MHD result code + */ +MHD_RESULT +TMH_private_post_orders (const struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + struct TMH_HandlerContext *hc); + + +#endif diff --git a/src/backend/taler-merchant-httpd_private-post-products.h b/src/backend/taler-merchant-httpd_private-post-products.h index 0874bc2d..efcbf5f0 100644 --- a/src/backend/taler-merchant-httpd_private-post-products.h +++ b/src/backend/taler-merchant-httpd_private-post-products.h @@ -28,7 +28,7 @@ /** - * Generate an instance, given its configuration. + * Generate a product entry in our inventory. * * @param rh context of the handler * @param connection the MHD connection to handle diff --git a/src/backenddb/merchant-0001.sql b/src/backenddb/merchant-0001.sql index a4f720ee..7c586432 100644 --- a/src/backenddb/merchant-0001.sql +++ b/src/backenddb/merchant-0001.sql @@ -188,8 +188,8 @@ CREATE TABLE IF NOT EXISTS merchant_orders ,merchant_serial BIGINT NOT NULL REFERENCES merchant_instances (merchant_serial) ON DELETE CASCADE ,order_id VARCHAR NOT NULL - ,contract_terms BYTEA NOT NULL ,pay_deadline INT8 NOT NULL + ,contract_terms BYTEA NOT NULL ,UNIQUE (merchant_serial, order_id) ); COMMENT ON TABLE merchant_orders diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 68e3f661..4ad8463c 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -1114,6 +1114,43 @@ postgres_lookup_order (void *cls, } +/** + * Insert order into the DB. + * + * @param cls closure + * @param instance_id identifies the instance responsible for the order + * @param order_id alphanumeric string that uniquely identifies the proposal + * @param pay_deadline how long does the customer have to pay for the order + * @param contract_terms proposal data to store + * @return transaction status + */ +static enum GNUNET_DB_QueryStatus +postgres_insert_order (void *cls, + const char *instance_id, + const char *order_id, + struct GNUNET_TIME_Absolute pay_deadline, + const json_t *contract_terms) +{ + struct PostgresClosure *pg = cls; + struct GNUNET_PQ_QueryParam params[] = { + GNUNET_PQ_query_param_string (instance_id), + GNUNET_PQ_query_param_string (order_id), + GNUNET_PQ_query_param_absolute_time (&pay_deadline), + TALER_PQ_query_param_json (contract_terms), + GNUNET_PQ_query_param_end + }; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "inserting order: order_id: %s, instance_id: %s.\n", + order_id, + instance_id); + check_connection (pg); + return GNUNET_PQ_eval_prepared_non_select (pg->conn, + "insert_order", + params); +} + + /* ********************* OLD API ************************** */ /** @@ -1282,43 +1319,6 @@ postgres_insert_contract_terms (void *cls, /** - * Insert order into the DB. - * - * @param cls closure - * @param order_id identificator of the proposal being stored - * @param merchant_pub merchant's public key - * @param timestamp timestamp of this proposal data - * @param contract_terms proposal data to store - * @return transaction status - */ -static enum GNUNET_DB_QueryStatus -postgres_insert_order (void *cls, - const char *order_id, - const struct TALER_MerchantPublicKeyP *merchant_pub, - struct GNUNET_TIME_Absolute timestamp, - const json_t *contract_terms) -{ - struct PostgresClosure *pg = cls; - struct GNUNET_PQ_QueryParam params[] = { - GNUNET_PQ_query_param_string (order_id), - GNUNET_PQ_query_param_auto_from_type (merchant_pub), - GNUNET_PQ_query_param_absolute_time (×tamp), - TALER_PQ_query_param_json (contract_terms), - GNUNET_PQ_query_param_end - }; - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "inserting order: order_id: %s, merchant_pub: %s.\n", - order_id, - TALER_B2S (merchant_pub)); - check_connection (pg); - return GNUNET_PQ_eval_prepared_non_select (pg->conn, - "insert_order", - params); -} - - -/** * Mark contract terms as paid. Needed by /history as only paid * contracts must be shown. * @@ -4193,7 +4193,17 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " WHERE merchant_id=$1)" " AND merchant_orders.order_id=$2", 2), - + GNUNET_PQ_make_prepare ("insert_order", + "INSERT INTO merchant_orders" + "(merchant_serial" + ",order_id" + ",pay_deadline" + ",contract_terms)" + " SELECT merchant_serial," + " $2, $3, $4" + " FROM merchant_instances" + " WHERE merchant_id=$1", + 4), /* OLD API: */ #if 0 GNUNET_PQ_make_prepare ("insert_deposit", @@ -4251,15 +4261,6 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " VALUES " "($1, $2, $3, $4, $5)", 5), - GNUNET_PQ_make_prepare ("insert_order", - "INSERT INTO merchant_orders" - "(order_id" - ",merchant_pub" - ",timestamp" - ",contract_terms)" - " VALUES " - "($1, $2, $3, $4)", - 4), GNUNET_PQ_make_prepare ("insert_session_info", "INSERT INTO merchant_session_info" "(session_id" diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index 2fa62302..0c4f79ca 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -1098,6 +1098,106 @@ TALER_MERCHANT_product_delete_cancel ( struct TALER_MERCHANT_ProductDeleteHandle *pdh); +/* ********************* /orders ************************** */ + + +/** + * Handle to a POST /orders operation + */ +struct TALER_MERCHANT_PostOrderOperation; + +/** + * Callbacks of this type are used to serve the result of submitting a + * POST /orders request to a merchant. + * + * @param cls closure + * @param hr HTTP response details + * @param order_id order id of the newly created order + */ +typedef void +(*TALER_MERCHANT_PostOrderCallback) ( + void *cls, + const struct TALER_MERCHANT_HttpResponse *hr, + const char *order_id); + + +/** + * POST to /orders at the backend to setup an order and obtain + * the order ID (which may have been set by the front-end). + * + * @param ctx execution context + * @param backend_url URL of the backend + * @param order basic information about this purchase, to be extended by the backend + * @param cb the callback to call when a reply for this request is available + * @param cb_cls closure for @a cb + * @return a handle for this request, NULL on error + */ +struct TALER_MERCHANT_PostOrderOperation * +TALER_MERCHANT_order_post (struct GNUNET_CURL_Context *ctx, + const char *backend_url, + const json_t *order, + TALER_MERCHANT_PostOrderCallback cb, + void *cb_cls); + + +/** + * Cancel a POST /orders request. This function cannot be used + * on a request handle if a response is already served for it. + * + * @param po the proposal operation request handle + */ +void +TALER_MERCHANT_order_post_cancel (struct TALER_MERCHANT_PostOrderOperation *po); + + +/** + * Handle for a DELETE /orders/$ID operation. + */ +struct TALER_MERCHANT_OrderDeleteHandle; + + +/** + * Function called with the result of the DELETE /order/$ID operation. + * + * @param cls closure + * @param hr HTTP response details + */ +typedef void +(*TALER_MERCHANT_OrderDeleteCallback)( + void *cls, + const struct TALER_MERCHANT_HttpResponse *hr); + + +/** + * Make a DELETE /orders/$ID request to delete a order from our + * inventory. + * + * @param ctx the context + * @param backend_url HTTP base URL for the backend + * @param order_id identifier of the order + * @param cb function to call with the backend's deletion status + * @param cb_cls closure for @a cb + * @return the request handle; NULL upon error + */ +struct TALER_MERCHANT_OrderDeleteHandle * +TALER_MERCHANT_order_delete ( + struct GNUNET_CURL_Context *ctx, + const char *backend_url, + const char *order_id, + TALER_MERCHANT_OrderDeleteCallback cb, + void *cb_cls); + + +/** + * Cancel DELETE /orders/$ID operation. + * + * @param odh operation to cancel + */ +void +TALER_MERCHANT_order_delete_cancel ( + struct TALER_MERCHANT_OrderDeleteHandle *odh); + + /* ********************* OLD ************************** */ @@ -1256,55 +1356,6 @@ TALER_MERCHANT_refund_increase_cancel ( /** - * Handle to a PUT /proposal operation - */ -struct TALER_MERCHANT_ProposalOperation; - -/** - * Callbacks of this type are used to serve the result of submitting a - * /contract request to a merchant. - * - * @param cls closure - * @param hr HTTP response details - * @param order_id order id of the newly created order - */ -typedef void -(*TALER_MERCHANT_ProposalCallback) ( - void *cls, - const struct TALER_MERCHANT_HttpResponse *hr, - const char *order_id); - - -/** - * PUT an order to the backend and receives the related proposal. - * - * @param ctx execution context - * @param backend_url URL of the backend - * @param order basic information about this purchase, to be extended by the - * backend - * @param proposal_cb the callback to call when a reply for this request is available - * @param proposal_cb_cls closure for @a proposal_cb - * @return a handle for this request, NULL on error - */ -struct TALER_MERCHANT_ProposalOperation * -TALER_MERCHANT_order_put (struct GNUNET_CURL_Context *ctx, - const char *backend_url, - const json_t *order, - TALER_MERCHANT_ProposalCallback proposal_cb, - void *proposal_cb_cls); - - -/** - * Cancel a PUT /proposal request. This function cannot be used - * on a request handle if a response is already served for it. - * - * @param po the proposal operation request handle - */ -void -TALER_MERCHANT_proposal_cancel (struct TALER_MERCHANT_ProposalOperation *po); - - -/** * Handle to a GET /proposal operation */ struct TALER_MERCHANT_ProposalLookupOperation; diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index c7ffdeb8..32407bb4 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -646,26 +646,26 @@ struct TALER_MERCHANTDB_Plugin json_t **contract_terms); - /* ****************** OLD API ******************** */ - /** * Insert order into db. * * @param cls closure + * @param instance_id identifies the instance responsible for the order * @param order_id alphanumeric string that uniquely identifies the proposal - * @param merchant_pub merchant's public key - * @param timestamp timestamp of this proposal data + * @param pay_deadline how long does the customer have to pay for the order * @param contract_terms proposal data to store * @return transaction status */ enum GNUNET_DB_QueryStatus (*insert_order)(void *cls, + const char *instance_id, const char *order_id, - const struct TALER_MerchantPublicKeyP *merchant_pub, - struct GNUNET_TIME_Absolute timestamp, + struct GNUNET_TIME_Absolute pay_deadline, const json_t *contract_terms); + /* ****************** OLD API ******************** */ + /** * Insert proposal data into db; the routine will internally hash and * insert the proposal data's hashcode into the same row. |