Clean Trash

src/DiIiS-NA/REST/Http/Http.cs

@@ -41,76 +41,17 @@ namespace DiIiS_NA.REST.Http
 
     public class HttpHelper
     {
-        public static byte[] CreateResponse2(HttpCode httpCode, bool closeConnection = false)
-        {
-            var sb = new StringBuilder();
-
-            //Blizzless Project 2022 
-using (var sw = new StringWriter(sb))
-            {
-                sw.WriteLine($"HTTP/1.1 {(int)httpCode} {httpCode}");
-
-                sw.WriteLine($"Date: {DateTime.Now.ToUniversalTime():r}");
-                sw.WriteLine("Server: Apache");
-                //sw.WriteLine("Retry-After: 600");
-                sw.WriteLine($"Content-Length: 0");
-                //sw.WriteLine("Vary: Accept-Encoding");
-                sw.WriteLine("[Request URI: https://cdn.discordapp.com/attachments/826902540460490753/830193471871647804/bgs-key-fingerprint");
-                if (closeConnection)
-                    sw.WriteLine("Connection: close");
-
-                sw.WriteLine("Content-Type: text/plain;charset=UTF-8");
-                //sw.WriteLine("[Request URI: http://eu.depot.battle.net:1119/adff75d57de90974f8e383c2a54ebd3d83838899d938fe33369a4e305f224fa9.bpk]");
-                //System.IO.File.WriteAllLines(@"C:\WriteLines.txt", lines);
-
-                //sw.WriteLine(System.IO.File.ReadAllText("bgs-key-fingerprint"));
-            }
-
-            return Encoding.UTF8.GetBytes(sb.ToString());
-        }
-
-        public static byte[] CreateResponse1(HttpCode httpCode, byte[] content, bool closeConnection = false)
-        {
-            var sb = new StringBuilder();
-
-            //Blizzless Project 2022 
-using (var sw = new StringWriter(sb))
-            {
-                sw.WriteLine($"HTTP/1.1 {(int)httpCode} {httpCode}");
-
-                //sw.WriteLine($"Date: {DateTime.Now.ToUniversalTime():r}");
-                sw.WriteLine("Server: Apache/2.2.15 (CentOS)");
-                //sw.WriteLine("Retry-After: 600");
-                sw.WriteLine($"Content-Length: {content.Length}");
-                //sw.WriteLine("Vary: Accept-Encoding");
-
-                if (closeConnection)
-                    sw.WriteLine("Connection: close");
-
-                sw.WriteLine("Content-Type: text/plain;charset=UTF-8");
-                //sw.WriteLine("[Request URI: http://eu.depot.battle.net:1119/adff75d57de90974f8e383c2a54ebd3d83838899d938fe33369a4e305f224fa9.bpk]");
-
-                sw.WriteLine(content);
-            }
-
-            return Encoding.UTF8.GetBytes(sb.ToString() + content);
-        }
 
         public static byte[] CreateResponseAlt(HttpCode httpCode, string content, bool closeConnection = false)
         {
             var sb = new StringBuilder();
 
             //Blizzless Project 2022 
-using (var sw = new StringWriter(sb))
+            using (var sw = new StringWriter(sb))
             {
-                //sw.WriteLine($"HTTP/1.1 404 Not Found");
-                //sw.WriteLine("Connection: close");
-                //*
                 sw.WriteLine($"HTTP/1.1 {(int)httpCode} {httpCode}");
                 sw.WriteLine("Connection: close"); ;
                 sw.WriteLine($"Content-Length: 0\r\n");
-                //*/
-                //sw.WriteLine();
             }
 
             return Encoding.UTF8.GetBytes(sb.ToString());
@@ -121,16 +62,10 @@ using (var sw = new StringWriter(sb))
             var sb = new StringBuilder();
 
             //Blizzless Project 2022 
-using (var sw = new StringWriter(sb))
+            using (var sw = new StringWriter(sb))
             {
                 sw.WriteLine($"HTTP/1.1 {(int)httpCode} {httpCode}");
-
-                //sw.WriteLine($"Date: {DateTime.Now.ToUniversalTime():r}");
-                //sw.WriteLine("Server: Arctium-Emulation");
-                //sw.WriteLine("Retry-After: 600");
                 sw.WriteLine($"Content-Length: {content.Length}");
-                //sw.WriteLine("Vary: Accept-Encoding");
-
                 if (closeConnection)
                     sw.WriteLine("Connection: close");
 
@@ -149,7 +84,7 @@ using (var sw = new StringWriter(sb))
             var header = new HttpHeader();
 
             //Blizzless Project 2022 
-using (var sr = new StreamReader(new MemoryStream(data, 0, length)))
+            using (var sr = new StreamReader(new MemoryStream(data, 0, length)))
             {
                 var info = sr.ReadLine().Split(new string[] { " " }, StringSplitOptions.RemoveEmptyEntries);
 

src/DiIiS-NA/REST/Manager/Cypher.cs

@@ -19,10 +19,7 @@ namespace DiIiS_NA.REST.Manager
         {
             if (!value)
             {
-               // if (!message.IsEmpty())
+                 throw new Exception(memberName);
-                //    Log.outFatal(LogFilter.Server, message);
-
-                throw new Exception(memberName);
             }
         }
     }

src/DiIiS-NA/REST/Manager/SessionManager.cs

@@ -21,7 +21,6 @@ namespace DiIiS_NA.REST.Manager
             int _port = Config.Instance.PORT;
             if (_port < 0 || _port > 0xFFFF)
             {
-                //Log.outError(LogFilter.Network, "Specified login service port ({0}) out of allowed range (1-65535), defaulting to 8081", _port);
                 _port = 8081;
             }
 
@@ -29,7 +28,6 @@ namespace DiIiS_NA.REST.Manager
             IPAddress address;
             if (!IPAddress.TryParse(configuredAddress, out address))
             {
-                //Log.outError(LogFilter.Network, "Could not resolve LoginREST.ExternalAddress {0}", configuredAddress);
                 return false;
             }
             _externalAddress = new IPEndPoint(address, _port);
@@ -37,13 +35,11 @@ namespace DiIiS_NA.REST.Manager
             configuredAddress = Config.Instance.IP;
             if (!IPAddress.TryParse(configuredAddress, out address))
             {
-                //Log.outError(LogFilter.Network, "Could not resolve LoginREST.ExternalAddress {0}", configuredAddress);
                 return false;
             }
 
             _localAddress = new IPEndPoint(address, _port);
 
-            // set up form inputs 
             _formInputs.Type = "LOGIN_FORM";
 
             var input = new FormInput();

src/DiIiS-NA/REST/Manager/SocketManager.cs

@@ -16,7 +16,6 @@ namespace DiIiS_NA.REST.Manager
             Acceptor = new AsyncAcceptor();
             if (!Acceptor.Start(bindIp, port))
             {
-                //Log.outError(LogFilter.Network, "StartNetwork failed to Start AsyncAcceptor");
                 return false;
             }
 
@@ -67,7 +66,7 @@ namespace DiIiS_NA.REST.Manager
             }
             catch (Exception err)
             {
-                //Log.outException(err);
+      
             }
         }
 

src/DiIiS-NA/REST/Networking/AsyncAcceptor.cs

@@ -24,7 +24,6 @@ namespace DiIiS_NA.REST.Networking
             IPAddress bindIP;
             if (!IPAddress.TryParse(ip, out bindIP))
             {
-                //Log.outError(LogFilter.Network, "Server can't be started: Invalid IP-Address ({0})", ip);
                 return false;
             }
 
@@ -35,7 +34,6 @@ namespace DiIiS_NA.REST.Networking
             }
             catch (SocketException ex)
             {
-                //Log.outException(ex);
                 return false;
             }
 

