boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-30 12:57:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix utf8 validation for autobahn

Browse Source
This commit is contained in:
Vinnie Falco
2017-10-25 23:23:59 -07:00
parent 3d3bc87042
commit 85f2dcca33
3 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -8,6 +8,10 @@ HTTP:
* Use message::need_eof in example servers * Use message::need_eof in example servers
* Use synchronous writes in chunk output example * Use synchronous writes in chunk output example
WebSocket:
* Fix utf8 validation for autobahn
API Changes: API Changes:
* Remove serializer::keep_alive * Remove serializer::keep_alive

75
include/boost/beast/websocket/detail/utf8_checker.hpp
View File

@ -109,63 +109,62 @@ write(std::uint8_t const* in, std::size_t size)
++p; ++p;
return true; return true;
} }
if((p[0] & 0x60) == 0x40) if((p[0] & 0xe0) == 0xc0)
{ {
if((p[1] & 0xc0) != 0x80) if( (p[1] & 0xc0) != 0x80 ||
(p[0] & 0xfe) == 0xc0) // overlong
return false; return false;
p += 2; p += 2;
return true; return true;
} }
if((p[0] & 0xf0) == 0xe0) if((p[0] & 0xf0) == 0xe0)
{ {
if((p[1] & 0xc0) != 0x80 || if( (p[1] & 0xc0) != 0x80
(p[2] & 0xc0) != 0x80 || || (p[2] & 0xc0) != 0x80
(p[0] == 224 && p[1] < 160) || || (p[0] == 0xe0 && (p[1] & 0xe0) == 0x80) // overlong
(p[0] == 237 && p[1] > 159)) || (p[0] == 0xed && (p[1] & 0xe0) == 0xa0) // surrogate
return false; //|| (p[0] == 0xef && p[1] == 0xbf && (p[2] & 0xfe) == 0xbe) // U+FFFE or U+FFFF
)
return false;
p += 3; p += 3;
return true; return true;
} }
if((p[0] & 0xf8) == 0xf0) if((p[0] & 0xf8) == 0xf0)
{ {
if(p[0] > 244 || if( (p[1] & 0xc0) != 0x80
(p[1] & 0xc0) != 0x80 || || (p[2] & 0xc0) != 0x80
(p[2] & 0xc0) != 0x80 || || (p[3] & 0xc0) != 0x80
(p[3] & 0xc0) != 0x80 || || (p[0] == 0xf0 && (p[1] & 0xf0) == 0x80) // overlong
(p[0] == 240 && p[1] < 144) || || (p[0] == 0xf4 && p[1] > 0x8f) || p[0] > 0xf4 // > U+10FFFF
(p[0] == 244 && p[1] > 143)) )
return false; return false;
p += 4; p += 4;
return true; return true;
} }
return false; return false;
}; };
auto const valid_have = auto const fail_fast =
[&]() [&]()
{ {
if((cp_[0] & 0x60) == 0x40) auto const n = p_ - cp_;
return cp_[0] <= 223; switch(n)
if((cp_[0] & 0xf0) == 0xe0)
{ {
if(p_ - cp_ > 1 && default:
((cp_[1] & 0xc0) != 0x80 || BOOST_ASSERT(false);
(cp_[0] == 224 && cp_[1] < 160) || BOOST_BEAST_FALLTHROUGH;
(cp_[0] == 237 && cp_[1] > 159))) case 1:
return false; cp_[1] = 0x81;
return true; BOOST_BEAST_FALLTHROUGH;
case 2:
cp_[2] = 0x81;
BOOST_BEAST_FALLTHROUGH;
case 3:
cp_[3] = 0x81;
BOOST_BEAST_FALLTHROUGH;
break;
} }
if((cp_[0] & 0xf8) == 0xf0) std::uint8_t const* p = cp_;
{ return ! valid(p);
auto const n = p_ - cp_;
if(n > 2 && (cp_[2] & 0xc0) != 0x80)
return false;
if(n > 1 &&
((cp_[1] & 0xc0) != 0x80 ||
(cp_[0] == 240 && cp_[1] < 144) ||
(cp_[0] == 244 && cp_[1] > 143)))
return false;
}
return true;
}; };
auto const needed = auto const needed =
[](std::uint8_t const v) [](std::uint8_t const v)
@ -207,7 +206,7 @@ write(std::uint8_t const* in, std::size_t size)
// Do partial validation on the incomplete // Do partial validation on the incomplete
// code point, this is called "Fail fast" // code point, this is called "Fail fast"
// in Autobahn|Testsuite parlance. // in Autobahn|Testsuite parlance.
return valid_have(); return ! fail_fast();
} }
// Complete code point, validate it // Complete code point, validate it
@ -320,7 +319,7 @@ tail:
// Do partial validation on the incomplete // Do partial validation on the incomplete
// code point, this is called "Fail fast" // code point, this is called "Fail fast"
// in Autobahn|Testsuite parlance. // in Autobahn|Testsuite parlance.
return valid_have(); return ! fail_fast();
} }
} }
return true; return true;

10
test/CMakeLists.txt
View File

@ -12,11 +12,11 @@ include_directories (./extras/include)
include_directories (../subtree/unit_test/include) include_directories (../subtree/unit_test/include)
file (GLOB_RECURSE EXTRAS_INCLUDES file (GLOB_RECURSE EXTRAS_INCLUDES
${PROJECT_SOURCE_DIR}/test/extras/include/boost/beast/*.hpp ${PROJECT_SOURCE_DIR}/test/extras/include/*.hpp
${PROJECT_SOURCE_DIR}/test/extras/include/boost/beast/*.ipp ${PROJECT_SOURCE_DIR}/test/extras/include/*.ipp
${PROJECT_SOURCE_DIR}/subtree/unit_test/include/beast/*.hpp ${PROJECT_SOURCE_DIR}/subtree/unit_test/include/*.hpp
${PROJECT_SOURCE_DIR}/subtree/unit_test/include/beast/*.ipp ${PROJECT_SOURCE_DIR}/subtree/unit_test/include/*.ipp
) )
set (TEST_MAIN ${PROJECT_SOURCE_DIR}/subtree/unit_test/include/boost/beast/unit_test/main.cpp) set (TEST_MAIN ${PROJECT_SOURCE_DIR}/subtree/unit_test/include/boost/beast/unit_test/main.cpp)