resolve

7 files changed, 130 insertions, 15 deletions

diff --git a/configure.ac b/configure.ac
index 01ff7adc..a5bb3be4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AS_IF([test "x$doc_only" != xyes],[
 AC_PROG_CC
 AC_PROG_CC_C99
 
-CFLAGS="-Wall $CFLAGS"
+CFLAGS="-Wall -Wno-address-of-packed-member $CFLAGS"
 
 # Checks for header files.
 AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h])
diff --git a/Doxyfile b/contrib/Doxyfile
index 3c068dbe..3c068dbe 100644
--- a/Doxyfile
+++ b/contrib/Doxyfile
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 67ba825b..f5476df0 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -30,7 +30,8 @@ taler_merchant_httpd_SOURCES = \
   taler-merchant-httpd_track-transfer.c taler-merchant-httpd_track-transfer.h \
   taler-merchant-httpd_refund.c taler-merchant-httpd_refund.h \
   taler-merchant-httpd_check-payment.c taler-merchant-httpd_check-payment.h \
-  taler-merchant-httpd_trigger-pay.c taler-merchant-httpd_trigger-pay.h
+  taler-merchant-httpd_trigger-pay.c taler-merchant-httpd_trigger-pay.h \
+  taler-merchant-httpd_config.c taler-merchant-httpd_config.h
 
 
 taler_merchant_httpd_LDADD = \
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
index a1397ed3..9cc198e5 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -48,6 +48,7 @@
 #include "taler-merchant-httpd_refund.h"
 #include "taler-merchant-httpd_check-payment.h"
 #include "taler-merchant-httpd_trigger-pay.h"
+#include "taler-merchant-httpd_config.h"
 
 /**
  * Backlog for listen operation on unix-domain sockets.
@@ -291,6 +292,9 @@ url_handler (void *cls,
       { "/public/trigger-pay", MHD_HTTP_METHOD_GET, "text/plain",
         NULL, 0,
         &MH_handler_trigger_pay, MHD_HTTP_OK},
+      { "/config", MHD_HTTP_METHOD_GET, "text/plain",
+        NULL, 0,
+        &MH_handler_config, MHD_HTTP_OK},
       {NULL, NULL, NULL, NULL, 0, 0 }
     };
   static struct TMH_RequestHandler h404 =
@@ -850,6 +854,20 @@ wireformat_iterator_cb (void *cls,
                    "url", payto,
                    "salt", salt_str);
     GNUNET_free (salt_str);
+
+    /* Make sure every path component exists.  */
+    if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (fn))
+    {
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                                "mkdir",
+                                fn);
+      GNUNET_free (fn);
+      GNUNET_free (payto);
+      json_decref (j);
+      iic->ret = GNUNET_SYSERR;
+      return;
+    }
+
     if (0 != json_dump_file (j,
                              fn,
                              JSON_COMPACT | JSON_SORT_KEYS))
