simplify code by using latest taler_mhd_lib convenience functions

3 files changed, 21 insertions, 188 deletions

diff --git a/src/backend/anastasis-httpd_policy-upload.c b/src/backend/anastasis-httpd_policy-upload.c
index 8670483..c4febb2 100644
--- a/src/backend/anastasis-httpd_policy-upload.c
+++ b/src/backend/anastasis-httpd_policy-upload.c
@@ -662,34 +662,10 @@ AH_handler_policy_post (
     hc->cc = &cleanup_ctx;
     puc->con = connection;
 
-    {
-      const char *pay_id;
-
-      pay_id = MHD_lookup_connection_value (connection,
-                                            MHD_HEADER_KIND,
-                                            ANASTASIS_HTTP_HEADER_PAYMENT_IDENTIFIER);
-      if (NULL != pay_id)
-      {
-        if (GNUNET_OK !=
-            GNUNET_STRINGS_string_to_data (
-              pay_id,
-              strlen (pay_id),
-              &puc->payment_identifier,
-              sizeof (struct ANASTASIS_PaymentSecretP)))
-        {
-          GNUNET_break_op (0);
-          return TALER_MHD_reply_with_error (connection,
-                                             MHD_HTTP_BAD_REQUEST,
-                                             TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                             ANASTASIS_HTTP_HEADER_PAYMENT_IDENTIFIER
-                                             " header must be a base32-encoded Payment-Secret");
-        }
-        puc->payment_identifier_provided = true;
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "Policy upload started with payment identifier `%s'\n",
-                    pay_id);
-      }
-    }
+    TALER_MHD_parse_request_header_auto (connection,
+                                         ANASTASIS_HTTP_HEADER_PAYMENT_IDENTIFIER,
+                                         &puc->payment_identifier,
+                                         puc->payment_identifier_provided);
     puc->account = *account_pub;
 
     /* check for meta-data */
@@ -768,28 +744,10 @@ AH_handler_policy_post (
       }
       puc->upload_size = (size_t) len;
     }
-    {
-      /* Check if header contains Anastasis-Policy-Signature */
-      const char *sig_s;
 
-      sig_s = MHD_lookup_connection_value (connection,
-                                           MHD_HEADER_KIND,
-                                           ANASTASIS_HTTP_HEADER_POLICY_SIGNATURE);
-      if ( (NULL == sig_s) ||
-           (GNUNET_OK !=
-            GNUNET_STRINGS_string_to_data (sig_s,
-                                           strlen (sig_s),
-                                           &puc->account_sig,
-                                           sizeof (puc->account_sig))) )
-      {
-        GNUNET_break_op (0);
-        return TALER_MHD_reply_with_error (connection,
-                                           MHD_HTTP_BAD_REQUEST,
-                                           TALER_EC_ANASTASIS_POLICY_BAD_SIGNATURE,
-                                           ANASTASIS_HTTP_HEADER_POLICY_SIGNATURE
-                                           " header must include a base32-encoded EdDSA signature");
-      }
-    }
+    TALER_MHD_parse_request_header_auto_t (connection,
+                                           ANASTASIS_HTTP_HEADER_POLICY_SIGNATURE,
+                                           &puc->account_sig);
     {
       /* Check if header contains an ETAG */
       const char *etag;
@@ -834,39 +792,10 @@ AH_handler_policy_post (
       }
     }
 
