taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-fix KYC logic change to work for all plugins and not just OAuth2.0

Browse Source
This commit is contained in:
Christian Grothoff 2023-01-16 11:14:59 +01:00
parent cbb021b6bf
commit 6231c365fd
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
7 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/exchange/taler-exchange-httpd.c
View File

@ -1258,8 +1258,7 @@ handle_mhd_request (void *cls,
.url = "kyc-proof", .url = "kyc-proof",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = &TEH_handler_kyc_proof, .handler.get = &TEH_handler_kyc_proof,
.nargs = 128, .nargs = 1
.nargs_is_upper_bound = true
}, },
{ {
.url = "kyc-wallet", .url = "kyc-wallet",

22
src/exchange/taler-exchange-httpd_kyc-proof.c
View File

@ -256,35 +256,34 @@ clean_kpc (struct TEH_RequestContext *rc)
MHD_RESULT MHD_RESULT
TEH_handler_kyc_proof ( TEH_handler_kyc_proof (
struct TEH_RequestContext *rc, struct TEH_RequestContext *rc,
const char *const args[3]) const char *const args[1])
{ {
struct KycProofContext *kpc = rc->rh_ctx; struct KycProofContext *kpc = rc->rh_ctx;
const char *provider_section_or_logic = args[0];
const char *h_payto; const char *h_payto;
if (NULL == kpc) if (NULL == kpc)
{ {
/* first time */ /* first time */
if ( (NULL == args[0])) if (NULL == provider_section_or_logic)
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (rc->connection, return TALER_MHD_reply_with_error (rc->connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_GENERIC_ENDPOINT_UNKNOWN, TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
"'/kyc-proof/$LOGIC?state=$H_PAYTO' required"); "'/kyc-proof/$PROVIDER_SECTION?state=$H_PAYTO' required");
} }
h_payto = MHD_lookup_connection_value (rc->connection, h_payto = MHD_lookup_connection_value (rc->connection,
MHD_GET_ARGUMENT_KIND, MHD_GET_ARGUMENT_KIND,
"state"); "state");
if ( (NULL == h_payto) ) if (NULL == h_payto)
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (rc->connection, return TALER_MHD_reply_with_error (rc->connection,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
TALER_EC_GENERIC_PARAMETER_MALFORMED, TALER_EC_GENERIC_PARAMETER_MISSING,
"h_payto"); "h_payto");
} }
kpc = GNUNET_new (struct KycProofContext); kpc = GNUNET_new (struct KycProofContext);
kpc->rc = rc; kpc->rc = rc;
rc->rh_ctx = kpc; rc->rh_ctx = kpc;
@ -302,7 +301,7 @@ TEH_handler_kyc_proof (
"h_payto"); "h_payto");
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_KYCLOGIC_lookup_logic (args[0], TALER_KYCLOGIC_lookup_logic (provider_section_or_logic,
&kpc->logic, &kpc->logic,
&kpc->pd, &kpc->pd,
&kpc->provider_section)) &kpc->provider_section))
@ -311,14 +310,14 @@ TEH_handler_kyc_proof (
return TALER_MHD_reply_with_error (rc->connection, return TALER_MHD_reply_with_error (rc->connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN, TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN,
args[0]); provider_section_or_logic);
} }
if (NULL != kpc->provider_section) if (NULL != kpc->provider_section)
{ {
enum GNUNET_DB_QueryStatus qs; enum GNUNET_DB_QueryStatus qs;
struct GNUNET_TIME_Absolute expiration; struct GNUNET_TIME_Absolute expiration;
if (0 != strcmp (args[0], if (0 != strcmp (provider_section_or_logic,
kpc->provider_section)) kpc->provider_section))
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
@ -364,7 +363,6 @@ TEH_handler_kyc_proof (
} }
kpc->ph = kpc->logic->proof (kpc->logic->cls, kpc->ph = kpc->logic->proof (kpc->logic->cls,
kpc->pd, kpc->pd,
&args[1],
rc->connection, rc->connection,
&kpc->h_payto, &kpc->h_payto,
kpc->process_row, kpc->process_row,

2
src/include/taler_kyclogic_plugin.h
View File

@ -303,7 +303,6 @@ struct TALER_KYCLOGIC_Plugin
* *
* @param cls the @e cls of this struct with the plugin-specific state * @param cls the @e cls of this struct with the plugin-specific state
* @param pd provider configuration details * @param pd provider configuration details
* @param url_path rest of the URL after `/kyc-webhook/$H_PAYTO/$LOGIC`
* @param connection MHD connection object (for HTTP headers) * @param connection MHD connection object (for HTTP headers)
* @param account_id which account to trigger process for * @param account_id which account to trigger process for
* @param process_row row in the legitimization processes table the legitimization is for * @param process_row row in the legitimization processes table the legitimization is for
@ -316,7 +315,6 @@ struct TALER_KYCLOGIC_Plugin
struct TALER_KYCLOGIC_ProofHandle * struct TALER_KYCLOGIC_ProofHandle *
(*proof)(void *cls, (*proof)(void *cls,
const struct TALER_KYCLOGIC_ProviderDetails *pd, const struct TALER_KYCLOGIC_ProviderDetails *pd,
const char *const url_path[],
struct MHD_Connection *connection, struct MHD_Connection *connection,
const struct TALER_PaytoHashP *account_id, const struct TALER_PaytoHashP *account_id,
uint64_t process_row, uint64_t process_row,

2
src/kyclogic/plugin_kyclogic_kycaid.c
View File

@ -643,7 +643,6 @@ proof_reply (void *cls)
* *
* @param cls the @e cls of this struct with the plugin-specific state * @param cls the @e cls of this struct with the plugin-specific state
* @param pd provider configuration details * @param pd provider configuration details
* @param url_path rest of the URL after `/kyc-webhook/`
* @param connection MHD connection object (for HTTP headers) * @param connection MHD connection object (for HTTP headers)
* @param account_id which account to trigger process for * @param account_id which account to trigger process for
* @param process_row row in the legitimization processes table the legitimization is for * @param process_row row in the legitimization processes table the legitimization is for
@ -656,7 +655,6 @@ proof_reply (void *cls)
static struct TALER_KYCLOGIC_ProofHandle * static struct TALER_KYCLOGIC_ProofHandle *
kycaid_proof (void *cls, kycaid_proof (void *cls,
const struct TALER_KYCLOGIC_ProviderDetails *pd, const struct TALER_KYCLOGIC_ProviderDetails *pd,
const char *const url_path[],
struct MHD_Connection *connection, struct MHD_Connection *connection,
const struct TALER_PaytoHashP *account_id, const struct TALER_PaytoHashP *account_id,
uint64_t process_row, uint64_t process_row,

4
src/kyclogic/plugin_kyclogic_oauth2.c
View File

@ -925,7 +925,6 @@ handle_curl_login_finished (void *cls,
* *
* @param cls the @e cls of this struct with the plugin-specific state * @param cls the @e cls of this struct with the plugin-specific state
* @param pd provider configuration details * @param pd provider configuration details
* @param url_path rest of the URL after `/kyc-webhook/`
* @param connection MHD connection object (for HTTP headers) * @param connection MHD connection object (for HTTP headers)
* @param account_id which account to trigger process for * @param account_id which account to trigger process for
* @param process_row row in the legitimization processes table the legitimization is for * @param process_row row in the legitimization processes table the legitimization is for
@ -938,7 +937,6 @@ handle_curl_login_finished (void *cls,
static struct TALER_KYCLOGIC_ProofHandle * static struct TALER_KYCLOGIC_ProofHandle *
oauth2_proof (void *cls, oauth2_proof (void *cls,
const struct TALER_KYCLOGIC_ProviderDetails *pd, const struct TALER_KYCLOGIC_ProviderDetails *pd,
const char *const url_path[],
struct MHD_Connection *connection, struct MHD_Connection *connection,
const struct TALER_PaytoHashP *account_id, const struct TALER_PaytoHashP *account_id,
uint64_t process_row, uint64_t process_row,
@ -951,7 +949,6 @@ oauth2_proof (void *cls,
struct TALER_KYCLOGIC_ProofHandle *ph; struct TALER_KYCLOGIC_ProofHandle *ph;
const char *code; const char *code;
(void) url_path;
GNUNET_break (NULL == provider_user_id); GNUNET_break (NULL == provider_user_id);
ph = GNUNET_new (struct TALER_KYCLOGIC_ProofHandle); ph = GNUNET_new (struct TALER_KYCLOGIC_ProofHandle);
GNUNET_snprintf (ph->provider_legitimization_id, GNUNET_snprintf (ph->provider_legitimization_id,
@ -966,6 +963,7 @@ oauth2_proof (void *cls,
GNUNET_free (ph); GNUNET_free (ph);
return NULL; return NULL;
} }
ph->pd = pd; ph->pd = pd;
ph->connection = connection; ph->connection = connection;
ph->h_payto = *account_id; ph->h_payto = *account_id;

13
src/kyclogic/plugin_kyclogic_persona.c
View File

@ -747,13 +747,14 @@ persona_initiate (void *cls,
(unsigned long long) ih->legitimization_uuid); (unsigned long long) ih->legitimization_uuid);
payto_s = GNUNET_STRINGS_data_to_string_alloc (&ih->h_payto, payto_s = GNUNET_STRINGS_data_to_string_alloc (&ih->h_payto,
sizeof (ih->h_payto)); sizeof (ih->h_payto));
/* NOTE: check here that exchange_base_url ends GNUNET_break ('/' ==
with a '/'? */ pd->ps->exchange_base_url[strlen (
pd->ps->exchange_base_url) - 1]);
GNUNET_asprintf (&proof_url, GNUNET_asprintf (&proof_url,
"%skyc-proof/%s/%s", "%skyc-proof/%s?state=%s",
pd->ps->exchange_base_url, pd->ps->exchange_base_url,
payto_s, pd->section,
pd->section); payto_s);
body = GNUNET_JSON_PACK ( body = GNUNET_JSON_PACK (
GNUNET_JSON_pack_object_steal ( GNUNET_JSON_pack_object_steal (
"data", "data",
@ -1345,7 +1346,6 @@ handle_proof_finished (void *cls,
* *
* @param cls the @e cls of this struct with the plugin-specific state * @param cls the @e cls of this struct with the plugin-specific state
* @param pd provider configuration details * @param pd provider configuration details
* @param url_path rest of the URL after `/kyc-webhook/`
* @param connection MHD connection object (for HTTP headers) * @param connection MHD connection object (for HTTP headers)
* @param account_id which account to trigger process for * @param account_id which account to trigger process for
* @param process_row row in the legitimization processes table the legitimization is for * @param process_row row in the legitimization processes table the legitimization is for
@ -1358,7 +1358,6 @@ handle_proof_finished (void *cls,
static struct TALER_KYCLOGIC_ProofHandle * static struct TALER_KYCLOGIC_ProofHandle *
persona_proof (void *cls, persona_proof (void *cls,
const struct TALER_KYCLOGIC_ProviderDetails *pd, const struct TALER_KYCLOGIC_ProviderDetails *pd,
const char *const url_path[],
struct MHD_Connection *connection, struct MHD_Connection *connection,
const struct TALER_PaytoHashP *account_id, const struct TALER_PaytoHashP *account_id,
uint64_t process_row, uint64_t process_row,

36
src/kyclogic/taler-exchange-kyc-tester.c
View File

@ -727,32 +727,42 @@ proof_cb (
* *
* @param rc request context * @param rc request context
* @param args remaining URL arguments; * @param args remaining URL arguments;
* args[0] is the 'h_payto', * args[0] should be the logic plugin name
* args[1] should be the logic plugin name
*/ */
static MHD_RESULT static MHD_RESULT
handler_kyc_proof_get ( handler_kyc_proof_get (
struct TEKT_RequestContext *rc, struct TEKT_RequestContext *rc,
const char *const args[]) const char *const args[1])
{ {
struct TALER_PaytoHashP h_payto; struct TALER_PaytoHashP h_payto;
struct TALER_KYCLOGIC_ProviderDetails *pd; struct TALER_KYCLOGIC_ProviderDetails *pd;
struct TALER_KYCLOGIC_Plugin *logic; struct TALER_KYCLOGIC_Plugin *logic;
struct ProofRequestState *rs; struct ProofRequestState *rs;
const char *section_name; const char *section_name;
const char *h_paytos;
if ( (NULL == args[0]) || if (NULL == args[0])
(NULL == args[1]) )
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
return TALER_MHD_reply_with_error (rc->connection, return TALER_MHD_reply_with_error (rc->connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_GENERIC_ENDPOINT_UNKNOWN, TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
"'/$H_PAYTO/$LOGIC' required after '/kyc-proof'"); "'/kyc-proof/$PROVIDER_SECTION?state=$H_PAYTO' required");
}
h_paytos = MHD_lookup_connection_value (rc->connection,
MHD_GET_ARGUMENT_KIND,
"state");
if (NULL == h_paytos)
{
GNUNET_break_op (0);
return TALER_MHD_reply_with_error (rc->connection,
MHD_HTTP_BAD_REQUEST,
TALER_EC_GENERIC_PARAMETER_MISSING,
"h_payto");
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_STRINGS_string_to_data (args[0], GNUNET_STRINGS_string_to_data (h_paytos,
strlen (args[0]), strlen (h_paytos),
&h_payto, &h_payto,
sizeof (h_payto))) sizeof (h_payto)))
{ {
@ -774,18 +784,18 @@ handler_kyc_proof_get (
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_KYCLOGIC_lookup_logic (args[1], TALER_KYCLOGIC_lookup_logic (args[0],
&logic, &logic,
&pd, &pd,
&section_name)) &section_name))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Could not initiate KYC with provider `%s' (configuration error?)\n", "Could not initiate KYC with provider `%s' (configuration error?)\n",
args[1]); args[0]);
return TALER_MHD_reply_with_error (rc->connection, return TALER_MHD_reply_with_error (rc->connection,
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN, TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN,
args[1]); args[0]);
} }
rs = GNUNET_new (struct ProofRequestState); rs = GNUNET_new (struct ProofRequestState);
rs->rc = rc; rs->rc = rc;
@ -796,7 +806,6 @@ handler_kyc_proof_get (
rs); rs);
rs->ph = logic->proof (logic->cls, rs->ph = logic->proof (logic->cls,
pd, pd,
&args[2],
rc->connection, rc->connection,
&h_payto, &h_payto,
kyc_row_id, kyc_row_id,
@ -1032,8 +1041,7 @@ handle_mhd_request (void *cls,
.url = "kyc-proof", .url = "kyc-proof",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
.handler.get = &handler_kyc_proof_get, .handler.get = &handler_kyc_proof_get,
.nargs = 128, .nargs = 1
.nargs_is_upper_bound = true
}, },
{ {
.url = "kyc-webhook", .url = "kyc-webhook",