QOAuthHttpServerReplyHandler: don't assume the server is localhost

The constructors allow passing a different address than 127.0.0.1, so
get the address we did bind to from the QTcpServer and use that in
constructing the URL.

Additionally, use QUrl to construct the URL, instead of doing string
concatenation. This ensures we do get a proper URL.

Pick-to: 6.7
Change-Id: Ie30a3caf09ef4176bb36fffd17cd9c921a2fc8c6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/oauth/qoauthhttpserverreplyhandler.cpp b/src/oauth/qoauthhttpserverreplyhandler.cpp
index 9d93c62..2612936 100644
--- a/src/oauth/qoauthhttpserverreplyhandler.cpp
+++ b/src/oauth/qoauthhttpserverreplyhandler.cpp
@@ -254,10 +254,17 @@ QString QOAuthHttpServerReplyHandler::callback() const
     Q_ASSERT(d->httpServer.isListening());
     QUrl url;
     url.setScheme(u"http"_s);
-    url.setHost(u"127.0.0.1"_s);
     url.setPort(d->httpServer.serverPort());
     url.setPath(d->path);
 
+    // convert Any and Localhost addresses to "localhost"
+    QHostAddress host = d->httpServer.serverAddress();
+    if (host.isLoopback() || host == QHostAddress::AnyIPv4 || host == QHostAddress::Any
+            || host == QHostAddress::AnyIPv6)
+        url.setHost(u"localhost"_s);
+    else
+        url.setHost(host.toString());
+
     return url.toString(QUrl::EncodeDelimiters);
 }