Core/Bnet: Send hostnames in portal requests for launcherlogin

1 files changed, 14 insertions, 49 deletions

diff --git a/src/server/bnetserver/REST/LoginRESTService.cpp b/src/server/bnetserver/REST/LoginRESTService.cpp
index 6e260b4df56..6cfdcb1324f 100644
--- a/src/server/bnetserver/REST/LoginRESTService.cpp
+++ b/src/server/bnetserver/REST/LoginRESTService.cpp
@@ -82,27 +82,25 @@ bool LoginRESTService::Start(Trinity::Asio::IoContext* ioContext)
 
     Trinity::Asio::Resolver resolver(*ioContext);
 
-    std::string configuredAddress = sConfigMgr->GetStringDefault("LoginREST.ExternalAddress", "127.0.0.1");
-    Optional<boost::asio::ip::tcp::endpoint> externalAddress = resolver.Resolve(boost::asio::ip::tcp::v4(), configuredAddress, std::to_string(_port));
+    _hostnames[0] = sConfigMgr->GetStringDefault("LoginREST.ExternalAddress", "127.0.0.1");
+    Optional<boost::asio::ip::tcp::endpoint> externalAddress = resolver.Resolve(boost::asio::ip::tcp::v4(), _hostnames[0], std::to_string(_port));
     if (!externalAddress)
     {
-        TC_LOG_ERROR("server.rest", "Could not resolve LoginREST.ExternalAddress {}", configuredAddress);
+        TC_LOG_ERROR("server.rest", "Could not resolve LoginREST.ExternalAddress {}", _hostnames[0]);
         return false;
     }
 
-    _externalEndpoint = *externalAddress;
-    _externalHostname = Trinity::StringFormat("{}:{}", configuredAddress, _port);
+    _addresses[0] = externalAddress->address();
 
-    configuredAddress = sConfigMgr->GetStringDefault("LoginREST.LocalAddress", "127.0.0.1");
-    Optional<boost::asio::ip::tcp::endpoint> localAddress = resolver.Resolve(boost::asio::ip::tcp::v4(), configuredAddress, std::to_string(_port));
+    _hostnames[1] = sConfigMgr->GetStringDefault("LoginREST.LocalAddress", "127.0.0.1");
+    Optional<boost::asio::ip::tcp::endpoint> localAddress = resolver.Resolve(boost::asio::ip::tcp::v4(), _hostnames[1], std::to_string(_port));
     if (!localAddress)
     {
-        TC_LOG_ERROR("server.rest", "Could not resolve LoginREST.LocalAddress {}", configuredAddress);
+        TC_LOG_ERROR("server.rest", "Could not resolve LoginREST.LocalAddress {}", _hostnames[1]);
         return false;
     }
 
-    _localEndpoint = *localAddress;
-    _localHostname = Trinity::StringFormat("{}:{}", configuredAddress, _port);
+    _addresses[1] = localAddress->address();
 
     // set up form inputs
     Battlenet::JSON::Login::FormInput* input;
@@ -136,48 +134,15 @@ void LoginRESTService::Stop()
     _thread.join();
 }
 
-boost::asio::ip::tcp::endpoint const& LoginRESTService::GetEndpointForClient(boost::asio::ip::address const& address) const
-{
-    std::array<boost::asio::ip::address, 2> addresses = std::array{ _externalEndpoint.address(), _localEndpoint.address() };
-    if (auto addressIndex = Trinity::Net::SelectAddressForClient(address, addresses))
-    {
-        switch (*addressIndex)
-        {
-            case 0:
-                return _externalEndpoint;
-            case 1:
-                return _localEndpoint;
-            default:
-                break;
-        }
-    }
-
-    if (address.is_loopback())
-        return _localEndpoint;
-
-    return _externalEndpoint;
-}
-
 std::string const& LoginRESTService::GetHostnameForClient(boost::asio::ip::address const& address) const
 {
-    std::array<boost::asio::ip::address, 2> addresses = std::array{ _externalEndpoint.address(), _localEndpoint.address() };
-    if (auto addressIndex = Trinity::Net::SelectAddressForClient(address, addresses))
-    {
-        switch (*addressIndex)
-        {
-            case 0:
-                return _externalHostname;
-            case 1:
-                return _localHostname;
-            default:
-                break;
-        }
-    }
+    if (auto addressIndex = Trinity::Net::SelectAddressForClient(address, _addresses))
+        return _hostnames[*addressIndex];
 
     if (address.is_loopback())
-        return _localHostname;
+        return _hostnames[0];
 
-    return _externalHostname;
+    return _hostnames[1];
 }
 
 void LoginRESTService::Run()
@@ -330,8 +295,8 @@ int32 LoginRESTService::HandleGetGameAccounts(std::shared_ptr<AsyncRequest> requ
 
 int32 LoginRESTService::HandleGetPortal(std::shared_ptr<AsyncRequest> request)
 {
-    boost::asio::ip::tcp::endpoint const& endpoint = GetEndpointForClient(boost::asio::ip::address_v4(request->GetClient()->ip));
-    std::string response = Trinity::StringFormat("{}:{}", endpoint.address().to_string(), sConfigMgr->GetIntDefault("BattlenetPort", 1119));
+    std::string const& hostname = GetHostnameForClient(boost::asio::ip::address_v4(request->GetClient()->ip));
+    std::string response = Trinity::StringFormat("{}:{}", hostname, sConfigMgr->GetIntDefault("BattlenetPort", 1119));
 
     soap_response(request->GetClient(), SOAP_FILE);
     soap_send_raw(request->GetClient(), response.c_str(), response.length());