5 files changed, 62 insertions, 8 deletions
diff --git a/Swiften/SASL/EXTERNALClientAuthenticator.cpp b/Swiften/SASL/EXTERNALClientAuthenticator.cpp
index 546140f..027bc89 100644
--- a/Swiften/SASL/EXTERNALClientAuthenticator.cpp
+++ b/Swiften/SASL/EXTERNALClientAuthenticator.cpp
@@ -12,7 +12,13 @@ EXTERNALClientAuthenticator::EXTERNALClientAuthenticator() : ClientAuthenticator
 }
 
 boost::optional<SafeByteArray> EXTERNALClientAuthenticator::getResponse() const {
-    return boost::optional<SafeByteArray>();
+    const std::string& authorizationID = getAuthorizationID();
+
+    if (authorizationID.empty()) {
+        return boost::optional<SafeByteArray>();
+    } else {
+        return createSafeByteArray(authorizationID);
+    }
 }
 
 bool EXTERNALClientAuthenticator::setChallenge(const boost::optional<ByteArray>&) {
diff --git a/Swiften/SASL/SConscript b/Swiften/SASL/SConscript
index 6aa3e72..8a248cc 100644
--- a/Swiften/SASL/SConscript
+++ b/Swiften/SASL/SConscript
@@ -23,6 +23,7 @@ swiften_env.Append(SWIFTEN_OBJECTS = [objects])
 env.Append(UNITTEST_SOURCES = [
             File("UnitTest/PLAINMessageTest.cpp"),
             File("UnitTest/PLAINClientAuthenticatorTest.cpp"),
+            File("UnitTest/EXTERNALClientAuthenticatorTest.cpp"),
             File("UnitTest/SCRAMSHA1ClientAuthenticatorTest.cpp"),
             File("UnitTest/DIGESTMD5PropertiesTest.cpp"),
             File("UnitTest/DIGESTMD5ClientAuthenticatorTest.cpp"),
diff --git a/Swiften/SASL/UnitTest/EXTERNALClientAuthenticatorTest.cpp b/Swiften/SASL/UnitTest/EXTERNALClientAuthenticatorTest.cpp
new file mode 100644
index 0000000..728eed6
--- /dev/null
+++ b/Swiften/SASL/UnitTest/EXTERNALClientAuthenticatorTest.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2017 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <QA/Checker/IO.h>
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include <Swiften/SASL/EXTERNALClientAuthenticator.h>
+
+using namespace Swift;
+
+class EXTERNALClientAuthenticatorTest : public CppUnit::TestFixture {
+        CPPUNIT_TEST_SUITE(EXTERNALClientAuthenticatorTest);
+        CPPUNIT_TEST(testGetResponse_WithoutAuthzID);
+        CPPUNIT_TEST(testGetResponse_WithAuthzID);
+        CPPUNIT_TEST_SUITE_END();
+
+    public:
+        void testGetResponse_WithoutAuthzID() {
+            EXTERNALClientAuthenticator testling;
+
+            // Authcid and password are not used (ignored)
+            testling.setCredentials("user", createSafeByteArray("pass"));
+
+            boost::optional<SafeByteArray> response = testling.getResponse();
+
+            // No data should have been returned
+            bool result = !response;
+
+            CPPUNIT_ASSERT(result);
+        }
+
+        void testGetResponse_WithAuthzID() {
+            EXTERNALClientAuthenticator testling;
+
+            // Authcid and password are not used (ignored)
+            testling.setCredentials("user", createSafeByteArray("pass"), "authz");
+
+            CPPUNIT_ASSERT_EQUAL(*testling.getResponse(), createSafeByteArray("authz", 5));
+        }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(EXTERNALClientAuthenticatorTest);
diff --git a/Swiften/SASL/UnitTest/WindowsServicePrincipalNameTest.cpp b/Swiften/SASL/UnitTest/WindowsServicePrincipalNameTest.cpp
index fa07052..ef3a9b3 100644
--- a/Swiften/SASL/UnitTest/WindowsServicePrincipalNameTest.cpp
+++ b/Swiften/SASL/UnitTest/WindowsServicePrincipalNameTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -97,16 +97,16 @@ class WindowsServicePrincipalNameTest : public CppUnit::TestFixture {
             WindowsServicePrincipalName spn("adlon.isode.net");
 
             spn.setInstanceName("mlink.adlon.isode.net");
-            spn.setInstancePort(6222);
-            CPPUNIT_ASSERT_EQUAL(spn.toString(), std::string("xmpp/mlink.adlon.isode.net:6222/adlon.isode.net"));
+            spn.setInstancePort(55222);
+            CPPUNIT_ASSERT_EQUAL(spn.toString(), std::string("xmpp/mlink.adlon.isode.net:55222/adlon.isode.net"));
 
             spn.setInstancePort(0);
             CPPUNIT_ASSERT_EQUAL(spn.toString(), std::string("xmpp/mlink.adlon.isode.net/adlon.isode.net"));
 
             WindowsServicePrincipalName spn2("mlink.adlon.isode.net");
 
-            spn2.setInstancePort(6222);
-            CPPUNIT_ASSERT_EQUAL(spn2.toString(), std::string("xmpp/mlink.adlon.isode.net:6222"));
+            spn2.setInstancePort(55222);
+            CPPUNIT_ASSERT_EQUAL(spn2.toString(), std::string("xmpp/mlink.adlon.isode.net:55222"));
 
             spn2.setInstancePort(0);
             CPPUNIT_ASSERT_EQUAL(spn2.toString(), std::string("xmpp/mlink.adlon.isode.net"));
diff --git a/Swiften/SASL/WindowsServicePrincipalName.h b/Swiften/SASL/WindowsServicePrincipalName.h
index 4c9f557..2e4e5c4 100644
--- a/Swiften/SASL/WindowsServicePrincipalName.h
+++ b/Swiften/SASL/WindowsServicePrincipalName.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -49,7 +49,7 @@ namespace Swift {
              * it remain 0 to indicate that the default port is
              * used.
              */
-            void setInstancePort(short int instancePort) { instancePort_ = instancePort; }
+            void setInstancePort(unsigned short instancePort) { instancePort_ = instancePort; }
 
             /*
              * This follows the rules of SPN creation on Windows and