-clean up challenge logic for new truth api

1 files changed, 117 insertions, 107 deletions

diff --git a/src/authorization/anastasis_authorization_plugin_iban.c b/src/authorization/anastasis_authorization_plugin_iban.c
index e557152..8aebbce 100644
--- a/src/authorization/anastasis_authorization_plugin_iban.c
+++ b/src/authorization/anastasis_authorization_plugin_iban.c
@@ -298,95 +298,6 @@ bank_event_cb (void *cls,
 }
 
 
-/**
- * Respond with instructions to the user how to
- * satisfy the challenge.
- *
- * @param as our state
- * @param connection connection to respond on
- * @return state of the request
- */
-static enum ANASTASIS_AUTHORIZATION_Result
-respond_with_challenge (struct ANASTASIS_AUTHORIZATION_State *as,
-                        struct MHD_Connection *connection)
-{
-  struct IBAN_Context *ctx = as->ctx;
-  const char *mime;
-  const char *lang;
-  MHD_RESULT mres;
-
-  mime = MHD_lookup_connection_value (connection,
-                                      MHD_HEADER_KIND,
-                                      MHD_HTTP_HEADER_ACCEPT);
-  if (NULL == mime)
-    mime = "text/plain";
-  lang = MHD_lookup_connection_value (connection,
-                                      MHD_HEADER_KIND,
-                                      MHD_HTTP_HEADER_ACCEPT_LANGUAGE);
-  if (NULL == lang)
-    lang = "en";
-
-  /* Build HTTP response */
-  {
-    struct MHD_Response *resp;
-
-    if (TALER_MHD_xmime_matches (mime,
-                                 "application/json"))
-    {
-      char subject[64];
-
-      GNUNET_snprintf (subject,
-                       sizeof (subject),
-                       "Anastasis %llu",
-                       (unsigned long long) as->code);
-      resp = TALER_MHD_MAKE_JSON_PACK (
-        GNUNET_JSON_pack_string ("challenge_type",
-                                 "IBAN_WIRE"),
-        GNUNET_JSON_pack_uint64 ("answer_code",
-                                 as->code),
-        TALER_JSON_pack_amount ("challenge_amount",
-                                &ctx->expected_amount),
-        GNUNET_JSON_pack_string ("credit_iban",
-                                 ctx->business_iban),
-        GNUNET_JSON_pack_string ("business_name",
-                                 ctx->business_name),
-        GNUNET_JSON_pack_string ("wire_transfer_subject",
-                                 subject));
-    }
-    else
-    {
-      size_t reply_len;
-      char *reply;
-
-      reply_len = GNUNET_asprintf (&reply,
-                                   get_message (ctx->messages,
-                                                connection,
-                                                "instructions"),
-                                   TALER_amount2s (&ctx->expected_amount),
-                                   ctx->business_name,
-                                   ctx->business_iban,
-                                   (unsigned long long) as->code);
-      resp = MHD_create_response_from_buffer (reply_len,
-                                              reply,
-                                              MHD_RESPMEM_MUST_COPY);
-      GNUNET_free (reply);
-      TALER_MHD_add_global_headers (resp);
-      GNUNET_break (MHD_YES ==
-                    MHD_add_response_header (resp,
-                                             MHD_HTTP_HEADER_CONTENT_TYPE,
-                                             "text/plain"));
-    }
-    mres = MHD_queue_response (connection,
-                               MHD_HTTP_ACCEPTED,
-                               resp);
-    MHD_destroy_response (resp);
-    if (MHD_YES != mres)
-      return ANASTASIS_AUTHORIZATION_RES_SUCCESS_REPLY_FAILED;
-    return ANASTASIS_AUTHORIZATION_RES_SUCCESS;
-  }
-}
-
-
 #include "iban.c"
 
 