src/DiIiS-NA/REST/Networking/NetworkThread.cs

@@ -53,9 +53,6 @@ namespace DiIiS_NA.REST.Networking
 
         void AddNewSockets()
         {
-            //if (_newSockets.Empty())
-            //    return;
-
             foreach (var socket in _newSockets.ToArray())
             {
                 if (!socket.IsOpen())
@@ -73,14 +70,13 @@ namespace DiIiS_NA.REST.Networking
 
         void Run()
         {
-            //Log.outDebug(LogFilter.Network, "Network Thread Starting");
+       
-
             int sleepTime = 10;
             while (!_stopped)
             {
                 Thread.Sleep(sleepTime);
 
-                uint tickStart = 0;//Time.GetMSTime();
+                uint tickStart = 0;
 
                 AddNewSockets();
 
@@ -99,11 +95,9 @@ namespace DiIiS_NA.REST.Networking
                     }
                 }
 
-                uint diff = 0;//Time.GetMSTimeDiffToNow(tickStart);
+                uint diff = 0;
                 sleepTime = (int)(diff > 10 ? 0 : 10 - diff);
             }
-
-            //Log.outDebug(LogFilter.Misc, "Network Thread exits");
             _newSockets.Clear();
             _Sockets.Clear();
         }

src/DiIiS-NA/REST/RestSession.cs

