From fd86fb8f38343e0eda229cd857ef03ed5c8a34e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 27 Aug 2011 19:23:58 +0200
Subject: Added StringPrep unit test.


diff --git a/Swiften/IDN/SConscript b/Swiften/IDN/SConscript
index 7382578..99b35fd 100644
--- a/Swiften/IDN/SConscript
+++ b/Swiften/IDN/SConscript
@@ -1,4 +1,4 @@
-Import("swiften_env")
+Import("swiften_env", "env")
 
 myenv = swiften_env.Clone()
 myenv.MergeFlags(swiften_env["LIBIDN_FLAGS"])
@@ -8,3 +8,7 @@ objects = myenv.SwiftenObject([
 			"IDNA.cpp",
 		])
 swiften_env.Append(SWIFTEN_OBJECTS = [objects])
+
+env.Append(UNITTEST_SOURCES = [
+			File("UnitTest/StringPrepTest.cpp"),
+	])
diff --git a/Swiften/IDN/UnitTest/StringPrepTest.cpp b/Swiften/IDN/UnitTest/StringPrepTest.cpp
new file mode 100644
index 0000000..beab01e
--- /dev/null
+++ b/Swiften/IDN/UnitTest/StringPrepTest.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/IDN/StringPrep.h"
+
+using namespace Swift;
+
+class StringPrepTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(StringPrepTest);
+		CPPUNIT_TEST(testStringPrep);
+		CPPUNIT_TEST(testStringPrep_Empty);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void testStringPrep() {
+			std::string result = StringPrep::getPrepared("tron\xc3\x87on", StringPrep::NamePrep);
+
+			CPPUNIT_ASSERT_EQUAL(std::string("tron\xc3\xa7on"), result);
+		}
+
+		void testStringPrep_Empty() {
+			CPPUNIT_ASSERT_EQUAL(std::string(""), StringPrep::getPrepared("", StringPrep::NamePrep));
+			CPPUNIT_ASSERT_EQUAL(std::string(""), StringPrep::getPrepared("", StringPrep::XMPPNodePrep));
+			CPPUNIT_ASSERT_EQUAL(std::string(""), StringPrep::getPrepared("", StringPrep::XMPPResourcePrep));
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(StringPrepTest);
-- 
cgit v0.10.2-6-g49f6


From 6137a266fd5f8d5953f7fa4baeee339d27f0caee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 27 Aug 2011 19:24:48 +0200
Subject: Mark JIDs with empty domains as invalid when StringPrep cache is
 disabled.

We used to only do this correctly in the default compilation setting
where the cache is enabled.

Resolves: #965

diff --git a/Swiften/JID/JID.cpp b/Swiften/JID/JID.cpp
index 925c763..f121120 100644
--- a/Swiften/JID/JID.cpp
+++ b/Swiften/JID/JID.cpp
@@ -92,10 +92,6 @@ void JID::nameprepAndSetComponents(const std::string& node, const std::string& d
 			r.first->second = StringPrep::getPrepared(domain, StringPrep::XMPPNodePrep);
 		}
 		domain_ = r.first->second;
-		if (domain_.empty()) {
-			valid_ = false;
-			return;
-		}
 
 		r = resourcePrepCache.insert(std::make_pair(resource, std::string()));
 		if (r.second) {
@@ -103,6 +99,11 @@ void JID::nameprepAndSetComponents(const std::string& node, const std::string& d
 		}
 		resource_ = r.first->second;
 #endif
+
+		if (domain_.empty()) {
+			valid_ = false;
+			return;
+		}
 	}
 	catch (const std::exception&) {
 		valid_ = false;
diff --git a/Swiften/JID/UnitTest/JIDTest.cpp b/Swiften/JID/UnitTest/JIDTest.cpp
index f406635..e083918 100644
--- a/Swiften/JID/UnitTest/JIDTest.cpp
+++ b/Swiften/JID/UnitTest/JIDTest.cpp
@@ -25,6 +25,7 @@ class JIDTest : public CppUnit::TestFixture
 		CPPUNIT_TEST(testConstructorWithString_EmptyNode);
 		CPPUNIT_TEST(testConstructorWithString_IllegalResource);
 		CPPUNIT_TEST(testConstructorWithStrings);
+		CPPUNIT_TEST(testConstructorWithStrings_EmptyDomain);
 		CPPUNIT_TEST(testIsBare);
 		CPPUNIT_TEST(testIsBare_NotBare);
 		CPPUNIT_TEST(testToBare);
@@ -139,6 +140,12 @@ class JIDTest : public CppUnit::TestFixture
 			CPPUNIT_ASSERT_EQUAL(std::string("baz"), testling.getResource());
 		}
 
+		void testConstructorWithStrings_EmptyDomain() {
+			JID testling("foo", "", "baz");
+
+			CPPUNIT_ASSERT(!testling.isValid());
+		}
+
 		void testIsBare() {
 			CPPUNIT_ASSERT(JID("foo@bar").isBare());
 		}
-- 
cgit v0.10.2-6-g49f6


From 8dbae452004e7bc3c3a6e855f365b9bb348e8f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 27 Aug 2011 19:27:11 +0200
Subject: Update last used certificate file correctly.

Resolves: #963
Release-Notes: Remember last used certificate file correctly.

diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index d0ab61e..fc92792 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -273,7 +273,7 @@ void QtLoginWindow::handleUsernameTextChanged() {
 	QString username = username_->currentText();
 	for (int i = 0; i < usernames_.count(); i++) {
 		if (username_->currentText() == usernames_[i]) {
-			certificateFile_ == certificateFiles_[i];
+			certificateFile_ = certificateFiles_[i];
 			password_->setText(passwords_[i]);
 			remember_->setChecked(password_->text() != "");
 		}
-- 
cgit v0.10.2-6-g49f6