Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Accept non-ASCII octets in percent-decoding #119

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

Merged
merged 3 commits into from
Oct 18, 2018
Merged

Accept non-ASCII octets in percent-decoding #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d70ced0
Allow octets outside ASCII range in percent-decoding
mtrenkmann Oct 18, 2018
56ba072
Change unit test to accept %80 octet in percent-decoding
mtrenkmann Oct 18, 2018
244362d
Add test that percent-decodes UTF-8 data
mtrenkmann Oct 18, 2018
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
4 changes: 0 additions & 4 deletions include/network/uri/detail/decode.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ InputIterator decode_char(InputIterator it, charT *out) {
++it;
auto h1 = *it;
auto v1 = detail::letter_to_hex(h1);
if (h0 >= '8') {
// unable to decode characters outside the ASCII character set.
throw percent_decoding_error(uri_error::conversion_failed);
}
++it;
*out = static_cast<charT>((0x10 * v0) + v1);
return it;
Expand Down
19 changes: 14 additions & 5 deletions test/uri_encoding_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,26 @@ TEST(uri_encoding_test, decode_iterator_error_6) {
network::percent_decoding_error);
}

TEST(uri_encoding_test, decode_iterator_not_an_error) {
TEST(uri_encoding_test, decode_iterator_not_an_error_1) {
const std::string encoded("%20");
std::string instance;
ASSERT_NO_THROW(network::uri::decode(std::begin(encoded), std::end(encoded),
std::back_inserter(instance)));
}

TEST(uri_encoding_test, decode_iterator_error_7) {
TEST(uri_encoding_test, decode_iterator_not_an_error_2) {
const std::string encoded("%80");
std::string instance;
ASSERT_THROW(network::uri::decode(std::begin(encoded), std::end(encoded),
std::back_inserter(instance)),
network::percent_decoding_error);
ASSERT_NO_THROW(network::uri::decode(std::begin(encoded), std::end(encoded),
std::back_inserter(instance)));
}

TEST(uri_encoding_test, decode_accepts_utf8) {
const std::string encoded("%EB%B2%95%EC%A0%95%EB%8F%99");
std::string instance;
ASSERT_NO_THROW(network::uri::decode(std::begin(encoded), std::end(encoded),
std::back_inserter(instance)));

const std::string unencoded = u8"법정동";
ASSERT_EQ(unencoded, instance);
}