Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Bnet: Send hostnames in portal requests for launcherlogin

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/8b426af763a9d51524538cebbf615595f94a99a4)
This commit is contained in:
hondacrx
2023-09-02 15:35:49 -04:00
parent 469c5ef862
commit 34ce07f880
2 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/BNetServer/Managers/LoginServiceManager.cs
+23 -30
View File
@@ -20,43 +20,42 @@ namespace BNetServer
{ {
ConcurrentDictionary<(uint ServiceHash, uint MethodId), BnetServiceHandler> serviceHandlers = new(); ConcurrentDictionary<(uint ServiceHash, uint MethodId), BnetServiceHandler> serviceHandlers = new();
FormInputs formInputs = new(); FormInputs formInputs = new();
string _externalHostname; string[] _hostnames = new string[2];
IPEndPoint _externalEndpoint; IPAddress[] _addresses = new IPAddress[2];
string _localHostname; int _port;
IPEndPoint _localEndpoint;
X509Certificate2 certificate; X509Certificate2 certificate;
LoginServiceManager() { } LoginServiceManager() { }
public void Initialize() public void Initialize()
{ {
int port = ConfigMgr.GetDefaultValue("LoginREST.Port", 8081); _port = ConfigMgr.GetDefaultValue("LoginREST.Port", 8081);
if (port < 0 || port > 0xFFFF) if (_port < 0 || _port > 0xFFFF)
{ {
Log.outError(LogFilter.Network, $"Specified login service port ({port}) out of allowed range (1-65535), defaulting to 8081"); Log.outError(LogFilter.Network, $"Specified login service port ({_port}) out of allowed range (1-65535), defaulting to 8081");
port = 8081; _port = 8081;
} }
string configuredAddress = ConfigMgr.GetDefaultValue("LoginREST.ExternalAddress", "127.0.0.1"); _hostnames[0] = ConfigMgr.GetDefaultValue("LoginREST.ExternalAddress", "127.0.0.1");
IPAddress address; var externalAddress = Dns.GetHostEntry($"{_hostnames[0]}:{_port}", System.Net.Sockets.AddressFamily.InterNetwork);
if (!IPAddress.TryParse(configuredAddress, out address)) if (externalAddress == null || externalAddress.AddressList.Empty())
{ {
Log.outError(LogFilter.Network, $"Could not resolve LoginREST.ExternalAddress {configuredAddress}"); Log.outError(LogFilter.Network, $"Could not resolve LoginREST.ExternalAddress {_hostnames[0]}");
return; return;
} }
_externalEndpoint = new IPEndPoint(address, port); _addresses[0] = externalAddress.AddressList[0];
_externalHostname = $"{configuredAddress}:{port}";
configuredAddress = ConfigMgr.GetDefaultValue("LoginREST.LocalAddress", "127.0.0.1"); _hostnames[1] = ConfigMgr.GetDefaultValue("LoginREST.LocalAddress", "127.0.0.1");
if (!IPAddress.TryParse(configuredAddress, out address)) var localAddress = Dns.GetHostEntry($"{_hostnames[1]}:{_port}", System.Net.Sockets.AddressFamily.InterNetwork);
if (localAddress == null || localAddress.AddressList.Empty())
{ {
Log.outError(LogFilter.Network, $"Could not resolve LoginREST.ExternalAddress {configuredAddress}"); Log.outError(LogFilter.Network, $"Could not resolve LoginREST.ExternalAddress {_hostnames[1]}");
return; return;
} }
_localEndpoint = new IPEndPoint(address, port); _addresses[1] = localAddress.AddressList[0];
_localHostname = $"{configuredAddress}:{port}";
// set up form inputs // set up form inputs
formInputs.Type = "LOGIN_FORM"; formInputs.Type = "LOGIN_FORM";
@@ -118,22 +117,16 @@ namespace BNetServer
return serviceHandlers.LookupByKey((serviceHash, methodId)); return serviceHandlers.LookupByKey((serviceHash, methodId));
} }
public IPEndPoint GetEndpointForClient(IPAddress address)
{
if (IPAddress.IsLoopback(address))
return _localEndpoint;
return _externalEndpoint;
}
public string GetHostnameForClient(IPEndPoint address) public string GetHostnameForClient(IPEndPoint address)
{ {
if (IPAddress.IsLoopback(address.Address)) if (IPAddress.IsLoopback(address.Address))
return _localHostname; return _hostnames[0];
return _externalHostname; return _hostnames[1];
} }
public int GetPort() { return _port; }
public FormInputs GetFormInput() public FormInputs GetFormInput()
{ {
return formInputs; return formInputs;
Source/BNetServer/Networking/Services/Authentication.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace BNetServer.Networking
ChallengeExternalRequest externalChallenge = new(); ChallengeExternalRequest externalChallenge = new();
externalChallenge.PayloadType = "web_auth_url"; externalChallenge.PayloadType = "web_auth_url";
externalChallenge.Payload = ByteString.CopyFromUtf8($"https://{hostname}/bnetserver/login/"); externalChallenge.Payload = ByteString.CopyFromUtf8($"https://{Global.LoginServiceMgr.GetHostnameForClient(GetRemoteIpEndPoint())}:{Global.LoginServiceMgr.GetPort()}/bnetserver/login/");
SendRequest((uint)OriginalHash.ChallengeListener, 3, externalChallenge); SendRequest((uint)OriginalHash.ChallengeListener, 3, externalChallenge);
return BattlenetRpcErrorCode.Ok; return BattlenetRpcErrorCode.Ok;