Completed unit tests for handshake request

Change-Id: I9558c0244e2285e7dc266bfcb3c51887fb7200d7
Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com>

2 files changed, 82 insertions, 69 deletions

diff --git a/src/websockets/qwebsockethandshakerequest_p.cpp b/src/websockets/qwebsockethandshakerequest_p.cpp
index 8026b49..ad88d12 100644
--- a/src/websockets/qwebsockethandshakerequest_p.cpp
+++ b/src/websockets/qwebsockethandshakerequest_p.cpp
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 QT_BEGIN_NAMESPACE
 
 /*!
+    \brief Constructs a new QWebSocketHandshakeRequest given \a port and \a isSecure
     \internal
  */
 QWebSocketHandshakeRequest::QWebSocketHandshakeRequest(int port, bool isSecure) :
@@ -53,12 +54,11 @@ QWebSocketHandshakeRequest::~QWebSocketHandshakeRequest()
 }
 
 /*!
+    \brief Clears the request
     \internal
  */
 void QWebSocketHandshakeRequest::clear()
 {
-    m_port = -1;
-    m_isSecure = false;
     m_isValid = false;
     m_headers.clear();
     m_versions.clear();
@@ -189,85 +189,98 @@ QTextStream &QWebSocketHandshakeRequest::readFromStream(QTextStream &textStream)
             bool conversionOk = false;
             const float httpVersion = httpProtocol.midRef(5).toFloat(&conversionOk);
 
-            QString headerLine = textStream.readLine();
-            m_headers.clear();
-            while (!headerLine.isEmpty())
+            if (conversionOk)
             {
-                const QStringList headerField = headerLine.split(QStringLiteral(": "), QString::SkipEmptyParts);
-                if (headerField.length() < 2)
+                QString headerLine = textStream.readLine();
+                m_headers.clear();
+                while (!headerLine.isEmpty())
                 {
-                    m_isValid = false;
-                    clear();
-                    return textStream;
+                    const QStringList headerField = headerLine.split(QStringLiteral(": "), QString::SkipEmptyParts);
+                    if (headerField.length() < 2)
+                    {
+                        clear();
+                        return textStream;
+                    }
+                    m_headers.insertMulti(headerField.at(0), headerField.at(1));
+                    headerLine = textStream.readLine();
                 }
-                m_headers.insertMulti(headerField.at(0), headerField.at(1));
-                headerLine = textStream.readLine();
-            }
 
-            const QString host = m_headers.value(QStringLiteral("Host"), QStringLiteral(""));
-            m_requestUrl = QUrl::fromEncoded(resourceName.toLatin1());
-            if (m_requestUrl.isRelative())
-            {
-                m_requestUrl.setHost(host);
-            }
-            if (m_requestUrl.scheme().isEmpty())
-            {
-                const QString scheme =  isSecure() ? QStringLiteral("wss://") : QStringLiteral("ws://");
-                m_requestUrl.setScheme(scheme);
-            }
+                const QString host = m_headers.value(QStringLiteral("Host"), QStringLiteral(""));
+                m_requestUrl = QUrl::fromEncoded(resourceName.toLatin1());
+                if (m_requestUrl.isRelative())
+                {
+                    m_requestUrl.setHost(host);
+                }
+                if (m_requestUrl.scheme().isEmpty())
+                {
+                    const QString scheme =  isSecure() ? QStringLiteral("wss") : QStringLiteral("ws");
+                    m_requestUrl.setScheme(scheme);
+                }
 
-            const QStringList versionLines = m_headers.values(QStringLiteral("Sec-WebSocket-Version"));
-            for (QStringList::const_iterator v = versionLines.begin(); v != versionLines.end(); ++v)
-            {
-                const QStringList versions = (*v).split(QStringLiteral(","), QString::SkipEmptyParts);
-                for (QStringList::const_iterator i = versions.begin(); i != versions.end(); ++i)
+                const QStringList versionLines = m_headers.values(QStringLiteral("Sec-WebSocket-Version"));
+                for (QStringList::const_iterator v = versionLines.begin(); v != versionLines.end(); ++v)
                 {
-                   const QWebSocketProtocol::Version ver = QWebSocketProtocol::versionFromString((*i).trimmed());
-                   m_versions << ver;
+                    const QStringList versions = (*v).split(QStringLiteral(","), QString::SkipEmptyParts);
+                    for (QStringList::const_iterator i = versions.begin(); i != versions.end(); ++i)
+                    {
+                        bool ok = false;
+                        (void)(*i).toUInt(&ok);
+                        if (!ok)
+                        {
+                            clear();
+                            return textStream;
+                        }
+                        const QWebSocketProtocol::Version ver = QWebSocketProtocol::versionFromString((*i).trimmed());
+                        m_versions << ver;
+                    }
+                }
+                std::sort(m_versions.begin(), m_versions.end(), qGreater<QWebSocketProtocol::Version>()); //sort in descending order
+                m_key = m_headers.value(QStringLiteral("Sec-WebSocket-Key"), QStringLiteral(""));
+                const QString upgrade = m_headers.value(QStringLiteral("Upgrade"), QStringLiteral(""));           //must be equal to "websocket", case-insensitive
+                const QString connection = m_headers.value(QStringLiteral("Connection"), QStringLiteral(""));     //must contain "Upgrade", case-insensitive
+                const QStringList connectionLine = connection.split(QStringLiteral(","), QString::SkipEmptyParts);
+                QStringList connectionValues;
+                for (QStringList::const_iterator c = connectionLine.begin(); c != connectionLine.end(); ++c)
+                {
+                    connectionValues << (*c).trimmed();
                 }
-            }
-            std::sort(m_versions.begin(), m_versions.end(), qGreater<QWebSocketProtocol::Version>()); //sort in descending order
-            m_key = m_headers.value(QStringLiteral("Sec-WebSocket-Key"), QStringLiteral(""));
-            const QString upgrade = m_headers.value(QStringLiteral("Upgrade"), QStringLiteral(""));           //must be equal to "websocket", case-insensitive
-            const QString connection = m_headers.value(QStringLiteral("Connection"), QStringLiteral(""));     //must contain "Upgrade", case-insensitive
-            const QStringList connectionLine = connection.split(QStringLiteral(","), QString::SkipEmptyParts);
-            QStringList connectionValues;
-            for (QStringList::const_iterator c = connectionLine.begin(); c != connectionLine.end(); ++c)
-            {
-                connectionValues << (*c).trimmed();
-            }
 
-            //optional headers
-            m_origin = m_headers.value(QStringLiteral("Sec-WebSocket-Origin"), QStringLiteral(""));
-            const QStringList protocolLines = m_headers.values(QStringLiteral("Sec-WebSocket-Protocol"));
-            for (QStringList::const_iterator pl = protocolLines.begin(); pl != protocolLines.end(); ++pl)
-            {
-                QStringList protocols = (*pl).split(QStringLiteral(","), QString::SkipEmptyParts);
-                for (QStringList::const_iterator p = protocols.begin(); p != protocols.end(); ++p)
+                //optional headers
+                m_origin = m_headers.value(QStringLiteral("Sec-WebSocket-Origin"), QStringLiteral(""));
+                const QStringList protocolLines = m_headers.values(QStringLiteral("Sec-WebSocket-Protocol"));
+                for (QStringList::const_iterator pl = protocolLines.begin(); pl != protocolLines.end(); ++pl)
                 {
-                    m_protocols << (*p).trimmed();
+                    QStringList protocols = (*pl).split(QStringLiteral(","), QString::SkipEmptyParts);
+                    for (QStringList::const_iterator p = protocols.begin(); p != protocols.end(); ++p)
+                    {
+                        m_protocols << (*p).trimmed();
+                    }
                 }
-            }
-            const QStringList extensionLines = m_headers.values(QStringLiteral("Sec-WebSocket-Extensions"));
-            for (QStringList::const_iterator el = extensionLines.begin(); el != extensionLines.end(); ++el)
-            {
-                QStringList extensions = (*el).split(QStringLiteral(","), QString::SkipEmptyParts);
-                for (QStringList::const_iterator e = extensions.begin(); e != extensions.end(); ++e)
+                const QStringList extensionLines = m_headers.values(QStringLiteral("Sec-WebSocket-Extensions"));
+                for (QStringList::const_iterator el = extensionLines.begin(); el != extensionLines.end(); ++el)
                 {
-                    m_extensions << (*e).trimmed();
+                    QStringList extensions = (*el).split(QStringLiteral(","), QString::SkipEmptyParts);
+                    for (QStringList::const_iterator e = extensions.begin(); e != extensions.end(); ++e)
+                    {
+                        m_extensions << (*e).trimmed();
+                    }
                 }
-            }
 
-            //TODO: authentication field
+                //TODO: authentication field
 
-            m_isValid = !(host.isEmpty() ||
-                          resourceName.isEmpty() ||
-                          m_versions.isEmpty() ||
-                          m_key.isEmpty() ||
-                          (verb != QStringLiteral("GET")) ||
-                          (!conversionOk || (httpVersion < 1.1f)) ||
-                          (upgrade.toLower() != QStringLiteral("websocket")) ||
-                          (!connectionValues.contains(QStringLiteral("upgrade"), Qt::CaseInsensitive)));
+                m_isValid = !(host.isEmpty() ||
+                              resourceName.isEmpty() ||
+                              m_versions.isEmpty() ||
+                              m_key.isEmpty() ||
+                              (verb != QStringLiteral("GET")) ||
+                              (!conversionOk || (httpVersion < 1.1f)) ||
+                              (upgrade.toLower() != QStringLiteral("websocket")) ||
+                              (!connectionValues.contains(QStringLiteral("upgrade"), Qt::CaseInsensitive)));
+            }
+            if (!m_isValid)
+            {
+                clear();
+            }
         }
     }
     return textStream;
diff --git a/src/websockets/qwebsockethandshakerequest_p.h b/src/websockets/qwebsockethandshakerequest_p.h
index 88025e9..fc292af 100644
--- a/src/websockets/qwebsockethandshakerequest_p.h
+++ b/src/websockets/qwebsockethandshakerequest_p.h
@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
 
 class QTextStream;
 
-class QWebSocketHandshakeRequest
+class Q_AUTOTEST_EXPORT QWebSocketHandshakeRequest
 {
     Q_DISABLE_COPY(QWebSocketHandshakeRequest)
 
@@ -80,7 +80,7 @@ private:
     QUrl m_requestUrl;
 };
 
-QTextStream &operator >>(QTextStream &stream, QWebSocketHandshakeRequest &request);
+QTextStream & Q_AUTOTEST_EXPORT operator >>(QTextStream &stream, QWebSocketHandshakeRequest &request);
 
 QT_END_NAMESPACE