Make url by value in Request
There's some tough-to-track-down safety problems in http Request. This
commit is an attempt to make things more safe, even if it isn't clear
how the old code was wrong.
Previously, the old code took a url_view from the target() string for a
given URI. This was effectively a pointer, and needed to be updated in
custom move/copy constructors that were error prone to write.
This commit moves to taking the URI by non-view, which involves a copy,
but allows us to use the default move and copy constructors, as well as
have no internal references within Request, which should improve the
safety and reviewability.
There's already so many string copies in bmcweb, that this is unlikely
to show up as any sort of performance regression, and simple code is
much better in this case.
Note, because of a bug in boost::url, we have to explicitly construct a
url_view in any case where we want to use segments() or query() on a
const Request. This has been reported to the boost maintainers, and is
being worked for a long term solution.
https://github.com/boostorg/url/pull/704
Tested: Redfish service validator passed on last commit in series.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I49a7710e642dff624d578ec1dde088428f284627
diff --git a/http/utility.hpp b/http/utility.hpp
index 71f39c8..4e6ed71 100644
--- a/http/utility.hpp
+++ b/http/utility.hpp
@@ -643,10 +643,10 @@
std::string_view segment;
};
-inline bool readUrlSegments(const boost::urls::url_view& urlView,
+inline bool readUrlSegments(const boost::urls::url_view& url,
std::initializer_list<UrlSegment>&& segments)
{
- const boost::urls::segments_view& urlSegments = urlView.segments();
+ const boost::urls::segments_view& urlSegments = url.segments();
if (!urlSegments.is_absolute())
{
@@ -687,10 +687,9 @@
} // namespace details
template <typename... Args>
-inline bool readUrlSegments(const boost::urls::url_view& urlView,
- Args&&... args)
+inline bool readUrlSegments(const boost::urls::url_view& url, Args&&... args)
{
- return details::readUrlSegments(urlView, {std::forward<Args>(args)...});
+ return details::readUrlSegments(url, {std::forward<Args>(args)...});
}
inline boost::urls::url replaceUrlSegment(const boost::urls::url_view& urlView,
@@ -723,13 +722,13 @@
return url;
}
-inline std::string setProtocolDefaults(const boost::urls::url_view& url)
+inline std::string setProtocolDefaults(const boost::urls::url_view& urlView)
{
- if (url.scheme() == "https")
+ if (urlView.scheme() == "https")
{
return "https";
}
- if (url.scheme() == "http")
+ if (urlView.scheme() == "http")
{
if (bmcwebInsecureEnableHttpPushStyleEventing)
{