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

-fix report generation field name missmatch

Browse Source
This commit is contained in:
Christian Grothoff 2022-08-23 14:22:59 +02:00
parent 0ad509bd10
commit 758a149059
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/auditor-report.tex.j2
View File

@ -1107,7 +1107,7 @@ have a clear financial impact.
{{ item.row }} & {{ item.row }} &
{{ item.diagnostic }} \\ {{ item.diagnostic }} \\
\nopagebreak \nopagebreak
\multicolumn{3}{l}{ {\tiny {\tt \truncate{\textwidth}{ {{ item.wire_offset_hash }} } } } } \\ \hline \multicolumn{3}{l}{ {\tiny {\tt \truncate{\textwidth}{ {{ item.id }} } } } } \\ \hline
{% endfor %} {% endfor %}
\end{longtable} \end{longtable}
{% endif %} {% endif %}

6
src/auditor/taler-helper-auditor-wire.c
View File

@ -1318,7 +1318,7 @@ complain_out_not_found (void *cls,
"profit_drains"), "profit_drains"),
GNUNET_JSON_pack_uint64 ("row", GNUNET_JSON_pack_uint64 ("row",
serial), serial),
GNUNET_JSON_pack_data_auto ("wtid", GNUNET_JSON_pack_data_auto ("id",
&roi->details.wtid), &roi->details.wtid),
GNUNET_JSON_pack_string ("diagnostic", GNUNET_JSON_pack_string ("diagnostic",
"invalid signature"))); "invalid signature")));
@ -1695,7 +1695,7 @@ reserve_in_cb (void *cls,
"reserves_in"), "reserves_in"),
GNUNET_JSON_pack_uint64 ("row", GNUNET_JSON_pack_uint64 ("row",
rowid), rowid),
GNUNET_JSON_pack_data_auto ("wire_offset_hash", GNUNET_JSON_pack_data_auto ("id",
&rii->row_off_hash), &rii->row_off_hash),
GNUNET_JSON_pack_string ("diagnostic", GNUNET_JSON_pack_string ("diagnostic",
"duplicate wire offset"))); "duplicate wire offset")));
@ -2096,7 +2096,7 @@ reserve_closed_cb (void *cls,
"reserves_closures"), "reserves_closures"),
GNUNET_JSON_pack_uint64 ("row", GNUNET_JSON_pack_uint64 ("row",
rowid), rowid),
GNUNET_JSON_pack_data_auto ("reserve_pub", GNUNET_JSON_pack_data_auto ("id",
reserve_pub), reserve_pub),
TALER_JSON_pack_amount ("amount_with_fee", TALER_JSON_pack_amount ("amount_with_fee",
amount_with_fee), amount_with_fee),

32
src/exchange/taler-exchange-httpd_reserves_purse.c
View File

@ -536,6 +536,23 @@ TEH_handler_reserves_purse (
reserve_pub); reserve_pub);
TALER_payto_hash (payto_uri, TALER_payto_hash (payto_uri,
&rpc.h_payto); &rpc.h_payto);
TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
if (GNUNET_OK !=
TALER_wallet_purse_merge_verify (payto_uri,
rpc.merge_timestamp,
&rpc.pd.purse_pub,
&rpc.merge_pub,
&rpc.merge_sig))
{
GNUNET_break_op (0);
GNUNET_JSON_parse_free (spec);
GNUNET_free (payto_uri);
return TALER_MHD_reply_with_error (
connection,
MHD_HTTP_FORBIDDEN,
TALER_EC_EXCHANGE_RESERVES_PURSE_MERGE_SIGNATURE_INVALID,
NULL);
}
GNUNET_free (payto_uri); GNUNET_free (payto_uri);
} }
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
@ -627,21 +644,6 @@ TEH_handler_reserves_purse (
TALER_EC_EXCHANGE_PURSE_CREATE_SIGNATURE_INVALID, TALER_EC_EXCHANGE_PURSE_CREATE_SIGNATURE_INVALID,
NULL); NULL);
} }
if (GNUNET_OK !=
TALER_wallet_purse_merge_verify (TEH_base_url,
rpc.merge_timestamp,
&rpc.pd.purse_pub,
&rpc.merge_pub,
&rpc.merge_sig))
{
GNUNET_break_op (0);
GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (
connection,
MHD_HTTP_FORBIDDEN,
TALER_EC_EXCHANGE_RESERVES_PURSE_MERGE_SIGNATURE_INVALID,
NULL);
}
if (GNUNET_OK != if (GNUNET_OK !=
TALER_wallet_account_merge_verify (rpc.merge_timestamp, TALER_wallet_account_merge_verify (rpc.merge_timestamp,
&rpc.pd.purse_pub, &rpc.pd.purse_pub,

17
src/lib/exchange_api_purse_create_with_merge.c
View File

@ -454,11 +454,18 @@ TALER_EXCHANGE_purse_create_with_merge (
&pcm->purse_value_after_fees, &pcm->purse_value_after_fees,
purse_priv, purse_priv,
&pcm->purse_sig); &pcm->purse_sig);
TALER_wallet_purse_merge_sign (exchange->url, {
merge_timestamp, char *payto_uri;
&pcm->purse_pub,
merge_priv, payto_uri = TALER_reserve_make_payto (exchange->url,
&pcm->merge_sig); &pcm->reserve_pub);
TALER_wallet_purse_merge_sign (payto_uri,
merge_timestamp,
&pcm->purse_pub,
merge_priv,
&pcm->merge_sig);
GNUNET_free (payto_uri);
}
TALER_wallet_account_merge_sign (merge_timestamp, TALER_wallet_account_merge_sign (merge_timestamp,
&pcm->purse_pub, &pcm->purse_pub,
pcm->purse_expiration, pcm->purse_expiration,