5 files changed, 68 insertions, 0 deletions
diff --git a/Swiften/Serializer/AuthChallengeSerializer.cpp b/Swiften/Serializer/AuthChallengeSerializer.cpp
new file mode 100644
index 0000000..152607d
--- /dev/null
+++ b/Swiften/Serializer/AuthChallengeSerializer.cpp
@@ -0,0 +1,17 @@
+#include "Swiften/Serializer/AuthChallengeSerializer.h"
+
+#include "Swiften/Elements/AuthChallenge.h"
+#include "Swiften/StringCodecs/Base64.h"
+
+namespace Swift {
+
+AuthChallengeSerializer::AuthChallengeSerializer() {
+}
+
+String AuthChallengeSerializer::serialize(boost::shared_ptr<Element> element)  const {
+	boost::shared_ptr<AuthChallenge> authRequest(boost::dynamic_pointer_cast<AuthChallenge>(element));
+	String value = (authRequest->getValue().isEmpty() ? "=" : Base64::encode(authRequest->getValue()));
+	return "<challenge xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">" + value + "</challenge>";
+}
+
+}
diff --git a/Swiften/Serializer/AuthChallengeSerializer.h b/Swiften/Serializer/AuthChallengeSerializer.h
new file mode 100644
index 0000000..010d9a9
--- /dev/null
+++ b/Swiften/Serializer/AuthChallengeSerializer.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include "Swiften/Elements/AuthChallenge.h"
+#include "Swiften/Serializer/GenericElementSerializer.h"
+
+namespace Swift {
+	class AuthChallengeSerializer : public GenericElementSerializer<AuthChallenge> {
+		public:
+			AuthChallengeSerializer();
+
+			virtual String serialize(boost::shared_ptr<Element> element)  const;
+	};
+}
diff --git a/Swiften/Serializer/AuthResponseSerializer.cpp b/Swiften/Serializer/AuthResponseSerializer.cpp
new file mode 100644
index 0000000..2348a3d
--- /dev/null
+++ b/Swiften/Serializer/AuthResponseSerializer.cpp
@@ -0,0 +1,17 @@
+#include "Swiften/Serializer/AuthResponseSerializer.h"
+
+#include "Swiften/Elements/AuthResponse.h"
+#include "Swiften/StringCodecs/Base64.h"
+
+namespace Swift {
+
+AuthResponseSerializer::AuthResponseSerializer() {
+}
+
+String AuthResponseSerializer::serialize(boost::shared_ptr<Element> element)  const {
+	boost::shared_ptr<AuthResponse> authRequest(boost::dynamic_pointer_cast<AuthResponse>(element));
+	String value = (authRequest->getValue().isEmpty() ? "=" : Base64::encode(authRequest->getValue()));
+	return "<response xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">" + value + "</response>";
+}
+
+}
diff --git a/Swiften/Serializer/AuthResponseSerializer.h b/Swiften/Serializer/AuthResponseSerializer.h
new file mode 100644
index 0000000..8d47291
--- /dev/null
+++ b/Swiften/Serializer/AuthResponseSerializer.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+#include "Swiften/Elements/AuthResponse.h"
+#include "Swiften/Serializer/GenericElementSerializer.h"
+
+namespace Swift {
+	class AuthResponseSerializer : public GenericElementSerializer<AuthResponse> {
+		public:
+			AuthResponseSerializer();
+
+			virtual String serialize(boost::shared_ptr<Element> element)  const;
+	};
+}
diff --git a/Swiften/Serializer/XMPPSerializer.cpp b/Swiften/Serializer/XMPPSerializer.cpp
index 660bb37..082cdf3 100644
--- a/Swiften/Serializer/XMPPSerializer.cpp
+++ b/Swiften/Serializer/XMPPSerializer.cpp
@@ -1,73 +1,77 @@
 #include "Swiften/Serializer/XMPPSerializer.h"
 
 #include <boost/bind.hpp>
 #include <iostream>
 
 #include "Swiften/Elements/ProtocolHeader.h"
 #include "Swiften/Base/foreach.h"
 #include "Swiften/Serializer/CompressRequestSerializer.h"
 #include "Swiften/Serializer/CompressFailureSerializer.h"
 #include "Swiften/Serializer/StreamFeaturesSerializer.h"
 #include "Swiften/Serializer/AuthRequestSerializer.h"
 #include "Swiften/Serializer/AuthFailureSerializer.h"
 #include "Swiften/Serializer/AuthSuccessSerializer.h"
+#include "Swiften/Serializer/AuthChallengeSerializer.h"
+#include "Swiften/Serializer/AuthResponseSerializer.h"
 #include "Swiften/Serializer/StartTLSRequestSerializer.h"
 #include "Swiften/Serializer/StartTLSFailureSerializer.h"
 #include "Swiften/Serializer/TLSProceedSerializer.h"
 #include "Swiften/Serializer/MessageSerializer.h"
 #include "Swiften/Serializer/PresenceSerializer.h"
 #include "Swiften/Serializer/IQSerializer.h"
 
 namespace Swift {
 
 XMPPSerializer::XMPPSerializer(PayloadSerializerCollection* payloadSerializers) {
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new PresenceSerializer(payloadSerializers)));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new IQSerializer(payloadSerializers)));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new MessageSerializer(payloadSerializers)));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new CompressRequestSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new CompressFailureSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new AuthRequestSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new AuthFailureSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new AuthSuccessSerializer()));
+	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new AuthChallengeSerializer()));
+	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new AuthResponseSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new StartTLSRequestSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new StartTLSFailureSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new TLSProceedSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new StreamFeaturesSerializer()));
 }
 
 String XMPPSerializer::serializeHeader(const ProtocolHeader& header) const {
 	String result = "<?xml version=\"1.0\"?><stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\"";
 	if (!header.getFrom().isEmpty()) {
 		result += " from=\"" + header.getFrom() + "\"";
 	}
 	if (!header.getTo().isEmpty()) {
 		result += " to=\"" + header.getTo() + "\"";
 	}
 	if (!header.getID().isEmpty()) {
 		result += " id=\"" + header.getID() + "\"";
 	}
 	if (!header.getVersion().isEmpty()) {
 		result += " version=\"" + header.getVersion() + "\"";
 	}
 	result += ">";
 	return result;
 }
 
 String XMPPSerializer::serializeElement(boost::shared_ptr<Element> element) const {
 	std::vector< boost::shared_ptr<ElementSerializer> >::const_iterator i = std::find_if(
 			serializers_.begin(), serializers_.end(), 
 			boost::bind(&ElementSerializer::canSerialize, _1, element));
 	if (i != serializers_.end()) {
 		return (*i)->serialize(element);
 	}
 	else {
 		std::cerr << "Could not find serializer for " << typeid(*(element.get())).name() << std::endl;
 		return "";
 	}
 }
 
 String XMPPSerializer::serializeFooter() const {
 	return "</stream:stream>";
 }
 
 }