2 files changed, 53 insertions, 2 deletions
diff --git a/Swiften/JID/JID.cpp b/Swiften/JID/JID.cpp
index a31c19f..fff88e9 100644
--- a/Swiften/JID/JID.cpp
+++ b/Swiften/JID/JID.cpp
@@ -105,19 +105,24 @@ void JID::nameprepAndSetComponents(const std::string& node, const std::string& d
     }
 
     if (hasResource_ && resource.empty()) {
         valid_ = false;
         return;
     }
 
     try {
         node_ = idnConverter->getStringPrepared(node, IDNConverter::XMPPNodePrep);
-        domain_ = idnConverter->getStringPrepared(domain, IDNConverter::NamePrep);
+        if (domain.back() == '.') {
+            domain_ = idnConverter->getStringPrepared(domain.substr(0, domain.size() - 1), IDNConverter::NamePrep);
+        }
+        else {
+            domain_ = idnConverter->getStringPrepared(domain, IDNConverter::NamePrep);
+        }
         resource_ = idnConverter->getStringPrepared(resource, IDNConverter::XMPPResourcePrep);
     } catch (...) {
         valid_ = false;
         return;
     }
 
     if (domain_.empty()) {
         valid_ = false;
         return;
diff --git a/Swiften/JID/UnitTest/JIDTest.cpp b/Swiften/JID/UnitTest/JIDTest.cpp
index aefda33..0753fb5 100644
--- a/Swiften/JID/UnitTest/JIDTest.cpp
+++ b/Swiften/JID/UnitTest/JIDTest.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/JID/JID.h>
 
@@ -14,25 +14,31 @@ using namespace Swift;
 class JIDTest : public CppUnit::TestFixture
 {
         CPPUNIT_TEST_SUITE(JIDTest);
         CPPUNIT_TEST(testConstructorWithString);
         CPPUNIT_TEST(testConstructorWithString_Empty);
         CPPUNIT_TEST(testConstructorWithString_NoResource);
         CPPUNIT_TEST(testConstructorWithString_NoNode);
         CPPUNIT_TEST(testConstructorWithString_EmptyResource);
         CPPUNIT_TEST(testConstructorWithString_OnlyDomain);
+        CPPUNIT_TEST(testConstructorWithString_OnlyDomainWithDot);
+        CPPUNIT_TEST(testConstructorWithString_OnlyDomainDotStrippedOff);
+        CPPUNIT_TEST(testConstructorWithString_InvalidOnlyDomainSingleDot);
         CPPUNIT_TEST(testConstructorWithString_InvalidDomain);
+        CPPUNIT_TEST(testConstructorWithString_InvalidDomainEmptyLabel);
         CPPUNIT_TEST(testConstructorWithString_UpperCaseNode);
         CPPUNIT_TEST(testConstructorWithString_UpperCaseDomain);
         CPPUNIT_TEST(testConstructorWithString_UpperCaseResource);
         CPPUNIT_TEST(testConstructorWithString_EmptyNode);
         CPPUNIT_TEST(testConstructorWithString_EmptyDomain);
         CPPUNIT_TEST(testConstructorWithString_EmptyDomainWithResource);
+        CPPUNIT_TEST(testConstructorWithString_DotDomain);
+        CPPUNIT_TEST(testConstructorWithString_DotDomainWithResource);
         CPPUNIT_TEST(testConstructorWithString_IllegalResource);
         CPPUNIT_TEST(testConstructorWithString_SpacesInNode);
         CPPUNIT_TEST(testConstructorWithStrings);
         CPPUNIT_TEST(testConstructorWithStrings_EmptyDomain);
         CPPUNIT_TEST(testConstructorWithStrings_EmptyResource);
         CPPUNIT_TEST(testIsBare);
         CPPUNIT_TEST(testIsBare_NotBare);
         CPPUNIT_TEST(testToBare);
         CPPUNIT_TEST(testToBare_EmptyNode);
@@ -116,22 +122,50 @@ class JIDTest : public CppUnit::TestFixture
             JID testling("bar");
 
             CPPUNIT_ASSERT_EQUAL(std::string(""), testling.getNode());
             CPPUNIT_ASSERT_EQUAL(std::string("bar"), testling.getDomain());
             CPPUNIT_ASSERT_EQUAL(std::string(""), testling.getResource());
             CPPUNIT_ASSERT(testling.isBare());
             CPPUNIT_ASSERT(testling.isValid());
         }
 
+        void testConstructorWithString_OnlyDomainWithDot() {
+            JID testling("bar.");
+
+            CPPUNIT_ASSERT_EQUAL(std::string(""), testling.getNode());
+            CPPUNIT_ASSERT_EQUAL(std::string("bar"), testling.getDomain());
+            CPPUNIT_ASSERT_EQUAL(std::string(""), testling.getResource());
+            CPPUNIT_ASSERT(testling.isBare());
+            CPPUNIT_ASSERT(testling.isValid());
+        }
+
+        void testConstructorWithString_OnlyDomainDotStrippedOff() {
+            JID testling("foo.@bar./resource.");
+
+            CPPUNIT_ASSERT_EQUAL(std::string("foo."), testling.getNode());
+            CPPUNIT_ASSERT_EQUAL(std::string("bar"), testling.getDomain());
+            CPPUNIT_ASSERT_EQUAL(std::string("resource."), testling.getResource());
+            CPPUNIT_ASSERT(!testling.isBare());
+            CPPUNIT_ASSERT(testling.isValid());
+        }
+
+        void testConstructorWithString_InvalidOnlyDomainSingleDot() {
+            CPPUNIT_ASSERT(!JID(".").isValid());
+        }
+
         void testConstructorWithString_InvalidDomain() {
             CPPUNIT_ASSERT(!JID("foo@bar,baz").isValid());
         }
 
+        void testConstructorWithString_InvalidDomainEmptyLabel() {
+            CPPUNIT_ASSERT(!JID("foo@bar..").isValid());
+        }
+
         void testConstructorWithString_UpperCaseNode() {
             JID testling("Fo\xCE\xA9@bar");
 
             CPPUNIT_ASSERT_EQUAL(std::string("fo\xCF\x89"), testling.getNode());
             CPPUNIT_ASSERT_EQUAL(std::string("bar"), testling.getDomain());
             CPPUNIT_ASSERT(testling.isValid());
         }
 
         void testConstructorWithString_UpperCaseDomain() {
@@ -166,18 +200,30 @@ class JIDTest : public CppUnit::TestFixture
             CPPUNIT_ASSERT_EQUAL(false, JID("foobar", "example^com").isValid());
         }
 
         void testConstructorWithString_EmptyDomainWithResource() {
             JID testling("bar@/resource");
 
             CPPUNIT_ASSERT(!testling.isValid());
         }
 
+        void testConstructorWithString_DotDomain() {
+            JID testling("bar@.");
+
+            CPPUNIT_ASSERT(!testling.isValid());
+        }
+
+        void testConstructorWithString_DotDomainWithResource() {
+            JID testling("bar@./resource");
+
+            CPPUNIT_ASSERT(!testling.isValid());
+        }
+
         void testConstructorWithString_IllegalResource() {
             JID testling("foo@bar.com/\xd8\xb1\xd9\x85\xd9\x82\xd9\x87\x20\xd8\xaa\xd8\xb1\xd9\x86\xd8\xb3\x20");
 
             CPPUNIT_ASSERT(!testling.isValid());
         }
 
         void testConstructorWithString_SpacesInNode() {
             CPPUNIT_ASSERT(!JID("   alice@wonderland.lit").isValid());
             CPPUNIT_ASSERT(!JID("alice   @wonderland.lit").isValid());