MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-25 23:14:13 +01:00
Code Issues Releases Wiki Activity

ircd::http: Check for user supplied header before generating one.

Browse source
This commit is contained in:
Jason Volk 2018-12-30 18:03:40 -08:00
parent 6e71c05586
commit 6a25df6582
2 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ircd/http.h
View file

@ -30,6 +30,7 @@ namespace ircd::http
void writeline(window_buffer &, const window_buffer::closure &);
void write(window_buffer &, const header &);
void write(window_buffer &, const vector_view<const header> &);
bool has(const vector_view<const header> &, const string_view &key);
size_t serialized(const vector_view<const header> &);
std::string strung(const vector_view<const header> &);
void writechunk(window_buffer &, const uint32_t &size);

57
ircd/http.cc
View file

@ -236,16 +236,17 @@ ircd::http::request::request(window_buffer &out,
};
});
writeline(out, [&host](const mutable_buffer &out) -> size_t
{
assert(!host.empty());
return fmt::sprintf
if(!has(headers, "host"))
writeline(out, [&host](const mutable_buffer &out) -> size_t
{
out, "Host: %s", host
};
});
assert(!host.empty());
return fmt::sprintf
{
out, "Host: %s", host
};
});
if(content_length)
if(content_length && !has(headers, "content-type"))
writeline(out, [&content_type](const mutable_buffer &out) -> size_t
{
return fmt::sprintf
@ -254,13 +255,14 @@ ircd::http::request::request(window_buffer &out,
};
});
writeline(out, [&content_length](const mutable_buffer &out) -> size_t
{
return fmt::sprintf
if(!has(headers, "content-length"))
writeline(out, [&content_length](const mutable_buffer &out) -> size_t
{
out, "Content-Length: %zu", content_length
};
});
return fmt::sprintf
{
out, "Content-Length: %zu", content_length
};
});
write(out, headers);
@ -310,7 +312,7 @@ ircd::http::response::response(window_buffer &out,
const size_t &content_length,
const string_view &content_type,
const string_view &headers_string,
const vector_view<const header> &headers_vector,
const vector_view<const header> &headers,
const bool &termination)
{
writeline(out, [&code](const mutable_buffer &out) -> size_t
@ -321,7 +323,7 @@ ircd::http::response::response(window_buffer &out,
};
});
if(code >= 200 && code < 300)
if(code >= 200 && code < 300 && !has(headers, "server"))
writeline(out, [&code](const mutable_buffer &out) -> size_t
{
size_t ret{0};
@ -330,7 +332,7 @@ ircd::http::response::response(window_buffer &out,
return ret;
});
if(code < 400)
if(code < 400 && !has(headers, "date"))
writeline(out, [](const mutable_buffer &out) -> size_t
{
thread_local char date_buf[96];
@ -340,7 +342,7 @@ ircd::http::response::response(window_buffer &out,
};
});
if(code != NO_CONTENT && content_type && content_length)
if(code != NO_CONTENT && content_type && content_length && !has(headers, "content-type"))
writeline(out, [&content_type](const mutable_buffer &out) -> size_t
{
return fmt::sprintf
@ -349,7 +351,7 @@ ircd::http::response::response(window_buffer &out,
};
});
if(code != NO_CONTENT && content_length != size_t(-1))
if(code != NO_CONTENT && content_length != size_t(-1) && !has(headers, "content-length"))
writeline(out, [&content_length](const mutable_buffer &out) -> size_t
{
return fmt::sprintf
@ -358,7 +360,7 @@ ircd::http::response::response(window_buffer &out,
};
});
if(content_length == size_t(-1))
if(content_length == size_t(-1) && !has(headers, "transfer-encoding"))
writeline(out, [&content_length](const mutable_buffer &out) -> size_t
{
return copy(out, "Transfer-Encoding: chunked"_sv);
@ -370,8 +372,8 @@ ircd::http::response::response(window_buffer &out,
return copy(out, headers_string);
});
if(!headers_vector.empty())
write(out, headers_vector);
if(!headers.empty())
write(out, headers);
if(termination)
writeline(out);
@ -615,6 +617,17 @@ ircd::http::writechunk(window_buffer &buf,
});
}
bool
ircd::http::has(const vector_view<const header> &headers,
const string_view &key)
{
return end(headers) != std::find_if(begin(headers), end(headers), [&key]
(const header &header)
{
return iequals(header.first, key);
});
}
std::string
ircd::http::strung(const vector_view<const header> &headers)
{