diff options
| author | Bradley Buda <bradleybuda@gmail.com> | 2013-07-11 00:29:22 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-23 08:23:57 (GMT) |
| commit | a585f2ae4538287ed57237a571e87a03c5a54207 (patch) | |
| tree | 38549fc8768c48d4281c14fc8b99ed718019f7cc | |
| parent | 40db54f8182e427f76c663aec15c3a6a682b3c9f (diff) | |
| download | Qt-a585f2ae4538287ed57237a571e87a03c5a54207.zip Qt-a585f2ae4538287ed57237a571e87a03c5a54207.tar.gz Qt-a585f2ae4538287ed57237a571e87a03c5a54207.tar.bz2 | |
Correct algorithm for digest auth when using the CONNECT verb
QHttpSocketEngine fails to authenticate to an HTTP proxy that is using
Digest authentication and the CONNECT method (i.e. when you are
tunneling TLS over HTTP). The bug is due to a bad parameter being
passed to QAuthenticatorPrivate::calculateResponse - the requestMethod
parameter is passed in as "CONNECT " instead of "CONNECT" (note the
trailing space).
Because an MD5 hash is derived from this method when using the
qop="auth" flavor of Digest auth, the hash does not match the expected
value and authentication always fails in this configuration.
(cherry picked from commit 5cab14b8a1dfbb03e22b10af385fb90900a9f280)
Change-Id: Ief025ada714e03d96a316116f6b9f1711ab2a7f7
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| -rw-r--r-- | src/network/socket/qhttpsocketengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 36b221c..2d90e77 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -496,12 +496,13 @@ void QHttpSocketEngine::slotSocketConnected() Q_D(QHttpSocketEngine); // Send the greeting. - const char method[] = "CONNECT "; + const char method[] = "CONNECT"; QByteArray peerAddress = d->peerName.isEmpty() ? d->peerAddress.toString().toLatin1() : QUrl::toAce(d->peerName); QByteArray path = peerAddress + ':' + QByteArray::number(d->peerPort); QByteArray data = method; + data += " "; data += path; data += " HTTP/1.1\r\n"; data += "Proxy-Connection: keep-alive\r\n" |