From 54e63f01df85ee0470493c6d0de29576ce3371c4 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 5 Jul 2020 21:54:11 +0200 Subject: fix #6408: make sure all timestamps are always rounded when they arrive over JSON, or 400 the requester; similarly don't tolerate anything else as client --- src/bank-lib/Makefile.am | 1 + src/bank-lib/bank_api_admin.c | 4 ++-- src/bank-lib/bank_api_credit.c | 4 ++-- src/bank-lib/bank_api_debit.c | 4 ++-- src/bank-lib/bank_api_transfer.c | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/bank-lib') diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am index 282c9db7e..223ff4afa 100644 --- a/src/bank-lib/Makefile.am +++ b/src/bank-lib/Makefile.am @@ -24,6 +24,7 @@ taler_bank_transfer_SOURCES = \ taler_bank_transfer_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/util/libtalerutil.la \ + $(top_builddir)/src/json/libtalerjson.la \ libtalerbank.la \ -lgnunetcurl \ -lgnunetutil \ diff --git a/src/bank-lib/bank_api_admin.c b/src/bank-lib/bank_api_admin.c index 8ccc154c3..952daca79 100644 --- a/src/bank-lib/bank_api_admin.c +++ b/src/bank-lib/bank_api_admin.c @@ -91,8 +91,8 @@ handle_admin_add_incoming_finished (void *cls, struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_uint64 ("row_id", &row_id), - GNUNET_JSON_spec_absolute_time ("timestamp", - ×tamp), + TALER_JSON_spec_absolute_time ("timestamp", + ×tamp), GNUNET_JSON_spec_end () }; diff --git a/src/bank-lib/bank_api_credit.c b/src/bank-lib/bank_api_credit.c index 33f66b48f..8eba7f5f9 100644 --- a/src/bank-lib/bank_api_credit.c +++ b/src/bank-lib/bank_api_credit.c @@ -90,8 +90,8 @@ parse_account_history (struct TALER_BANK_CreditHistoryHandle *hh, struct GNUNET_JSON_Specification hist_spec[] = { TALER_JSON_spec_amount ("amount", &td.amount), - GNUNET_JSON_spec_absolute_time ("date", - &td.execution_date), + TALER_JSON_spec_absolute_time ("date", + &td.execution_date), GNUNET_JSON_spec_uint64 ("row_id", &row_id), GNUNET_JSON_spec_fixed_auto ("reserve_pub", diff --git a/src/bank-lib/bank_api_debit.c b/src/bank-lib/bank_api_debit.c index 367f6c7ed..217685dd4 100644 --- a/src/bank-lib/bank_api_debit.c +++ b/src/bank-lib/bank_api_debit.c @@ -90,8 +90,8 @@ parse_account_history (struct TALER_BANK_DebitHistoryHandle *hh, struct GNUNET_JSON_Specification hist_spec[] = { TALER_JSON_spec_amount ("amount", &td.amount), - GNUNET_JSON_spec_absolute_time ("date", - &td.execution_date), + TALER_JSON_spec_absolute_time ("date", + &td.execution_date), GNUNET_JSON_spec_uint64 ("row_id", &row_id), GNUNET_JSON_spec_fixed_auto ("wtid", diff --git a/src/bank-lib/bank_api_transfer.c b/src/bank-lib/bank_api_transfer.c index 90c5a0584..60a7b1b66 100644 --- a/src/bank-lib/bank_api_transfer.c +++ b/src/bank-lib/bank_api_transfer.c @@ -184,8 +184,8 @@ handle_transfer_finished (void *cls, struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_uint64 ("row_id", &row_id), - GNUNET_JSON_spec_absolute_time ("timestamp", - ×tamp), + TALER_JSON_spec_absolute_time ("timestamp", + ×tamp), GNUNET_JSON_spec_end () }; -- cgit v1.2.3