diff options
| -rw-r--r-- | src/exchange/taler-exchange-httpd_batch-deposit.c | 2 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_common_kyc.c | 33 | ||||
| -rw-r--r-- | src/exchangedb/exchange_do_trigger_kyc_rule_for_account.sql | 4 |
3 files changed, 20 insertions, 19 deletions
diff --git a/src/exchange/taler-exchange-httpd_batch-deposit.c b/src/exchange/taler-exchange-httpd_batch-deposit.c index abebe51ca..5901843ec 100644 --- a/src/exchange/taler-exchange-httpd_batch-deposit.c +++ b/src/exchange/taler-exchange-httpd_batch-deposit.c @@ -998,8 +998,6 @@ bdc_phase_parse (struct BatchDepositContext *bdc, TALER_merchant_wire_signature_hash (bd->receiver_wire_account, &bd->wire_salt, &bdc->h_wire); - - bd->num_cdis = json_array_size (coins); if (0 == bd->num_cdis) { diff --git a/src/exchange/taler-exchange-httpd_common_kyc.c b/src/exchange/taler-exchange-httpd_common_kyc.c index c28dbb601..4a1b4b6c0 100644 --- a/src/exchange/taler-exchange-httpd_common_kyc.c +++ b/src/exchange/taler-exchange-httpd_common_kyc.c @@ -1046,8 +1046,11 @@ struct TEH_LegitimizationCheckHandle struct TALER_PaytoHashP h_payto; /** - * Public key of the account. Associates this public - * key with the account if @e have_account_pub is true. + * Public key of the account. We should associate this public + * key with the account if @e have_account_pub is true. Do not + * confuse with @e lcr.kyc.have_account_pub which refers to us + * already having an @e lcr.kyc.account_pub in the database for + * the given @e h_payto. */ union TALER_AccountPublicKeyP account_pub; @@ -1091,12 +1094,6 @@ struct TEH_LegitimizationCheckHandle */ bool have_merchant_pub; - /** - * True if @a have_merchant_pub is true but the given - * merchant pub did not match the target_pub for the - * given @a h_payto. - */ - bool bad_kyc_auth; }; @@ -1516,9 +1513,10 @@ run_check ( break; } GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "trigger_kyc_rule_for_account on %d/%d returned %llu/%d\n", + "trigger_kyc_rule_for_account-2 on %d/%d returned %d/%llu/%d\n", lch->have_account_pub, lch->have_merchant_pub, + (int) qs, (unsigned long long) lch->lcr.kyc.requirement_row, lch->lcr.bad_kyc_auth); /* return success! */ @@ -1589,14 +1587,13 @@ amount_iterator_wrapper_cb ( GNUNET_log (GNUNET_ERROR_TYPE_INFO, "KYC: Checking amounts until %s\n", GNUNET_TIME_absolute2s (limit)); - if (lch->bad_kyc_auth) + if (lch->lcr.bad_kyc_auth) { /* We *do* have applicable KYC rules *and* the target_pub does not match the merchant_pub, so we indeed have a problem! */ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "KYC: Mismatch between merchant_pub and target_pub is relevant!\n"); - lch->lcr.bad_kyc_auth = true; } return lch->ai (lch->ai_cls, limit, @@ -1663,6 +1660,11 @@ legitimization_check_run ( case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: break; } + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "get_kyc_rules returned %d/%d/%d\n", + (int) qs, + ! no_account_pub, + ! no_reserve_pub); lch->lcr.kyc.have_account_pub = ! no_account_pub; @@ -1683,10 +1685,11 @@ legitimization_check_run ( /* We do not have custom rules, defer enforcing merchant_pub match until we actually have deposit constraints */ GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "KYC: merchant_pub given but no known target_pub(%d)/reserve_pub(%d) match!\n", + "KYC: merchant_pub given but no known target_pub(%d)/reserve_pub(%d) match (%d)!\n", lch->lcr.kyc.have_account_pub, - lch->lcr.have_reserve_pub); - lch->bad_kyc_auth = true; + lch->lcr.have_reserve_pub, + (int) qs); + lch->lcr.bad_kyc_auth = true; } else { @@ -1846,7 +1849,7 @@ legitimization_check_run ( &lch->lcr.kyc.requirement_row, &lch->lcr.bad_kyc_auth); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "trigger_kyc_rule_for_account on %d/%d returned %d/%llu/%d\n", + "trigger_kyc_rule_for_account-1 on %d/%d returned %d/%llu/%d\n", lch->have_account_pub, lch->have_merchant_pub, (int) qs, diff --git a/src/exchangedb/exchange_do_trigger_kyc_rule_for_account.sql b/src/exchangedb/exchange_do_trigger_kyc_rule_for_account.sql index 414ac51ff..9a224b7da 100644 --- a/src/exchangedb/exchange_do_trigger_kyc_rule_for_account.sql +++ b/src/exchangedb/exchange_do_trigger_kyc_rule_for_account.sql @@ -18,7 +18,7 @@ DROP FUNCTION IF EXISTS exchange_do_trigger_kyc_rule_for_account; CREATE FUNCTION exchange_do_trigger_kyc_rule_for_account( IN in_h_payto BYTEA, - IN in_account_pub BYTEA, -- can be NULL + IN in_account_pub BYTEA, -- can be NULL, if given, should be SET IN in_merchant_pub BYTEA, -- can be NULL IN in_payto_uri TEXT, -- can be NULL IN in_now INT8, @@ -52,7 +52,7 @@ THEN -- Extract details, determine if KYC auth matches. my_access_token = my_rec.access_token; my_account_pub = my_rec.target_pub; - out_bad_kyc_auth = COALESCE ((my_account_pub = in_merchant_pub), TRUE); + out_bad_kyc_auth = COALESCE ((my_account_pub != in_merchant_pub), TRUE); ELSE -- No constraint on merchant_pub, just create -- the wire_target. |