diff options
| -rw-r--r-- | src/mint/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mint/taler-mint-httpd.c | 40 | ||||
| -rw-r--r-- | src/mint/taler-mint-httpd_wire.c | 90 | ||||
| -rw-r--r-- | src/mint/taler-mint-httpd_wire.h | 82 |
4 files changed, 211 insertions, 2 deletions
diff --git a/src/mint/Makefile.am b/src/mint/Makefile.am index 71b4ce63a..7d75f9b62 100644 --- a/src/mint/Makefile.am +++ b/src/mint/Makefile.am @@ -19,6 +19,7 @@ taler_mint_httpd_SOURCES = \ taler-mint-httpd_admin.c taler-mint-httpd_admin.h \ taler-mint-httpd_deposit.c taler-mint-httpd_deposit.h \ taler-mint-httpd_withdraw.c taler-mint-httpd_withdraw.h \ + taler-mint-httpd_wire.c taler-mint-httpd_wire.h \ taler-mint-httpd_refresh.c taler-mint-httpd_refresh.h taler_mint_httpd_LDADD = \ $(LIBGCRYPT_LIBS) \ diff --git a/src/mint/taler-mint-httpd.c b/src/mint/taler-mint-httpd.c index cf825e6b1..a5a0681b6 100644 --- a/src/mint/taler-mint-httpd.c +++ b/src/mint/taler-mint-httpd.c @@ -31,6 +31,7 @@ #include "taler-mint-httpd_admin.h" #include "taler-mint-httpd_deposit.h" #include "taler-mint-httpd_withdraw.h" +#include "taler-mint-httpd_wire.h" #include "taler-mint-httpd_refresh.h" #include "taler-mint-httpd_keystate.h" #if HAVE_DEVELOPER @@ -142,13 +143,23 @@ handle_mhd_request (void *cls, { static struct TMH_RequestHandler handlers[] = { + /* Landing page, tell humans to go away. */ { "/", MHD_HTTP_METHOD_GET, "text/plain", - "Hello, I'm the mint\n", 0, + "Hello, I'm the Taler mint. This HTTP server is not for humans.\n", 0, &TMH_MHD_handler_static_response, MHD_HTTP_OK }, + /* /robots.txt: disallow everything */ + { "/robots.txt", MHD_HTTP_METHOD_GET, "text/plain", + "User-agent: *\nDisallow: /\n", 0, + &TMH_MHD_handler_static_response, MHD_HTTP_OK }, + /* AGPL licensing page, redirect to source. As per the AGPL-license, + every deployment is required to offer the user a download of the + source. We make this easy by including a redirect to the source + here. */ { "/agpl", MHD_HTTP_METHOD_GET, "text/plain", NULL, 0, &TMH_MHD_handler_agpl_redirect, MHD_HTTP_FOUND }, + /* Return key material and fundamental properties for this mint */ { "/keys", MHD_HTTP_METHOD_GET, "application/json", NULL, 0, &TMH_KS_handler_keys, MHD_HTTP_OK }, @@ -156,6 +167,29 @@ handle_mhd_request (void *cls, "Only GET is allowed", 0, &TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED }, + /* Requests for wiring information */ + { "/wire", MHD_HTTP_METHOD_GET, "application/json", + NULL, 0, + &TMH_WIRE_handler_wire, MHD_HTTP_OK }, + { "/wire", NULL, "text/plain", + "Only GET is allowed", 0, + &TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED }, + + { "/wire/test", MHD_HTTP_METHOD_GET, "application/json", + NULL, 0, + &TMH_WIRE_handler_wire_test, MHD_HTTP_OK }, + { "/wire/test", NULL, "text/plain", + "Only GET is allowed", 0, + &TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED }, + + { "/wire/sepa", MHD_HTTP_METHOD_GET, "application/json", + NULL, 0, + &TMH_WIRE_handler_wire_sepa, MHD_HTTP_OK }, + { "/wire/sepa", NULL, "text/plain", + "Only GET is allowed", 0, + &TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED }, + + /* Withdrawing coins / interaction with reserves */ { "/withdraw/status", MHD_HTTP_METHOD_GET, "application/json", NULL, 0, &TMH_WITHDRAW_handler_withdraw_status, MHD_HTTP_OK }, @@ -170,6 +204,7 @@ handle_mhd_request (void *cls, "Only POST is allowed", 0, &TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED }, + /* Depositing coins */ { "/deposit", MHD_HTTP_METHOD_POST, "application/json", NULL, 0, &TMH_DEPOSIT_handler_deposit, MHD_HTTP_OK }, @@ -177,6 +212,7 @@ handle_mhd_request (void *cls, "Only POST is allowed", 0, &TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED }, + /* Dealing with change */ { "/refresh/melt", MHD_HTTP_METHOD_POST, "application/json", NULL, 0, &TMH_REFRESH_handler_refresh_melt, MHD_HTTP_OK }, @@ -213,8 +249,8 @@ handle_mhd_request (void *cls, "Only POST is allowed", 0, &TMH_MHD_handler_send_json_pack_error, MHD_HTTP_METHOD_NOT_ALLOWED }, - #if HAVE_DEVELOPER + /* Client crypto-interoperability test functions */ { "/test", MHD_HTTP_METHOD_POST, "application/json", NULL, 0, &TMH_TEST_handler_test, MHD_HTTP_OK }, diff --git a/src/mint/taler-mint-httpd_wire.c b/src/mint/taler-mint-httpd_wire.c new file mode 100644 index 000000000..01b995f86 --- /dev/null +++ b/src/mint/taler-mint-httpd_wire.c @@ -0,0 +1,90 @@ +/* + This file is part of TALER + Copyright (C) 2015 GNUnet e.V. + + 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License along with + TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/> +*/ +/** + * @file taler-mint-httpd_wire.c + * @brief Handle /wire requests + * @author Christian Grothoff + */ +#include "platform.h" +#include "taler-mint-httpd_wire.h" + + +/** + * Handle a "/wire" 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 +TMH_WIRE_handler_wire (struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size) +{ + GNUNET_break (0); // FIXME: not implemented (#3477) + return MHD_NO; +} + + +/** + * Handle a "/wire/test" 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 +TMH_WIRE_handler_wire_test (struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size) +{ + GNUNET_break (0); // FIXME: not implemented (#3477) + return MHD_NO; +} + + +/** + * Handle a "/wire/sepa" 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 +TMH_WIRE_handler_wire_sepa (struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size) +{ + GNUNET_break (0); // FIXME: not implemented (#3477) + return MHD_NO; +} + +/* end of taler-mint-httpd_wire.c */ diff --git a/src/mint/taler-mint-httpd_wire.h b/src/mint/taler-mint-httpd_wire.h new file mode 100644 index 000000000..e77daf019 --- /dev/null +++ b/src/mint/taler-mint-httpd_wire.h @@ -0,0 +1,82 @@ +/* + This file is part of TALER + Copyright (C) 2014 GNUnet e.V. + + 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License along with + TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/> +*/ +/** + * @file taler-mint-httpd_wire.h + * @brief Handle /wire requests + * @author Christian Grothoff + */ +#ifndef TALER_MINT_HTTPD_WIRE_H +#define TALER_MINT_HTTPD_WIRE_H + +#include <gnunet/gnunet_util_lib.h> +#include <microhttpd.h> +#include "taler-mint-httpd.h" + + +/** + * Handle a "/wire" 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 +TMH_WIRE_handler_wire (struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size); + + +/** + * Handle a "/wire/test" 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 +TMH_WIRE_handler_wire_test (struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size); + + +/** + * Handle a "/wire/sepa" 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 +TMH_WIRE_handler_wire_sepa (struct TMH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size); + +#endif |