Core/Battlegrounds: Move to scripts And a lot of misc commits i couldn't recover.

Port From (https://github.com/TrinityCore/TrinityCore/commit/d0d5d309bb5877dc2fcb27f6cb123707a31ec1e8)
This commit is contained in:
Hondacrx
2024-08-04 15:18:22 -04:00
parent bca02a24b0
commit e9b21a91be
139 changed files with 8322 additions and 8700 deletions
@@ -64,6 +64,11 @@ namespace BNetServer
{
return certificate;
}
public bool UsesDevWildcardCertificate()
{
return certificate.Subject.Contains("*.*");
}
}
public class BnetServiceHandler
@@ -57,7 +57,7 @@ namespace BNetServer.Networking
ChallengeExternalRequest externalChallenge = new();
externalChallenge.PayloadType = "web_auth_url";
externalChallenge.Payload = ByteString.CopyFromUtf8($"https://{Global.LoginService.GetHostnameForClient(GetRemoteIpAddress())}:{Global.LoginService.GetPort()}/bnetserver/login/");
externalChallenge.Payload = ByteString.CopyFromUtf8($"http{(!Global.LoginServiceMgr.UsesDevWildcardCertificate() ? "s" : "")}://{Global.LoginService.GetHostnameForClient(GetRemoteIpAddress())}:{Global.LoginService.GetPort()}/bnetserver/login/");
SendRequest((uint)OriginalHash.ChallengeListener, 3, externalChallenge);
return BattlenetRpcErrorCode.Ok;
+3 -3
View File
@@ -16,7 +16,7 @@ using System.Threading.Tasks;
namespace BNetServer.Networking
{
public partial class Session : SSLSocket
public partial class Session : SocketBase
{
AccountInfo accountInfo;
GameAccountInfo gameAccountInfo;
@@ -34,7 +34,7 @@ namespace BNetServer.Networking
AsyncCallbackProcessor<QueryCallback> queryProcessor;
Dictionary<uint, Action<CodedInputStream>> responseCallbacks;
public Session(Socket socket) : base(socket)
public Session(Socket socket) : base(socket, true)
{
clientSecret = new byte[32];
queryProcessor = new AsyncCallbackProcessor<QueryCallback>();
@@ -294,4 +294,4 @@ namespace BNetServer.Networking
public ulong CharacterGUID;
public uint LastPlayedTime;
}
}
}
+6 -3
View File
@@ -16,11 +16,11 @@ namespace BNetServer.REST
public BnetSRP6Base Srp;
}
public class LoginHttpSession : SslSocket<LoginHttpSession>
public class LoginHttpSession : BaseHttpSocket
{
public static string SESSION_ID_COOKIE = "JSESSIONID";
public LoginHttpSession(Socket socket) : base(socket) { }
public LoginHttpSession(Socket socket) : base(socket, !Global.LoginServiceMgr.UsesDevWildcardCertificate()) { }
public override void Start()
{
@@ -56,7 +56,10 @@ namespace BNetServer.REST
}
}
await AsyncHandshake(Global.LoginServiceMgr.GetCertificate());
if (!Global.LoginServiceMgr.UsesDevWildcardCertificate())
await AsyncHandshake(Global.LoginServiceMgr.GetCertificate());
else
await AsyncRead();
}
public override RequestHandlerResult RequestHandler(RequestContext context)
+1 -1
View File
@@ -132,7 +132,7 @@ namespace BNetServer.REST
RequestHandlerResult HandleGetForm(LoginHttpSession session, RequestContext context)
{
FormInputs form = _formInputs;
form.SrpUrl = $"https://{GetHostnameForClient(session.GetRemoteIpAddress())}:{_port}/bnetserver/login/srp/";
form.SrpUrl = $"http{(!Global.LoginServiceMgr.UsesDevWildcardCertificate() ? "s" : "")}://{GetHostnameForClient(session.GetRemoteIpAddress())}:{_port}/bnetserver/login/srp/";
context.response.ContentType = "application/json;charset=utf-8";
context.response.Content = JsonSerializer.Serialize(form);