Changing configuration structure to enable multiple accounts.

This change enables using multiple wire plugins at the same time.
Also, we now distinguish between the wire plugin (i.e. EBICS or
taler_bank) and the wire method (i.e. SEPA or x-taler-bank) that
the wire plugin is implementing.  The "taler-bank" wire method
was renamed from "test" to "x-taler-bank".

This also changes the format of the /wire response of the exchange,
as we now need to return multiple accounts.  Note that wire fees
are specified per wire method, not per wire account.

taler-exchange-keyup now automatically signs all of the /wire
responses in the location specified by the configuration.

Account identification in wire plugins was changed to use
payto://-URLs instead of method-specific JSON fields.  Signing
and validation of /wire responses was moved from each wire
plugin to a generic validation method in libtalerutil (crypto)
or libtalerjson (for JSON-formatted inputs).
Convenience methods were added to generate JSON for wire accounts
(salting, signing).

Various section and option names were adjusted to streamline the
configuration and make it more consistent overall.  Documentation
was updated as well.

1 files changed, 44 insertions, 45 deletions

diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 6c6330556..140bceb2e 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -127,6 +127,7 @@ postgres_drop_tables (void *cls)
   PGconn *conn;
   int ret;
 
+  /* FIXME: use GNUNET_PQ_connect_with_cfg instead? */
   conn = GNUNET_PQ_connect (pc->connection_cfg_str);
   if (NULL == conn)
     return GNUNET_SYSERR;
@@ -218,12 +219,13 @@ postgres_create_tables (void *cls)
                            ",credit_frac INT4 NOT NULL"
                            ",credit_curr VARCHAR("TALER_CURRENCY_LEN_STR") NOT NULL"
                            ",sender_account_details TEXT NOT NULL"
+                           ",exchange_account_section TEXT NOT NULL"
                            ",execution_date INT8 NOT NULL"
                            ",PRIMARY KEY (reserve_pub, wire_reference)"
                            ");"),
     /* Create indices on reserves_in */
     GNUNET_PQ_make_try_execute ("CREATE INDEX reserves_in_execution_index"
-                                " ON reserves_in (execution_date);"),
+                                " ON reserves_in (exchange_account_section,execution_date);"),
     /* This table contains the data for wire transfers the exchange has
        executed to close a reserve. */
     GNUNET_PQ_make_execute("CREATE TABLE IF NOT EXISTS reserves_close "
@@ -433,6 +435,7 @@ postgres_create_tables (void *cls)
   PGconn *conn;
   int ret;
 
+  /* FIXME: use GNUNET_PQ_connect_with_cfg instead? */
   conn = GNUNET_PQ_connect (pc->connection_cfg_str);
   if (NULL == conn)
     return GNUNET_SYSERR;
@@ -585,21 +588,23 @@ postgres_prepare (PGconn *db_conn)
                             ",credit_val"
                             ",credit_frac"
                             ",credit_curr"
+                            ",exchange_account_section"
                             ",sender_account_details"
                             ",execution_date"
                             ") VALUES "
-                            "($1, $2, $3, $4, $5, $6, $7) "
+                            "($1, $2, $3, $4, $5, $6, $7, $8) "
                             "ON CONFLICT DO NOTHING;",
-                            7),
+                            8),
     /* Used in postgres_select_reserves_in_above_serial_id() to obtain inbound
        transactions for reserves with serial id '\geq' the given parameter */
     GNUNET_PQ_make_prepare ("reserves_in_get_latest_wire_reference",
                             "SELECT"
                             " wire_reference"
                             " FROM reserves_in"
+                            " WHERE exchange_account_section=$1"
                             " ORDER BY reserve_in_serial_id DESC"
                             " LIMIT 1;",
-                            0),
+                            1),
     /* Used in postgres_select_reserves_in_above_serial_id() to obtain inbound
        transactions for reserves with serial id '\geq' the given parameter */
     GNUNET_PQ_make_prepare ("audit_reserves_in_get_transactions_incr",
@@ -1509,6 +1514,7 @@ postgres_get_session (void *cls)
       return session;
     }
   }
