Include CORS headers in bitcoind POST response as required.

Author: evoskuil

include/bitcoin/node/protocols/protocol_bitcoind.hpp

@@ -49,6 +49,9 @@ class BCN_API protocol_bitcoind
     void start() NOEXCEPT override;
 
 protected:
+    using post = network::http::method::post;
+    using options = network::http::method::options;
+
     template <class Derived, typename Method, typename... Args>
     inline void subscribe(Method&& method, Args&&... args) NOEXCEPT
     {
@@ -59,7 +62,7 @@ class BCN_API protocol_bitcoind
     void handle_receive_options(const code& ec,
         const network::http::method::options::cptr& options) NOEXCEPT override;
     void handle_receive_post(const code& ec,
-        const network::http::method::post::cptr& post) NOEXCEPT override;
+        const post::cptr& post) NOEXCEPT override;
 
     /// Handlers.
     bool handle_get_best_block_hash(const code& ec,
@@ -101,14 +104,19 @@ class BCN_API protocol_bitcoind
         interface::verify_tx_out_set, const std::string&) NOEXCEPT;
 
 private:
-    void send_json(boost::json::value&& model, size_t size_hint,
-        const network::http::request& request={}) NOEXCEPT;
+    // Provide the request for serialization, keeping it out of dispatch.
+    void set_post(const post::cptr& post) NOEXCEPT;
+    const post& get_post() const NOEXCEPT;
+
+    // Send the response.
+    void send_json(boost::json::value&& model, size_t size_hint) NOEXCEPT;
 
     // This is thread safe.
     ////const options_t& options_;
 
-    // This is protected by strand.
+    // These are protected by strand.
     dispatcher dispatcher_{};
+    post::cptr post_{};
 };
 
 } // namespace node

src/protocols/protocol_bitcoind.cpp

@@ -74,7 +74,7 @@ void protocol_bitcoind::start() NOEXCEPT
 // ----------------------------------------------------------------------------
 
 void protocol_bitcoind::handle_receive_options(const code& ec,
-    const network::http::method::options::cptr& options) NOEXCEPT
+    const options::cptr& options) NOEXCEPT
 {
     BC_ASSERT(stranded());
 
@@ -100,7 +100,7 @@ void protocol_bitcoind::handle_receive_options(const code& ec,
 
 // TODO: also handle_receive_get and dispatch based on URL parse.
 void protocol_bitcoind::handle_receive_post(const code& ec,
-    const network::http::method::post::cptr& post) NOEXCEPT
+    const post::cptr& post) NOEXCEPT
 {
     BC_ASSERT(stranded());
 
@@ -145,14 +145,14 @@ void protocol_bitcoind::handle_receive_post(const code& ec,
         return;
     }
 
-    // TODO: post-process request.
-    // github.com/bitcoin/bitcoin/blob/master/doc/JSON-RPC-interface.md
+    set_post(post);
     if (const auto code = dispatcher_.notify(request))
         stop(code);
 }
 
 // Handlers.
 // ----------------------------------------------------------------------------
+// github.com/bitcoin/bitcoin/blob/master/doc/JSON-RPC-interface.md
 // TODO: precompute size for buffer hints.
 
 // {"jsonrpc": "1.0", "id": "curltest", "method": "getbestblockhash", "params": []}
@@ -283,14 +283,28 @@ bool protocol_bitcoind::handle_verify_tx_out_set(const code& ec,
 // private
 // ----------------------------------------------------------------------------
 
+void protocol_bitcoind::set_post(const post::cptr& post) NOEXCEPT
+{
+    BC_ASSERT(post);
+    post_ = post;
+}
+
+const protocol_bitcoind::post& protocol_bitcoind::get_post() const NOEXCEPT
+{
+    BC_ASSERT(post_);
+    return *post_;
+}
+
 // TODO: post-process response for json-rpc version.
-void protocol_bitcoind::send_json(boost::json::value&& model, size_t size_hint,
-    const request& request) NOEXCEPT
+void protocol_bitcoind::send_json(boost::json::value&& model,
+    size_t size_hint) NOEXCEPT
 {
     BC_ASSERT(stranded());
+    const auto& post = get_post();
     constexpr auto json = media_type::application_json;
-    response response{ status::ok, request.version() };
-    add_common_headers(response, request);
+    response response{ status::ok, post.version() };
+    add_common_headers(response, post);
+    add_access_control_headers(response, post);
     response.set(field::content_type, from_media_type(json));
     response.body() = { std::move(model), size_hint };
     response.prepare_payload();

src/protocols/protocol_html.cpp

@@ -168,6 +168,7 @@ void protocol_html::send_json(boost::json::value&& model, size_t size_hint,
     BC_ASSERT(stranded());
     response response{ status::ok, request.version() };
     add_common_headers(response, request);
+    add_access_control_headers(response, request);
     response.set(field::content_type, from_media_type(json));
     response.body() = { std::move(model), size_hint };
     response.prepare_payload();
@@ -180,6 +181,7 @@ void protocol_html::send_text(std::string&& hexidecimal,
     BC_ASSERT(stranded());
     response response{ status::ok, request.version() };
     add_common_headers(response, request);
+    add_access_control_headers(response, request);
     response.set(field::content_type, from_media_type(text));
     response.body() = std::move(hexidecimal);
     response.prepare_payload();
@@ -192,6 +194,7 @@ void protocol_html::send_chunk(system::data_chunk&& bytes,
     BC_ASSERT(stranded());
     response response{ status::ok, request.version() };
     add_common_headers(response, request);
+    add_access_control_headers(response, request);
     response.set(field::content_type, from_media_type(data));
     response.body() = std::move(bytes);
     response.prepare_payload();
@@ -205,6 +208,7 @@ void protocol_html::send_file(file&& file, media_type type,
     BC_ASSERT_MSG(file.is_open(), "sending closed file handle");
     response response{ status::ok, request.version() };
     add_common_headers(response, request);
+    add_access_control_headers(response, request);
     response.set(field::content_type, from_media_type(type));
     response.body() = std::move(file);
     response.prepare_payload();
@@ -217,6 +221,7 @@ void protocol_html::send_span(span_body::value_type&& span,
     BC_ASSERT(stranded());
     response response{ status::ok, request.version() };
     add_common_headers(response, request);
+    add_access_control_headers(response, request);
     response.set(field::content_type, from_media_type(type));
     response.body() = std::move(span);
     response.prepare_payload();
@@ -229,6 +234,7 @@ void protocol_html::send_buffer(buffer_body::value_type&& buffer,
     BC_ASSERT(stranded());
     response response{ status::ok, request.version() };
     add_common_headers(response, request);
+    add_access_control_headers(response, request);
     response.set(field::content_type, from_media_type(type));
     response.body() = std::move(buffer);
     response.prepare_payload();