summaryrefslogtreecommitdiff
path: root/src/exchange
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-12-06 22:36:29 +0100
committerChristian Grothoff <christian@grothoff.org>2020-12-06 22:36:29 +0100
commit7db909dd12fd03c7cce21b9e590cc66dd729f867 (patch)
tree47c66956a3c79d7cba2409eacf7953ae97cb002a /src/exchange
parent22c9321e67c54c581eca7ad8428267b0b14b9425 (diff)
downloadexchange-7db909dd12fd03c7cce21b9e590cc66dd729f867.tar.gz
exchange-7db909dd12fd03c7cce21b9e590cc66dd729f867.tar.bz2
exchange-7db909dd12fd03c7cce21b9e590cc66dd729f867.zip
record DB replies for /keys in memory
Diffstat (limited to 'src/exchange')
-rw-r--r--src/exchange/taler-exchange-httpd_keys.c76
-rw-r--r--src/exchange/taler-exchange-httpd_keys.h24
2 files changed, 92 insertions, 8 deletions
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index 67a5a3fb..e6f2c028 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -86,6 +86,34 @@ struct HelperDenomination
/**
+ * Signatures of an auditor over a denomination key of this exchange.
+ */
+struct TEH_AuditorSignature
+{
+ /**
+ * We store the signatures in a DLL.
+ */
+ struct AuditorSignature *prev;
+
+ /**
+ * We store the signatures in a DLL.
+ */
+ struct AuditorSignature *next;
+
+ /**
+ * A signature from the auditor.
+ */
+ struct TALER_AuditorSignatureP asig;
+
+ /**
+ * Public key of the auditor.
+ */
+ struct TALER_AuditorPublicKeyP apub;
+
+};
+
+
+/**
* Information about a signing key on offer by the esign helper.
*/
struct HelperSignkey
@@ -229,8 +257,11 @@ struct TEH_KeyStateHandle
*/
struct GNUNET_CONTAINER_MultiPeerMap *signkey_map;
- // FIXME: need list of auditors here!
- // FIXME: need list of auditor-denominations here!
+ /**
+ * json array with the auditors of this exchange. Contains exactly
+ * the information needed for the "auditors" field of the /keys response.
+ */
+ json_t *auditors;
/**
* Sorted array of responses to /keys (MUST be sorted by cherry-picking date) of
@@ -631,10 +662,18 @@ clear_denomination_cb (void *cls,
void *value)
{
struct TEH_DenominationKey *dk = value;
+ struct TEH_AuditorSignature *as;
(void) cls;
(void) h_denom_pub;
GNUNET_CRYPTO_rsa_public_key_free (dk->denom_pub.rsa_public_key);
+ while (NULL != (as = dk->as_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (dk->as_head,
+ dk->as_tail,
+ as);
+ GNUNET_free (as);
+ }
GNUNET_free (dk);
return GNUNET_OK;
}
@@ -682,6 +721,8 @@ destroy_key_state (struct TEH_KeyStateHandle *ksh,
&clear_signkey_cb,
ksh);
GNUNET_CONTAINER_multihashmap_destroy (ksh->denomkey_map);
+ json_decref (ksh->auditors);
+ ksh->auditors = NULL;
if (free_helper)
destroy_key_helpers (&ksh->helpers);
GNUNET_free (ksh);
@@ -793,7 +834,16 @@ auditor_info_cb (
{
struct TEH_KeyStateHandle *ksh = cls;
- // FIXME: remember...
+ GNUNET_break (0 ==
+ json_array_append_new (
+ ksh->auditors,
+ json_pack ("{s:s, s:o, s:s}",
+ "name",
+ auditor_name,
+ "auditor_pub",
+ GNUNET_JSON_from_data_auto (auditor_pub),
+ "url",
+ auditor_url)));
}
@@ -814,8 +864,25 @@ auditor_denom_cb (
const struct TALER_AuditorSignatureP *auditor_sig)
{
struct TEH_KeyStateHandle *ksh = cls;
+ struct TEH_DenominationKey *dk;
+ struct TEH_AuditorSignature *as;
- // FIXME: remember...
+ dk = GNUNET_CONTAINER_multihashmap_get (ksh->denom_map,
+ h_denom_pub);
+ if (NULL == dk)
+ {
+ /* Odd, this should be impossible as per foreign key
+ constraint on 'auditor_denom_sigs'! Well, we can
+ safely continue anyway, so let's just log it. */
+ GNUNET_break (0);
+ return;
+ }
+ as = GNUNET_new (struct TEH_AuditorSignature);
+ as->asig = *auditor_sig;
+ as->apub = *auditor_pub;
+ GNUNET_CONTAINER_DLL_insert (dk->as_head,
+ dk->as_tail,
+ as);
}
@@ -851,6 +918,7 @@ build_key_state (struct HelperState *hs)
GNUNET_YES);
ksh->signkey_map = GNUNET_CONTAINER_multihashmap_create (32,
GNUNET_NO /* MUST be NO! */);
+ ksh->auditors = json_array ();
/* NOTE: fetches master-signed signkeys, but ALSO those that were revoked! */
qs = TEH_plugin->iterate_denominations (TEH_plugin->cls,
&denomination_info_cb,
diff --git a/src/exchange/taler-exchange-httpd_keys.h b/src/exchange/taler-exchange-httpd_keys.h
index 07883861..24eed4ca 100644
--- a/src/exchange/taler-exchange-httpd_keys.h
+++ b/src/exchange/taler-exchange-httpd_keys.h
@@ -29,6 +29,12 @@
#define TALER_EXCHANGE_HTTPD_KEYS_H
/**
+ * Signatures of an auditor over a denomination key of this exchange.
+ */
+struct TEH_AuditorSignature;
+
+
+/**
* @brief All information about a denomination key (which is used to
* sign coins into existence).
*/
@@ -56,13 +62,23 @@ struct TEH_DenominationKey
* The long-term offline master key's signature for this denomination.
* Signs over @e h_denom_pub and @e meta.
*/
- struct TALER_MasterSignatureP master_sig_validity;
+ struct TALER_MasterSignatureP master_sig;
+
+ /**
+ * We store the auditor signatures for this denomination in a DLL.
+ */
+ struct TEH_AuditorSignature *as_head;
+
+ /**
+ * We store the auditor signatures for this denomination in a DLL.
+ */
+ struct TEH_AuditorSignature *as_tail;
/**
- * The master key's signature to revoke this denomination, or all zero
- * if the denomination has NOT yet been revoked.
+ * Set to 'true' if this denomination has been revoked and recoup is
+ * thus supported right now.
*/
- struct TALER_MasterSignatureP master_sig_revocation;
+ bool recoup_possible;
};