Accept non-ASCII octets in percent-decoding (#119)

mtrenkmann · glynos · commit 0bfbd14a658e · 2018-10-18T12:42:48.000+02:00
* Allow octets outside ASCII range in percent-decoding

* Change unit test to accept %80 octet in percent-decoding

* Add test that percent-decodes UTF-8 data
diff --git a/include/network/uri/detail/decode.hpp b/include/network/uri/detail/decode.hpp
@@ -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;
diff --git a/test/uri_encoding_test.cpp b/test/uri_encoding_test.cpp
@@ -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);
 }
