Skip to content

uri fails to parse compact ipv6 representation #146

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 1 commit into from
Sep 24, 2012
Merged

uri fails to parse compact ipv6 representation #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
uri fails to parse compact ipv6 representation 
1. Hangs on ::1. The rule that matches anything before '::' should match
   0 or 1 occurance.
2. qi::repeat(min, max) is greedy in nature. Workaround to use
   qi::repeat(n) multiple times with varying n.
  • Loading branch information
@kvikas
kvikas committed Sep 24, 2012
commit ffaa80e10abcb84b29a61856d0d20354b7044af3
39 changes: 30 additions & 9 deletions include/network/uri/uri.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,36 @@ struct uri_grammar : qi::grammar<
;

ipv6address %= qi::raw[
qi::repeat(6)[h16 >> ':'] >> ls32
| "::" >> qi::repeat(5)[h16 >> ':'] >> ls32
| qi::raw[ h16] >> "::" >> qi::repeat(4)[h16 >> ':'] >> ls32
| qi::raw[ +(*(h16 >> ':')) >> h16] >> "::" >> qi::repeat(3)[h16 >> ':'] >> ls32
| qi::raw[qi::repeat(2)[*(h16 >> ':')] >> h16] >> "::" >> qi::repeat(2)[h16 >> ':'] >> ls32
| qi::raw[qi::repeat(3)[*(h16 >> ':')] >> h16] >> "::" >> h16 >> ':' >> ls32
| qi::raw[qi::repeat(4)[*(h16 >> ':')] >> h16] >> "::" >> ls32
| qi::raw[qi::repeat(5)[*(h16 >> ':')] >> h16] >> "::" >> h16
| qi::raw[qi::repeat(6)[*(h16 >> ':')] >> h16] >> "::"
qi::repeat(6)[h16 >> ':'] >> ls32
| "::" >> qi::repeat(5)[h16 >> ':'] >> ls32
| - qi::raw[ h16] >> "::" >> qi::repeat(4)[h16 >> ':'] >> ls32
| - qi::raw[ h16] >> "::" >> qi::repeat(3)[h16 >> ':'] >> ls32
| - qi::raw[ h16] >> "::" >> qi::repeat(2)[h16 >> ':'] >> ls32
| - qi::raw[ h16] >> "::" >> h16 >> ':' >> ls32
| - qi::raw[ h16] >> "::" >> ls32
| - qi::raw[ h16] >> "::" >> h16
| - qi::raw[ h16] >> "::"
| - qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> qi::repeat(3)[h16 >> ':'] >> ls32
| - qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> qi::repeat(2)[h16 >> ':'] >> ls32
| - qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> h16 >> ':' >> ls32
| - qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> ls32
| - qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> h16
| - qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::"
| - qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> qi::repeat(2)[h16 >> ':'] >> ls32
| - qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> h16 >> ':' >> ls32
| - qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> ls32
| - qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> h16
| - qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::"
| - qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" >> h16 >> ':' >> ls32
| - qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" >> ls32
| - qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" >> h16
| - qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::"
| - qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >> "::" >> ls32
| - qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >> "::" >> h16
| - qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >> "::"
| - qi::raw[qi::repeat(5)[(h16 >> ':')] >> h16] >> "::" >> h16
| - qi::raw[qi::repeat(5)[(h16 >> ':')] >> h16] >> "::"
| - qi::raw[qi::repeat(6)[(h16 >> ':')] >> h16] >> "::"
];

// ls32 = ( h16 ":" h16 ) / IPv4address
Expand Down
126 changes: 119 additions & 7 deletions libs/network/test/uri/uri_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,125 @@ BOOST_AUTO_TEST_CASE(ipv6_address_test_2) {
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

//BOOST_AUTO_TEST_CASE(ipv6_loopback_test) {
// network::uri instance("http://[::1]/");
// BOOST_REQUIRE(network::valid(instance));
// BOOST_CHECK_EQUAL(network::scheme(instance), "http");
// BOOST_CHECK_EQUAL(network::host(instance), "[::1]");
// BOOST_CHECK_EQUAL(network::path(instance), "/");
//}
BOOST_AUTO_TEST_CASE(ipv6_address_test_3) {
network::uri instance("http://[2001:db8:85a3:0:0:8a2e:370:7334]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[2001:db8:85a3:0:0:8a2e:370:7334]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_4) {
network::uri instance("http://[2001:db8:85a3::8a2e:370:7334]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[2001:db8:85a3::8a2e:370:7334]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_5) {
network::uri instance("http://[2001:0db8:0000:0000:0000:0000:1428:57ab]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[2001:0db8:0000:0000:0000:0000:1428:57ab]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_6) {
network::uri instance("http://[2001:0db8:0000:0000:0000::1428:57ab]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[2001:0db8:0000:0000:0000::1428:57ab]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_7) {
network::uri instance("http://[2001:0db8:0:0:0:0:1428:57ab]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[2001:0db8:0:0:0:0:1428:57ab]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_8) {
network::uri instance("http://[2001:0db8:0:0::1428:57ab]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[2001:0db8:0:0::1428:57ab]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_9) {
network::uri instance("http://[2001:0db8::1428:57ab]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[2001:0db8::1428:57ab]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_10) {
network::uri instance("http://[2001:db8::1428:57ab]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[2001:db8::1428:57ab]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_11) {
network::uri instance("http://[::ffff:0c22:384e]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[::ffff:0c22:384e]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_12) {
network::uri instance("http://[fe80::]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[fe80::]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_address_test_13) {
network::uri instance("http://[::ffff:c000:280]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[::ffff:c000:280]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_loopback_test) {
network::uri instance("http://[::1]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[::1]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_loopback_test_1) {
network::uri instance("http://[0000:0000:0000:0000:0000:0000:0000:0001]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[0000:0000:0000:0000:0000:0000:0000:0001]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_v4inv6_test_1) {
network::uri instance("http://[::ffff:12.34.56.78]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[::ffff:12.34.56.78]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ipv6_v4inv6_test_2) {
network::uri instance("http://[::ffff:192.0.2.128]/");
BOOST_REQUIRE(network::valid(instance));
BOOST_CHECK_EQUAL(network::scheme(instance), "http");
BOOST_CHECK_EQUAL(network::host(instance), "[::ffff:192.0.2.128]");
BOOST_CHECK_EQUAL(network::path(instance), "/");
}

BOOST_AUTO_TEST_CASE(ftp_test) {
network::uri instance("ftp://john.doe@ftp.example.com/");
Expand Down