Fix Request use-after-move
Partial revert of 915d2d4e59be56958b04a79ba96e0242ef735f44
Request object was being moved out of the owning Connection object,
which would then try to use the Request again in completeRequest(). Just
pass around a reference instead of taking ownership.
The obvious symptom was that Redfish pages were served as json in the
browser instead of HTML, because the headers in the Request were no
longer valid after being moved.
Tested: /redfish/v1 is served as HTML in the browser again.
Change-Id: Iae68a68817146c28377bbcade04716725e4a6096
Signed-off-by: Jonathan Doman <jonathan.doman@intel.com>
diff --git a/http/routing.hpp b/http/routing.hpp
index 5bf6c90..e41ce93 100644
--- a/http/routing.hpp
+++ b/http/routing.hpp
@@ -1335,7 +1335,7 @@
}
template <typename CallbackFn>
- void afterGetUserInfo(Request&& req,
+ void afterGetUserInfo(Request& req,
const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
BaseRule& rule, CallbackFn&& callback,
const boost::system::error_code& ec,
@@ -1356,11 +1356,11 @@
asyncResp->res.result(boost::beast::http::status::forbidden);
return;
}
- callback(std::move(req));
+ callback(req);
}
template <typename CallbackFn>
- void validatePrivilege(Request&& req,
+ void validatePrivilege(Request& req,
const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
BaseRule& rule, CallbackFn&& callback)
{
@@ -1370,11 +1370,11 @@
}
std::string username = req.session->username;
crow::connections::systemBus->async_method_call(
- [this, req{std::move(req)}, asyncResp, &rule,
+ [this, &req, asyncResp, &rule,
callback(std::forward<CallbackFn>(callback))](
const boost::system::error_code& ec,
const dbus::utility::DBusPropertiesMap& userInfoMap) mutable {
- afterGetUserInfo(std::move(req), asyncResp, rule,
+ afterGetUserInfo(req, asyncResp, rule,
std::forward<CallbackFn>(callback), ec,
userInfoMap);
},
@@ -1431,9 +1431,9 @@
// TODO(ed) This should be able to use std::bind_front, but it doesn't
// appear to work with the std::move on adaptor.
validatePrivilege(
- std::move(req), asyncResp, rule,
+ req, asyncResp, rule,
[&rule, asyncResp, adaptor(std::forward<Adaptor>(adaptor))](
- Request&& thisReq) mutable {
+ Request& thisReq) mutable {
rule.handleUpgrade(thisReq, asyncResp, std::move(adaptor));
});
}
@@ -1503,11 +1503,10 @@
rule.handle(req, asyncResp, params);
return;
}
- validatePrivilege(
- std::move(req), asyncResp, rule,
- [&rule, asyncResp, params](Request&& thisReq) mutable {
+ validatePrivilege(req, asyncResp, rule,
+ [&rule, asyncResp, params](Request& thisReq) mutable {
rule.handle(thisReq, asyncResp, params);
- });
+ });
}
void debugPrint()