jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HttpHeader::FieldValue::SemicolonSeparated renamed to HttpHeader::FieldValue::SemicolonSeparatedAttributes, and cleanup of HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse, attribute values are now also percent-decoded

Browse source
This commit is contained in:
eidheim 2017-11-08 11:30:21 +01:00
commit 2860f76139
2 changed files with 50 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

40
tests/parse_test.cpp
View file

@ -196,86 +196,94 @@ int main() {
{ {
{ {
SimpleWeb::CaseInsensitiveMultimap solution; SimpleWeb::CaseInsensitiveMultimap solution;
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse(""); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
SimpleWeb::CaseInsensitiveMultimap solution = {{"a", ""}}; SimpleWeb::CaseInsensitiveMultimap solution = {{"a", ""}};
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("a"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
SimpleWeb::CaseInsensitiveMultimap solution = {{"a", ""}, {"b", ""}}; SimpleWeb::CaseInsensitiveMultimap solution = {{"a", ""}, {"b", ""}};
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("a; b"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a; b");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("a;b"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a;b");
assert(parsed == solution); assert(parsed == solution);
} }
} }
{ {
SimpleWeb::CaseInsensitiveMultimap solution = {{"a", ""}, {"b", "c"}}; SimpleWeb::CaseInsensitiveMultimap solution = {{"a", ""}, {"b", "c"}};
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("a; b=c"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a; b=c");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("a;b=c"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a;b=c");
assert(parsed == solution); assert(parsed == solution);
} }
} }
{ {
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}}; SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}};
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"test", ""}}; SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"test", ""}};
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data; test"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; test");
assert(parsed == solution); assert(parsed == solution);
} }
} }
{ {
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"name", "file"}}; SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"name", "file"}};
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data; name=\"file\""); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=\"file\"");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data; name=file"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=file");
assert(parsed == solution); assert(parsed == solution);
} }
} }
{ {
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"name", "file"}, {"filename", "filename.png"}}; SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"name", "file"}, {"filename", "filename.png"}};
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data; name=\"file\"; filename=\"filename.png\""); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=\"file\"; filename=\"filename.png\"");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data;name=\"file\";filename=\"filename.png\""); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data;name=\"file\";filename=\"filename.png\"");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data; name=file; filename=filename.png"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=file; filename=filename.png");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data;name=file;filename=filename.png"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data;name=file;filename=filename.png");
assert(parsed == solution); assert(parsed == solution);
} }
} }
{ {
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"name", "fi le"}, {"filename", "file name.png"}}; SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"name", "fi le"}, {"filename", "file name.png"}};
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data; name=\"fi le\"; filename=\"file name.png\""); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=\"fi le\"; filename=\"file name.png\"");
assert(parsed == solution); assert(parsed == solution);
} }
{ {
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparated::parse("form-data; name=fi le; filename=file name.png"); auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=\"fi%20le\"; filename=\"file%20name.png\"");
assert(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=fi le; filename=file name.png");
assert(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=fi%20le; filename=file%20name.png");
assert(parsed == solution); assert(parsed == solution);
} }
} }

52
utility.hpp
View file

@ -158,53 +158,53 @@ namespace SimpleWeb {
class FieldValue { class FieldValue {
public: public:
class SemicolonSeparated { class SemicolonSeparatedAttributes {
public: public:
/// Parse Set-Cookie or Content-Disposition header field value /// Parse Set-Cookie or Content-Disposition header field value. Attribute values are percent-decoded.
static CaseInsensitiveMultimap parse(const std::string &line) { static CaseInsensitiveMultimap parse(const std::string &str) {
CaseInsensitiveMultimap result; CaseInsensitiveMultimap result;
std::size_t para_start_pos = std::string::npos; std::size_t name_start_pos = std::string::npos;
std::size_t para_end_pos = std::string::npos; std::size_t name_end_pos = std::string::npos;
std::size_t value_start_pos = std::string::npos; std::size_t value_start_pos = std::string::npos;
for(std::size_t c = 0; c < line.size(); ++c) { for(std::size_t c = 0; c < str.size(); ++c) {
if(para_start_pos == std::string::npos) { if(name_start_pos == std::string::npos) {
if(line[c] != ' ' && line[c] != ';') if(str[c] != ' ' && str[c] != ';')
para_start_pos = c; name_start_pos = c;
} }
else { else {
if(para_end_pos == std::string::npos) { if(name_end_pos == std::string::npos) {
if(line[c] == ';') { if(str[c] == ';') {
result.emplace(line.substr(para_start_pos, c - para_start_pos), std::string()); result.emplace(str.substr(name_start_pos, c - name_start_pos), std::string());
para_start_pos = std::string::npos; name_start_pos = std::string::npos;
} }
else if(line[c] == '=') else if(str[c] == '=')
para_end_pos = c; name_end_pos = c;
} }
else { else {
if(value_start_pos == std::string::npos) { if(value_start_pos == std::string::npos) {
if(line[c] == '"' && c + 1 < line.size()) if(str[c] == '"' && c + 1 < str.size())
value_start_pos = c + 1; value_start_pos = c + 1;
else else
value_start_pos = c; value_start_pos = c;
} }
else if(line[c] == '"' || line[c] == ';') { else if(str[c] == '"' || str[c] == ';') {
result.emplace(line.substr(para_start_pos, para_end_pos - para_start_pos), line.substr(value_start_pos, c - value_start_pos)); result.emplace(str.substr(name_start_pos, name_end_pos - name_start_pos), Percent::decode(str.substr(value_start_pos, c - value_start_pos)));
para_start_pos = std::string::npos; name_start_pos = std::string::npos;
para_end_pos = std::string::npos; name_end_pos = std::string::npos;
value_start_pos = std::string::npos; value_start_pos = std::string::npos;
} }
} }
} }
} }
if(para_start_pos != std::string::npos) { if(name_start_pos != std::string::npos) {
if(para_end_pos == std::string::npos) if(name_end_pos == std::string::npos)
result.emplace(line.substr(para_start_pos), std::string()); result.emplace(str.substr(name_start_pos), std::string());
else if(value_start_pos != std::string::npos) { else if(value_start_pos != std::string::npos) {
if(line.back() == '"') if(str.back() == '"')
result.emplace(line.substr(para_start_pos, para_end_pos - para_start_pos), line.substr(value_start_pos, line.size() - 1)); result.emplace(str.substr(name_start_pos, name_end_pos - name_start_pos), Percent::decode(str.substr(value_start_pos, str.size() - 1)));
else else
result.emplace(line.substr(para_start_pos, para_end_pos - para_start_pos), line.substr(value_start_pos)); result.emplace(str.substr(name_start_pos, name_end_pos - name_start_pos), Percent::decode(str.substr(value_start_pos)));
} }
} }