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

make keyup configuration structure more logical

Browse Source
This commit is contained in:
Christian Grothoff 2015-03-17 14:34:55 +01:00
parent 93d1fe6e68
commit b314f07431
2 changed files with 82 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
contrib/mint-template/config/mint-keyup.conf
View File

@ -15,65 +15,46 @@ lookahead_provide = 4 weeks 1 day
coin_types = default_eur_ct_10 default_eur_5 default_eur_10 default_eur_1000 coin_types = default_eur_ct_10 default_eur_5 default_eur_10 default_eur_1000
[default_eur_ct_10]
value = EUR:0.10
duration_overlap = 5 minutes
duration_withdraw = 7 days
duration_spend = 2 years
fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.01
rsa_keysize = 1024
kappa = 3
[mint_denom_duration_overlap] [default_eur_5]
default_eur_ct_10 = 5 minutes value = EUR:5
default_eur_5 = 5 minutes duration_overlap = 5 minutes
default_eur_10 = 5 minutes duration_withdraw = 7 days
default_eur_1000 = 5 minutes duration_spend = 2 years
fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.01
rsa_keysize = 1024
kappa = 3
[default_eur_10]
value = EUR:10
duration_overlap = 5 minutes
duration_withdraw = 7 days
duration_spend = 2 years
fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.01
rsa_keysize = 1024
kappa = 3
[default_eur_1000]
[mint_denom_value] value = EUR:1000
default_eur_ct_10 = EUR:0.10 duration_overlap = 5 minutes
default_eur_5 = EUR:5 duration_withdraw = 7 days
default_eur_10 = EUR:10 duration_spend = 2 years
default_eur_1000 = EUR:1000 fee_withdraw = EUR:0.01
fee_deposit = EUR:0.01
fee_refresh = EUR:0.01
rsa_keysize = 2048
[mint_denom_duration_withdraw] kappa = 5
default_eur_ct_10 = 7 days
default_eur_5 = 7 days
default_eur_10 = 7 days
default_eur_1000 = 1 day
[mint_denom_duration_spend]
default_eur_ct_10 = 30 days
default_eur_5 = 30 days
default_eur_10 = 30 days
default_eur_1000 = 30 day
[mint_denom_fee_withdraw]
default_eur_ct_10 = EUR:0.01
default_eur_5 = EUR:0.01
default_eur_10 = EUR:0.01
default_eur_1000 = EUR:0.01
[mint_denom_fee_deposit]
default_eur_ct_10 = EUR:0.01
default_eur_5 = EUR:0.01
default_eur_10 = EUR:0.01
default_eur_1000 = EUR:0.01
[mint_denom_fee_refresh]
default_eur_ct_10 = EUR:0.01
default_eur_5 = EUR:0.01
default_eur_10 = EUR:0.01
default_eur_1000 = EUR:0.01
[mint_denom_kappa]
default_eur_ct_10 = 3
default_eur_5 = 3
default_eur_10 = 3
default_eur_1000 = 5

86
src/mint/taler-mint-keyup.c
View File