+  /* FIXME: use GNUNET_PQ_connect_with_cfg instead? */
   db_conn = GNUNET_PQ_connect (pc->connection_cfg_str);
   if (NULL == db_conn)
     return NULL;
@@ -1836,7 +1842,9 @@ reserves_update (void *cls,
  * @param reserve_pub public key of the reserve
  * @param balance the amount that has to be added to the reserve
  * @param execution_time when was the amount added
- * @param sender_account_details account information for the sender
+ * @param sender_account_details account information for the sender (payto://-URL)
+ * @param exchange_account_section name of the section in the configuration for the exchange's
+ *                       account into which the deposit was made
  * @param wire_reference unique reference identifying the wire transfer (binary blob)
  * @param wire_reference_size number of bytes in @a wire_reference
  * @return transaction status code
@@ -1847,7 +1855,8 @@ postgres_reserves_in_insert (void *cls,
                              const struct TALER_ReservePublicKeyP *reserve_pub,
                              const struct TALER_Amount *balance,
                              struct GNUNET_TIME_Absolute execution_time,
-                             const json_t *sender_account_details,
+                             const char *sender_account_details,
+                             const char *exchange_account_section,
                              const void *wire_reference,
                              size_t wire_reference_size)
 {
@@ -1900,7 +1909,7 @@ postgres_reserves_in_insert (void *cls,
        as a foreign key. */
     struct GNUNET_PQ_QueryParam params[] = {
       GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-      TALER_PQ_query_param_json (sender_account_details),
+      GNUNET_PQ_query_param_string (sender_account_details),
       TALER_PQ_query_param_amount (balance),
       TALER_PQ_query_param_absolute_time (&expiry),
       GNUNET_PQ_query_param_end
@@ -1929,7 +1938,8 @@ postgres_reserves_in_insert (void *cls,
       GNUNET_PQ_query_param_fixed_size (wire_reference,
                                         wire_reference_size),
       TALER_PQ_query_param_amount (balance),
-      TALER_PQ_query_param_json (sender_account_details),
+      GNUNET_PQ_query_param_string (exchange_account_section),
+      GNUNET_PQ_query_param_string (sender_account_details),
       TALER_PQ_query_param_absolute_time (&execution_time),
       GNUNET_PQ_query_param_end
     };
@@ -1976,6 +1986,8 @@ postgres_reserves_in_insert (void *cls,
  *
  * @param cls the @e cls of this struct with the plugin-specific state
  * @param session the database session handle
+ * @param exchange_account_name name of the section in the exchange's configuration
+ *                       for the account that we are tracking here
  * @param[out] wire_reference set to unique reference identifying the wire transfer (binary blob)
  * @param[out] wire_reference_size set to number of bytes in @a wire_reference
  * @return transaction status code
@@ -1983,10 +1995,12 @@ postgres_reserves_in_insert (void *cls,
 static enum GNUNET_DB_QueryStatus
 postgres_get_latest_reserve_in_reference (void *cls,
                                           struct TALER_EXCHANGEDB_Session *session,
+                                          const char *exchange_account_name,
                                           void **wire_reference,
                                           size_t *wire_reference_size)
 {
   struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (exchange_account_name),
     GNUNET_PQ_query_param_end
   };
   struct GNUNET_PQ_ResultSpec rs[] = {
@@ -2222,8 +2236,8 @@ add_bank_to_exchange (void *cls,
 				     &bt->amount),
 	TALER_PQ_result_spec_absolute_time ("execution_date",
 					     &bt->execution_date),
-	TALER_PQ_result_spec_json ("sender_account_details",
-				   &bt->sender_account_details),
+	GNUNET_PQ_result_spec_string ("sender_account_details",
+                                      &bt->sender_account_details),
 	GNUNET_PQ_result_spec_end
       };
 
@@ -2389,8 +2403,8 @@ add_exchange_to_bank (void *cls,
 				     &closing->closing_fee),
 	TALER_PQ_result_spec_absolute_time ("execution_date",
 					     &closing->execution_date),
-	TALER_PQ_result_spec_json ("receiver_account",
-				   &closing->receiver_account_details),
+	GNUNET_PQ_result_spec_string ("receiver_account",
+                                      &closing->receiver_account_details),
 	GNUNET_PQ_result_spec_auto_from_type ("wtid",
 					      &closing->wtid),
 	GNUNET_PQ_result_spec_end
@@ -2710,7 +2724,7 @@ postgres_get_ready_deposit (void *cls,
     GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
 					  &coin_pub),
     TALER_PQ_result_spec_json ("wire",
-			       &wire),
+                               &wire),
     GNUNET_PQ_result_spec_end
   };
   enum GNUNET_DB_QueryStatus qs;
@@ -3811,7 +3825,7 @@ add_coin_deposit (void *cls,
 	GNUNET_PQ_result_spec_auto_from_type ("h_wire",
 					      &deposit->h_wire),
 	TALER_PQ_result_spec_json ("wire",
-				   &deposit->receiver_wire_account),
+                                   &deposit->receiver_wire_account),
 	GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
 					      &deposit->csig),
 	GNUNET_PQ_result_spec_end
@@ -4178,8 +4192,6 @@ handle_wt_result (void *cls,
     struct TALER_Amount amount_with_fee;
     struct TALER_Amount deposit_fee;
     json_t *wire;
-    json_t *t;
-    const char *wire_method;
     struct GNUNET_PQ_ResultSpec rs[] = {
       GNUNET_PQ_result_spec_uint64 ("aggregation_serial_id", &rowid),
       GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms", &h_contract_terms),
@@ -4202,25 +4214,11 @@ handle_wt_result (void *cls,
       ctx->status = GNUNET_SYSERR;
       return;
     }
-    t = json_object_get (wire, "type");
-    if (NULL == t)
-    {
-      GNUNET_break (0);
-      ctx->status = GNUNET_SYSERR;
-      return;
-    }
-    wire_method = json_string_value (t);
-    if (NULL == wire_method)
-    {
-      GNUNET_break (0);
-      ctx->status = GNUNET_SYSERR;
-      return;
-    }
     ctx->cb (ctx->cb_cls,
 	     rowid,
 	     &merchant_pub,
-	     wire_method,
 	     &h_wire,
+             wire,
 	     exec_time,
 	     &h_contract_terms,
 	     &coin_pub,
@@ -4580,14 +4578,14 @@ reserve_expired_cb (void *cls,
   for (unsigned int i=0;i<num_results;i++)
   {
     struct GNUNET_TIME_Absolute exp_date;
-    json_t *account_details;
+    char *account_details;
     struct TALER_ReservePublicKeyP reserve_pub;
     struct TALER_Amount remaining_balance;
     struct GNUNET_PQ_ResultSpec rs[] = {
       TALER_PQ_result_spec_absolute_time ("expiration_date",
 					   &exp_date),
-      TALER_PQ_result_spec_json ("account_details",
-				 &account_details),
+      GNUNET_PQ_result_spec_string ("account_details",
+                                    &account_details),
       GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
 					    &reserve_pub),
       TALER_PQ_result_spec_amount ("current_balance",
@@ -4674,7 +4672,7 @@ postgres_insert_reserve_closed (void *cls,
 				struct TALER_EXCHANGEDB_Session *session,
 				const struct TALER_ReservePublicKeyP *reserve_pub,
 				struct GNUNET_TIME_Absolute execution_date,
-				const json_t *receiver_account,
+				const char *receiver_account,
 				const struct TALER_WireTransferIdentifierRawP *wtid,
 				const struct TALER_Amount *amount_with_fee,
 				const struct TALER_Amount *closing_fee)
@@ -4684,7 +4682,7 @@ postgres_insert_reserve_closed (void *cls,
     GNUNET_PQ_query_param_auto_from_type (reserve_pub),
     TALER_PQ_query_param_absolute_time (&execution_date),
     GNUNET_PQ_query_param_auto_from_type (wtid),
-    TALER_PQ_query_param_json (receiver_account),
+    GNUNET_PQ_query_param_string (receiver_account),
     TALER_PQ_query_param_amount (amount_with_fee),
     TALER_PQ_query_param_amount (closing_fee),
     GNUNET_PQ_query_param_end
@@ -4946,6 +4944,7 @@ postgres_gc (void *cls)
   long_ago = GNUNET_TIME_absolute_subtract (now,
 					    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS,
 									   10));
+  /* FIXME: use GNUNET_PQ_connect_with_cfg instead? */
   conn = GNUNET_PQ_connect (pc->connection_cfg_str);
   if (NULL == conn)
     return GNUNET_SYSERR;
@@ -5421,7 +5420,7 @@ reserves_in_serial_helper_cb (void *cls,
   {
     struct TALER_ReservePublicKeyP reserve_pub;
     struct TALER_Amount credit;
-    json_t *sender_account_details;
+    char *sender_account_details;
     struct GNUNET_TIME_Absolute execution_date;
     uint64_t rowid;
     void *wire_reference;
@@ -5436,8 +5435,8 @@ reserves_in_serial_helper_cb (void *cls,
                                    &credit),
       TALER_PQ_result_spec_absolute_time("execution_date",
                                           &execution_date),
-      TALER_PQ_result_spec_json ("sender_account_details",
-                                 &sender_account_details),
+      GNUNET_PQ_result_spec_string ("sender_account_details",
+                                    &sender_account_details),
       GNUNET_PQ_result_spec_uint64 ("reserve_in_serial_id",
                                     &rowid),
       GNUNET_PQ_result_spec_end
@@ -5943,7 +5942,7 @@ reserve_closed_serial_helper_cb (void *cls,
   {
     uint64_t rowid;
     struct TALER_ReservePublicKeyP reserve_pub;
-    json_t *receiver_account;
+    char *receiver_account;
     struct TALER_WireTransferIdentifierRawP wtid;
     struct TALER_Amount amount_with_fee;
     struct TALER_Amount closing_fee;
@@ -5957,8 +5956,8 @@ reserve_closed_serial_helper_cb (void *cls,
                                            &execution_date),
       GNUNET_PQ_result_spec_auto_from_type ("wtid",
 					    &wtid),
-      TALER_PQ_result_spec_json ("receiver_account",
-				 &receiver_account),
+      GNUNET_PQ_result_spec_string ("receiver_account",
+                                    &receiver_account),
       TALER_PQ_result_spec_amount ("amount",
                                    &amount_with_fee),
       TALER_PQ_result_spec_amount ("closing_fee",
@@ -6271,7 +6270,7 @@ missing_wire_cb (void *cls,
       TALER_PQ_result_spec_amount ("amount_with_fee",
 				   &amount),
       TALER_PQ_result_spec_json ("wire",
-				 &wire),
+                                 &wire),
       TALER_PQ_result_spec_absolute_time ("wire_deadline",
 					   &deadline),
       GNUNET_PQ_result_spec_auto_from_type ("tiny",
@@ -6380,12 +6379,12 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
     if (GNUNET_OK !=
         GNUNET_CONFIGURATION_get_value_string (cfg,
                                                "exchangedb-postgres",
-                                               "db_conn_str",
+                                               "CONFIG",
                                                &pg->connection_cfg_str))
     {
       GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                  "exchangedb-postgres",
-                                 "db_conn_str");
+                                 "CONFIG");
       GNUNET_free (pg);
       return NULL;
     }