@@ -32,148 +32,7 @@ using DiIiS_NA.GameServer.MessageSystem;
 
 namespace DiIiS_NA.REST
 {
-    public enum LoginStatements
+    public class RestSession : SocketBase
-    {
-        SEL_REALMLIST,
-        DEL_EXPIRED_IP_BANS,
-        UPD_EXPIRED_ACCOUNT_BANS,
-        SEL_IP_INFO,
-        INS_IP_AUTO_BANNED,
-        SEL_ACCOUNT_BANNED_ALL,
-        SEL_ACCOUNT_BANNED_BY_USERNAME,
-        DEL_ACCOUNT_BANNED,
-        UPD_ACCOUNT_INFO_CONTINUED_SESSION,
-        SEL_ACCOUNT_INFO_CONTINUED_SESSION,
-        UPD_VS,
-        SEL_ACCOUNT_ID_BY_NAME,
-        SEL_ACCOUNT_LIST_BY_NAME,
-        SEL_ACCOUNT_INFO_BY_NAME,
-        SEL_ACCOUNT_LIST_BY_EMAIL,
-        SEL_ACCOUNT_BY_IP,
-        INS_IP_BANNED,
-        DEL_IP_NOT_BANNED,
-        SEL_IP_BANNED_ALL,
-        SEL_IP_BANNED_BY_IP,
-        SEL_ACCOUNT_BY_ID,
-        INS_ACCOUNT_BANNED,
-        UPD_ACCOUNT_NOT_BANNED,
-        DEL_REALM_CHARACTERS_BY_REALM,
-        DEL_REALM_CHARACTERS,
-        INS_REALM_CHARACTERS,
-        SEL_SUM_REALM_CHARACTERS,
-        INS_ACCOUNT,
-        INS_REALM_CHARACTERS_INIT,
-        UPD_EXPANSION,
-        UPD_ACCOUNT_LOCK,
-        UPD_ACCOUNT_LOCK_COUNTRY,
-        INS_LOG,
-        UPD_USERNAME,
-        UPD_PASSWORD,
-        UPD_EMAIL,
-        UPD_REG_EMAIL,
-        UPD_MUTE_TIME,
-        UPD_MUTE_TIME_LOGIN,
-        UPD_LAST_IP,
-        UPD_LAST_ATTEMPT_IP,
-        UPD_ACCOUNT_ONLINE,
-        UPD_UPTIME_PLAYERS,
-        DEL_OLD_LOGS,
-        DEL_ACCOUNT_ACCESS,
-        DEL_ACCOUNT_ACCESS_BY_REALM,
-        INS_ACCOUNT_ACCESS,
-        GET_ACCOUNT_ID_BY_USERNAME,
-        GET_ACCOUNT_ACCESS_GMLEVEL,
-        GET_GMLEVEL_BY_REALMID,
-        GET_USERNAME_BY_ID,
-        SEL_CHECK_PASSWORD,
-        SEL_CHECK_PASSWORD_BY_NAME,
-        SEL_PINFO,
-        SEL_PINFO_BANS,
-        SEL_GM_ACCOUNTS,
-        SEL_ACCOUNT_INFO,
-        SEL_ACCOUNT_ACCESS_GMLEVEL_TEST,
-        SEL_ACCOUNT_ACCESS,
-        SEL_ACCOUNT_RECRUITER,
-        SEL_BANS,
-        SEL_ACCOUNT_WHOIS,
-        SEL_REALMLIST_SECURITY_LEVEL,
-        DEL_ACCOUNT,
-        SEL_IP2NATION_COUNTRY,
-        SEL_AUTOBROADCAST,
-        SEL_LAST_ATTEMPT_IP,
-        SEL_LAST_IP,
-        GET_EMAIL_BY_ID,
-        INS_ALDL_IP_LOGGING,
-        INS_FACL_IP_LOGGING,
-        INS_CHAR_IP_LOGGING,
-        INS_FALP_IP_LOGGING,
-
-        SEL_ACCOUNT_ACCESS_BY_ID,
-        SEL_RBAC_ACCOUNT_PERMISSIONS,
-        INS_RBAC_ACCOUNT_PERMISSION,
-        DEL_RBAC_ACCOUNT_PERMISSION,
-
-        INS_ACCOUNT_MUTE,
-        SEL_ACCOUNT_MUTE_INFO,
-        DEL_ACCOUNT_MUTED,
-
-        SEL_BNET_AUTHENTICATION,
-        UPD_BNET_AUTHENTICATION,
-        SEL_BNET_ACCOUNT_INFO,
-        UPD_BNET_LAST_LOGIN_INFO,
-        UPD_BNET_GAME_ACCOUNT_LOGIN_INFO,
-        SEL_BNET_CHARACTER_COUNTS_BY_ACCOUNT_ID,
-        SEL_BNET_CHARACTER_COUNTS_BY_BNET_ID,
-        SEL_BNET_LAST_PLAYER_CHARACTERS,
-        DEL_BNET_LAST_PLAYER_CHARACTERS,
-        INS_BNET_LAST_PLAYER_CHARACTERS,
-        INS_BNET_ACCOUNT,
-        SEL_BNET_ACCOUNT_EMAIL_BY_ID,
-        SEL_BNET_ACCOUNT_ID_BY_EMAIL,
-        UPD_BNET_PASSWORD,
-        SEL_BNET_ACCOUNT_SALT_BY_ID,
-        SEL_BNET_CHECK_PASSWORD,
-        UPD_BNET_ACCOUNT_LOCK,
-        UPD_BNET_ACCOUNT_LOCK_CONTRY,
-        SEL_BNET_ACCOUNT_ID_BY_GAME_ACCOUNT,
-        UPD_BNET_GAME_ACCOUNT_LINK,
-        SEL_BNET_MAX_ACCOUNT_INDEX,
-        SEL_BNET_GAME_ACCOUNT_LIST,
-
-        UPD_BNET_FAILED_LOGINS,
-        INS_BNET_ACCOUNT_AUTO_BANNED,
-        DEL_BNET_EXPIRED_ACCOUNT_BANNED,
-        UPD_BNET_RESET_FAILED_LOGINS,
-
-        SEL_LAST_CHAR_UNDELETE,
-        UPD_LAST_CHAR_UNDELETE,
-
-        SEL_ACCOUNT_TOYS,
-        REP_ACCOUNT_TOYS,
-
-        SEL_BATTLE_PETS,
-        INS_BATTLE_PETS,
-        DEL_BATTLE_PETS,
-        UPD_BATTLE_PETS,
-        SEL_BATTLE_PET_SLOTS,
-        INS_BATTLE_PET_SLOTS,
-        DEL_BATTLE_PET_SLOTS,
-
-        SEL_ACCOUNT_HEIRLOOMS,
-        REP_ACCOUNT_HEIRLOOMS,
-
-        SEL_ACCOUNT_MOUNTS,
-        REP_ACCOUNT_MOUNTS,
-
-        SEL_BNET_ITEM_APPEARANCES,
-        INS_BNET_ITEM_APPEARANCES,
-        SEL_BNET_ITEM_FAVORITE_APPEARANCES,
-        INS_BNET_ITEM_FAVORITE_APPEARANCE,
-        DEL_BNET_ITEM_FAVORITE_APPEARANCE,
-
-        MAX_LOGINDATABASE_STATEMENTS
-    }
-    public class RestSession : SocketBase//SSLSocket
     {
         public static bool ToGet = false;
         public static int b = 0;
@@ -196,19 +55,7 @@ namespace DiIiS_NA.REST
             {
                 if (httpRequest.Path == "200")
                 {
-                    //HandleLoginRequest(httpRequest);
-                    //SendResponse(HttpCode.OK, Global.Global.SessionMgr.GetFormInput());
-                }
-                else if (httpRequest.Path == "/fakeclient/")
-                {
-                    switch (httpRequest.Method)
-                    {
-                        case "GET":
-                        default:
-                            SendResponseAlt(HttpCode.OK);
-                            break;
 
-                    }
                 }
                 else if (httpRequest.Path == "/client/alert?targetRegion=ruRU")
                 {
@@ -230,28 +77,6 @@ namespace DiIiS_NA.REST
                             break;
                     }
                 }
-                else if (httpRequest.Path == "/shop" || httpRequest.Path == "/D3/ruRU/client/alert?targetRegion=US" || httpRequest.Path == "/D3/ruRU/client/alert?targetRegion=EU")
-                {
-                    switch (httpRequest.Method)
-                    {
-                        case "GET":
-                        default:
-                            Shop(httpRequest);
-                            break;
-                    }
-                }
-                else if (httpRequest.Path == "/key" || httpRequest.Path == "/key/" || httpRequest.Path == "/bgs-key-fingerprint"
-                    || httpRequest.Path == "/Bnet/zxx/client/bgs-key-fingerprint")
-                {
-                    switch (httpRequest.Method)
-                    {
-                        case "GET":
-                        default:
-                            Logger.Info("...return bgs-key-fingerprint.");
-                            Key(httpRequest);
-                            break;
-                    }
-                }
                 else
                 {
                     switch (httpRequest.Method)
@@ -271,15 +96,14 @@ namespace DiIiS_NA.REST
 
         public void HandleConnectRequest(HttpHeader request)
         {
-            // Login form is the same for all clients...
             SendResponse(HttpCode.OK, Global.Global.SessionMgr.GetFormInput());
         }
 
         public void HandleInfoRequest(HttpHeader request)
         {
-            SendResponseHtml(HttpCode.OK, "     Welcome to BlizzLess.Net" + //System.Environment.NewLine +
+            SendResponseHtml(HttpCode.OK, "Welcome to BlizzLess.Net" + 
-                                          "\nBuild " + Program.Build +// + System.Environment.NewLine +
+                                          "\nBuild " + Program.Build +
-                                          "\nSupport: 2.7.1.77744, PTR: 2.7.2.78988");
+                                          "\nSupport: 2.7.4");
         }
 
         public static byte[] StringToByteArray(string hex)
@@ -290,69 +114,20 @@ namespace DiIiS_NA.REST
                              .ToArray();
         }
 
-
-        public void Key(HttpHeader request)
-        {
-            //SendBytes(StringToByteArray("485454502f312e3120323030204f4b0d0a5365727665723a204170616368652f322e322e3135202843656e744f53290d0a436f6e74656e742d547970653a20746578742f706c61696e3b20636861727365743d5554462d380d0a582d5661726e6973683a203434393539303836380d0a5669613a20312e31207661726e6973682d76340d0a4163636570742d52616e6765733a2062797465730d0a582d4c4c49443a2032346361623335333637316439643831333564356163346536346561363766640d0a4167653a2032343434390d0a446174653a205361742c2031302041707220323032312030313a31333a343320474d540d0a4c6173742d4d6f6469666965643a205475652c2030322046656220323032312030313a35333a343020474d540d0a436f6e74656e742d4c656e6774683a2033323736310d0a436f6e6e656374696f6e3a206b6565702d616c6976650d0a0d0a"));
-            //SendResponseAlt(HttpCode.OK);
-            //SendResponseAlt(HttpCode.OK);
-            //SendResponseHtmlAlt(HttpCode.OK, System.IO.File.ReadAllText("bgs-key-fingerprint"));
-            SendResponseHtmlAlt(HttpCode.OK, "");
-        }
-
-
-        public void Shop(HttpHeader request)
-        {
-
-            SendResponseHtml(HttpCode.OK, "     Welcome to BlizzLess.Net" + //System.Environment.NewLine +
-                                          "\nBuild " + Program.Build +// + System.Environment.NewLine +
-                                          "\nSupport: 2.7.1.77744, PTR: 2.7.2.78988");
-        }
-
         void SendResponse<T>(HttpCode code, T response)
         {
             AsyncWrite(HttpHelper.CreateResponse(code, JSON.Json.CreateString(response)));
         }
 
-        void SendBytes(byte[] array)
-        {
-            AsyncWrite(array);
-        }
-
-        void SendResponseAlt(HttpCode code)
-        {
-            AsyncWrite(HttpHelper.CreateResponse2(code));
-        }
-
-        void SendResponseByte(HttpCode code, byte[] array)
-        {
-            AsyncWrite(HttpHelper.CreateResponse1(code, array));
-        }
-
         void SendResponseHtml(HttpCode code, string response)
         {
             AsyncWrite(HttpHelper.CreateResponse(code, response));
         }
 
-        void SendResponseHtmlAlt(HttpCode code, string response)
-        {
-            AsyncWrite(HttpHelper.CreateResponseAlt(code, response));
-            //CloseSocket();
-            
-        }
-
         public override void Start()
         {
             AsyncRead();
         }
-
-        string CalculateShaPassHash(string name, string password)
-        {
-            SHA256 sha256 = SHA256.Create();
-            var i = sha256.ComputeHash(Encoding.UTF8.GetBytes(name));
-            return sha256.ComputeHash(Encoding.UTF8.GetBytes(i.ToHexString() + ":" + password)).ToHexString();
-        }
-
         public void HandleLoginRequest(HttpHeader request)
         {
             LogonData loginForm = Json.CreateObject<LogonData>(request.Content);
@@ -382,10 +157,6 @@ namespace DiIiS_NA.REST
                 }
             }
 
-            //PreparedStatement stmt = DB.Login.GetPreparedStatement(LoginStatements.SEL_BNET_AUTHENTICATION);
-            //stmt.AddValue(0, login);
-
-            //SQLResult result = DB.Login.Query(stmt);
             bool result = false;
             
             if(AccountManager.GetAccountBySaltTicket(password + " asa " + login.ToLower()) != null)
@@ -394,84 +165,8 @@ namespace DiIiS_NA.REST
                 result = true;
             }
 
