commit ccb8c161a227e8b3678472ce7006e911073bbdfb
parent 832838e21fde67bb1d94fe85eb433be5d2d09f1c
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Thu, 2 Feb 2017 17:18:49 +0100
First steps in renaming
Diffstat:
7 files changed, 250 insertions(+), 293 deletions(-)
diff --git a/doc/version.texi b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 8 January 2017
+@set UPDATED 27 January 2017
@set UPDATED-MONTH January 2017
@set EDITION 0.2.0
@set VERSION 0.2.0
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
@@ -19,7 +19,7 @@ taler_merchant_httpd_SOURCES = \
taler-merchant-httpd_mhd.c taler-merchant-httpd_mhd.h \
taler-merchant-httpd_auditors.c taler-merchant-httpd_auditors.h \
taler-merchant-httpd_exchanges.c taler-merchant-httpd_exchanges.h \
- taler-merchant-httpd_propose.c taler-merchant-httpd_propose.h \
+ taler-merchant-httpd_proposal.c taler-merchant-httpd_proposal.h \
taler-merchant-httpd_pay.c taler-merchant-httpd_pay.h \
taler-merchant-httpd_history.c taler-merchant-httpd_history.h \
taler-merchant-httpd_track-transaction.c taler-merchant-httpd_track-transaction.h \
diff --git a/src/backend/taler-merchant-httpd_propose.c b/src/backend/taler-merchant-httpd_proposal.c
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -14,7 +14,7 @@ libtalermerchant_la_LDFLAGS = \
-no-undefined
libtalermerchant_la_SOURCES = \
- merchant_api_contract.c \
+ merchant_api_proposal.c \
merchant_api_pay.c \
merchant_api_track_transaction.c \
merchant_api_track_transfer.c \
diff --git a/src/lib/merchant_api_contract.c b/src/lib/merchant_api_contract.c
@@ -1,239 +0,0 @@
-/*
- This file is part of TALER
- Copyright (C) 2014, 2015, 2016 GNUnet e.V. and INRIA
-
- TALER is free software; you can redistribute it and/or modify it under the
- terms of the GNU Lesser General Public License as published by the Free Software
- Foundation; either version 2.1, 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License along with
- TALER; see the file COPYING.LGPL. If not, see
- <http://www.gnu.org/licenses/>
-*/
-/**
- * @file lib/merchant_api_contract.c
- * @brief Implementation of the /contract request of the merchant's HTTP API
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <curl/curl.h>
-#include <jansson.h>
-#include <microhttpd.h> /* just for HTTP status codes */
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_merchant_service.h"
-#include <taler/taler_json_lib.h>
-#include <taler/taler_signatures.h>
-
-
-/**
- * @brief A Contract Operation Handle
- */
-struct TALER_MERCHANT_ContractOperation
-{
-
- /**
- * The url for this request.
- */
- char *url;
-
- /**
- * JSON encoding of the request to POST.
- */
- char *json_enc;
-
- /**
- * Handle for the request.
- */
- struct GNUNET_CURL_Job *job;
-
- /**
- * Function to call with the result.
- */
- TALER_MERCHANT_ContractCallback cb;
-
- /**
- * Closure for @a cb.
- */
- void *cb_cls;
-
- /**
- * Reference to the execution context.
- */
- struct GNUNET_CURL_Context *ctx;
-};
-
-
-/**
- * Function called when we're done processing the
- * HTTP /contract request.
- *
- * @param cls the `struct TALER_MERCHANT_Pay`
- * @param response_code HTTP response code, 0 on error
- * @param json response body, NULL if not in JSON
- */
-static void
-handle_contract_finished (void *cls,
- long response_code,
- const json_t *json)
-{
- struct TALER_MERCHANT_ContractOperation *co = cls;
- json_t *contract;
- const struct TALER_MerchantSignatureP *sigp;
- const struct GNUNET_HashCode *h_contractp;
- struct TALER_MerchantSignatureP sig;
- struct GNUNET_HashCode h_contract;
-
- co->job = NULL;
- contract = NULL;
- sigp = NULL;
- h_contractp = NULL;
- switch (response_code)
- {
- case 0:
- break;
- case MHD_HTTP_OK:
- {
- struct GNUNET_JSON_Specification spec[] = {
- GNUNET_JSON_spec_json ("contract", &contract),
- GNUNET_JSON_spec_fixed_auto ("merchant_sig", &sig),
- GNUNET_JSON_spec_fixed_auto ("H_contract", &h_contract),
- GNUNET_JSON_spec_end()
- };
-
- if (GNUNET_OK !=
- GNUNET_JSON_parse (json,
- spec,
- NULL, NULL))
- {
- GNUNET_break_op (0);
- response_code = 0;
- break;
- }
- h_contractp = &h_contract;
- sigp = &sig;
- }
- break;
- case MHD_HTTP_BAD_REQUEST:
- /* This should never happen, either us or the merchant is buggy
- (or API version conflict); just pass JSON reply to the application */
- break;
- case MHD_HTTP_FORBIDDEN:
- break;
- case MHD_HTTP_UNAUTHORIZED:
- /* Nothing really to verify, merchant says one of the signatures is
- invalid; as we checked them, this should never happen, we
- should pass the JSON reply to the application */
- break;
- case MHD_HTTP_NOT_FOUND:
- /* Nothing really to verify, this should never
- happen, we should pass the JSON reply to the application */
- break;
- case MHD_HTTP_INTERNAL_SERVER_ERROR:
- /* Server had an internal issue; we should retry, but this API
- leaves this to the application */
- break;
- default:
- /* unexpected response code */
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Unexpected response code %u\n",
- (unsigned int) response_code);
- GNUNET_break (0);
- response_code = 0;
- }
- co->cb (co->cb_cls,
- response_code,
- TALER_JSON_get_error_code (json),
- json,
- contract,
- sigp,
- h_contractp);
- if (NULL != contract)
- json_decref (contract);
-}
-
-
-/**
- * Request backend to sign a contract (and add fields like wire transfer
- * details).
- *
- * @param ctx execution context
- * @param backend_uri URI of the backend
- * @param contract prototype of the contract
- * @param contract_cb the callback to call when a reply for this request is available
- * @param contract_cb_cls closure for @a contract_cb
- * @return a handle for this request
- */
-struct TALER_MERCHANT_ContractOperation *
-TALER_MERCHANT_contract_sign (struct GNUNET_CURL_Context *ctx,
- const char *backend_uri,
- const json_t *contract,
- TALER_MERCHANT_ContractCallback contract_cb,
- void *contract_cb_cls)
-{
- struct TALER_MERCHANT_ContractOperation *co;
- json_t *req;
- CURL *eh;
-
- co = GNUNET_new (struct TALER_MERCHANT_ContractOperation);
- co->ctx = ctx;
- co->cb = contract_cb;
- co->cb_cls = contract_cb_cls;
- GNUNET_asprintf (&co->url,
- "%s%s",
- backend_uri,
- "/contract");
-
- req = json_pack ("{s:O}",
- "contract", (json_t *) contract);
- eh = curl_easy_init ();
- GNUNET_assert (NULL != (co->json_enc =
- json_dumps (req,
- JSON_COMPACT)));
- json_decref (req);
- GNUNET_assert (CURLE_OK ==
- curl_easy_setopt (eh,
- CURLOPT_URL,
- co->url));
- GNUNET_assert (CURLE_OK ==
- curl_easy_setopt (eh,
- CURLOPT_POSTFIELDS,
- co->json_enc));
- GNUNET_assert (CURLE_OK ==
- curl_easy_setopt (eh,
- CURLOPT_POSTFIELDSIZE,
- strlen (co->json_enc)));
- co->job = GNUNET_CURL_job_add (ctx,
- eh,
- GNUNET_YES,
- &handle_contract_finished,
- co);
- return co;
-}
-
-
-/**
- * Cancel a /contract request. This function cannot be used
- * on a request handle if a response is already served for it.
- *
- * @param co the contract operation request handle
- */
-void
-TALER_MERCHANT_contract_sign_cancel (struct TALER_MERCHANT_ContractOperation *co)
-{
- if (NULL != co->job)
- {
- GNUNET_CURL_job_cancel (co->job);
- co->job = NULL;
- }
- GNUNET_free (co->url);
- GNUNET_free (co->json_enc);
- GNUNET_free (co);
-}
-
-
-/* end of merchant_api_contract.c */
diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
@@ -0,0 +1,240 @@
+/*
+ This file is part of TALER
+ Copyright (C) 2014, 2015, 2016 GNUnet e.V. and INRIA
+
+ TALER is free software; you can redistribute it and/or modify it under the
+ terms of the GNU Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1, 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License along with
+ TALER; see the file COPYING.LGPL. If not, see
+ <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file lib/merchant_api_proposal.c
+ * @brief Implementation of the /proposal PUT and GET
+ * @author Christian Grothoff
+ * @author Marcello Stanisci
+ */
+#include "platform.h"
+#include <curl/curl.h>
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_merchant_service.h"
+#include <taler/taler_json_lib.h>
+#include <taler/taler_signatures.h>
+
+
+/**
+ * @brief A Contract Operation Handle
+ */
+struct TALER_MERCHANT_ContractOperation
+{
+
+ /**
+ * The url for this request.
+ */
+ char *url;
+
+ /**
+ * JSON encoding of the request to POST.
+ */
+ char *json_enc;
+
+ /**
+ * Handle for the request.
+ */
+ struct GNUNET_CURL_Job *job;
+
+ /**
+ * Function to call with the result.
+ */
+ TALER_MERCHANT_ContractCallback cb;
+
+ /**
+ * Closure for @a cb.
+ */
+ void *cb_cls;
+
+ /**
+ * Reference to the execution context.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /contract request.
+ *
+ * @param cls the `struct TALER_MERCHANT_Pay`
+ * @param response_code HTTP response code, 0 on error
+ * @param json response body, NULL if not in JSON
+ */
+static void
+handle_contract_finished (void *cls,
+ long response_code,
+ const json_t *json)
+{
+ struct TALER_MERCHANT_ContractOperation *co = cls;
+ json_t *contract;
+ const struct TALER_MerchantSignatureP *sigp;
+ const struct GNUNET_HashCode *h_contractp;
+ struct TALER_MerchantSignatureP sig;
+ struct GNUNET_HashCode h_contract;
+
+ co->job = NULL;
+ contract = NULL;
+ sigp = NULL;
+ h_contractp = NULL;
+ switch (response_code)
+ {
+ case 0:
+ break;
+ case MHD_HTTP_OK:
+ {
+ struct GNUNET_JSON_Specification spec[] = {
+ GNUNET_JSON_spec_json ("contract", &contract),
+ GNUNET_JSON_spec_fixed_auto ("merchant_sig", &sig),
+ GNUNET_JSON_spec_fixed_auto ("H_contract", &h_contract),
+ GNUNET_JSON_spec_end()
+ };
+
+ if (GNUNET_OK !=
+ GNUNET_JSON_parse (json,
+ spec,
+ NULL, NULL))
+ {
+ GNUNET_break_op (0);
+ response_code = 0;
+ break;
+ }
+ h_contractp = &h_contract;
+ sigp = &sig;
+ }
+ break;
+ case MHD_HTTP_BAD_REQUEST:
+ /* This should never happen, either us or the merchant is buggy
+ (or API version conflict); just pass JSON reply to the application */
+ break;
+ case MHD_HTTP_FORBIDDEN:
+ break;
+ case MHD_HTTP_UNAUTHORIZED:
+ /* Nothing really to verify, merchant says one of the signatures is
+ invalid; as we checked them, this should never happen, we
+ should pass the JSON reply to the application */
+ break;
+ case MHD_HTTP_NOT_FOUND:
+ /* Nothing really to verify, this should never
+ happen, we should pass the JSON reply to the application */
+ break;
+ case MHD_HTTP_INTERNAL_SERVER_ERROR:
+ /* Server had an internal issue; we should retry, but this API
+ leaves this to the application */
+ break;
+ default:
+ /* unexpected response code */
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unexpected response code %u\n",
+ (unsigned int) response_code);
+ GNUNET_break (0);
+ response_code = 0;
+ }
+ co->cb (co->cb_cls,
+ response_code,
+ TALER_JSON_get_error_code (json),
+ json,
+ contract,
+ sigp,
+ h_contractp);
+ if (NULL != contract)
+ json_decref (contract);
+}
+
+
+/**
+ * PUT an order to the backend and receives the related
+ * proposal.
+ *
+ * @param ctx execution context
+ * @param backend_uri URI of the backend
+ * @param contract prototype of the contract
+ * @param contract_cb the callback to call when a reply for this request is available
+ * @param contract_cb_cls closure for @a contract_cb
+ * @return a handle for this request
+ */
+struct TALER_MERCHANT_ContractOperation *
+TALER_MERCHANT_put_order (struct GNUNET_CURL_Context *ctx,
+ const char *backend_uri,
+ const json_t *order,
+ TALER_MERCHANT_ProposalCallback proposal_cb,
+ void *proposal_cb_cls)
+{
+ struct TALER_MERCHANT_ContractOperation *co;
+ json_t *req;
+ CURL *eh;
+
+ co = GNUNET_new (struct TALER_MERCHANT_ContractOperation);
+ co->ctx = ctx;
+ co->cb = contract_cb;
+ co->cb_cls = contract_cb_cls;
+ GNUNET_asprintf (&co->url,
+ "%s%s",
+ backend_uri,
+ "/contract");
+
+ req = json_pack ("{s:O}",
+ "contract", (json_t *) contract);
+ eh = curl_easy_init ();
+ GNUNET_assert (NULL != (co->json_enc =
+ json_dumps (req,
+ JSON_COMPACT)));
+ json_decref (req);
+ GNUNET_assert (CURLE_OK ==
+ curl_easy_setopt (eh,
+ CURLOPT_URL,
+ co->url));
+ GNUNET_assert (CURLE_OK ==
+ curl_easy_setopt (eh,
+ CURLOPT_POSTFIELDS,
+ co->json_enc));
+ GNUNET_assert (CURLE_OK ==
+ curl_easy_setopt (eh,
+ CURLOPT_POSTFIELDSIZE,
+ strlen (co->json_enc)));
+ co->job = GNUNET_CURL_job_add (ctx,
+ eh,
+ GNUNET_YES,
+ &handle_contract_finished,
+ co);
+ return co;
+}
+
+
+/**
+ * Cancel a /contract request. This function cannot be used
+ * on a request handle if a response is already served for it.
+ *
+ * @param co the contract operation request handle
+ */
+void
+TALER_MERCHANT_contract_sign_cancel (struct TALER_MERCHANT_ContractOperation *co)
+{
+ if (NULL != co->job)
+ {
+ GNUNET_CURL_job_cancel (co->job);
+ co->job = NULL;
+ }
+ GNUNET_free (co->url);
+ GNUNET_free (co->json_enc);
+ GNUNET_free (co);
+}
+
+
+/* end of merchant_api_contract.c */
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
@@ -132,12 +132,6 @@ enum OpCode
OC_END = 0,
/**
- * Ask the backend to store a contract and its hashcode into
- * the database.
- */
- OC_MAP_IN,
-
- /**
* Ask the backend to retrieve a contract from the database, according
* to its hashcode.
*/
@@ -1499,7 +1493,6 @@ interpreter_run (void *cls)
is);
return;
- case OC_MAP_IN:
case OC_MAP_OUT:
{
struct GNUNET_HashCode h_proposal;
@@ -1521,29 +1514,13 @@ interpreter_run (void *cls)
GNUNET_assert (GNUNET_SYSERR !=
TALER_JSON_hash (proposal, &h_proposal));
- if (OC_MAP_IN == cmd->oc)
- {
-
- if (MHD_HTTP_UNPROCESSABLE_ENTITY == cmd->expected_response_code)
- RND_BLK (&h_proposal);
-
- GNUNET_assert (NULL !=
- (cmd->details.map.mo
- = TALER_MERCHANT_map_in (ctx,
- MERCHANT_URI,
- proposal,
- &h_proposal,
- map_cb,
- is)));
- }
- else
- GNUNET_assert (NULL !=
- (cmd->details.map.mo
- = TALER_MERCHANT_map_out (ctx,
- MERCHANT_URI,
- &h_proposal,
- map_cb,
- is)));
+ GNUNET_assert (NULL !=
+ (cmd->details.map.mo
+ = TALER_MERCHANT_map_out (ctx,
+ MERCHANT_URI,
+ &h_proposal,
+ map_cb,
+ is)));
}
return;
@@ -2033,7 +2010,6 @@ do_shutdown (void *cls)
case OC_END:
GNUNET_assert (0);
break;
- case OC_MAP_IN:
case OC_MAP_OUT:
if (NULL != cmd->details.map.mo)
{
@@ -2301,12 +2277,6 @@ run (void *cls)
.details.pay.amount_with_fee = "EUR:5",
.details.pay.amount_without_fee = "EUR:4.99" },
- /* Store contract-1 */
- {
- .oc = OC_MAP_IN,
- .label = "store-contract-1",
- .expected_response_code = MHD_HTTP_OK,
- .details.map.contract_reference = "create-contract-1" },
/* Create another contract */
{ .oc = OC_CONTRACT,
@@ -2341,14 +2311,6 @@ run (void *cls)
.details.admin_add_incoming.transfer_details = "{ \"uuid\": 2}",
.details.admin_add_incoming.amount = "EUR:1" },
- /* Store contract-1 */
- {
- .oc = OC_MAP_IN,
- .label = "store-contract-2",
- .expected_response_code = MHD_HTTP_OK,
- .details.map.contract_reference = "create-contract-2",
- },
-
/* Add another 4.01 EUR to reserve #2 */
{ .oc = OC_ADMIN_ADD_INCOMING,
.label = "create-reserve-2b",
@@ -2523,12 +2485,6 @@ run (void *cls)
\"products\":\
[ {\"description\":\"bogus\", \"value\":\"{EUR:1}\"} ] }" },
- /* Try to store a contract passing a bogus hashcode. */
- {
- .oc = OC_MAP_IN,
- .label = "store-contract-bogus",
- .expected_response_code = MHD_HTTP_UNPROCESSABLE_ENTITY,
- .details.map.contract_reference = "create-contract-3" },
/* end of testcase */
{ .oc = OC_END }
};
