3 files changed, 259 insertions, 7 deletions
diff --git a/Swiften/Client/UnitTest/ClientBlockListManagerTest.cpp b/Swiften/Client/UnitTest/ClientBlockListManagerTest.cpp
new file mode 100644
index 0000000..dd6c95d
--- /dev/null
+++ b/Swiften/Client/UnitTest/ClientBlockListManagerTest.cpp
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2013 Tobias Markmann
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include <algorithm>
+
+#include <Swiften/Base/foreach.h>
+
+#include <Swiften/Client/StanzaChannel.h>
+#include <Swiften/Client/DummyStanzaChannel.h>
+#include <Swiften/Client/ClientBlockListManager.h>
+#include <Swiften/Queries/IQRouter.h>
+#include <Swiften/Elements/IQ.h>
+
+using namespace Swift;
+
+class ClientBlockListManagerTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(ClientBlockListManagerTest);
+		CPPUNIT_TEST(testFetchBlockList);
+		CPPUNIT_TEST(testBlockCommand);
+		CPPUNIT_TEST(testUnblockCommand);
+		CPPUNIT_TEST(testUnblockAllCommand);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void setUp() {
+			ownJID_ = JID("kev@wonderland.lit");
+			stanzaChannel_ = new DummyStanzaChannel();
+			iqRouter_ = new IQRouter(stanzaChannel_);
+			iqRouter_->setJID(ownJID_);
+			clientBlockListManager_ = new ClientBlockListManager(iqRouter_);
+		}
+
+		void testFetchBlockList() {
+			std::vector<JID> blockJids;
+			blockJids.push_back(JID("romeo@montague.net"));
+			blockJids.push_back(JID("iago@shakespeare.lit"));
+			helperInitialBlockListFetch(blockJids);
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), clientBlockListManager_->getBlockList()->getItems().size());
+		}
+
+		void testBlockCommand() {
+			// start with an already fetched block list
+			helperInitialBlockListFetch(std::vector<JID>(1, JID("iago@shakespeare.lit")));
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), clientBlockListManager_->getBlockList()->getItems().size());
+			CPPUNIT_ASSERT_EQUAL(BlockList::Available, clientBlockListManager_->getBlockList()->getState());
+
+			GenericRequest<BlockPayload>::ref blockRequest = clientBlockListManager_->createBlockJIDRequest(JID("romeo@montague.net"));
+			blockRequest->send();
+			IQ::ref request = stanzaChannel_->getStanzaAtIndex<IQ>(2);
+			CPPUNIT_ASSERT(request.get() != NULL);
+			boost::shared_ptr<BlockPayload> blockPayload = request->getPayload<BlockPayload>();
+			CPPUNIT_ASSERT(blockPayload.get() != NULL);
+			CPPUNIT_ASSERT_EQUAL(JID("romeo@montague.net"), blockPayload->getItems().at(0));
+
+			IQ::ref blockRequestResponse = IQ::createResult(request->getFrom(), JID(), request->getID());
+			stanzaChannel_->sendIQ(blockRequestResponse);
+			stanzaChannel_->onIQReceived(blockRequestResponse);
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), clientBlockListManager_->getBlockList()->getItems().size());
+
+			// send block push
+			boost::shared_ptr<BlockPayload> pushPayload = boost::make_shared<BlockPayload>();
+			pushPayload->addItem(JID("romeo@montague.net"));
+			IQ::ref blockPush = IQ::createRequest(IQ::Set, ownJID_, "push1", pushPayload);
+			stanzaChannel_->sendIQ(blockPush);
+			stanzaChannel_->onIQReceived(blockPush);
+
+			std::vector<JID> blockedJIDs = clientBlockListManager_->getBlockList()->getItems();
+			CPPUNIT_ASSERT(blockedJIDs.end() != std::find(blockedJIDs.begin(), blockedJIDs.end(), JID("romeo@montague.net")));
+		}
+
+		void testUnblockCommand() {
+			// start with an already fetched block list
+			std::vector<JID> initialBlockList = std::vector<JID>(1, JID("iago@shakespeare.lit"));
+			initialBlockList.push_back(JID("romeo@montague.net"));
+			helperInitialBlockListFetch(initialBlockList);
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), clientBlockListManager_->getBlockList()->getItems().size());
+			CPPUNIT_ASSERT_EQUAL(BlockList::Available, clientBlockListManager_->getBlockList()->getState());
+
+			GenericRequest<UnblockPayload>::ref unblockRequest = clientBlockListManager_->createUnblockJIDRequest(JID("romeo@montague.net"));
+			unblockRequest->send();
+			IQ::ref request = stanzaChannel_->getStanzaAtIndex<IQ>(2);
+			CPPUNIT_ASSERT(request.get() != NULL);
+			boost::shared_ptr<UnblockPayload> unblockPayload = request->getPayload<UnblockPayload>();
+			CPPUNIT_ASSERT(unblockPayload.get() != NULL);
+			CPPUNIT_ASSERT_EQUAL(JID("romeo@montague.net"), unblockPayload->getItems().at(0));
+
+			IQ::ref unblockRequestResponse = IQ::createResult(request->getFrom(), JID(), request->getID());
+			stanzaChannel_->sendIQ(unblockRequestResponse);
+			stanzaChannel_->onIQReceived(unblockRequestResponse);
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), clientBlockListManager_->getBlockList()->getItems().size());
+
+			// send block push
+			boost::shared_ptr<UnblockPayload> pushPayload = boost::make_shared<UnblockPayload>();
+			pushPayload->addItem(JID("romeo@montague.net"));
+			IQ::ref unblockPush = IQ::createRequest(IQ::Set, ownJID_, "push1", pushPayload);
+			stanzaChannel_->sendIQ(unblockPush);
+			stanzaChannel_->onIQReceived(unblockPush);
+
+			std::vector<JID> blockedJIDs = clientBlockListManager_->getBlockList()->getItems();
+			CPPUNIT_ASSERT(blockedJIDs.end() == std::find(blockedJIDs.begin(), blockedJIDs.end(), JID("romeo@montague.net")));
+		}
+
+		void testUnblockAllCommand() {
+			// start with an already fetched block list
+			std::vector<JID> initialBlockList = std::vector<JID>(1, JID("iago@shakespeare.lit"));
+			initialBlockList.push_back(JID("romeo@montague.net"));
+			initialBlockList.push_back(JID("benvolio@montague.net"));
+			helperInitialBlockListFetch(initialBlockList);
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), clientBlockListManager_->getBlockList()->getItems().size());
+			CPPUNIT_ASSERT_EQUAL(BlockList::Available, clientBlockListManager_->getBlockList()->getState());
+
+			GenericRequest<UnblockPayload>::ref unblockRequest = clientBlockListManager_->createUnblockAllRequest();
+			unblockRequest->send();
+			IQ::ref request = stanzaChannel_->getStanzaAtIndex<IQ>(2);
+			CPPUNIT_ASSERT(request.get() != NULL);
+			boost::shared_ptr<UnblockPayload> unblockPayload = request->getPayload<UnblockPayload>();
+			CPPUNIT_ASSERT(unblockPayload.get() != NULL);
+			CPPUNIT_ASSERT_EQUAL(true, unblockPayload->getItems().empty());
+
+			IQ::ref unblockRequestResponse = IQ::createResult(request->getFrom(), JID(), request->getID());
+			stanzaChannel_->sendIQ(unblockRequestResponse);
+			stanzaChannel_->onIQReceived(unblockRequestResponse);
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), clientBlockListManager_->getBlockList()->getItems().size());
+
+			// send block push
+			boost::shared_ptr<UnblockPayload> pushPayload = boost::make_shared<UnblockPayload>();
+			IQ::ref unblockPush = IQ::createRequest(IQ::Set, ownJID_, "push1", pushPayload);
+			stanzaChannel_->sendIQ(unblockPush);
+			stanzaChannel_->onIQReceived(unblockPush);
+
+			CPPUNIT_ASSERT_EQUAL(true, clientBlockListManager_->getBlockList()->getItems().empty());
+		}
+
+		void tearDown() {
+			delete clientBlockListManager_;
+			delete iqRouter_;
+			delete stanzaChannel_;
+		}
+
+	private:
+		void helperInitialBlockListFetch(const std::vector<JID>& blockedJids) {
+			boost::shared_ptr<BlockList> blockList = clientBlockListManager_->requestBlockList();
+			CPPUNIT_ASSERT(blockList);
+
+			// check for IQ request
+			IQ::ref request = stanzaChannel_->getStanzaAtIndex<IQ>(0);
+			CPPUNIT_ASSERT(request.get() != NULL);
+			boost::shared_ptr<BlockListPayload> requestPayload = request->getPayload<BlockListPayload>();
+			CPPUNIT_ASSERT(requestPayload.get() != NULL);
+
+			CPPUNIT_ASSERT_EQUAL(BlockList::Requesting, blockList->getState());
+			CPPUNIT_ASSERT_EQUAL(BlockList::Requesting, clientBlockListManager_->getBlockList()->getState());
+
+			// build IQ response
+			boost::shared_ptr<BlockListPayload> responsePayload = boost::make_shared<BlockListPayload>();
+			foreach(const JID& jid, blockedJids) {
+				responsePayload->addItem(jid);
+			}
+
+			IQ::ref response = IQ::createResult(ownJID_, JID(), request->getID(), responsePayload);
+			stanzaChannel_->sendIQ(response);
+			stanzaChannel_->onIQReceived(response);
+
+			CPPUNIT_ASSERT_EQUAL(BlockList::Available, clientBlockListManager_->getBlockList()->getState());
+			CPPUNIT_ASSERT(responsePayload->getItems() == clientBlockListManager_->getBlockList()->getItems());
+		}
+
+
+	private:
+		JID ownJID_;
+		IQRouter* iqRouter_;
+		DummyStanzaChannel* stanzaChannel_;
+		ClientBlockListManager* clientBlockListManager_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ClientBlockListManagerTest);
+
diff --git a/Swiften/Client/UnitTest/ClientSessionTest.cpp b/Swiften/Client/UnitTest/ClientSessionTest.cpp
index 6793643..4e1fc31 100644
--- a/Swiften/Client/UnitTest/ClientSessionTest.cpp
+++ b/Swiften/Client/UnitTest/ClientSessionTest.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -12,7 +12,10 @@
 #include <boost/smart_ptr/make_shared.hpp>
 
