Skip to content

lib: fix response header component sanitization #2478

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

Open
quart27219 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

lib: fix response header component sanitization #2478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion lib/src/HttpResponseImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <trantor/net/InetAddress.h>
#include <trantor/utils/Date.h>
#include <trantor/utils/MsgBuffer.h>
#include <algorithm>
#include <memory>
#include <mutex>
#include <string>
Expand All @@ -35,6 +36,16 @@ class DROGON_EXPORT HttpResponseImpl : public HttpResponse
friend class HttpResponseParser;

public:
static void sanitizeHeaderComponent(std::string &s)
{
s.erase(std::remove_if(s.begin(),
s.end(),
[](char c) {
return c == '\r' || c == '\n' || c == '\0';
}),
s.end());
}

HttpResponseImpl() : creationDate_(trantor::Date::now())
{
}
Expand Down Expand Up @@ -158,20 +169,25 @@ class DROGON_EXPORT HttpResponseImpl : public HttpResponse
void addHeader(std::string field, const std::string &value) override
{
fullHeaderString_.reset();
sanitizeHeaderComponent(field);
transform(field.begin(),
field.end(),
field.begin(),
[](unsigned char c) { return tolower(c); });
headers_[std::move(field)] = value;
auto sanitizedValue = value;
sanitizeHeaderComponent(sanitizedValue);
headers_[std::move(field)] = std::move(sanitizedValue);
}

void addHeader(std::string field, std::string &&value) override
{
fullHeaderString_.reset();
sanitizeHeaderComponent(field);
transform(field.begin(),
field.end(),
field.begin(),
[](unsigned char c) { return tolower(c); });
sanitizeHeaderComponent(value);
headers_[std::move(field)] = std::move(value);
}

Expand Down