@@ -496,18 +407,109 @@ test_wire_transfers (struct ANASTASIS_AUTHORIZATION_State *as)
 
 
 /**
+ * Respond with instructions to the user how to
+ * satisfy the challenge.
+ *
+ * @param as authorization state
+ * @param connection HTTP client request (for queuing response, such as redirection to video portal)
+ * @return state of the request
+ */
+static enum ANASTASIS_AUTHORIZATION_ChallengeResult
+iban_challenge (struct ANASTASIS_AUTHORIZATION_State *as,
+                struct MHD_Connection *connection)
+{
+  struct IBAN_Context *ctx = as->ctx;
+  const char *mime;
+  const char *lang;
+  MHD_RESULT mres;
+
+  mime = MHD_lookup_connection_value (connection,
+                                      MHD_HEADER_KIND,
+                                      MHD_HTTP_HEADER_ACCEPT);
+  if (NULL == mime)
+    mime = "text/plain";
+  lang = MHD_lookup_connection_value (connection,
+                                      MHD_HEADER_KIND,
+                                      MHD_HTTP_HEADER_ACCEPT_LANGUAGE);
+  if (NULL == lang)
+    lang = "en";
+
+  /* Build HTTP response */
+  {
+    struct MHD_Response *resp;
+
+    if (TALER_MHD_xmime_matches (mime,
+                                 "application/json"))
+    {
+      char subject[64];
+
+      GNUNET_snprintf (subject,
+                       sizeof (subject),
+                       "Anastasis %llu",
+                       (unsigned long long) as->code);
+      resp = TALER_MHD_MAKE_JSON_PACK (
+        GNUNET_JSON_pack_string ("challenge_type",
+                                 "IBAN_WIRE"),
+        GNUNET_JSON_pack_uint64 ("answer_code",
+                                 as->code),
+        TALER_JSON_pack_amount ("challenge_amount",
+                                &ctx->expected_amount),
+        GNUNET_JSON_pack_string ("credit_iban",
+                                 ctx->business_iban),
+        GNUNET_JSON_pack_string ("business_name",
+                                 ctx->business_name),
+        GNUNET_JSON_pack_string ("wire_transfer_subject",
+                                 subject));
+    }
+    else
+    {
+      size_t reply_len;
+      char *reply;
+
+      reply_len = GNUNET_asprintf (&reply,
+                                   get_message (ctx->messages,
+                                                connection,
+                                                "instructions"),
+                                   TALER_amount2s (&ctx->expected_amount),
+                                   ctx->business_name,
+                                   ctx->business_iban,
+                                   (unsigned long long) as->code);
+      resp = MHD_create_response_from_buffer (reply_len,
+                                              reply,
+                                              MHD_RESPMEM_MUST_COPY);
+      GNUNET_free (reply);
+      TALER_MHD_add_global_headers (resp);
+      GNUNET_break (MHD_YES ==
+                    MHD_add_response_header (resp,
+                                             MHD_HTTP_HEADER_CONTENT_TYPE,
+                                             "text/plain"));
+    }
+    mres = MHD_queue_response (connection,
+                               MHD_HTTP_ACCEPTED,
+                               resp);
+    MHD_destroy_response (resp);
+    if (MHD_YES != mres)
+      return ANASTASIS_AUTHORIZATION_CRES_SUCCESS_REPLY_FAILED;
+    return ANASTASIS_AUTHORIZATION_CRES_SUCCESS;
+  }
+}
+
+
+/**
  * Begin issuing authentication challenge to user based on @a data.
  * I.e. start to send IBAN or e-mail or launch video identification.
  *
  * @param as authorization state
  * @param timeout how long do we have to produce a reply
+ * @param challenge_response hash of the challenge response, or NULL
  * @param connection HTTP client request (for queuing response, such as redirection to video portal)
  * @return state of the request
  */
