Move origin processing to http settings (in network).

Author: evoskuil

include/bitcoin/node/protocols/protocol_html.hpp

@@ -81,8 +81,6 @@ class BCN_API protocol_html
         const network::http::request& request={}) NOEXCEPT;
 
     /// Utilities.
-    bool is_allowed_origin(const network::http::fields& fields,
-        size_t version) const NOEXCEPT;
     std::filesystem::path to_path(
         const std::string& target = "/") const NOEXCEPT;
     std::filesystem::path to_local_path(

include/bitcoin/node/settings.hpp

@@ -147,12 +147,6 @@ class BCN_API settings
         /// Default page for default URL (recommended).
         std::string default_{ "index.html" };
 
-        /// Validated against origins if configured (recommended).
-        network::config::endpoints origins{};
-
-        /// Normalized origins.
-        virtual system::string_list origin_names() const NOEXCEPT;
-
         /// !path.empty() && http_server::enabled() [hidden, not virtual]
         virtual bool enabled() const NOEXCEPT;
     };

src/protocols/protocol_html.cpp

@@ -238,19 +238,6 @@ void protocol_html::send_buffer(buffer_body::value_type&& buffer,
 // Utilities.
 // ----------------------------------------------------------------------------
 
-bool protocol_html::is_allowed_origin(const fields& fields,
-    size_t version) const NOEXCEPT
-{
-    // Allow same-origin and no-origin requests.
-    // Origin header field is not available until http 1.1.
-    const auto origin = fields[field::origin];
-    if (origin.empty() || version < version_1_1)
-        return true;
-
-    return options_.origins.empty() || system::contains(options_.origins,
-        network::config::to_normal_host(origin, default_port()));
-}
-
 std::filesystem::path protocol_html::to_path(
     const std::string& target) const NOEXCEPT
 {

src/settings.cpp

@@ -180,13 +180,6 @@ settings::html_server::html_server(const std::string_view& logging_name,
 {
 }
 
-system::string_list settings::html_server::origin_names() const NOEXCEPT
-{
-    // secure changes default port from 80 to 443.
-    const auto port = secure ? http::default_tls : http::default_http;
-    return network::config::to_host_names(hosts, port);
-}
-
 bool settings::html_server::enabled() const NOEXCEPT
 {
     return (!path.empty() || pages.enabled()) && http_server::enabled();

test/settings.cpp

@@ -115,8 +115,6 @@ BOOST_AUTO_TEST_CASE(server__html_server__defaults__expected)
     BOOST_REQUIRE(instance.websocket);
     BOOST_REQUIRE(instance.path.empty());
     BOOST_REQUIRE_EQUAL(instance.default_, "index.html");
-    BOOST_REQUIRE(instance.origins.empty());
-    BOOST_REQUIRE(instance.origin_names().empty());
 }
 
 BOOST_AUTO_TEST_CASE(server__web_server__defaults__expected)
@@ -152,8 +150,6 @@ BOOST_AUTO_TEST_CASE(server__web_server__defaults__expected)
     BOOST_REQUIRE(server.path.empty());
     BOOST_REQUIRE(server.websocket);
     BOOST_REQUIRE_EQUAL(server.default_, "index.html");
-    BOOST_REQUIRE(server.origins.empty());
-    BOOST_REQUIRE(server.origin_names().empty());
 }
 
 BOOST_AUTO_TEST_CASE(server__explore_server__defaults__expected)
@@ -189,8 +185,6 @@ BOOST_AUTO_TEST_CASE(server__explore_server__defaults__expected)
     BOOST_REQUIRE(server.path.empty());
     BOOST_REQUIRE(server.websocket);
     BOOST_REQUIRE_EQUAL(server.default_, "index.html");
-    BOOST_REQUIRE(server.origins.empty());
-    BOOST_REQUIRE(server.origin_names().empty());
 }
 
 // TODO: could add websocket under bitcoind as a custom property.