diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-09-13 14:35:57 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-09-13 14:35:57 +0200 |
commit | 80a7fe9dcf2b334e5a46a21d981a117a4085f5db (patch) | |
tree | 309b21527ccd82e900026e29c3243753b776cdbb | |
parent | e243a8952fe92d20a28274a0ec0f239e528add81 (diff) | |
download | exchange-80a7fe9dcf2b334e5a46a21d981a117a4085f5db.tar.xz |
add logic to signal exchange to reload keys
-rw-r--r-- | src/exchange-lib/test_exchange_api.c | 8 | ||||
-rw-r--r-- | src/exchange-lib/test_exchange_api.conf | 3 | ||||
-rw-r--r-- | src/exchange-lib/test_exchange_api_keys_cherry_picking.c | 80 |
3 files changed, 85 insertions, 6 deletions
diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c index b5b68041e..4c0a49e8b 100644 --- a/src/exchange-lib/test_exchange_api.c +++ b/src/exchange-lib/test_exchange_api.c @@ -3773,9 +3773,11 @@ main (int argc, GNUNET_SIGNAL_handler_uninstall (shc_chld); shc_chld = NULL; GNUNET_DISK_pipe_close (sigpipe); - GNUNET_OS_process_kill (exchanged, - SIGTERM); - GNUNET_OS_process_wait (exchanged); + GNUNET_break (0 == + GNUNET_OS_process_kill (exchanged, + SIGTERM)); + GNUNET_break (GNUNET_OK == + GNUNET_OS_process_wait (exchanged)); GNUNET_OS_process_destroy (exchanged); return (GNUNET_OK == result) ? 0 : 1; } diff --git a/src/exchange-lib/test_exchange_api.conf b/src/exchange-lib/test_exchange_api.conf index a8543bc14..653992819 100644 --- a/src/exchange-lib/test_exchange_api.conf +++ b/src/exchange-lib/test_exchange_api.conf @@ -26,6 +26,9 @@ BASE_URL = "https://exchange.com/" [exchangedb-postgres] DB_CONN_STR = "postgres:///talercheck" +[auditordb-postgres] +DB_CONN_STR = "postgres:///talercheck" + [exchange-wire-sepa] # Enable 'sepa' to test SEPA-specific routines. ENABLE = YES diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking.c b/src/exchange-lib/test_exchange_api_keys_cherry_picking.c index 02e62a3ef..9f771701e 100644 --- a/src/exchange-lib/test_exchange_api_keys_cherry_picking.c +++ b/src/exchange-lib/test_exchange_api_keys_cherry_picking.c @@ -138,6 +138,13 @@ struct Command */ unsigned int num_denom_keys; + /** + * Which generation of /keys are we verifying here? + * Used to make sure we got the right number of + * interactions. + */ + unsigned int generation; + } check_keys; } details; @@ -171,6 +178,17 @@ struct InterpreterState */ unsigned int ip; + /** + * Is the interpreter running (#GNUNET_YES) or waiting + * for /keys (#GNUNET_NO)? + */ + int working; + + /** + * How often have we gotten a /keys response so far? + */ + unsigned int key_generation; + }; @@ -305,6 +323,48 @@ interpreter_run (void *cls) is); return; } + case OC_SIGNAL_EXCHANGE: + { + GNUNET_break (0 == + GNUNET_OS_process_kill (exchanged, + SIGUSR1)); + /* give exchange time to process the signal */ + sleep (1); + next_command (is); + return; + } + case OC_CHECK_KEYS: + { + if (is->key_generation < cmd->details.check_keys.generation) + { + /* Go back to waiting for /keys signal! */ + is->working = GNUNET_NO; + GNUNET_break (0 == + TALER_EXCHANGE_check_keys_current (exchange, + GNUNET_YES).abs_value_us); + return; + } + if (is->key_generation > cmd->details.check_keys.generation) + { + /* We got /keys too often, strange. Fatal. May theoretically happen if + somehow we were really unlucky and /keys expired "naturally", but + obviously with a sane configuration this should also not be. */ + GNUNET_break (0); + fail (is); + return; + } + /* /keys was updated, let's check they were OK! */ + if (cmd->details.check_keys.num_denom_keys != + is->keys->num_denom_keys) + { + /* Did not get the expected number of denomination keys! */ + GNUNET_break (0); + fail (is); + return; + } + next_command (is); + return; + } default: GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unknown instruction %d at %u (%s)\n", @@ -388,6 +448,12 @@ do_shutdown (void *cls) cmd->details.run_process.child_death_task = NULL; } break; + case OC_SIGNAL_EXCHANGE: + /* nothing to do */ + break; + case OC_CHECK_KEYS: + /* nothing to do */ + break; default: GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unknown instruction %d at %u (%s)\n", @@ -457,6 +523,10 @@ cert_cb (void *cls, /* run actual tests via interpreter-loop */ is->keys = keys; + if (GNUNET_YES == is->working) + return; + is->working = GNUNET_YES; + is->key_generation++; is->task = GNUNET_SCHEDULER_add_now (&interpreter_run, is); } @@ -473,6 +543,8 @@ run (void *cls) struct InterpreterState *is; static struct Command commands[] = { + /* Test signal handling by itself */ + { .oc = OC_SIGNAL_EXCHANGE }, { .oc = OC_END } }; @@ -677,9 +749,11 @@ main (int argc, GNUNET_SIGNAL_handler_uninstall (shc_chld); shc_chld = NULL; GNUNET_DISK_pipe_close (sigpipe); - GNUNET_OS_process_kill (exchanged, - SIGTERM); - GNUNET_OS_process_wait (exchanged); + GNUNET_break (0 == + GNUNET_OS_process_kill (exchanged, + SIGTERM)); + GNUNET_break (GNUNET_OK == + GNUNET_OS_process_wait (exchanged)); GNUNET_OS_process_destroy (exchanged); return (GNUNET_OK == result) ? 0 : 1; } |