loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix crash in extractBodyContent when using large headers (#10636)

Browse Source 
If you send a request with a body and a header greater than 255 characters long there will be an exception. The session->fetch will not return the body in the synchronous way expected.
This commit is contained in:
eoghanbdoyle 2022-07-23 05:27:11 +01:00 committed by GitHub
parent 2e6cdb5196
commit 153cfeb7ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/cpp-restbed-server/api-header.mustache vendored
View File

@ -75,8 +75,6 @@ protected:
// Override these for customization // // Override these for customization //
////////////////////////////////////// //////////////////////////////////////
virtual std::string extractBodyContent(const std::shared_ptr<restbed::Session>& session);
{{#hasPathParams}} {{#hasPathParams}}
{{#pathParams}} {{#pathParams}}
{{#isPrimitiveType}} {{#isPrimitiveType}}

36
modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache vendored
View File

@ -128,7 +128,13 @@ void {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::handler_
{ {
const auto request = session->get_request(); const auto request = session->get_request();
{{#hasBodyParam}} {{#hasBodyParam}}
std::string bodyContent = extractBodyContent(session); int content_length = request->get_header("Content-Length", 0);
session->fetch(content_length,
[this](const std::shared_ptr<restbed::Session> session,
const restbed::Bytes& body) {
std::string bodyContent = restbed::String::format(
"%.*s\n", (int)body.size(), body.data());
// Get body params or form params here from the body content string // Get body params or form params here from the body content string
{{#allParams}} {{#allParams}}
@ -224,6 +230,10 @@ void {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::handler_
} }
{{/responses}} {{/responses}}
defaultSessionClose(session, status_code, result); defaultSessionClose(session, status_code, result);
{{#hasBodyParam}}
});
{{/hasBodyParam}}
} }
{{#vendorExtensions.x-codegen-other-methods}} {{#vendorExtensions.x-codegen-other-methods}}
@ -232,7 +242,13 @@ void {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::handler_
const auto request = session->get_request(); const auto request = session->get_request();
{{#hasBodyParam}} {{#hasBodyParam}}
std::string bodyContent = extractBodyContent(session); int content_length = request->get_header("Content-Length", 0);
session->fetch(content_length,
[this](const std::shared_ptr<restbed::Session> session,
const restbed::Bytes& body) {
std::string bodyContent = restbed::String::format(
"%.*s\n", (int)body.size(), body.data());
// body params or form params here from the body content string // body params or form params here from the body content string
{{#allParams}} {{#allParams}}
@ -334,6 +350,9 @@ void {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::handler_
} }
{{/responses}} {{/responses}}
defaultSessionClose(session, status_code, result); defaultSessionClose(session, status_code, result);
{{#hasBodyParam}}
});
{{/hasBodyParam}}
} }
{{/vendorExtensions.x-codegen-other-methods}} {{/vendorExtensions.x-codegen-other-methods}}
@ -350,19 +369,6 @@ void {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::handler_
throw {{classname}}Exception(501, "Not implemented"); throw {{classname}}Exception(501, "Not implemented");
} }
{{/vendorExtensions.x-codegen-other-methods}} {{/vendorExtensions.x-codegen-other-methods}}
std::string {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::extractBodyContent(const std::shared_ptr<restbed::Session>& session) {
const auto request = session->get_request();
int content_length = request->get_header("Content-Length", 0);
std::string bodyContent;
session->fetch(content_length,
[&bodyContent](const std::shared_ptr<restbed::Session> session,
const restbed::Bytes &body) {
bodyContent = restbed::String::format(
"%.*s\n", (int)body.size(), body.data());
});
return bodyContent;
}
{{/operation}} {{/operation}}
{{classname}}::{{classname}}(std::shared_ptr<restbed::Service> const& restbedService) {{classname}}::{{classname}}(std::shared_ptr<restbed::Service> const& restbedService)