Skip to content

Adapt to network mime_type::application_octet[_stream] rename. #873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 3 commits into from
Oct 29, 2025
Merged

Adapt to network mime_type::application_octet[_stream] rename. #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d03105f
Adapt to network mime_type::application_octet[_stream] rename.
evoskuil Oct 29, 2025
760331f
Adapt to network use of variant http::request.
evoskuil Oct 29, 2025
654b3fe
Adapt to network use/convention of fields vs. string params.
evoskuil Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/bitcoin/node/protocols/protocol_html.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ class BCN_API protocol_html
const network::http::method::get& request) NOEXCEPT override;

/// Senders.
void send_file(const network::http::string_request& request,
void send_file(const network::http::request& request,
network::http::file&& file, network::http::mime_type type) NOEXCEPT;

/// Utilities.
bool is_allowed_origin(const std::string& origin,
bool is_allowed_origin(const network::http::fields& fields,
size_t version) const NOEXCEPT;
std::filesystem::path to_local_path(
const std::string& target = "/") const NOEXCEPT;
Expand Down
4 changes: 2 additions & 2 deletions src/protocols/protocol_explore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ void protocol_explore::handle_receive_get(const code& ec,
return;

// Enforce http origin policy (requires configured hosts).
if (!is_allowed_origin((*request)[field::origin], request->version()))
if (!is_allowed_origin(*request, request->version()))
{
send_forbidden(*request);
return;
}

// Enforce http host header (if any hosts are configured).
if (!is_allowed_host((*request)[field::host], request->version()))
if (!is_allowed_host(*request, request->version()))
{
send_bad_host(*request);
return;
Expand Down
13 changes: 7 additions & 6 deletions src/protocols/protocol_html.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ void protocol_html::handle_receive_get(const code& ec,
return;

// Enforce http origin policy (requires configured hosts).
if (!is_allowed_origin((*request)[field::origin], request->version()))
if (!is_allowed_origin(*request, request->version()))
{
send_forbidden(*request);
return;
}

// Enforce http host header (if any hosts are configured).
if (!is_allowed_host((*request)[field::host], request->version()))
if (!is_allowed_host(*request, request->version()))
{
send_bad_host(*request);
return;
Expand All @@ -72,15 +72,15 @@ void protocol_html::handle_receive_get(const code& ec,
return;
}

const auto default_type = mime_type::application_octet;
const auto default_type = mime_type::application_octet_stream;
send_file(*request, std::move(file), file_mime_type(path, default_type));
}

// Senders.
// ----------------------------------------------------------------------------

void protocol_html::send_file(const string_request& request,
file&& file, mime_type type) NOEXCEPT
void protocol_html::send_file(const request& request, file&& file,
mime_type type) NOEXCEPT
{
BC_ASSERT_MSG(stranded(), "strand");
BC_ASSERT_MSG(file.is_open(), "sending closed file handle");
Expand All @@ -98,13 +98,14 @@ void protocol_html::send_file(const string_request& request,
// Utilities.
// ----------------------------------------------------------------------------

bool protocol_html::is_allowed_origin(const std::string& origin,
bool protocol_html::is_allowed_origin(const fields& fields,
size_t version) const NOEXCEPT
{
BC_ASSERT_MSG(stranded(), "strand");

// 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;

Expand Down
Loading