-            //result = true;
+            if (result)
-            if (result)// || loginForm.Inputs.Count == 0)
             {
-                #region
-                /*
-                uint accountId = result.Read<uint>(0);
-                string pass_hash = result.Read<string>(1);
-                uint failedLogins = result.Read<uint>(2);
-                string loginTicket = result.Read<string>(3);
-                uint loginTicketExpiry = result.Read<uint>(4);
-                bool isBanned = result.Read<ulong>(5) != 0;
-
-                if (CalculateShaPassHash(login, password) == pass_hash)
-                {
-                    if (loginTicket.IsEmpty() || loginTicketExpiry < Time.UnixTime)
-                    {
-                        byte[] ticket = new byte[0].GenerateRandomKey(20);
-                        loginTicket = "TC-" + ticket.ToHexString();
-                    }
-
-                    stmt = DB.Login.GetPreparedStatement(LoginStatements.UPD_BNET_AUTHENTICATION);
-                    stmt.AddValue(0, loginTicket);
-                    stmt.AddValue(1, Time.UnixTime + 3600);
-                    stmt.AddValue(2, accountId);
-
-                    DB.Login.Execute(stmt);
-                    loginResult.LoginTicket = loginTicket;
-                }
-                else if (!isBanned)
-                {
-                    uint maxWrongPassword = ConfigMgr.GetDefaultValue("WrongPass.MaxCount", 0u);
-
-                    if (ConfigMgr.GetDefaultValue("WrongPass.Logging", false))
-                        Log.outDebug(LogFilter.Network, "[{0}, Account {1}, Id {2}] Attempted to connect with wrong password!", request.Host, login, accountId);
-
-                    if (maxWrongPassword != 0)
-                    {
-                        SQLTransaction trans = new SQLTransaction();
-                        stmt = DB.Login.GetPreparedStatement(LoginStatements.UPD_BNET_FAILED_LOGINS);
-                        stmt.AddValue(0, accountId);
-                        trans.Append(stmt);
-
-                        ++failedLogins;
-
-                        Log.outDebug(LogFilter.Network, "MaxWrongPass : {0}, failed_login : {1}", maxWrongPassword, accountId);
-
-                        if (failedLogins >= maxWrongPassword)
-                        {
-                            BanMode banType = ConfigMgr.GetDefaultValue("WrongPass.BanType", BanMode.Ip);
-                            int banTime = ConfigMgr.GetDefaultValue("WrongPass.BanTime", 600);
-
-                            if (banType == BanMode.Account)
-                            {
-                                stmt = DB.Login.GetPreparedStatement(LoginStatements.INS_BNET_ACCOUNT_AUTO_BANNED);
-                                stmt.AddValue(0, accountId);
-                            }
-                            else
-                            {
-                                stmt = DB.Login.GetPreparedStatement(LoginStatements.INS_IP_AUTO_BANNED);
-                                stmt.AddValue(0, request.Host);
-                            }
-
-                            stmt.AddValue(1, banTime);
-                            trans.Append(stmt);
-
-                            stmt = DB.Login.GetPreparedStatement(LoginStatements.UPD_BNET_RESET_FAILED_LOGINS);
-                            stmt.AddValue(0, accountId);
-                            trans.Append(stmt);
-                        }
-
-                        DB.Login.CommitTransaction(trans);
-                    }
-                }
-                */
-                #endregion
-
-                //TODO: Передача уникального тикета
-
                 loginResult.AuthenticationState = "DONE";
                 SendResponse(HttpCode.OK, loginResult);
                 Logger.Warn("Аутентификация завершена: Логин - {0}. Cоединение с REST разорвано.", login);
@@ -484,8 +179,6 @@ namespace DiIiS_NA.REST
                 SendResponse(HttpCode.BadRequest, loginResult);
                 Logger.Error("Аутентификация неудалась: Логин - {0}. Cоединение с REST разорвано.", login);
             }