+#include <Swiften/IDN/IDNConverter.h>
+#include <Swiften/IDN/PlatformIDNConverter.h>
 #include <Swiften/Session/SessionStream.h>
 #include <Swiften/Client/ClientSession.h>
 #include <Swiften/Elements/Message.h>
+#include <Swiften/Elements/AuthChallenge.h>
 #include <Swiften/Elements/StartTLSRequest.h>
 #include <Swiften/Elements/StreamFeatures.h>
@@ -31,4 +34,6 @@
 #include <Swiften/TLS/SimpleCertificate.h>
 #include <Swiften/TLS/BlindCertificateTrustChecker.h>
+#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/Crypto/PlatformCryptoProvider.h>
 
 using namespace Swift;
@@ -48,6 +53,8 @@ class ClientSessionTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testAuthenticate_PLAINOverNonTLS);
 		CPPUNIT_TEST(testAuthenticate_RequireTLS);
+		CPPUNIT_TEST(testAuthenticate_EXTERNAL);
 		CPPUNIT_TEST(testStreamManagement);
 		CPPUNIT_TEST(testStreamManagement_Failed);
+		CPPUNIT_TEST(testUnexpectedChallenge);
 		CPPUNIT_TEST(testFinishAcksStanzas);
 		/*
@@ -67,4 +74,6 @@ class ClientSessionTest : public CppUnit::TestFixture {
 	public:
 		void setUp() {
+			crypto = boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
+			idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
 			server = boost::make_shared<MockSessionStream>();
 			sessionFinishedReceived = false;
@@ -248,4 +257,32 @@ class ClientSessionTest : public CppUnit::TestFixture {
 		}
 
+		void testAuthenticate_EXTERNAL() {
+			boost::shared_ptr<ClientSession> session(createSession());
+			session->start();
+			server->receiveStreamStart();
+			server->sendStreamStart();
+			server->sendStreamFeaturesWithEXTERNALAuthentication();
+			server->receiveAuthRequest("EXTERNAL");
+			server->sendAuthSuccess();
+			server->receiveStreamStart();
+
+			session->finish();
+		}
+
+		void testUnexpectedChallenge() {
+			boost::shared_ptr<ClientSession> session(createSession());
+			session->start();
+			server->receiveStreamStart();
+			server->sendStreamStart();
+			server->sendStreamFeaturesWithEXTERNALAuthentication();
+			server->receiveAuthRequest("EXTERNAL");
+			server->sendChallenge();
+			server->sendChallenge();
+
+			CPPUNIT_ASSERT_EQUAL(ClientSession::Finished, session->getState());
+			CPPUNIT_ASSERT(sessionFinishedReceived);
+			CPPUNIT_ASSERT(sessionFinishedError);
+		}
+
 		void testStreamManagement() {
 			boost::shared_ptr<ClientSession> session(createSession());
@@ -309,5 +346,5 @@ class ClientSessionTest : public CppUnit::TestFixture {
 	private:
 		boost::shared_ptr<ClientSession> createSession() {
-			boost::shared_ptr<ClientSession> session = ClientSession::create(JID("me@foo.com"), server);
+			boost::shared_ptr<ClientSession> session = ClientSession::create(JID("me@foo.com"), server, idnConverter.get(), crypto.get());
 			session->onFinished.connect(boost::bind(&ClientSessionTest::handleSessionFinished, this, _1));
 			session->onNeedCredentials.connect(boost::bind(&ClientSessionTest::handleSessionNeedCredentials, this));
@@ -345,9 +382,9 @@ class ClientSessionTest : public CppUnit::TestFixture {
 			public:
 				struct Event {
-					Event(boost::shared_ptr<Element> element) : element(element), footer(false) {}
+					Event(boost::shared_ptr<ToplevelElement> element) : element(element), footer(false) {}
 					Event(const ProtocolHeader& header) : header(header), footer(false) {}
 					Event() : footer(true) {}
 					
-					boost::shared_ptr<Element> element;
+					boost::shared_ptr<ToplevelElement> element;
 					boost::optional<ProtocolHeader> header;
 					bool footer;
@@ -373,5 +410,5 @@ class ClientSessionTest : public CppUnit::TestFixture {
 				}
 
-				virtual void writeElement(boost::shared_ptr<Element> element) {
+				virtual void writeElement(boost::shared_ptr<ToplevelElement> element) {
 					receivedEvents.push_back(Event(element));
 				}
@@ -400,4 +437,8 @@ class ClientSessionTest : public CppUnit::TestFixture {
 				}
 
+				virtual std::vector<Certificate::ref> getPeerCertificateChain() const {
+					 return std::vector<Certificate::ref>();
+				}
+
 				virtual boost::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const {
 					return boost::shared_ptr<CertificateVerificationError>();
@@ -441,4 +482,8 @@ class ClientSessionTest : public CppUnit::TestFixture {
 				}
 
+				void sendChallenge() {
+					onElementReceived(boost::make_shared<AuthChallenge>());
+				}
+
 				void sendStreamError() {
 					onElementReceived(boost::make_shared<StreamError>());
@@ -467,4 +512,10 @@ class ClientSessionTest : public CppUnit::TestFixture {
 				}
 
+				void sendStreamFeaturesWithEXTERNALAuthentication() {
+					boost::shared_ptr<StreamFeatures> streamFeatures(new StreamFeatures());
+					streamFeatures->addAuthenticationMechanism("EXTERNAL");
+					onElementReceived(streamFeatures);
+				}
+
 				void sendStreamFeaturesWithUnknownAuthentication() {
 					boost::shared_ptr<StreamFeatures> streamFeatures(new StreamFeatures());
@@ -572,4 +623,5 @@ class ClientSessionTest : public CppUnit::TestFixture {
 		};
 
+		boost::shared_ptr<IDNConverter> idnConverter;
 		boost::shared_ptr<MockSessionStream> server;
 		bool sessionFinishedReceived;
@@ -577,4 +629,5 @@ class ClientSessionTest : public CppUnit::TestFixture {
 		boost::shared_ptr<Error> sessionFinishedError;
 		BlindCertificateTrustChecker* blindCertificateTrustChecker;
+		boost::shared_ptr<CryptoProvider> crypto;
 };
 
diff --git a/Swiften/Client/UnitTest/NickResolverTest.cpp b/Swiften/Client/UnitTest/NickResolverTest.cpp
index dfc90fe..a8b011c 100644
--- a/Swiften/Client/UnitTest/NickResolverTest.cpp
+++ b/Swiften/Client/UnitTest/NickResolverTest.cpp
@@ -5,4 +5,10 @@
  */
 
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
@@ -15,4 +21,6 @@
 #include <Swiften/Queries/IQRouter.h>
 #include <Swiften/Client/DummyStanzaChannel.h>
+#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/Crypto/PlatformCryptoProvider.h>
 
 using namespace Swift;
@@ -35,9 +43,10 @@ class NickResolverTest : public CppUnit::TestFixture {
 	public:
 		void setUp() {
+			crypto = boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
 			ownJID_ = JID("kev@wonderland.lit");
 			xmppRoster_ = new XMPPRosterImpl();
 			stanzaChannel_ = new DummyStanzaChannel();
 		  iqRouter_ = new IQRouter(stanzaChannel_);
-			vCardStorage_ = new VCardMemoryStorage();
+			vCardStorage_ = new VCardMemoryStorage(crypto.get());
 			vCardManager_ = new VCardManager(ownJID_, iqRouter_, vCardStorage_);
 			registry_ = new MUCRegistry();
@@ -145,5 +154,5 @@ class NickResolverTest : public CppUnit::TestFixture {
 		NickResolver* resolver_;
 		JID ownJID_;
-
+		boost::shared_ptr<CryptoProvider> crypto;
 };