diff options
author | Christian Grothoff <christian@grothoff.org> | 2024-05-05 11:20:57 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2024-07-29 12:18:39 +0200 |
commit | b51932dc73673a733de9f2bd0d12001737926a11 (patch) | |
tree | 593791844da9f70961947bc26d3903276cfc6778 /src | |
parent | eff2f2cca6b14db6b983e7235a7b5379a88636a1 (diff) |
get exchange_api_lookup_aml_decisions.c to build again
Diffstat (limited to 'src')
-rw-r--r-- | src/include/taler_exchange_service.h | 4 | ||||
-rw-r--r-- | src/lib/Makefile.am | 1 | ||||
-rw-r--r-- | src/lib/exchange_api_lookup_aml_decision.c | 417 | ||||
-rw-r--r-- | src/lib/exchange_api_lookup_aml_decisions.c | 166 |
4 files changed, 120 insertions, 468 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 87f146dd7..e6aa98747 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -5821,12 +5821,12 @@ struct TALER_EXCHANGE_AmlDecision /** * When was the decision taken? */ - struct GNUNET_TIME_Absolute decision_time; + struct GNUNET_TIME_Timestamp decision_time; /** * When will this decision expire? */ - struct GNUNET_TIME_Absolute expiration_time; + struct GNUNET_TIME_Timestamp expiration_time; /** * Properties set for the account. diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 3737fc02a..c2c52ca5e 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -40,7 +40,6 @@ libtalerexchange_la_SOURCES = \ exchange_api_kyc_proof.c \ exchange_api_kyc_wallet.c \ exchange_api_link.c \ - exchange_api_lookup_aml_decision.c \ exchange_api_lookup_aml_decisions.c \ exchange_api_management_add_partner.c \ exchange_api_management_auditor_disable.c \ diff --git a/src/lib/exchange_api_lookup_aml_decision.c b/src/lib/exchange_api_lookup_aml_decision.c deleted file mode 100644 index 501b9d185..000000000 --- a/src/lib/exchange_api_lookup_aml_decision.c +++ /dev/null @@ -1,417 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2023 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 lib/exchange_api_lookup_aml_decision.c - * @brief Implementation of the /aml/$OFFICER_PUB/decision request - * @author Christian Grothoff - */ -#include "platform.h" -#include <microhttpd.h> /* just for HTTP status codes */ -#include <gnunet/gnunet_util_lib.h> -#include <gnunet/gnunet_curl_lib.h> -#include "taler_exchange_service.h" -#include "taler_json_lib.h" -#include "exchange_api_handle.h" -#include "taler_signatures.h" -#include "exchange_api_curl_defaults.h" - - -/** - * @brief A /coins/$COIN_PUB/link Handle - */ -struct TALER_EXCHANGE_LookupAmlDecision -{ - - /** - * The url for this request. - */ - char *url; - - /** - * Handle for the request. - */ - struct GNUNET_CURL_Job *job; - - /** - * Function to call with the result. - */ - TALER_EXCHANGE_LookupAmlDecisionCallback decision_cb; - - /** - * Closure for @e cb. - */ - void *decision_cb_cls; - - /** - * HTTP headers for the job. - */ - struct curl_slist *job_headers; -}; - - -/** - * Parse AML decision history. - * - * @param aml_history JSON array with AML history - * @param[out] aml_history_ar where to write the result - * @return #GNUNET_OK on success - */ -static enum GNUNET_GenericReturnValue -parse_aml_history (const json_t *aml_history, - struct TALER_EXCHANGE_AmlDecisionDetail *aml_history_ar) -{ - json_t *obj; - size_t idx; - - json_array_foreach (aml_history, idx, obj) - { - struct TALER_EXCHANGE_AmlDecisionDetail *aml = &aml_history_ar[idx]; - struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_timestamp ("decision_time", - &aml->decision_time), - GNUNET_JSON_spec_string ("justification", - &aml->justification), - TALER_JSON_spec_amount_any ("new_threshold", - &aml->new_threshold), - TALER_JSON_spec_aml_decision ("new_state", - &aml->new_state), - GNUNET_JSON_spec_fixed_auto ("decider_pub", - &aml->decider_pub), - GNUNET_JSON_spec_end () - }; - - if (GNUNET_OK != - GNUNET_JSON_parse (obj, - spec, - NULL, - NULL)) - { - GNUNET_break_op (0); - return GNUNET_SYSERR; - } - } - return GNUNET_OK; -} - - -/** - * Parse KYC response array. - * - * @param kyc_attributes JSON array with KYC details - * @param[out] kyc_attributes_ar where to write the result - * @return #GNUNET_OK on success - */ -static enum GNUNET_GenericReturnValue -parse_kyc_attributes (const json_t *kyc_attributes, - struct TALER_EXCHANGE_KycHistoryDetail *kyc_attributes_ar) -{ - json_t *obj; - size_t idx; - - json_array_foreach (kyc_attributes, idx, obj) - { - struct TALER_EXCHANGE_KycHistoryDetail *kyc = &kyc_attributes_ar[idx]; - struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_timestamp ("collection_time", - &kyc->collection_time), - GNUNET_JSON_spec_mark_optional ( - GNUNET_JSON_spec_object_const ("attributes", - &kyc->attributes), - NULL), - GNUNET_JSON_spec_string ("provider_section", - &kyc->provider_section), - GNUNET_JSON_spec_end () - }; - - if (GNUNET_OK != - GNUNET_JSON_parse (obj, - spec, - NULL, - NULL)) - { - GNUNET_break_op (0); - return GNUNET_SYSERR; - } - } - return GNUNET_OK; -} - - -/** - * Parse the provided decision data from the "200 OK" response. - * - * @param[in,out] lh handle (callback may be zero'ed out) - * @param json json reply with the data for one coin - * @return #GNUNET_OK on success, #GNUNET_SYSERR on error - */ -static enum GNUNET_GenericReturnValue -parse_decision_ok (struct TALER_EXCHANGE_LookupAmlDecision *lh, - const json_t *json) -{ - struct TALER_EXCHANGE_AmlDecisionResponse lr = { - .hr.reply = json, - .hr.http_status = MHD_HTTP_OK - }; - const json_t *aml_history; - const json_t *kyc_attributes; - struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_array_const ("aml_history", - &aml_history), - GNUNET_JSON_spec_array_const ("kyc_attributes", - &kyc_attributes), - GNUNET_JSON_spec_end () - }; - - if (GNUNET_OK != - GNUNET_JSON_parse (json, - spec, - NULL, - NULL)) - { - GNUNET_break_op (0); - return GNUNET_SYSERR; - } - lr.details.ok.aml_history_length = json_array_size (aml_history); - lr.details.ok.kyc_attributes_length = json_array_size (kyc_attributes); - { - struct TALER_EXCHANGE_AmlDecisionDetail aml_history_ar[ - GNUNET_NZL (lr.details.ok.aml_history_length)]; - struct TALER_EXCHANGE_KycHistoryDetail kyc_attributes_ar[ - GNUNET_NZL (lr.details.ok.kyc_attributes_length)]; - enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR; - - memset (aml_history_ar, - 0, - sizeof (aml_history_ar)); - memset (kyc_attributes_ar, - 0, - sizeof (kyc_attributes_ar)); - lr.details.ok.aml_history = aml_history_ar; - lr.details.ok.kyc_attributes = kyc_attributes_ar; - ret = parse_aml_history (aml_history, - aml_history_ar); - if (GNUNET_OK == ret) - ret = parse_kyc_attributes (kyc_attributes, - kyc_attributes_ar); - if (GNUNET_OK == ret) - { - lh->decision_cb (lh->decision_cb_cls, - &lr); - lh->decision_cb = NULL; - } - return ret; - } -} - - -/** - * Function called when we're done processing the - * HTTP /aml/$OFFICER_PUB/decision request. - * - * @param cls the `struct TALER_EXCHANGE_LookupAmlDecision` - * @param response_code HTTP response code, 0 on error - * @param response parsed JSON result, NULL on error - */ -static void -handle_lookup_finished (void *cls, - long response_code, - const void *response) -{ - struct TALER_EXCHANGE_LookupAmlDecision *lh = cls; - const json_t *j = response; - struct TALER_EXCHANGE_AmlDecisionResponse lr = { - .hr.reply = j, - .hr.http_status = (unsigned int) response_code - }; - - lh->job = NULL; - switch (response_code) - { - case 0: - lr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE; - break; - case MHD_HTTP_OK: - if (GNUNET_OK != - parse_decision_ok (lh, - j)) - { - GNUNET_break_op (0); - lr.hr.http_status = 0; - lr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED; - break; - } - GNUNET_assert (NULL == lh->decision_cb); - TALER_EXCHANGE_lookup_aml_decision_cancel (lh); - return; - case MHD_HTTP_NO_CONTENT: - break; - case MHD_HTTP_BAD_REQUEST: - lr.hr.ec = TALER_JSON_get_error_code (j); - lr.hr.hint = TALER_JSON_get_error_hint (j); - /* This should never happen, either us or the exchange is buggy - (or API version conflict); just pass JSON reply to the application */ - break; - case MHD_HTTP_FORBIDDEN: - lr.hr.ec = TALER_JSON_get_error_code (j); - lr.hr.hint = TALER_JSON_get_error_hint (j); - /* Nothing really to verify, exchange says this coin was not melted; we - should pass the JSON reply to the application */ - break; - case MHD_HTTP_NOT_FOUND: - lr.hr.ec = TALER_JSON_get_error_code (j); - lr.hr.hint = TALER_JSON_get_error_hint (j); - /* Nothing really to verify, exchange says this coin was not melted; we - should pass the JSON reply to the application */ - break; - case MHD_HTTP_INTERNAL_SERVER_ERROR: - lr.hr.ec = TALER_JSON_get_error_code (j); - lr.hr.hint = TALER_JSON_get_error_hint (j); - /* Server had an internal issue; we should retry, but this API - leaves this to the application */ - break; - default: - /* unexpected response code */ - GNUNET_break_op (0); - lr.hr.ec = TALER_JSON_get_error_code (j); - lr.hr.hint = TALER_JSON_get_error_hint (j); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Unexpected response code %u/%d for exchange lookup AML decision\n", - (unsigned int) response_code, - (int) lr.hr.ec); - break; - } - if (NULL != lh->decision_cb) - lh->decision_cb (lh->decision_cb_cls, - &lr); - TALER_EXCHANGE_lookup_aml_decision_cancel (lh); -} - - -struct TALER_EXCHANGE_LookupAmlDecision * -TALER_EXCHANGE_lookup_aml_decision ( - struct GNUNET_CURL_Context *ctx, - const char *exchange_url, - const struct TALER_PaytoHashP *h_payto, - const struct TALER_AmlOfficerPrivateKeyP *officer_priv, - bool history, - TALER_EXCHANGE_LookupAmlDecisionCallback cb, - void *cb_cls) -{ - struct TALER_EXCHANGE_LookupAmlDecision *lh; - CURL *eh; - struct TALER_AmlOfficerPublicKeyP officer_pub; - struct TALER_AmlOfficerSignatureP officer_sig; - char arg_str[sizeof (officer_pub) * 2 - + sizeof (*h_payto) * 2 + 32]; - - GNUNET_CRYPTO_eddsa_key_get_public (&officer_priv->eddsa_priv, - &officer_pub.eddsa_pub); - TALER_officer_aml_query_sign (officer_priv, - &officer_sig); - { - char pub_str[sizeof (officer_pub) * 2]; - char pt_str[sizeof (*h_payto) * 2]; - char *end; - - end = GNUNET_STRINGS_data_to_string ( - &officer_pub, - sizeof (officer_pub), - pub_str, - sizeof (pub_str)); - *end = '\0'; - end = GNUNET_STRINGS_data_to_string ( - h_payto, - sizeof (*h_payto), - pt_str, - sizeof (pt_str)); - *end = '\0'; - GNUNET_snprintf (arg_str, - sizeof (arg_str), - "aml/%s/decision/%s", - pub_str, - pt_str); - } - lh = GNUNET_new (struct TALER_EXCHANGE_LookupAmlDecision); - lh->decision_cb = cb; - lh->decision_cb_cls = cb_cls; - lh->url = TALER_url_join (exchange_url, - arg_str, - "history", - history - ? "true" - : NULL, - NULL); - if (NULL == lh->url) - { - GNUNET_free (lh); - return NULL; - } - eh = TALER_EXCHANGE_curl_easy_get_ (lh->url); - if (NULL == eh) - { - GNUNET_break (0); - GNUNET_free (lh->url); - GNUNET_free (lh); - return NULL; - } - { - char *hdr; - char sig_str[sizeof (officer_sig) * 2]; - char *end; - - end = GNUNET_STRINGS_data_to_string ( - &officer_sig, - sizeof (officer_sig), - sig_str, - sizeof (sig_str)); - *end = '\0'; - - GNUNET_asprintf (&hdr, - "%s: %s", - TALER_AML_OFFICER_SIGNATURE_HEADER, - sig_str); - lh->job_headers = curl_slist_append (NULL, - hdr); - GNUNET_free (hdr); - lh->job_headers = curl_slist_append (lh->job_headers, - "Content-type: application/json"); - lh->job = GNUNET_CURL_job_add2 (ctx, - eh, - lh->job_headers, - &handle_lookup_finished, - lh); - } - return lh; -} - - -void -TALER_EXCHANGE_lookup_aml_decision_cancel ( - struct TALER_EXCHANGE_LookupAmlDecision *lh) -{ - if (NULL != lh->job) - { - GNUNET_CURL_job_cancel (lh->job); - lh->job = NULL; - } - curl_slist_free_all (lh->job_headers); - GNUNET_free (lh->url); - GNUNET_free (lh); -} - - -/* end of exchange_api_lookup_aml_decision.c */ diff --git a/src/lib/exchange_api_lookup_aml_decisions.c b/src/lib/exchange_api_lookup_aml_decisions.c index bb3c18b68..66df0982a 100644 --- a/src/lib/exchange_api_lookup_aml_decisions.c +++ b/src/lib/exchange_api_lookup_aml_decisions.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2023 Taler Systems SA + Copyright (C) 2023, 2024 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 @@ -31,7 +31,7 @@ /** - * @brief A /coins/$COIN_PUB/link Handle + * @brief A GET /aml/$OFFICER_PUB/decisions Handle */ struct TALER_EXCHANGE_LookupAmlDecisions { @@ -64,6 +64,41 @@ struct TALER_EXCHANGE_LookupAmlDecisions /** + * Parse AML limits array. + * + * @param jlimits JSON array with AML rules + * @param[out] decision_ar where to write the result + * @return #GNUNET_OK on success + */ +static enum GNUNET_GenericReturnValue +parse_limits (const json_t *jlimits, + struct TALER_EXCHANGE_AmlDecision *ds) +{ + json_t *obj; + size_t idx; + + json_array_foreach (jlimits, idx, obj) + { + struct GNUNET_JSON_Specification spec[] = { + GNUNET_JSON_spec_end () + }; + + if (GNUNET_OK != + GNUNET_JSON_parse (obj, + spec, + NULL, + NULL)) + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } + } + // FIXME... + return GNUNET_SYSERR; +} + + +/** * Parse AML decision summary array. * * @param decisions JSON array with AML decision summaries @@ -72,23 +107,34 @@ struct TALER_EXCHANGE_LookupAmlDecisions */ static enum GNUNET_GenericReturnValue parse_aml_decisions (const json_t *decisions, - struct TALER_EXCHANGE_AmlDecisionSummary *decision_ar) + struct TALER_EXCHANGE_AmlDecision *decision_ar) { json_t *obj; size_t idx; json_array_foreach (decisions, idx, obj) { - struct TALER_EXCHANGE_AmlDecisionSummary *decision = &decision_ar[idx]; + struct TALER_EXCHANGE_AmlDecision *decision = &decision_ar[idx]; + const json_t *jlimits; // FIXME: not used!!! struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_fixed_auto ("h_payto", &decision->h_payto), - TALER_JSON_spec_aml_decision ("current_state", - &decision->current_state), - TALER_JSON_spec_amount_any ("threshold", - &decision->threshold), GNUNET_JSON_spec_uint64 ("rowid", &decision->rowid), + GNUNET_JSON_spec_timestamp ("decision_time", + &decision->decision_time), + GNUNET_JSON_spec_timestamp ("expiration_time", + &decision->expiration_time), + GNUNET_JSON_spec_mark_optional ( + GNUNET_JSON_spec_object_const ("properties", + &decision->jproperties), + NULL), + GNUNET_JSON_spec_array_const ("limits", + &jlimits), + GNUNET_JSON_spec_bool ("to_investigate", + &decision->to_investigate), + GNUNET_JSON_spec_bool ("is_active", + &decision->is_active), GNUNET_JSON_spec_end () }; @@ -101,6 +147,13 @@ parse_aml_decisions (const json_t *decisions, GNUNET_break_op (0); return GNUNET_SYSERR; } + if (GNUNET_OK != + parse_limits (jlimits, + decision)) + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } } return GNUNET_OK; } @@ -137,12 +190,16 @@ parse_decisions_ok (struct TALER_EXCHANGE_LookupAmlDecisions *lh, GNUNET_break_op (0); return GNUNET_SYSERR; } - lr.details.ok.decisions_length = json_array_size (records); + lr.details.ok.decisions_length + = json_array_size (records); { - struct TALER_EXCHANGE_AmlDecisionSummary decisions[ + struct TALER_EXCHANGE_AmlDecision decisions[ GNUNET_NZL (lr.details.ok.decisions_length)]; enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR; + memset (decisions, + 0, + sizeof (decisions)); lr.details.ok.decisions = decisions; ret = parse_aml_decisions (records, decisions); @@ -152,6 +209,7 @@ parse_decisions_ok (struct TALER_EXCHANGE_LookupAmlDecisions *lh, &lr); lh->decisions_cb = NULL; } + // FIXME: free limits! return ret; } } @@ -244,9 +302,11 @@ struct TALER_EXCHANGE_LookupAmlDecisions * TALER_EXCHANGE_lookup_aml_decisions ( struct GNUNET_CURL_Context *ctx, const char *exchange_url, - uint64_t start, - int delta, - enum TALER_AmlDecisionState state, + const struct TALER_PaytoHashP *h_payto, + enum TALER_EXCHANGE_YesNoAll investigation_only, + enum TALER_EXCHANGE_YesNoAll active_only, + uint64_t offset, + int64_t limit, const struct TALER_AmlOfficerPrivateKeyP *officer_priv, TALER_EXCHANGE_LookupAmlDecisionsCallback cb, void *cb_cls) @@ -255,22 +315,9 @@ TALER_EXCHANGE_lookup_aml_decisions ( CURL *eh; struct TALER_AmlOfficerPublicKeyP officer_pub; struct TALER_AmlOfficerSignatureP officer_sig; - char arg_str[sizeof (struct TALER_AmlOfficerPublicKeyP) * 2 + 32]; - const char *state_str = NULL; + char arg_str[sizeof (struct TALER_AmlOfficerPublicKeyP) * 2 + + 32]; - switch (state) - { - case TALER_AML_NORMAL: - state_str = "normal"; - break; - case TALER_AML_PENDING: - state_str = "pending"; - break; - case TALER_AML_FROZEN: - state_str = "frozen"; - break; - } - GNUNET_assert (NULL != state_str); GNUNET_CRYPTO_eddsa_key_get_public (&officer_priv->eddsa_priv, &officer_pub.eddsa_pub); TALER_officer_aml_query_sign (officer_priv, @@ -287,32 +334,55 @@ TALER_EXCHANGE_lookup_aml_decisions ( *end = '\0'; GNUNET_snprintf (arg_str, sizeof (arg_str), - "aml/%s/decisions/%s", - pub_str, - state_str); + "aml/%s/decisions", + pub_str); } lh = GNUNET_new (struct TALER_EXCHANGE_LookupAmlDecisions); lh->decisions_cb = cb; lh->decisions_cb_cls = cb_cls; { - char delta_s[24]; - char start_s[24]; - - GNUNET_snprintf (delta_s, - sizeof (delta_s), - "%d", - delta); - GNUNET_snprintf (start_s, - sizeof (start_s), + char limit_s[24]; + char offset_s[24]; + char payto_s[sizeof (h_payto) * 2]; + char *end; + + if (NULL != h_payto) + { + end = GNUNET_STRINGS_data_to_string ( + h_payto, + sizeof (h_payto), + payto_s, + sizeof (payto_s)); + *end = '\0'; + } + GNUNET_snprintf (limit_s, + sizeof (limit_s), + "%lld", + (long long) limit); + GNUNET_snprintf (offset_s, + sizeof (offset_s), "%llu", - (unsigned long long) start); - lh->url = TALER_url_join (exchange_url, - arg_str, - "delta", - delta_s, - "start", - start_s, - NULL); + (unsigned long long) offset); + lh->url = TALER_url_join ( + exchange_url, + arg_str, + "limit", + limit_s, + "offset", + offset_s, + "h_payto", + NULL != h_payto + ? payto_s + : NULL, + "active", + TALER_EXCHANGE_YNA_ALL != active_only + ? TALER_yna_to_string (active_only) + : NULL, + "investigation", + TALER_EXCHANGE_YNA_ALL != investigation_only + ? TALER_yna_to_string (investigation_only) + : NULL, + NULL); } if (NULL == lh->url) { |