-
-            //Аутентификация завершена 
             CloseSocket();
             
         }

src/DiIiS-NA/REST/SSLSocket.cs

@@ -1,170 +0,0 @@
-//Blizzless Project 2022
-//Blizzless Project 2022 
-using DiIiS_NA.Core.Logging;
-//Blizzless Project 2022 
-using System;
-//Blizzless Project 2022 
-using System.Net;
-//Blizzless Project 2022 
-using System.Net.Security;
-//Blizzless Project 2022 
-using System.Net.Sockets;
-//Blizzless Project 2022 
-using System.Security.Cryptography.X509Certificates;
-
-namespace DiIiS_NA.REST
-{
-    public abstract class SSLSocket : ISocket
-    {
-        private static readonly Logger Logger = LogManager.CreateLogger();
-        protected SSLSocket(Socket socket)
-        {
-            _socket = socket;
-            _remoteAddress = ((IPEndPoint)_socket.RemoteEndPoint).Address;
-            _remotePort = (ushort)((IPEndPoint)_socket.RemoteEndPoint).Port;
-            _receiveBuffer = new byte[ushort.MaxValue];
-
-            _stream = new SslStream(new NetworkStream(socket), false);
-        }
-
-        public abstract void Start();
-
-        public virtual bool Update()
-        {
-            return IsOpen();
-        }
-
-        public IPAddress GetRemoteIpAddress()
-        {
-            return _remoteAddress;
-        }
-
-        public ushort GetRemotePort()
-        {
-            return _remotePort;
-        }
-
-        public void AsyncRead()
-        {
-            if (!IsOpen())
-                return;
-
-            try
-            {
-                _stream.BeginRead(_receiveBuffer, 0, _receiveBuffer.Length, ReadHandlerInternal, _stream);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException(ex, "");
-            }
-        }
-
-        void ReadHandlerInternal(IAsyncResult result)
-        {
-            int bytes = 0;
-            try
-            {
-                bytes = _stream.EndRead(result);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException(ex, "");
-            }
-
-            ReadHandler(bytes);
-        }
-
-        public abstract void ReadHandler(int transferredBytes);
-
-        public void AsyncHandshake(X509Certificate2 certificate)
-        {
-            
-            try
-            {
-                if(certificate == null)
-                    certificate = new X509Certificate2("bnetserver.p12", "123");
-
-                _stream.BeginAuthenticateAsServer(certificate, false, true, OnTLSAuthentication, this._stream);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException(ex, "");
-                CloseSocket();
-                return;
-            }
-            
-        }
-
-        void OnTLSAuthentication(IAsyncResult result)
-        {
-            try
-            {
-                _stream.EndAuthenticateAsServer(result);
-                if (_stream.IsEncrypted)
-                {
-                    Logger.Info("Connection Established.");
-                    AsyncRead();
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.FatalException(e, "OnTLSAuthentication() exception: ");
-            }
-        }
-
-        public void AsyncWrite(byte[] data)
-        {
-            if (!IsOpen())
-                return;
-
-            try
-            {
-                _stream.Write(data, 0, data.Length);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException(ex, "");
-            }
-        }
-
-        public void CloseSocket()
-        {
-            try
-            {
-                _closed = true;
-                _socket.Shutdown(SocketShutdown.Both);
-                _socket.Close();
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException(ex, GetRemoteIpAddress().ToString());
-                //Log.outDebug(LogFilter.Network, "WorldSocket.CloseSocket: {0} errored when shutting down socket: {1}", GetRemoteIpAddress().ToString(), ex.Message);
-            }
-
-            OnClose();
-        }
-
-        public void SetNoDelay(bool enable)
-        {
-            _socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, enable);
-        }
-
-        public virtual void OnClose() { }
-
-        public bool IsOpen() { return !_closed; }
-
-        public byte[] GetReceiveBuffer()
-        {
-            return _receiveBuffer;
-        }
-
-        Socket _socket;
-        internal SslStream _stream;
-        byte[] _receiveBuffer;
-
-        volatile bool _closed;
-
-        IPAddress _remoteAddress;
-        ushort _remotePort;
-    }
-}

