Skip to content

Use string_view in CookieParser::before_handle parsing #1024

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.

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
63 changes: 43 additions & 20 deletions include/crow/middlewares/cookie_parser.h
Original file line number Diff line number Diff line change
@@ -231,8 +231,7 @@ namespace crow

void before_handle(request& req, response& res, context& ctx)
{
// TODO(dranikpg): remove copies, use string_view with c++17
int count = req.headers.count("Cookie");
const int count = req.headers.count("Cookie");
if (!count)
return;
if (count > 1)
@@ -241,34 +240,58 @@ namespace crow
res.end();
return;
}
std::string cookies = req.get_header_value("Cookie");

const std::string_view cookies_sv = req.get_header_value("Cookie");

auto trim_sv = [](const std::string_view sv) -> std::string_view {
const size_t first = sv.find_first_not_of(" \t\n\r\f\v"); // same as isspace
if (std::string_view::npos == first) {
return sv.substr(0, 0);
}
const size_t last = sv.find_last_not_of(" \t\n\r\f\v");
return sv.substr(first, (last - first + 1));
};

size_t pos = 0;
while (pos < cookies.size())
while (pos < cookies_sv.size())
{
size_t pos_equal = cookies.find('=', pos);
if (pos_equal == cookies.npos)
const size_t pos_equal = cookies_sv.find('=', pos);
if (pos_equal == std::string_view::npos) {
break;
std::string name = cookies.substr(pos, pos_equal - pos);
name = utility::trim(name);
}

std::string_view name_sv = cookies_sv.substr(pos, pos_equal - pos);
name_sv = trim_sv(name_sv);

pos = pos_equal + 1;
if (pos == cookies.size())
if (pos == cookies_sv.size()) {
break;
}

size_t pos_semicolon = cookies.find(';', pos);
std::string value = cookies.substr(pos, pos_semicolon - pos);
const size_t pos_semicolon = cookies_sv.find(';', pos);
std::string_view value_sv;

value = utility::trim(value);
if (value[0] == '"' && value[value.size() - 1] == '"')
{
value = value.substr(1, value.size() - 2);
if (pos_semicolon == std::string_view::npos) {
value_sv = cookies_sv.substr(pos);
pos = cookies_sv.size();
} else {
value_sv = cookies_sv.substr(pos, pos_semicolon - pos);
pos = pos_semicolon + 1;
}

ctx.jar.emplace(std::move(name), std::move(value));
value_sv = trim_sv(value_sv);

pos = pos_semicolon;
if (pos == cookies.npos)
break;
pos++;
if (!value_sv.empty() && value_sv.front() == '"' && value_sv.back() == '"')
{
if (value_sv.size() >= 2) {
value_sv.remove_prefix(1);
value_sv.remove_suffix(1);
} else {
value_sv = value_sv.substr(0,0);
}
}

ctx.jar.emplace(std::string(name_sv), std::string(value_sv));
}
}