aboutsummaryrefslogtreecommitdiff
path: root/src/auditor
diff options
context:
space:
mode:
Diffstat (limited to 'src/auditor')
-rw-r--r--src/auditor/taler-auditor-httpd.c64
-rw-r--r--src/auditor/taler-auditor-httpd_balances-get.c11
-rw-r--r--src/auditor/taler-auditor-httpd_closure-lags-get.c2
-rw-r--r--src/auditor/taler-auditor-httpd_closure-lags-put.c2
-rw-r--r--src/auditor/taler-auditor-httpd_denomination-pending-get.c10
-rw-r--r--src/auditor/taler-auditor-httpd_emergency-get.c11
-rw-r--r--src/auditor/taler-auditor-httpd_historic-denomination-revenue-get.c10
-rw-r--r--src/auditor/taler-auditor-httpd_historic-reserve-summary-get.c10
-rw-r--r--src/auditor/taler-auditor-httpd_progress-get.c8
-rw-r--r--src/auditor/taler-auditor-httpd_purses-get.c11
-rw-r--r--src/auditor/taler-auditor-httpd_reserves-get.c10
-rw-r--r--src/auditor/taler-auditor-httpd_row-inconsistency-get.c5
-rw-r--r--src/auditor/taler-helper-auditor-purses.c2
13 files changed, 54 insertions, 102 deletions
diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c
index 506ba1f13..e7f2b3b91 100644
--- a/src/auditor/taler-auditor-httpd.c
+++ b/src/auditor/taler-auditor-httpd.c
@@ -845,12 +845,13 @@ handle_mhd_request (void *cls,
NULL, 0,
&TAH_PURSES_handler_delete,
MHD_HTTP_OK, true },
- { "/monitoring/purses", MHD_HTTP_METHOD_PATCH,
- "application/json",
- NULL, 0,
- &TAH_PURSES_handler_update,
- MHD_HTTP_OK, true },
-
+ /*
+ { "/monitoring/purses", MHD_HTTP_METHOD_PATCH,
+ "application/json",
+ NULL, 0,
+ &TAH_PURSES_handler_update,
+ MHD_HTTP_OK, true },
+*/
{ "/monitoring/historic-denomination-revenue", MHD_HTTP_METHOD_GET,
"application/json",
@@ -867,12 +868,13 @@ handle_mhd_request (void *cls,
NULL, 0,
&TAH_HISTORIC_DENOMINATION_REVENUE_handler_delete,
MHD_HTTP_OK, true },
- { "/monitoring/historic-denomination-revenue", MHD_HTTP_METHOD_PATCH,
- "application/json",
- NULL, 0,
- &TAH_HISTORIC_DENOMINATION_REVENUE_handler_update,
- MHD_HTTP_OK, true },
-
+ /*
+ { "/monitoring/historic-denomination-revenue", MHD_HTTP_METHOD_PATCH,
+ "application/json",
+ NULL, 0,
+ &TAH_HISTORIC_DENOMINATION_REVENUE_handler_update,
+ MHD_HTTP_OK, true },
+*/
{ "/monitoring/denomination-pending", MHD_HTTP_METHOD_GET,
"application/json",
@@ -889,12 +891,13 @@ handle_mhd_request (void *cls,
NULL, 0,
&TAH_DENOMINATION_PENDING_handler_delete,
MHD_HTTP_OK, true },
- { "/monitoring/denomination-pending", MHD_HTTP_METHOD_PATCH,
- "application/json",
- NULL, 0,
- &TAH_DENOMINATION_PENDING_handler_update,
- MHD_HTTP_OK, true },
-
+ /*
+ { "/monitoring/denomination-pending", MHD_HTTP_METHOD_PATCH,
+ "application/json",
+ NULL, 0,
+ &TAH_DENOMINATION_PENDING_handler_update,
+ MHD_HTTP_OK, true },
+*/
{ "/monitoring/historic-reserve-summary", MHD_HTTP_METHOD_GET,
"application/json",
@@ -911,13 +914,14 @@ handle_mhd_request (void *cls,
NULL, 0,
&TAH_HISTORIC_RESERVE_SUMMARY_handler_delete,
MHD_HTTP_OK, true },
- { "/monitoring/historic-reserve-summary", MHD_HTTP_METHOD_PATCH,
- "application/json",
- NULL, 0,
- &TAH_HISTORIC_RESERVE_SUMMARY_handler_update,
- MHD_HTTP_OK, true },
-
-
+ /*
+ { "/monitoring/historic-reserve-summary", MHD_HTTP_METHOD_PATCH,
+ "application/json",
+ NULL, 0,
+ &TAH_HISTORIC_RESERVE_SUMMARY_handler_update,
+ MHD_HTTP_OK, true },
+*/
+/*
{ "/monitoring/exchange-signkeys", MHD_HTTP_METHOD_GET,
"application/json",
NULL, 0,
@@ -938,7 +942,7 @@ handle_mhd_request (void *cls,
NULL, 0,
&TAH_EXCHANGE_SIGNKEYS_handler_update,
MHD_HTTP_OK, true },
-
+*/
{ "/monitoring/wire-format-inconsistency", MHD_HTTP_METHOD_GET,
"application/json",
@@ -1107,6 +1111,9 @@ handle_mhd_request (void *cls,
{
struct TAH_RequestHandler *rh = &handlers[i];
+ if (0 == strcasecmp (method, MHD_HTTP_METHOD_OPTIONS) )
+ return TALER_MHD_reply_cors_preflight (connection);
+
unsigned int argsnr = 3;
// arguments, and the url itself, and a terminator that is always null
@@ -1136,6 +1143,7 @@ handle_mhd_request (void *cls,
memset (argurl, 0, ulen + 1 + strlen ("/monitoring"));
strcpy (argurl,"/");
+
if (args[0] != NULL)
{
@@ -1167,7 +1175,7 @@ handle_mhd_request (void *cls,
(0 == strcasecmp (method,
rh->method)) ) )
{
-
+/*
if ((0 == strcasecmp (method, MHD_HTTP_METHOD_DELETE)) ||
(0 == strcasecmp (method, MHD_HTTP_METHOD_PUT)) )
{
@@ -1178,7 +1186,7 @@ handle_mhd_request (void *cls,
"This method is currently disabled.");
}
-
+*/
found = true;
requiresAuth = true;
diff --git a/src/auditor/taler-auditor-httpd_balances-get.c b/src/auditor/taler-auditor-httpd_balances-get.c
index 822344fd3..a685a6b3f 100644
--- a/src/auditor/taler-auditor-httpd_balances-get.c
+++ b/src/auditor/taler-auditor-httpd_balances-get.c
@@ -48,8 +48,7 @@ process_balances (void *cls,
GNUNET_JSON_pack_uint64 ("row_id", serial_id),
GNUNET_JSON_pack_string ("balance_key", dc->balance_key),
- TALER_JSON_pack_amount ("balance_value", &dc->balance_value),
- GNUNET_JSON_pack_bool ("suppressed", dc->suppressed)
+ TALER_JSON_pack_amount ("balance_value", &dc->balance_value)
);
@@ -116,14 +115,6 @@ TAH_BALANCES_handler_get (struct TAH_RequestHandler *rh,
&offset);
bool return_suppressed = false;
- const char *ret_s = MHD_lookup_connection_value (connection,
- MHD_GET_ARGUMENT_KIND,
- "return_suppressed");
-
- if (ret_s != NULL && strcmp (ret_s, "true") == 0)
- {
- return_suppressed = true;
- }
const char *balance_key = MHD_lookup_connection_value (connection,
MHD_GET_ARGUMENT_KIND,
diff --git a/src/auditor/taler-auditor-httpd_closure-lags-get.c b/src/auditor/taler-auditor-httpd_closure-lags-get.c
index 529dc62f2..30a8422af 100644
--- a/src/auditor/taler-auditor-httpd_closure-lags-get.c
+++ b/src/auditor/taler-auditor-httpd_closure-lags-get.c
@@ -48,7 +48,7 @@ process_closure_lags (void *cls,
TALER_JSON_pack_amount ("amount", &dc->amount),
TALER_JSON_pack_time_abs_human ("deadline", dc->deadline),
- GNUNET_JSON_pack_int64 ("wtid", dc->wtid),
+ GNUNET_JSON_pack_data_auto ("wtid", &dc->wtid),
GNUNET_JSON_pack_string ("account", dc->account)
);
diff --git a/src/auditor/taler-auditor-httpd_closure-lags-put.c b/src/auditor/taler-auditor-httpd_closure-lags-put.c
index c1f144e55..e57740efc 100644
--- a/src/auditor/taler-auditor-httpd_closure-lags-put.c
+++ b/src/auditor/taler-auditor-httpd_closure-lags-put.c
@@ -91,7 +91,7 @@ TAH_CLOSURE_LAGS_PUT_handler (
TALER_JSON_spec_amount ("amount", TAH_currency, &dc.amount),
GNUNET_JSON_spec_timestamp ("deadline", &d),
- GNUNET_JSON_spec_string ("wtid", (const char **) &dc.wtid),
+ GNUNET_JSON_spec_fixed_auto ("wtid", &dc.wtid),
GNUNET_JSON_spec_string ("account", (const char **) &dc.account),
GNUNET_JSON_spec_end ()
diff --git a/src/auditor/taler-auditor-httpd_denomination-pending-get.c b/src/auditor/taler-auditor-httpd_denomination-pending-get.c
index 2058c3644..ac05ede14 100644
--- a/src/auditor/taler-auditor-httpd_denomination-pending-get.c
+++ b/src/auditor/taler-auditor-httpd_denomination-pending-get.c
@@ -51,8 +51,7 @@ process_denomination_pending (void *cls,
TALER_JSON_pack_amount ("denom_loss", &dc->denom_loss),
GNUNET_JSON_pack_int64 ("num_issued", dc->num_issued),
TALER_JSON_pack_amount ("denom_risk", &dc->denom_risk),
- TALER_JSON_pack_amount ("recoup_loss", &dc->recoup_loss),
- GNUNET_JSON_pack_bool ("suppressed", dc->suppressed)
+ TALER_JSON_pack_amount ("recoup_loss", &dc->recoup_loss)
);
@@ -119,13 +118,6 @@ TAH_DENOMINATION_PENDING_handler_get (struct TAH_RequestHandler *rh,
&offset);
bool return_suppressed = false;
- const char *ret_s = MHD_lookup_connection_value (connection,
- MHD_GET_ARGUMENT_KIND,
- "return_suppressed");
- if (ret_s != NULL && strcmp (ret_s, "true") == 0)
- {
- return_suppressed = true;
- }
qs = TAH_plugin->get_denomination_pending (
TAH_plugin->cls,
diff --git a/src/auditor/taler-auditor-httpd_emergency-get.c b/src/auditor/taler-auditor-httpd_emergency-get.c
index 3ba578e0b..b09771574 100644
--- a/src/auditor/taler-auditor-httpd_emergency-get.c
+++ b/src/auditor/taler-auditor-httpd_emergency-get.c
@@ -48,6 +48,8 @@ process_emergency (void *cls,
obj = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_int64 ("row_id", serial_id),
+
GNUNET_JSON_pack_data_auto ("denompub_h", &dc->denompub_h),
TALER_JSON_pack_amount ("denom_risk", &dc->denom_risk),
@@ -121,13 +123,6 @@ TAH_EMERGENCY_handler_get (struct TAH_RequestHandler *rh,
&offset);
bool return_suppressed = false;
- const char *ret_s = MHD_lookup_connection_value (connection,
- MHD_GET_ARGUMENT_KIND,
- "return_suppressed");
- if (ret_s != NULL && strcmp (ret_s, "true") == 0)
- {
- return_suppressed = true;
- }
qs = TAH_plugin->get_emergency (
TAH_plugin->cls,
@@ -146,7 +141,7 @@ TAH_EMERGENCY_handler_get (struct TAH_RequestHandler *rh,
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_GENERIC_DB_FETCH_FAILED,
- "emergency");
+ "emergency error");
}
return TALER_MHD_REPLY_JSON_PACK (
connection,
diff --git a/src/auditor/taler-auditor-httpd_historic-denomination-revenue-get.c b/src/auditor/taler-auditor-httpd_historic-denomination-revenue-get.c
index 46d4c154e..ad696fc1f 100644
--- a/src/auditor/taler-auditor-httpd_historic-denomination-revenue-get.c
+++ b/src/auditor/taler-auditor-httpd_historic-denomination-revenue-get.c
@@ -49,8 +49,7 @@ process_historic_denomination_revenue (void *cls,
GNUNET_JSON_pack_data_auto ("denom_pub_hash", &dc->denom_pub_hash),
TALER_JSON_pack_time_abs_human ("revenue_timestamp", dc->revenue_timestamp),
TALER_JSON_pack_amount ("revenue_balance", &dc->revenue_balance),
- TALER_JSON_pack_amount ("loss_balance", &dc->loss_balance),
- GNUNET_JSON_pack_bool ("suppressed", dc->suppressed)
+ TALER_JSON_pack_amount ("loss_balance", &dc->loss_balance)
);
@@ -117,13 +116,6 @@ TAH_HISTORIC_DENOMINATION_REVENUE_handler_get (struct TAH_RequestHandler *rh,
&offset);
bool return_suppressed = false;
- const char *ret_s = MHD_lookup_connection_value (connection,
- MHD_GET_ARGUMENT_KIND,
- "return_suppressed");
- if (ret_s != NULL && strcmp (ret_s, "true") == 0)
- {
- return_suppressed = true;
- }
qs = TAH_plugin->get_historic_denomination_revenue (
TAH_plugin->cls,
diff --git a/src/auditor/taler-auditor-httpd_historic-reserve-summary-get.c b/src/auditor/taler-auditor-httpd_historic-reserve-summary-get.c
index b7bdc5b76..88b5866a4 100644
--- a/src/auditor/taler-auditor-httpd_historic-reserve-summary-get.c
+++ b/src/auditor/taler-auditor-httpd_historic-reserve-summary-get.c
@@ -49,8 +49,7 @@ process_historic_reserve_summary (void *cls,
GNUNET_JSON_pack_int64 ("row_id", serial_id),
TALER_JSON_pack_time_abs_human ("start_date", dc->start_date),
TALER_JSON_pack_time_abs_human ("end_date", dc->end_date),
- TALER_JSON_pack_amount ("reserve_profits", &dc->reserve_profits),
- GNUNET_JSON_pack_bool ("suppressed", dc->suppressed)
+ TALER_JSON_pack_amount ("reserve_profits", &dc->reserve_profits)
);
@@ -117,13 +116,6 @@ TAH_HISTORIC_RESERVE_SUMMARY_handler_get (struct TAH_RequestHandler *rh,
&offset);
bool return_suppressed = false;
- const char *ret_s = MHD_lookup_connection_value (connection,
- MHD_GET_ARGUMENT_KIND,
- "return_suppressed");
- if (ret_s != NULL && strcmp (ret_s, "true") == 0)
- {
- return_suppressed = true;
- }
qs = TAH_plugin->get_historic_reserve_summary (
TAH_plugin->cls,
diff --git a/src/auditor/taler-auditor-httpd_progress-get.c b/src/auditor/taler-auditor-httpd_progress-get.c
index 150b9ca8d..f89d7002c 100644
--- a/src/auditor/taler-auditor-httpd_progress-get.c
+++ b/src/auditor/taler-auditor-httpd_progress-get.c
@@ -111,13 +111,7 @@ TAH_PROGRESS_handler_get (struct TAH_RequestHandler *rh,
&offset);
bool return_suppressed = false;
- const char *ret_s = MHD_lookup_connection_value (connection,
- MHD_GET_ARGUMENT_KIND,
- "return_suppressed");
- if (ret_s != NULL && strcmp (ret_s, "true") == 0)
- {
- return_suppressed = true;
- }
+
qs = TAH_plugin->get_progress (
TAH_plugin->cls,
diff --git a/src/auditor/taler-auditor-httpd_purses-get.c b/src/auditor/taler-auditor-httpd_purses-get.c
index 3ad6bad5c..78c13dd95 100644
--- a/src/auditor/taler-auditor-httpd_purses-get.c
+++ b/src/auditor/taler-auditor-httpd_purses-get.c
@@ -50,8 +50,7 @@ process_purses (void *cls,
GNUNET_JSON_pack_data_auto ("purse_pub", &dc->purse_pub),
TALER_JSON_pack_amount ("balance", &dc->balance),
TALER_JSON_pack_amount ("target", &dc->target),
- TALER_JSON_pack_time_abs_human ("expiration_date", dc->expiration_date),
- GNUNET_JSON_pack_bool ("suppressed", dc->suppressed)
+ TALER_JSON_pack_time_abs_human ("expiration_date", dc->expiration_date)
);
@@ -118,13 +117,7 @@ TAH_PURSES_handler_get (struct TAH_RequestHandler *rh,
&offset);
bool return_suppressed = false;
- const char *ret_s = MHD_lookup_connection_value (connection,
- MHD_GET_ARGUMENT_KIND,
- "return_suppressed");
- if (ret_s != NULL && strcmp (ret_s, "true") == 0)
- {
- return_suppressed = true;
- }
+
qs = TAH_plugin->get_purses (
TAH_plugin->cls,
diff --git a/src/auditor/taler-auditor-httpd_reserves-get.c b/src/auditor/taler-auditor-httpd_reserves-get.c
index a9cfc6a52..4c2ac0567 100644
--- a/src/auditor/taler-auditor-httpd_reserves-get.c
+++ b/src/auditor/taler-auditor-httpd_reserves-get.c
@@ -57,8 +57,7 @@ process_reserves (void *cls,
TALER_JSON_pack_amount ("open_fee_balance", &dc->open_fee_balance),
TALER_JSON_pack_amount ("history_fee_balance", &dc->history_fee_balance),
TALER_JSON_pack_time_abs_human ("expiration_date", dc->expiration_date),
- GNUNET_JSON_pack_string ("origin_account", dc->origin_account),
- GNUNET_JSON_pack_bool ("suppressed", dc->suppressed)
+ GNUNET_JSON_pack_string ("origin_account", dc->origin_account)
);
@@ -125,13 +124,6 @@ TAH_RESERVES_handler_get (struct TAH_RequestHandler *rh,
&offset);
bool return_suppressed = false;
- const char *ret_s = MHD_lookup_connection_value (connection,
- MHD_GET_ARGUMENT_KIND,
- "return_suppressed");
- if (ret_s != NULL && strcmp (ret_s, "true") == 0)
- {
- return_suppressed = true;
- }
qs = TAH_plugin->get_reserves (
TAH_plugin->cls,
diff --git a/src/auditor/taler-auditor-httpd_row-inconsistency-get.c b/src/auditor/taler-auditor-httpd_row-inconsistency-get.c
index a2fa543ea..bfd6f95fe 100644
--- a/src/auditor/taler-auditor-httpd_row-inconsistency-get.c
+++ b/src/auditor/taler-auditor-httpd_row-inconsistency-get.c
@@ -45,10 +45,13 @@ add_row_inconsistency (void *cls,
obj = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_int64 ("row_id", serial_id),
+
GNUNET_JSON_pack_string ("row_table",
dc->row_table),
GNUNET_JSON_pack_string ("diagnostic",
- dc->diagnostic)
+ dc->diagnostic),
+ GNUNET_JSON_pack_bool ("suppressed", dc->suppressed)
);
GNUNET_break (0 ==
json_array_append_new (list,
diff --git a/src/auditor/taler-helper-auditor-purses.c b/src/auditor/taler-helper-auditor-purses.c
index 8ba1643df..0dc8833d5 100644
--- a/src/auditor/taler-helper-auditor-purses.c
+++ b/src/auditor/taler-helper-auditor-purses.c
@@ -702,7 +702,7 @@ handle_purse_deposits (
{
if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == pc->qs)
{
- report_row_inconsistency ("purse-deposit",
+ report_row_inconsistency ("purse_deposit",
rowid,
"purse not found");
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-14 12:51:37 +0000