src/DiIiS-NA/REST/SocketBase.cs

@@ -51,7 +51,7 @@ namespace DiIiS_NA.REST
             try
             {
                 //Blizzless Project 2022 
-using (var socketEventargs = new SocketAsyncEventArgs())
+                using (var socketEventargs = new SocketAsyncEventArgs())
                 {
                     socketEventargs.SetBuffer(_receiveBuffer, 0, _receiveBuffer.Length);
                     socketEventargs.Completed += (sender, args) => ReadHandlerInternal(args);
@@ -77,7 +77,7 @@ using (var socketEventargs = new SocketAsyncEventArgs())
             try
             {
                 //Blizzless Project 2022 
-using (var socketEventargs = new SocketAsyncEventArgs())
+                using (var socketEventargs = new SocketAsyncEventArgs())
                 {
                     socketEventargs.SetBuffer(_receiveBuffer, 0, _receiveBuffer.Length);
                     socketEventargs.Completed += (sender, args) => callback(args);
@@ -124,7 +124,7 @@ using (var socketEventargs = new SocketAsyncEventArgs())
             if (!IsOpen())
                 return;
             //Blizzless Project 2022 
-using (var socketEventargs = new SocketAsyncEventArgs())
+            using (var socketEventargs = new SocketAsyncEventArgs())
             {
                 socketEventargs.SetBuffer(data, 0, data.Length);
                 socketEventargs.Completed += WriteHandlerInternal;
@@ -154,7 +154,6 @@ using (var socketEventargs = new SocketAsyncEventArgs())
             catch (Exception ex)
             {
                 Logger.ErrorException(ex, GetRemoteIpAddress().ToString());
-                // Log.outDebug(LogFilter.Network, "WorldSocket.CloseSocket: {0} errored when shutting down socket: {1}", GetRemoteIpAddress().ToString(), ex.Message);
             }
 
             OnClose();