socks5: make server explicitly return "no acceptable method"

2 files changed, 12 insertions, 2 deletions

diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp
index cd1e306b..905b7a1b 100644
--- a/src/base/QXmppSocks.cpp
+++ b/src/base/QXmppSocks.cpp
@@ -32,8 +32,7 @@ const static char SocksVersion = 5;
 
 enum AuthenticationMethod {
     NoAuthentication = 0,
-    GSSAPI = 1,
-    UsernamePassword = 2
+    NoAcceptableMethod = 255
 };
 
 enum Command {
@@ -274,6 +273,12 @@ void QXmppSocksServer::slotReadyRead()
         if (!foundMethod)
         {
             qWarning("QXmppSocksServer received bad authentication method");
+
+            buffer.resize(2);
+            buffer[0] = SocksVersion;
+            buffer[1] = NoAcceptableMethod;
+            socket->write(buffer);
+
             socket->close();
             return;
         }
diff --git a/tests/qxmppsocks/tst_qxmppsocks.cpp b/tests/qxmppsocks/tst_qxmppsocks.cpp
index a8cfe56c..767e322f 100644
--- a/tests/qxmppsocks/tst_qxmppsocks.cpp
+++ b/tests/qxmppsocks/tst_qxmppsocks.cpp
@@ -220,6 +220,11 @@ void tst_QXmppSocks::testServer()
     client.write(clientHandshake);
     loop.exec();
     if (!clientHandshakeWorks) {
+        // consume any last data
+        QByteArray data = client.readAll();
+        if (client.state() != QAbstractSocket::UnconnectedState)
+            loop.exec();
+
         QCOMPARE(client.state(), QAbstractSocket::UnconnectedState);
 
         QVERIFY(!m_connectionSocket);