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

fix #4984

Browse Source
This commit is contained in:
Christian Grothoff 2017-04-16 17:21:26 +02:00
parent 4d4ac495a4
commit 62afe341b7
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/auditor/taler-auditor.c
View File

@ -832,6 +832,7 @@ handle_payback_by_reserve (void *cls,
struct GNUNET_TIME_Absolute expiry; struct GNUNET_TIME_Absolute expiry;
struct TALER_PaybackRequestPS pr; struct TALER_PaybackRequestPS pr;
struct TALER_MasterSignatureP msig; struct TALER_MasterSignatureP msig;
uint64_t rev_rowid;
int ret; int ret;
/* should be monotonically increasing */ /* should be monotonically increasing */
@ -866,7 +867,8 @@ handle_payback_by_reserve (void *cls,
ret = edb->get_denomination_revocation (edb->cls, ret = edb->get_denomination_revocation (edb->cls,
esession, esession,
&pr.h_denom_pub, &pr.h_denom_pub,
&msig); &msig,
&rev_rowid);
if (GNUNET_SYSERR == ret) if (GNUNET_SYSERR == ret)
{ {
GNUNET_break (0); GNUNET_break (0);
@ -893,7 +895,7 @@ handle_payback_by_reserve (void *cls,
&master_pub.eddsa_pub)) &master_pub.eddsa_pub))
{ {
report_row_inconsistency ("denomination_revocations", report_row_inconsistency ("denomination_revocations",
0, /* FIXME: modify DB API to return rowid! (#4984) */ rev_rowid,
"master signature invalid"); "master signature invalid");
} }
/* TODO: cache result so we don't do this every time! (#4983) */ /* TODO: cache result so we don't do this every time! (#4983) */

9
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -317,7 +317,8 @@ postgres_create_tables (void *cls)
add denom_pub_hash column to denominations, changing other REFERENCEs add denom_pub_hash column to denominations, changing other REFERENCEs
also to the hash!? */ also to the hash!? */
SQLEXEC ("CREATE TABLE IF NOT EXISTS denomination_revocations" SQLEXEC ("CREATE TABLE IF NOT EXISTS denomination_revocations"
"(denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64)" "(denom_revocations_serial_id BIGSERIAL"
",denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64)"
",master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)" ",master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)"
")"); ")");
@ -667,6 +668,7 @@ postgres_prepare (PGconn *db_conn)
PREPARE ("denomination_revocation_get", PREPARE ("denomination_revocation_get",
"SELECT" "SELECT"
" master_sig" " master_sig"
",denom_revocations_serial_id"
" FROM denomination_revocations" " FROM denomination_revocations"
" WHERE denom_pub_hash=$1;", " WHERE denom_pub_hash=$1;",
1, NULL); 1, NULL);
@ -6042,6 +6044,7 @@ postgres_insert_denomination_revocation (void *cls,
* @param session a session * @param session a session
* @param denom_pub_hash hash of the revoked denomination key * @param denom_pub_hash hash of the revoked denomination key
* @param[out] master_sig signature affirming the revocation * @param[out] master_sig signature affirming the revocation
* @param[out] rowid row where the information is stored
* @return #GNUNET_OK on success, * @return #GNUNET_OK on success,
* #GNUNET_NO no such entry exists * #GNUNET_NO no such entry exists
* #GNUNET_SYSERR on DB errors * #GNUNET_SYSERR on DB errors
@ -6050,7 +6053,8 @@ static int
postgres_get_denomination_revocation (void *cls, postgres_get_denomination_revocation (void *cls,
struct TALER_EXCHANGEDB_Session *session, struct TALER_EXCHANGEDB_Session *session,
const struct GNUNET_HashCode *denom_pub_hash, const struct GNUNET_HashCode *denom_pub_hash,
struct TALER_MasterSignatureP *master_sig) struct TALER_MasterSignatureP *master_sig,
uint64_t *rowid)
{ {
struct GNUNET_PQ_QueryParam params[] = { struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_auto_from_type (denom_pub_hash), GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
@ -6058,6 +6062,7 @@ postgres_get_denomination_revocation (void *cls,
}; };
struct GNUNET_PQ_ResultSpec rs[] = { struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_auto_from_type ("master_sig", master_sig), GNUNET_PQ_result_spec_auto_from_type ("master_sig", master_sig),
GNUNET_PQ_result_spec_uint64 ("denom_revocations_serial_id", rowid),
GNUNET_PQ_result_spec_end GNUNET_PQ_result_spec_end
}; };
PGresult *result; PGresult *result;

4
src/exchangedb/test_exchangedb.c
View File

@ -1823,12 +1823,14 @@ run (void *cls)
session)); session));
{ {
struct TALER_MasterSignatureP msig; struct TALER_MasterSignatureP msig;
uint64_t rev_rowid;
FAILIF (GNUNET_OK != FAILIF (GNUNET_OK !=
plugin->get_denomination_revocation (plugin->cls, plugin->get_denomination_revocation (plugin->cls,
session, session,
&dkp_pub_hash, &dkp_pub_hash,
&msig)); &msig,
&rev_rowid));
FAILIF (0 != memcmp (&msig, FAILIF (0 != memcmp (&msig,
&master_sig, &master_sig,
sizeof (msig))); sizeof (msig)));

4
src/include/taler_exchangedb_plugin.h
View File

@ -2040,6 +2040,7 @@ struct TALER_EXCHANGEDB_Plugin
* @param session a session * @param session a session
* @param denom_pub_hash hash of the revoked denomination key * @param denom_pub_hash hash of the revoked denomination key
* @param[out] master_sig signature affirming the revocation * @param[out] master_sig signature affirming the revocation
* @param[out] rowid row where the information is stored
* @return #GNUNET_OK on success, * @return #GNUNET_OK on success,
* #GNUNET_NO no such entry exists * #GNUNET_NO no such entry exists
* #GNUNET_SYSERR on DB errors * #GNUNET_SYSERR on DB errors
@ -2048,7 +2049,8 @@ struct TALER_EXCHANGEDB_Plugin
(*get_denomination_revocation)(void *cls, (*get_denomination_revocation)(void *cls,
struct TALER_EXCHANGEDB_Session *session, struct TALER_EXCHANGEDB_Session *session,
const struct GNUNET_HashCode *denom_pub_hash, const struct GNUNET_HashCode *denom_pub_hash,
struct TALER_MasterSignatureP *master_sig); struct TALER_MasterSignatureP *master_sig,
uint64_t *rowid);
}; };