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

check well-formedness of URI when signing, check return value of function for error

Browse Source
This commit is contained in:
Christian Grothoff 2020-03-01 13:31:46 +01:00
parent 2906aeb459
commit 1eb292fe1f
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/exchange-tools/taler-exchange-wire.c
View File

@ -74,6 +74,13 @@ sign_account_data (void *cls,
wire = TALER_JSON_exchange_wire_signature_make (ai->payto_uri, wire = TALER_JSON_exchange_wire_signature_make (ai->payto_uri,
&master_priv); &master_priv);
if (NULL == wire)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Could not sign wire account `%s'. Is the URI well-formed?\n");
global_ret = 1;
return;
}
GNUNET_assert (NULL != wire); GNUNET_assert (NULL != wire);
json_out = json_dumps (wire, json_out = json_dumps (wire,
JSON_INDENT (2)); JSON_INDENT (2));

9
src/include/taler_json_lib.h
View File

@ -149,7 +149,8 @@ TALER_JSON_get_error_code2 (const void *data,
/** /**
* Compute the hash of the given wire details. The resulting * Compute the hash of the given wire details. The resulting
* hash is what is put into the contract. * hash is what is put into the contract. Also performs rudimentary
* checks on the account data *if* supported.
* *
* @param wire_s wire details to hash * @param wire_s wire details to hash
* @param[out] hc set to the hash * @param[out] hc set to the hash
@ -161,7 +162,8 @@ TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
/** /**
* Check the signature in @a wire_s. * Check the signature in @a wire_s. Also performs rudimentary
* checks on the account data *if* supported.
* *
* @param wire_s signed wire information of an exchange * @param wire_s signed wire information of an exchange
* @param master_pub master public key of the exchange * @param master_pub master public key of the exchange
@ -177,7 +179,8 @@ TALER_JSON_exchange_wire_signature_check (const json_t *wire_s,
* Create a signed wire statement for the given account. * Create a signed wire statement for the given account.
* *
* @param payto_uri account specification * @param payto_uri account specification
* @param master_priv private key to sign with, NULL to not sign * @param master_priv private key to sign with
* @return NULL if @a payto_uri is malformed
*/ */
json_t * json_t *
TALER_JSON_exchange_wire_signature_make (const char *payto_uri, TALER_JSON_exchange_wire_signature_make (const char *payto_uri,

14
src/json/json_wire.c
View File

@ -392,7 +392,8 @@ TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
/** /**
* Check the signature in @a wire_s. * Check the signature in @a wire_s. Also performs rudimentary
* checks on the account data *if* supported.
* *
* @param wire_s signed wire information of an exchange * @param wire_s signed wire information of an exchange
* @param master_pub master public key of the exchange * @param master_pub master public key of the exchange
@ -420,6 +421,7 @@ TALER_JSON_exchange_wire_signature_check (const json_t *wire_s,
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
/* Note: this check does nothing if this is not an IBAN */
if (GNUNET_SYSERR == validate_payto_iban (payto_uri)) if (GNUNET_SYSERR == validate_payto_iban (payto_uri))
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
@ -436,7 +438,8 @@ TALER_JSON_exchange_wire_signature_check (const json_t *wire_s,
* Create a signed wire statement for the given account. * Create a signed wire statement for the given account.
* *
* @param payto_uri account specification * @param payto_uri account specification
* @param master_priv private key to sign with, NULL to not sign * @param master_priv private key to sign with
* @return NULL if @a payto_uri is malformed
*/ */
json_t * json_t *
TALER_JSON_exchange_wire_signature_make (const char *payto_uri, TALER_JSON_exchange_wire_signature_make (const char *payto_uri,
@ -445,6 +448,13 @@ TALER_JSON_exchange_wire_signature_make (const char *payto_uri,
{ {
struct TALER_MasterSignatureP master_sig; struct TALER_MasterSignatureP master_sig;
/* Note: this check does nothing if this is not an IBAN */
if (GNUNET_SYSERR == validate_payto_iban (payto_uri))
{
GNUNET_break_op (0);
return NULL;
}
TALER_exchange_wire_signature_make (payto_uri, TALER_exchange_wire_signature_make (payto_uri,
master_priv, master_priv,
&master_sig); &master_sig);