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

code cleanup

Browse Source
This commit is contained in:
Christian Grothoff 2020-03-15 22:08:29 +01:00
parent 9ee86d4da4
commit d06d0af2fe
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 43 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,7 @@
/** /**
* Backlog for listen operation on unix * Backlog for listen operation on unix domain sockets.
* domain sockets.
*/ */
#define UNIX_BACKLOG 500 #define UNIX_BACKLOG 500
@ -87,21 +86,21 @@ char *TEH_revocation_directory;
/** /**
* The exchange's configuration (global) * The exchange's configuration (global)
*/ */
struct GNUNET_CONFIGURATION_Handle *cfg; struct GNUNET_CONFIGURATION_Handle *TEH_cfg;
/** /**
* How long is caching /keys allowed at most? * How long is caching /keys allowed at most? (global)
*/ */
struct GNUNET_TIME_Relative TEH_max_keys_caching; struct GNUNET_TIME_Relative TEH_max_keys_caching;
/** /**
* Master public key (according to the * Master public key (according to the
* configuration in the exchange directory). * configuration in the exchange directory). (global)
*/ */
struct TALER_MasterPublicKeyP TEH_master_public_key; struct TALER_MasterPublicKeyP TEH_master_public_key;
/** /**
* Our DB plugin. * Our DB plugin. (global)
*/ */
struct TALER_EXCHANGEDB_Plugin *TEH_plugin; struct TALER_EXCHANGEDB_Plugin *TEH_plugin;
@ -138,6 +137,8 @@ static unsigned long long req_count;
/** /**
* Limit for the number of requests this HTTP may process before restarting. * Limit for the number of requests this HTTP may process before restarting.
* (This was added as one way of dealing with unavoidable memory fragmentation
* happening slowly over time.)
*/ */
static unsigned long long req_max; static unsigned long long req_max;
@ -267,32 +268,15 @@ handle_mhd_completion_callback (void *cls,
TALER_MHD_parse_post_cleanup_callback (ecls->opaque_post_parsing_context); TALER_MHD_parse_post_cleanup_callback (ecls->opaque_post_parsing_context);
GNUNET_free (ecls); GNUNET_free (ecls);
*con_cls = NULL; *con_cls = NULL;
/* check that we didn't leave any transactions hanging */ /* Sanity-check that we didn't leave any transactions hanging */
/* NOTE: In high-performance production, we might want to /* NOTE: In high-performance production, we could consider
remove this. */ removing this as it should not be needed and might be costly
(to be benchmarked). */
TEH_plugin->preflight (TEH_plugin->cls, TEH_plugin->preflight (TEH_plugin->cls,
TEH_plugin->get_session (TEH_plugin->cls)); TEH_plugin->get_session (TEH_plugin->cls));
} }
/**
* Return #GNUNET_YES if given a valid correlation ID and
* #GNUNET_NO otherwise.
*
* @returns #GNUNET_YES iff given a valid correlation ID
*/
static int
is_valid_correlation_id (const char *correlation_id)
{
if (strlen (correlation_id) >= 64)
return GNUNET_NO;
for (size_t i = 0; i < strlen (correlation_id); i++)
if (! (isalnum (correlation_id[i]) || (correlation_id[i] == '-')))
return GNUNET_NO;
return GNUNET_YES;
}
/** /**
* We found @a rh responsible for handling a request. Parse the * We found @a rh responsible for handling a request. Parse the
* @a upload_data (if applicable) and the @a url and call the * @a upload_data (if applicable) and the @a url and call the
@ -348,9 +332,9 @@ proceed_with_handler (const struct TEH_RequestHandler *rh,
upload_data_size, upload_data_size,
&root); &root);
if (GNUNET_SYSERR == res) if (GNUNET_SYSERR == res)
return MHD_NO; return MHD_NO; /* bad upload, could not even generate error */
if ( (GNUNET_NO == res) || (NULL == root) ) if ( (GNUNET_NO == res) || (NULL == root) )
return MHD_YES; return MHD_YES; /* so far incomplete upload or parser error */
} }
{ {
@ -398,16 +382,17 @@ proceed_with_handler (const struct TEH_RequestHandler *rh,
/* just to be safe(r), we always terminate the array with a NULL /* just to be safe(r), we always terminate the array with a NULL
(which handlers should not read, but at least if they do, they'll (which handlers should not read, but at least if they do, they'll
crash pretty reliably... */ crash pretty reliably...) */
args[rh->nargs] = NULL; args[rh->nargs] = NULL;
/* Above logic ensures that 'root' is exactly non-NULL for POST operations */ /* Above logic ensures that 'root' is exactly non-NULL for POST operations,
so we test for 'root' to decide which handler to invoke. */
if (NULL != root) if (NULL != root)
ret = rh->handler.post (rh, ret = rh->handler.post (rh,
connection, connection,
root, root,
args); args);
else /* and we only have "POST" or "GET" in the API for at this point else /* We also only have "POST" or "GET" in the API for at this point
(OPTIONS/HEAD are taken care of earlier) */ (OPTIONS/HEAD are taken care of earlier) */
ret = rh->handler.get (rh, ret = rh->handler.get (rh,
connection, connection,
@ -462,10 +447,10 @@ handle_mhd_request (void *cls,
"Hello, I'm the Taler exchange. This HTTP server is not for humans.\n", "Hello, I'm the Taler exchange. This HTTP server is not for humans.\n",
.response_code = MHD_HTTP_OK .response_code = MHD_HTTP_OK
}, },
/* AGPL licensing page, redirect to source. As per the AGPL-license, /* AGPL licensing page, redirect to source. As per the AGPL-license, every
every deployment is required to offer the user a download of the deployment is required to offer the user a download of the source of
source. We make this easy by including a redirect to the source the actual deployment. We make this easy by including a redirect to the
here. */ source here. */
{ {
.url = "agpl", .url = "agpl",
.method = MHD_HTTP_METHOD_GET, .method = MHD_HTTP_METHOD_GET,
@ -521,7 +506,7 @@ handle_mhd_request (void *cls,
.handler.get = TEH_handler_link, .handler.get = TEH_handler_link,
.nargs = 2, .nargs = 2,
}, },
/* refreshing */ /* refreshes/$RCH/reveal */
{ {
.url = "refreshes", .url = "refreshes",
.method = MHD_HTTP_METHOD_POST, .method = MHD_HTTP_METHOD_POST,
@ -560,7 +545,9 @@ handle_mhd_request (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Handling new request\n"); "Handling new request\n");
cnt = __sync_add_and_fetch (&req_count, 1LLU); /* Atomic operation, no need for a lock ;-) */
cnt = __sync_add_and_fetch (&req_count,
1LLU);
if (req_max == cnt) if (req_max == cnt)
{ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@ -578,7 +565,7 @@ handle_mhd_request (void *cls,
MHD_HEADER_KIND, MHD_HEADER_KIND,
"Taler-Correlation-Id"); "Taler-Correlation-Id");
if ((NULL != correlation_id) && if ((NULL != correlation_id) &&
(GNUNET_YES != is_valid_correlation_id (correlation_id))) (GNUNET_YES != GNUNET_CURL_is_valid_scope_id (correlation_id)))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"illegal incoming correlation ID\n"); "illegal incoming correlation ID\n");
@ -717,7 +704,7 @@ static int
exchange_serve_process_config () exchange_serve_process_config ()
{ {
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg, GNUNET_CONFIGURATION_get_value_number (TEH_cfg,
"exchange", "exchange",
"MAX_REQUESTS", "MAX_REQUESTS",
&req_max)) &req_max))
@ -725,7 +712,7 @@ exchange_serve_process_config ()
req_max = ULONG_LONG_MAX; req_max = ULONG_LONG_MAX;
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (cfg, GNUNET_CONFIGURATION_get_value_time (TEH_cfg,
"exchange", "exchange",
"MAX_KEYS_CACHING", "MAX_KEYS_CACHING",
&TEH_max_keys_caching)) &TEH_max_keys_caching))
@ -737,7 +724,7 @@ exchange_serve_process_config ()
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg, GNUNET_CONFIGURATION_get_value_filename (TEH_cfg,
"exchange", "exchange",
"KEYDIR", "KEYDIR",
&TEH_exchange_directory)) &TEH_exchange_directory))
@ -748,7 +735,7 @@ exchange_serve_process_config ()
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg, GNUNET_CONFIGURATION_get_value_filename (TEH_cfg,
"exchange", "exchange",
"REVOCATION_DIR", "REVOCATION_DIR",
&TEH_revocation_directory)) &TEH_revocation_directory))
@ -762,7 +749,7 @@ exchange_serve_process_config ()
char *master_public_key_str; char *master_public_key_str;
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
"exchange", "exchange",
"MASTER_PUBLIC_KEY", "MASTER_PUBLIC_KEY",
&master_public_key_str)) &master_public_key_str))
@ -791,14 +778,14 @@ exchange_serve_process_config ()
GNUNET_p2s (&TEH_master_public_key.eddsa_pub)); GNUNET_p2s (&TEH_master_public_key.eddsa_pub));
if ( (GNUNET_OK != if ( (GNUNET_OK !=
TEH_VALIDATION_init (cfg)) || TEH_VALIDATION_init (TEH_cfg)) ||
(GNUNET_OK != (GNUNET_OK !=
TEH_WIRE_init ()) ) TEH_WIRE_init ()) )
return GNUNET_SYSERR; return GNUNET_SYSERR;
if (NULL == if (NULL ==
(TEH_plugin = TALER_EXCHANGEDB_plugin_load (cfg))) (TEH_plugin = TALER_EXCHANGEDB_plugin_load (TEH_cfg)))
{ {
fprintf (stderr, fprintf (stderr,
"Failed to initialize DB subsystem\n"); "Failed to initialize DB subsystem\n");
@ -807,7 +794,7 @@ exchange_serve_process_config ()
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_MHD_parse_config (cfg, TALER_MHD_parse_config (TEH_cfg,
"exchange", "exchange",
&serve_port, &serve_port,
&serve_unixpath, &serve_unixpath,
@ -1246,9 +1233,10 @@ main (int argc,
logfile)); logfile));
if (NULL == cfgfile) if (NULL == cfgfile)
cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file); cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
cfg = GNUNET_CONFIGURATION_create (); TEH_cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_SYSERR == if (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_load (cfg, cfgfile)) GNUNET_CONFIGURATION_load (TEH_cfg,
cfgfile))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_ ("Malformed configuration file `%s', exit ...\n"), _ ("Malformed configuration file `%s', exit ...\n"),
@ -1260,7 +1248,7 @@ main (int argc,
if (GNUNET_OK != if (GNUNET_OK !=
exchange_serve_process_config ()) exchange_serve_process_config ())
return 1; return 1;
TEH_load_terms (cfg); TEH_load_terms (TEH_cfg);
/* check for systemd-style FD passing */ /* check for systemd-style FD passing */
listen_pid = getenv ("LISTEN_PID"); listen_pid = getenv ("LISTEN_PID");

2
src/exchange/taler-exchange-httpd.h
View File

@ -36,7 +36,7 @@ extern struct GNUNET_TIME_Relative TEH_max_keys_caching;
/** /**
* The exchange's configuration. * The exchange's configuration.
*/ */
extern struct GNUNET_CONFIGURATION_Handle *cfg; extern struct GNUNET_CONFIGURATION_Handle *TEH_cfg;
/** /**
* Main directory with exchange data. * Main directory with exchange data.

6
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -675,7 +675,7 @@ TALER_EXCHANGE_conf_duration_provide ()
struct GNUNET_TIME_Relative rel; struct GNUNET_TIME_Relative rel;
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (cfg, GNUNET_CONFIGURATION_get_value_time (TEH_cfg,
"exchange", "exchange",
"LOOKAHEAD_PROVIDE", "LOOKAHEAD_PROVIDE",
&rel)) &rel))
@ -1474,7 +1474,7 @@ build_keys_response (const struct ResponseFactoryContext *rfc,
&ks.purpose, &ks.purpose,
&sig.eddsa_signature)); &sig.eddsa_signature));
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (cfg, GNUNET_CONFIGURATION_get_value_time (TEH_cfg,
"exchangedb", "exchangedb",
"IDLE_RESERVE_EXPIRATION_TIME", "IDLE_RESERVE_EXPIRATION_TIME",
&reserve_closing_delay)) &reserve_closing_delay))
@ -1780,7 +1780,7 @@ make_fresh_key_state (struct GNUNET_TIME_Absolute now)
&denomkey_array_sort_comparator); &denomkey_array_sort_comparator);
/* Complete `denomkey_array` by adding auditor signature data */ /* Complete `denomkey_array` by adding auditor signature data */
TALER_EXCHANGEDB_auditor_iterate (cfg, TALER_EXCHANGEDB_auditor_iterate (TEH_cfg,
&reload_auditor_iter, &reload_auditor_iter,
&rfc); &rfc);
/* Sanity check: do we have auditors for all denomination keys? */ /* Sanity check: do we have auditors for all denomination keys? */

2
src/exchange/taler-exchange-httpd_wire.c
View File

@ -95,7 +95,7 @@ TEH_WIRE_get_fees (const char *method)
json_t *j; json_t *j;
struct GNUNET_TIME_Absolute now; struct GNUNET_TIME_Absolute now;
af = TALER_EXCHANGEDB_fees_read (cfg, af = TALER_EXCHANGEDB_fees_read (TEH_cfg,
method); method);
now = GNUNET_TIME_absolute_get (); now = GNUNET_TIME_absolute_get ();
while ( (NULL != af) && while ( (NULL != af) &&