6 files changed, 37 insertions, 15 deletions
diff --git a/Swiften/SASL/ClientAuthenticator.h b/Swiften/SASL/ClientAuthenticator.h
index f93f44e..f42a51e 100644
--- a/Swiften/SASL/ClientAuthenticator.h
+++ b/Swiften/SASL/ClientAuthenticator.h
@@ -1,43 +1,43 @@
 #pragma once
 
 #include "Swiften/Base/String.h"
 #include "Swiften/Base/ByteArray.h"
 
 namespace Swift {
 	class ClientAuthenticator {
 		public:
 			ClientAuthenticator(const String& name);
 			virtual ~ClientAuthenticator();
 
 			const String& getName() const {
 				return name;
 			}
 
 			void setCredentials(const String& authcid, const String& password, const String& authzid = String()) {
 				this->authcid = authcid;
 				this->password = password;
 				this->authzid = authzid;
 			}
 
-			virtual ByteArray getResponse() = 0;
+			virtual ByteArray getResponse() const = 0;
 			virtual bool setChallenge(const ByteArray&) = 0;
 
 			const String& getAuthenticationID() const {
 				return authcid;
 			}
 
 			const String& getAuthorizationID() const {
 				return authzid;
 			}
 
 			const String& getPassword() const {
 				return password;
 			}
 		
 		private:
 			String name;
 			String authcid;
 			String password;
 			String authzid;
 	};
 }
diff --git a/Swiften/SASL/PLAINClientAuthenticator.cpp b/Swiften/SASL/PLAINClientAuthenticator.cpp
index f61f1a0..8f88c3c 100644
--- a/Swiften/SASL/PLAINClientAuthenticator.cpp
+++ b/Swiften/SASL/PLAINClientAuthenticator.cpp
@@ -1,16 +1,16 @@
 #include "Swiften/SASL/PLAINClientAuthenticator.h"
 
 namespace Swift {
 
 PLAINClientAuthenticator::PLAINClientAuthenticator() : ClientAuthenticator("PLAIN") {
 }
 
-ByteArray PLAINClientAuthenticator::getResponse() {
+ByteArray PLAINClientAuthenticator::getResponse() const {
 	return ByteArray(getAuthorizationID()) + '\0' + ByteArray(getAuthenticationID()) + '\0' + ByteArray(getPassword());
 }
 
 bool PLAINClientAuthenticator::setChallenge(const ByteArray&) {
 	return true;
 }
 
 }
diff --git a/Swiften/SASL/PLAINClientAuthenticator.h b/Swiften/SASL/PLAINClientAuthenticator.h
index bb24af7..854eb30 100644
--- a/Swiften/SASL/PLAINClientAuthenticator.h
+++ b/Swiften/SASL/PLAINClientAuthenticator.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include "Swiften/SASL/ClientAuthenticator.h"
 
 namespace Swift {
 	class PLAINClientAuthenticator : public ClientAuthenticator {
 		public:
 			PLAINClientAuthenticator();
 
-			virtual ByteArray getResponse();
+			virtual ByteArray getResponse() const;
 			virtual bool setChallenge(const ByteArray&);
 	};
 }
diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
index b0a9f96..16c938a 100644
--- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
+++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
@@ -1,105 +1,107 @@
 #include "Swiften/SASL/SCRAMSHA1ClientAuthenticator.h"
 
 #include <cassert>
 #include <map>
 #include <boost/lexical_cast.hpp>
 
 #include "Swiften/StringCodecs/SHA1.h"
 #include "Swiften/StringCodecs/Base64.h"
 #include "Swiften/StringCodecs/HMACSHA1.h"
 #include "Swiften/StringCodecs/PBKDF2.h"
 #include "Swiften/StringPrep/StringPrep.h"
 
 namespace Swift {
 
 SCRAMSHA1ClientAuthenticator::SCRAMSHA1ClientAuthenticator(const String& nonce) : ClientAuthenticator("SCRAM-SHA-1"), step(Initial), clientnonce(nonce) {
 	// TODO: Normalize authentication id
 	// TODO: Normalize getPassword()
 }
 
-ByteArray SCRAMSHA1ClientAuthenticator::getResponse() {
+ByteArray SCRAMSHA1ClientAuthenticator::getResponse() const {
 	if (step == Initial) {
 		return "n,," + getInitialBareClientMessage();
 	}
 	else {
-		ByteArray saltedPassword = PBKDF2::encode(getPassword(), salt, iterations);
 		ByteArray clientKey = HMACSHA1::getResult(saltedPassword, "Client Key");
 		ByteArray storedKey = SHA1::getBinaryHash(clientKey);
-		ByteArray serverKey = HMACSHA1::getResult(saltedPassword, "Server Key");
-
-		ByteArray authMessage = getInitialBareClientMessage() + "," + initialServerMessage + "," + "c=biwsCg==," + "r=" + clientnonce + serverNonce;
 		ByteArray clientSignature = HMACSHA1::getResult(storedKey, authMessage);
-		serverSignature = HMACSHA1::getResult(serverKey, authMessage);
 		ByteArray clientProof = clientKey;
 		for (unsigned int i = 0; i < clientProof.getSize(); ++i) {
 			clientProof[i] ^= clientSignature[i];
 		}
 		ByteArray result = ByteArray("c=biwsCg==,r=") + clientnonce + serverNonce + ",p=" + Base64::encode(clientProof);
 		return result;
 	}
 }
 
 bool SCRAMSHA1ClientAuthenticator::setChallenge(const ByteArray& challenge) {
 	if (step == Initial) {
 		initialServerMessage = challenge;
 
 		// TODO: Check if these values are correct
 		std::map<char, String> keys = parseMap(String(initialServerMessage.getData(), initialServerMessage.getSize()));
-		salt = Base64::decode(keys['s']);
+		ByteArray salt = Base64::decode(keys['s']);
 		String clientServerNonce = keys['r'];
 		serverNonce = clientServerNonce.getSubstring(clientnonce.getUTF8Size(), clientServerNonce.npos());
-		iterations = boost::lexical_cast<int>(keys['i'].getUTF8String());
+		int iterations = boost::lexical_cast<int>(keys['i'].getUTF8String());
+
+		// Compute all the values needed for the server signature
+		saltedPassword = PBKDF2::encode(StringPrep::getPrepared(getPassword(), StringPrep::SASLPrep), salt, iterations);
+		authMessage = getInitialBareClientMessage() + "," + initialServerMessage + "," + "c=biwsCg==," + "r=" + clientnonce + serverNonce;
+		ByteArray serverKey = HMACSHA1::getResult(saltedPassword, "Server Key");
+		serverSignature = HMACSHA1::getResult(serverKey, authMessage);
 
 		step = Proof;
 		return true;
 	}
 	else {
-		return challenge == Base64::encode(ByteArray("v=") + Base64::encode(serverSignature));
+		ByteArray result = ByteArray("v=") + ByteArray(Base64::encode(serverSignature));
+		return challenge == result;
 	}
 }
 
 std::map<char, String> SCRAMSHA1ClientAuthenticator::parseMap(const String& s) {
 	// TODO: Do some proper checking here
 	std::map<char, String> result;
 	if (s.getUTF8Size() > 0) {
 		char key;
 		String value;
 		size_t i = 0;
 		bool expectKey = true;
 		while (i < s.getUTF8Size()) {
 			if (expectKey) {
 				key = s[i];
 				expectKey = false;
 				i++;
 			}
 			else if (s[i] == ',') {
 				result[key] = value;
 				value = "";
 				expectKey = true;
 			}
 			else {
 				value += s[i];
 			}
 			i++;
 		}
 		result[key] = value;
 	}
 	return result;
 }
 
 ByteArray SCRAMSHA1ClientAuthenticator::getInitialBareClientMessage() const {
 	String authenticationID = StringPrep::getPrepared(getAuthenticationID(), StringPrep::SASLPrep);
 	String escapedAuthenticationID;
 	for (size_t i = 0; i < authenticationID.getUTF8Size(); ++i) {
 		if (authenticationID[i] == ',') {
 			escapedAuthenticationID += "=2C";
 		}
 		else if (authenticationID[i] == '=') {
 			escapedAuthenticationID += "=3D";
 		}
 		else {
 			escapedAuthenticationID += authenticationID[i];
 		}
 	}
 	return ByteArray(String("n=" + escapedAuthenticationID + ",r=" + clientnonce));
 }
diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.h b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.h
index 9504b35..108ac2e 100644
--- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.h
+++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.h
@@ -1,33 +1,33 @@
 #pragma once
 
 #include <map>
 
 #include "Swiften/Base/String.h"
 #include "Swiften/Base/ByteArray.h"
 #include "Swiften/SASL/ClientAuthenticator.h"
 
 namespace Swift {
 	class SCRAMSHA1ClientAuthenticator : public ClientAuthenticator {
 		public:
 			SCRAMSHA1ClientAuthenticator(const String& nonce);
 			
-			virtual ByteArray getResponse();
+			virtual ByteArray getResponse() const;
 			virtual bool setChallenge(const ByteArray&);
 
 		private:
 			ByteArray getInitialBareClientMessage() const;
 			static std::map<char, String> parseMap(const String&);
 
 		private:
 			enum Step {
 				Initial,
 				Proof
 			} step;
 			String clientnonce;
 			ByteArray initialServerMessage;
-			int iterations;
 			ByteArray serverNonce;
-			ByteArray salt;
+			ByteArray authMessage;
+			ByteArray saltedPassword;
 			ByteArray serverSignature;
 	};
 }
diff --git a/Swiften/SASL/UnitTest/SCRAMSHA1ClientAuthenticatorTest.cpp b/Swiften/SASL/UnitTest/SCRAMSHA1ClientAuthenticatorTest.cpp
index 9f18ff0..618a748 100644
--- a/Swiften/SASL/UnitTest/SCRAMSHA1ClientAuthenticatorTest.cpp
+++ b/Swiften/SASL/UnitTest/SCRAMSHA1ClientAuthenticatorTest.cpp
@@ -1,49 +1,69 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include "Swiften/SASL/SCRAMSHA1ClientAuthenticator.h"
 #include "Swiften/Base/ByteArray.h"
 
 using namespace Swift;
 
 class SCRAMSHA1ClientAuthenticatorTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(SCRAMSHA1ClientAuthenticatorTest);
 		CPPUNIT_TEST(testGetInitialResponse);
 		CPPUNIT_TEST(testGetInitialResponse_UsernameHasSpecialChars);
 		CPPUNIT_TEST(testGetFinalResponse);
+		CPPUNIT_TEST(testSetFinalChallenge);
+		CPPUNIT_TEST(testSetFinalChallenge_InvalidChallenge);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void setUp() {
 		}
 
 		void testGetInitialResponse() {
 			SCRAMSHA1ClientAuthenticator testling("abcdefghABCDEFGH");
 			testling.setCredentials("user", "pass", "");
 
 			ByteArray response = testling.getResponse();
 
 			CPPUNIT_ASSERT_EQUAL(String("n,,n=user,r=abcdefghABCDEFGH"), testling.getResponse().toString());
 		}
 
 		void testGetInitialResponse_UsernameHasSpecialChars() {
 			SCRAMSHA1ClientAuthenticator testling("abcdefghABCDEFGH");
 			testling.setCredentials(",us=,er=", "pass", "");
 
 			ByteArray response = testling.getResponse();
 
 			CPPUNIT_ASSERT_EQUAL(String("n,,n==2Cus=3D=2Cer=3D,r=abcdefghABCDEFGH"), testling.getResponse().toString());
 		}
 
 		void testGetFinalResponse() {
 			SCRAMSHA1ClientAuthenticator testling("abcdefgh");
 			testling.setCredentials("user", "pass", "");
 			testling.setChallenge(ByteArray("r=abcdefghABCDEFGH,s=MTIzNDU2NzgK,i=4096"));
 
 			ByteArray response = testling.getResponse();
 
 			CPPUNIT_ASSERT_EQUAL(String("c=biwsCg==,r=abcdefghABCDEFGH,p=bVzb1EAf2hXw5Z+QIMYPTy5TOsU="), testling.getResponse().toString());
 		}
+
+		void testSetFinalChallenge() {
+			SCRAMSHA1ClientAuthenticator testling("abcdefgh");
+			testling.setCredentials("user", "pass", "");
+			testling.setChallenge(ByteArray("r=abcdefghABCDEFGH,s=MTIzNDU2NzgK,i=4096"));
+			bool result = testling.setChallenge(ByteArray("v=xWI/+vT8aAm0hKpqKIqctIDwtQE="));
+
+			CPPUNIT_ASSERT(result);
+		}
+
+		void testSetFinalChallenge_InvalidChallenge() {
+			SCRAMSHA1ClientAuthenticator testling("abcdefgh");
+			testling.setCredentials("user", "pass", "");
+			testling.setChallenge(ByteArray("r=abcdefghABCDEFGH,s=MTIzNDU2NzgK,i=4096"));
+			bool result = testling.setChallenge(ByteArray("v=e26kI69ICb6zosapLLxrER/631A="));
+
+			CPPUNIT_ASSERT(!result);
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SCRAMSHA1ClientAuthenticatorTest);