summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-22 18:43:53 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-22 18:43:53 (GMT)
commit1e0c7d5c9d53ee6678a5f27d554710e6ae56d2da (patch)
tree5bcc524e6b45c34d8fbba6394102ca28cd1899c0 /Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
parent2c4ea892d1da498e486ce48d80de0eee547375f2 (diff)
downloadswift-1e0c7d5c9d53ee6678a5f27d554710e6ae56d2da.zip
swift-1e0c7d5c9d53ee6678a5f27d554710e6ae56d2da.tar.bz2
Fix bug in SCRAM-SHA-1 authzid handling.
Diffstat (limited to 'Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp')
-rw-r--r--Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp33
1 files changed, 19 insertions, 14 deletions
diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
index 8621b85..a261810 100644
--- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
+++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
@@ -1,62 +1,79 @@
#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 {
+static String escape(const String& s) {
+ String result;
+ for (size_t i = 0; i < s.getUTF8Size(); ++i) {
+ if (s[i] == ',') {
+ result += "=2C";
+ }
+ else if (s[i] == '=') {
+ result += "=3D";
+ }
+ else {
+ result += s[i];
+ }
+ }
+ return result;
+}
+
+
SCRAMSHA1ClientAuthenticator::SCRAMSHA1ClientAuthenticator(const String& nonce) : ClientAuthenticator("SCRAM-SHA-1"), step(Initial), clientnonce(nonce) {
}
ByteArray SCRAMSHA1ClientAuthenticator::getResponse() const {
if (step == Initial) {
return getGS2Header() + getInitialBareClientMessage();
}
else {
ByteArray clientKey = HMACSHA1::getResult(saltedPassword, "Client Key");
ByteArray storedKey = SHA1::getBinaryHash(clientKey);
ByteArray clientSignature = HMACSHA1::getResult(storedKey, authMessage);
ByteArray clientProof = clientKey;
for (unsigned int i = 0; i < clientProof.getSize(); ++i) {
clientProof[i] ^= clientSignature[i];
}
ByteArray result = ByteArray("c=") + Base64::encode(getGS2Header()) + ",r=" + clientnonce + serverNonce + ",p=" + Base64::encode(clientProof);
return result;
}
}
bool SCRAMSHA1ClientAuthenticator::setChallenge(const ByteArray& challenge) {
if (step == Initial) {
initialServerMessage = challenge;
std::map<char, String> keys = parseMap(String(initialServerMessage.getData(), initialServerMessage.getSize()));
// Extract the salt
ByteArray salt = Base64::decode(keys['s']);
// Extract the server nonce
String clientServerNonce = keys['r'];
if (clientServerNonce.getUTF8Size() <= clientnonce.getUTF8Size()) {
return false;
}
String receivedClientNonce = clientServerNonce.getSubstring(0, clientnonce.getUTF8Size());
if (receivedClientNonce != clientnonce) {
return false;
}
serverNonce = clientServerNonce.getSubstring(clientnonce.getUTF8Size(), clientServerNonce.npos());
// Extract the number of iterations
int iterations = 0;
try {
iterations = boost::lexical_cast<int>(keys['i'].getUTF8String());
}
catch (const boost::bad_lexical_cast&) {
return false;
}
@@ -64,68 +81,56 @@ bool SCRAMSHA1ClientAuthenticator::setChallenge(const ByteArray& challenge) {
return false;
}
// Compute all the values needed for the server signature
saltedPassword = PBKDF2::encode(StringPrep::getPrepared(getPassword(), StringPrep::SASLPrep), salt, iterations);
authMessage = getInitialBareClientMessage() + "," + initialServerMessage + "," + "c=" + Base64::encode(getGS2Header()) + ",r=" + clientnonce + serverNonce;
ByteArray serverKey = HMACSHA1::getResult(saltedPassword, "Server Key");
serverSignature = HMACSHA1::getResult(serverKey, authMessage);
step = Proof;
return true;
}
else {
ByteArray result = ByteArray("v=") + ByteArray(Base64::encode(serverSignature));
return challenge == result;
}
}
std::map<char, String> SCRAMSHA1ClientAuthenticator::parseMap(const String& s) {
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));
+ return ByteArray(String("n=" + escape(authenticationID) + ",r=" + clientnonce));
}
ByteArray SCRAMSHA1ClientAuthenticator::getGS2Header() const {
- return ByteArray("n,") + getAuthorizationID() + ",";
+ return ByteArray("n,") + (getAuthorizationID().isEmpty() ? "" : "a=" + escape(getAuthorizationID())) + ",";
}
}