-    {
-      const char *long_poll_timeout_ms;
-
-      long_poll_timeout_ms = MHD_lookup_connection_value (connection,
-                                                          MHD_GET_ARGUMENT_KIND,
-                                                          "timeout_ms");
-      if (NULL != long_poll_timeout_ms)
-      {
-        unsigned int timeout;
-        char dummy;
-
-        if (1 != sscanf (long_poll_timeout_ms,
-                         "%u%c",
-                         &timeout,
-                         &dummy))
-        {
-          GNUNET_break_op (0);
-          return TALER_MHD_reply_with_error (connection,
-                                             MHD_HTTP_BAD_REQUEST,
-                                             TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                             "timeout_ms (must be non-negative number)");
-        }
-        puc->timeout
-          = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (
-                                                GNUNET_TIME_UNIT_MILLISECONDS,
-                                                timeout));
-      }
-      else
-      {
-        puc->timeout = GNUNET_TIME_relative_to_absolute (
-          CHECK_PAYMENT_GENERIC_TIMEOUT);
-      }
-    }
+    puc->timeout = GNUNET_TIME_relative_to_absolute (
+      CHECK_PAYMENT_GENERIC_TIMEOUT);
+    TALER_MHD_parse_request_timeout (connection,
+                                     &puc->timeout);
 
     /* check if the client insists on paying */
     {
diff --git a/src/backend/anastasis-httpd_truth-solve.c b/src/backend/anastasis-httpd_truth-solve.c
index 957d924..deb1ee2 100644
--- a/src/backend/anastasis-httpd_truth-solve.c
+++ b/src/backend/anastasis-httpd_truth-solve.c
@@ -1140,40 +1140,10 @@ AH_handler_truth_solve (
     gc->connection = connection;
     gc->truth_uuid = *truth_uuid;
     gc->hc->cc = &request_done;
-
-    {
-      const char *long_poll_timeout_ms;
-
-      long_poll_timeout_ms = MHD_lookup_connection_value (connection,
-                                                          MHD_GET_ARGUMENT_KIND,
-                                                          "timeout_ms");
-      if (NULL != long_poll_timeout_ms)
-      {
-        unsigned int timeout;
-        char dummy;
-
-        if (1 != sscanf (long_poll_timeout_ms,
-                         "%u%c",
-                         &timeout,
-                         &dummy))
-        {
-          GNUNET_break_op (0);
-          return TALER_MHD_reply_with_error (connection,
-                                             MHD_HTTP_BAD_REQUEST,
-                                             TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                             "timeout_ms (must be non-negative number)");
-        }
-        gc->timeout
-          = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (
-                                                GNUNET_TIME_UNIT_MILLISECONDS,
-                                                timeout));
-      }
-      else
-      {
-        gc->timeout = GNUNET_TIME_relative_to_absolute (
-          GNUNET_TIME_UNIT_SECONDS);
-      }
-    }
+    gc->timeout = GNUNET_TIME_relative_to_absolute (
+      GNUNET_TIME_UNIT_SECONDS);
+    TALER_MHD_parse_request_timeout (connection,
+                                     &gc->timeout);
   } /* end of first-time initialization (if NULL == gc) */
   else
   {
diff --git a/src/backend/anastasis-httpd_truth-upload.c b/src/backend/anastasis-httpd_truth-upload.c
index 362d7e1..2872eb3 100644
--- a/src/backend/anastasis-httpd_truth-upload.c
+++ b/src/backend/anastasis-httpd_truth-upload.c
@@ -549,78 +549,12 @@ AH_handler_truth_post (
     tuc->truth_uuid = *truth_uuid;
     hc->ctx = tuc;
     hc->cc = &cleanup_truth_post;
-
-    /* check for excessive upload */
-    {
-      const char *lens;
-      unsigned long len;
-      char dummy;
-
-      lens = MHD_lookup_connection_value (connection,
-                                          MHD_HEADER_KIND,
-                                          MHD_HTTP_HEADER_CONTENT_LENGTH);
-      if ( (NULL == lens) ||
-           (1 != sscanf (lens,
-                         "%lu%c",
-                         &len,
-                         &dummy)) )
-      {
-        GNUNET_break_op (0);
-        return TALER_MHD_reply_with_error (
-          connection,
-          MHD_HTTP_BAD_REQUEST,
-          (NULL == lens)
-          ? TALER_EC_ANASTASIS_GENERIC_MISSING_CONTENT_LENGTH
-          : TALER_EC_ANASTASIS_GENERIC_MALFORMED_CONTENT_LENGTH,
-          NULL);
-      }
-      if (len / 1024 / 1024 >= AH_upload_limit_mb)
-      {
-        GNUNET_break_op (0);
-        return TALER_MHD_reply_with_error (connection,
-                                           MHD_HTTP_PAYLOAD_TOO_LARGE,
-                                           TALER_EC_SYNC_MALFORMED_CONTENT_LENGTH,
-                                           "Content-length value not acceptable");
-      }
-    }
-
-    {
-      const char *long_poll_timeout_ms;
-
-      long_poll_timeout_ms = MHD_lookup_connection_value (connection,
-                                                          MHD_GET_ARGUMENT_KIND,
-                                                          "timeout_ms");
-      if (NULL != long_poll_timeout_ms)
-      {
-        unsigned int timeout;
-        char dummy;
-
-        if (1 != sscanf (long_poll_timeout_ms,
-                         "%u%c",
-                         &timeout,
-                         &dummy))
-        {
-          GNUNET_break_op (0);
-          return TALER_MHD_reply_with_error (connection,
-                                             MHD_HTTP_BAD_REQUEST,
-                                             TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                             "timeout_ms (must be non-negative number)");
-        }
-        tuc->timeout
-          = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (
-                                                GNUNET_TIME_UNIT_MILLISECONDS,
-                                                timeout));
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Long polling for %u ms enabled\n",
-                    timeout);
-      }
-      else
-      {
-        tuc->timeout = GNUNET_TIME_relative_to_absolute (
-          GNUNET_TIME_UNIT_SECONDS);
-      }
-    }
-
+    TALER_MHD_check_content_length (connection,
+                                    AH_upload_limit_mb * 1024LLU * 1024LLU);
+    tuc->timeout = GNUNET_TIME_relative_to_absolute (
+      GNUNET_TIME_UNIT_SECONDS);
+    TALER_MHD_parse_request_timeout (connection,
+                                     &tuc->timeout);
   } /* end 'if (NULL == tuc)' */
 
   if (NULL != tuc->resp)