@ -321,7 +321,9 @@ get_cointype_file (const struct CoinTypeParams *p,
/** /**
* Get the latest key file from a past run of the key generation * Get the latest key file from a past run of the key generation
* tool. Used to calculate the starting time for the keys we * tool. Used to calculate the starting time for the keys we
* generate during this invocation. * generate during this invocation. This function is used to
* handle both signing keys and coin keys, as in both cases
* the filenames correspond to the timestamps we need.
* *
* @param cls closure, a `struct GNUNET_TIME_Absolute *`, updated * @param cls closure, a `struct GNUNET_TIME_Absolute *`, updated
* to contain the highest timestamp (below #now) * to contain the highest timestamp (below #now)
@ -349,7 +351,6 @@ get_anchor_iter (void *cls,
filename); filename);
return GNUNET_OK; return GNUNET_OK;
} }
// TODO: check if it's actually a valid key file?
if (stamp.abs_value_us <= now.abs_value_us) if (stamp.abs_value_us <= now.abs_value_us)
*anchor = GNUNET_TIME_absolute_max (stamp, *anchor = GNUNET_TIME_absolute_max (stamp,
*anchor); *anchor);
@ -456,7 +457,8 @@ create_signkey_issue_priv (struct GNUNET_TIME_Absolute start,
/** /**
* * Generate signing keys starting from the last key found to
* the lookahead time.
* *
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/ */
@ -483,7 +485,7 @@ mint_keys_update_signkeys ()
GNUNET_asprintf (&signkey_dir, GNUNET_asprintf (&signkey_dir,
"%s" DIR_SEPARATOR_STR DIR_SIGNKEYS, "%s" DIR_SEPARATOR_STR DIR_SIGNKEYS,
mintdir); mintdir);
// make sure the directory exists /* make sure the directory exists */
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_DISK_directory_create (signkey_dir)) GNUNET_DISK_directory_create (signkey_dir))
{ {
@ -494,38 +496,35 @@ mint_keys_update_signkeys ()
get_anchor (signkey_dir, get_anchor (signkey_dir,
signkey_duration, signkey_duration,
GNUNET_TIME_UNIT_ZERO, GNUNET_TIME_UNIT_ZERO /* no overlap for signing keys */,
&anchor); &anchor);
while (anchor.abs_value_us < lookahead_sign_stamp.abs_value_us) while (anchor.abs_value_us < lookahead_sign_stamp.abs_value_us)
{ {
const char *skf; const char *skf;
struct TALER_MINT_SignKeyIssuePriv signkey_issue;
ssize_t nwrite;
skf = get_signkey_file (anchor); skf = get_signkey_file (anchor);
if (GNUNET_YES != GNUNET_break (GNUNET_YES !=
GNUNET_DISK_file_test (skf)) GNUNET_DISK_file_test (skf));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Generating signing key for %s.\n",
GNUNET_STRINGS_absolute_time_to_string (anchor));
create_signkey_issue_priv (anchor,
signkey_duration,
&signkey_issue);
nwrite = GNUNET_DISK_fn_write (skf,
&signkey_issue,
sizeof (struct TALER_MINT_SignKeyIssue),
GNUNET_DISK_PERM_USER_WRITE | GNUNET_DISK_PERM_USER_READ);
if (nwrite != sizeof (struct TALER_MINT_SignKeyIssue))
{ {
struct TALER_MINT_SignKeyIssuePriv signkey_issue; fprintf (stderr,
ssize_t nwrite; "Failed to write to file `%s': %s\n",
skf,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, STRERROR (errno));
"Generating signing key for %s.\n", return GNUNET_SYSERR;
GNUNET_STRINGS_absolute_time_to_string (anchor));
create_signkey_issue_priv (anchor,
signkey_duration,
&signkey_issue);
nwrite = GNUNET_DISK_fn_write (skf,
&signkey_issue,
sizeof (struct TALER_MINT_SignKeyIssue),
GNUNET_DISK_PERM_USER_WRITE | GNUNET_DISK_PERM_USER_READ);
if (nwrite != sizeof (struct TALER_MINT_SignKeyIssue))
{
fprintf (stderr,
"Failed to write to file `%s': %s\n",
skf,
STRERROR (errno));
return GNUNET_SYSERR;
}
} }
anchor = GNUNET_TIME_absolute_add (anchor, anchor = GNUNET_TIME_absolute_add (anchor,
signkey_duration); signkey_duration);
@ -549,37 +548,36 @@ get_cointype_params (const char *ct,
const char *dir; const char *dir;
unsigned long long rsa_keysize; unsigned long long rsa_keysize;
/* FIXME: is 'ct' option or section name? */
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg, GNUNET_CONFIGURATION_get_value_time (kcfg,
"mint_denom_duration_withdraw",
ct, ct,
"duration_withdraw",
&params->duration_withdraw)) &params->duration_withdraw))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
ct, ct,
"mint_denom_duration_withdraw"); "duration_withdraw");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
ROUND_TO_SECS (params->duration_withdraw, ROUND_TO_SECS (params->duration_withdraw,
rel_value_us); rel_value_us);
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg, GNUNET_CONFIGURATION_get_value_time (kcfg,
"mint_denom_duration_spend",
ct, ct,
"duration_spend",
&params->duration_spend)) &params->duration_spend))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
ct, ct,
"mint_denom_duration_spend"); "duration_spend");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
ROUND_TO_SECS (params->duration_spend, ROUND_TO_SECS (params->duration_spend,
rel_value_us); rel_value_us);
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg, GNUNET_CONFIGURATION_get_value_time (kcfg,
"mint_denom_duration_overlap",
ct, ct,
"duration_overlap",
&params->duration_overlap)) &params->duration_overlap))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
@ -591,13 +589,13 @@ get_cointype_params (const char *ct,
rel_value_us); rel_value_us);
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (kcfg, GNUNET_CONFIGURATION_get_value_number (kcfg,
"mint_denom_rsa_keysize",
ct, ct,
"rsa_keysize",
&rsa_keysize)) &rsa_keysize))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
ct, ct,
"mint_denom_rsa_keysize"); "rsa_keysize");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if ( (rsa_keysize > 4 * 2048) || if ( (rsa_keysize > 4 * 2048) ||
@ -611,46 +609,46 @@ get_cointype_params (const char *ct,
params->rsa_keysize = (unsigned int) rsa_keysize; params->rsa_keysize = (unsigned int) rsa_keysize;
if (GNUNET_OK != if (GNUNET_OK !=
TALER_config_get_denom (kcfg, TALER_config_get_denom (kcfg,
"mint_denom_value",
ct, ct,
"value",
&params->value)) &params->value))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
ct, ct,
"mint_denom_value"); "value");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_config_get_denom (kcfg, TALER_config_get_denom (kcfg,
"mint_denom_fee_withdraw",
ct, ct,
"fee_withdraw",
&params->fee_withdraw)) &params->fee_withdraw))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
ct, ct,
"mint_denom_fee_withdraw"); "fee_withdraw");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_config_get_denom (kcfg, TALER_config_get_denom (kcfg,
"mint_denom_fee_deposit",
ct, ct,
"fee_deposit",
&params->fee_deposit)) &params->fee_deposit))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
ct, ct,
"mint_denom_fee_deposit"); "fee_deposit");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_config_get_denom (kcfg, TALER_config_get_denom (kcfg,
"mint_denom_fee_refresh",
ct, ct,
"fee_refresh",
&params->fee_refresh)) &params->fee_refresh))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
ct, ct,
"mint_denom_fee_refresh"); "fee_refresh");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }