mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Surround ipv6 with [], and properly cleanup otherwise invalid domains

Browse Source 
fix #2694 (yeah, it was closed, but it was badly fixed)
This commit is contained in:
louiz’
2017-02-15 01:07:32 +01:00
parent 7f08cf83aa
commit fef585ad66
2 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/jid.cpp
+14 -6
View File
@@ -15,7 +15,10 @@ TEST_CASE("Jid")
CHECK(jid2.local == "");
CHECK(jid2.domain == "ツ.coucou");
CHECK(jid2.resource == "coucou@coucou/coucou");
}
TEST_CASE("jidprep")
{
// Jidprep
const std::string badjid("~zigougou™@EpiK-7D9D1FDE.poez.io/Boujour/coucou/slt™");
const std::string correctjid = jidprep(badjid);
@@ -26,13 +29,18 @@ TEST_CASE("Jid")
CHECK(jidprep(badjid) == "~zigougoutm@epik-7d9d1fde.poez.io/Boujour/coucou/sltTM");
CHECK(jidprep(badjid) == "~zigougoutm@epik-7d9d1fde.poez.io/Boujour/coucou/sltTM");
const std::string badjid2("Zigougou@poez.io");
const std::string correctjid2 = jidprep(badjid2);
CHECK(correctjid2 == "zigougou@poez.io");
CHECK(jidprep("Zigougou@poez.io") == "zigougou@poez.io");
const std::string crappy("~Bisous@7ea8beb1:c5fd2849:da9a048e:ip");
const std::string fixed_crappy = jidprep(crappy);
CHECK(fixed_crappy == "~bisous@7ea8beb1-c5fd2849-da9a048e-ip");
CHECK(jidprep("~Bisous@88.123.43.45") == "~bisous@88.123.43.45");
CHECK(jidprep("~Bisous@::ffff:42.156.139.46") == "~bisous@[::ffff:42.156.139.46]");
CHECK(jidprep("louiz!6bf74289@2001:bc8:38e7::") == "louiz!6bf74289@[2001:bc8:38e7::]");
CHECK(jidprep("louiz@+:::::----coucou.com78--.") == "louiz@coucou.com78");
CHECK(jidprep("louiz@coucou.com78--.") == "louiz@coucou.com78");
CHECK(jidprep("louiz@+:::::----coucou.com78") == "louiz@coucou.com78");
CHECK(jidprep("louiz@:::::") == "louiz@empty");
#else // Without libidn, jidprep always returns an empty string
CHECK(jidprep(badjid) == "");
#endif