-static enum ANASTASIS_AUTHORIZATION_Result
-iban_process (struct ANASTASIS_AUTHORIZATION_State *as,
-              struct GNUNET_TIME_Absolute timeout,
-              struct MHD_Connection *connection)
+static enum ANASTASIS_AUTHORIZATION_SolveResult
+iban_solve (struct ANASTASIS_AUTHORIZATION_State *as,
+            struct GNUNET_TIME_Absolute timeout,
+            const struct GNUNET_HashCode *challenge_response,
+            struct MHD_Connection *connection)
 {
   struct IBAN_Context *ctx = as->ctx;
   struct ANASTASIS_DatabasePlugin *db = ctx->ac->db;
@@ -550,45 +552,53 @@ iban_process (struct ANASTASIS_AUTHORIZATION_State *as,
   {
   case GNUNET_DB_STATUS_HARD_ERROR:
   case GNUNET_DB_STATUS_SOFT_ERROR:
-    resp = TALER_MHD_make_error (TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                 "test_challenge_code_satisfied");
+    resp = TALER_MHD_make_error (TALER_EC_ANASTASIS_TRUTH_AUTH_TIMEOUT,
+                                 "IBAN payment not yet received");
     mres = MHD_queue_response (connection,
                                MHD_HTTP_INTERNAL_SERVER_ERROR,
                                resp);
     MHD_destroy_response (resp);
     if (MHD_YES != mres)
-      return ANASTASIS_AUTHORIZATION_RES_FAILED_REPLY_FAILED;
-    return ANASTASIS_AUTHORIZATION_RES_FAILED;
+      return ANASTASIS_AUTHORIZATION_SRES_FAILED_REPLY_FAILED;
+    return ANASTASIS_AUTHORIZATION_SRES_FAILED;
   case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
     switch (test_wire_transfers (as))
     {
     case WTS_SUCCESS:
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "IBAN authorization finished!\n");
-      return ANASTASIS_AUTHORIZATION_RES_FINISHED;
+      return ANASTASIS_AUTHORIZATION_SRES_FINISHED;
     case WTS_NOT_READY:
       break;   /* continue below */
     case WTS_FAILED_WITH_REPLY:
-      return ANASTASIS_AUTHORIZATION_RES_FAILED;
+      return ANASTASIS_AUTHORIZATION_SRES_FAILED;
     case WTS_FAILED_WITHOUT_REPLY:
-      return ANASTASIS_AUTHORIZATION_RES_FAILED_REPLY_FAILED;
+      return ANASTASIS_AUTHORIZATION_SRES_FAILED_REPLY_FAILED;
     }
     if (GNUNET_TIME_absolute_is_future (timeout))
     {
       as->connection = connection;
       MHD_suspend_connection (connection);
-      return ANASTASIS_AUTHORIZATION_RES_SUSPENDED;
+      return ANASTASIS_AUTHORIZATION_SRES_SUSPENDED;
     }
-    return respond_with_challenge (as,
-                                   connection);
+
+    resp = TALER_MHD_make_error (TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                 NULL);
+    mres = MHD_queue_response (connection,
+                               MHD_HTTP_FORBIDDEN,
+                               resp);
+    MHD_destroy_response (resp);
+    if (MHD_YES != mres)
+      return ANASTASIS_AUTHORIZATION_SRES_FAILED_REPLY_FAILED;
+    return ANASTASIS_AUTHORIZATION_SRES_FAILED;
   case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "IBAN authorization finished!\n");
-    return ANASTASIS_AUTHORIZATION_RES_FINISHED;
+    return ANASTASIS_AUTHORIZATION_SRES_FINISHED;
   }
   /* should be impossible */
   GNUNET_break (0);
-  return ANASTASIS_AUTHORIZATION_RES_FAILED_REPLY_FAILED;
+  return ANASTASIS_AUTHORIZATION_SRES_FAILED_REPLY_FAILED;
 }
 
 
@@ -703,9 +713,9 @@ libanastasis_plugin_authorization_iban_init (void *cls)
   plugin->cls = ctx;
   plugin->validate = &iban_validate;
   plugin->start = &iban_start;
-  plugin->process = &iban_process;
+  plugin->challenge = &iban_challenge;
+  plugin->solve = &iban_solve;
   plugin->cleanup = &iban_cleanup;
-
   return plugin;
 }