diff --git a/src/backend/taler-merchant-httpd_check-payment.c b/src/backend/taler-merchant-httpd_check-payment.c
index 3c5909d9..2e6cea91 100644
--- a/src/backend/taler-merchant-httpd_check-payment.c
+++ b/src/backend/taler-merchant-httpd_check-payment.c
@@ -93,9 +93,11 @@ send_pay_request (struct MHD_Connection *connection,
   GNUNET_assert (NULL != url);
   ret = TMH_RESPONSE_reply_json_pack (connection,
                                       MHD_HTTP_OK,
-                                      "{s:s, s:b}",
+                                      "{s:s, s:s, s:b}",
                                       "payment_redirect_url",
                                       url,
+                                      "contract_url",
+                                      final_contract_url,
                                       "paid",
                                       0);
   GNUNET_free (url);
@@ -257,21 +259,11 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
   session_sig_str = MHD_lookup_connection_value (connection,
                                                 MHD_GET_ARGUMENT_KIND,
                                                 "session_sig");
-  if (NULL != session_id)
+  if ((NULL != session_id) && (NULL != session_sig_str))
   {
     struct GNUNET_CRYPTO_EddsaSignature sig;
     struct TALER_MerchantPaySessionSigPS mps;
-    /* If the session id is given, the frontend wants us
-       to verify the session signature. */
-    if (NULL == session_sig_str)
-    {
-      /* pay session signature required but missing */
-      GNUNET_break_op (0);
-      GNUNET_free (final_contract_url);
-      return TMH_RESPONSE_reply_bad_request (connection,
-                                             TALER_EC_PARAMETER_MISSING,
-                                             "session_sig required if session_id given");
-    }
+
     if (GNUNET_OK !=
         GNUNET_STRINGS_string_to_data (session_sig_str,
                                        strlen (session_sig_str),
diff --git a/src/backend/taler-merchant-httpd_config.c b/src/backend/taler-merchant-httpd_config.c
new file mode 100644
index 00000000..931270f1
--- /dev/null
+++ b/src/backend/taler-merchant-httpd_config.c
@@ -0,0 +1,61 @@
+/*
+  This file is part of TALER
+  (C) 2019 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Affero General Public License as published by the Free Software
+  Foundation; either version 3, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file backend/taler-merchant-httpd_config.c
+ * @brief implement API for querying configuration data of the backend
+ * @author Florian Dold
+ */
+#include "platform.h"
+#include <jansson.h>
+#include <taler/taler_util.h>
+#include <taler/taler_json_lib.h>
+#include "taler-merchant-httpd.h"
+#include "taler-merchant-httpd_mhd.h"
+#include "taler-merchant-httpd_parsing.h"
+#include "taler-merchant-httpd_exchanges.h"
+#include "taler-merchant-httpd_responses.h"
+#include "taler-merchant-httpd_tip-query.h"
+#include "taler-merchant-httpd_tip-reserve-helper.h"
+
+
+/**
+ * Handle a "/config" request.
+ *
+ * @param rh context of the handler
+ * @param connection the MHD connection to handle
+ * @param[in,out] connection_cls the connection's closure (can be updated)
+ * @param upload_data upload data
+ * @param[in,out] upload_data_size number of bytes (left) in @a upload_data
+ * @return MHD result code
+ */
+int
+MH_handler_config (struct TMH_RequestHandler *rh,
+                   struct MHD_Connection *connection,
+                   void **connection_cls,
+                   const char *upload_data,
+                   size_t *upload_data_size)
+{
+  int ret;
+  ret = TMH_RESPONSE_reply_json_pack (connection,
+                                      MHD_HTTP_OK,
+                                      "{s:s}",
+                                      "currency", TMH_currency);
+
+
+  return ret;
+}
+
+/* end of taler-merchant-httpd_config.c */
diff --git a/src/backend/taler-merchant-httpd_config.h b/src/backend/taler-merchant-httpd_config.h
new file mode 100644
index 00000000..cff766eb
--- /dev/null
+++ b/src/backend/taler-merchant-httpd_config.h
@@ -0,0 +1,43 @@
+/*
+  This file is part of TALER
+  (C) 2019 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU General Public License as published by the Free Software
+  Foundation; either version 3, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file backend/taler-merchant-httpd_config.h
+ * @brief headers for /config handler
+ * @author Florian Dold
+ */
+#ifndef TALER_MERCHANT_HTTPD_CONFIG_H
+#define TALER_MERCHANT_HTTPD_CONFIG_H
+#include <microhttpd.h>
+#include "taler-merchant-httpd.h"
+
+/**
+ * Manages a /config call.
+ *
+ * @param rh context of the handler
+ * @param connection the MHD connection to handle
+ * @param[in,out] connection_cls the connection's closure (can be updated)
+ * @param upload_data upload data
+ * @param[in,out] upload_data_size number of bytes (left) in @a upload_data
+ * @return MHD result code
+ */
+int
+MH_handler_config (struct TMH_RequestHandler *rh,
+                   struct MHD_Connection *connection,
+                   void **connection_cls,
+                   const char *upload_data,
+                   size_t *upload_data_size);
+
+#endif