Changeset 402 for binary-improvements2/WebServer/src/UrlHandlers

Timestamp:

Jan 27, 2023, 7:28:00 PM (22 months ago)

Author:

alloc

Message:

• Major refactoring
• Using Utf8Json for (de)serialization
• Moving APIs to REST
• Removing dependencies from WebServer and MapRenderer to ServerFixes

Location:

binary-improvements2/WebServer/src/UrlHandlers

Files:

• ApiHandler.cs (modified) (2 diffs)
• ItemIconHandler.cs (modified) (9 diffs)
• RewriteHandler.cs (modified) (1 diff)
• SessionHandler.cs (modified) (4 diffs)
• SseHandler.cs (modified) (3 diffs)
• StaticHandler.cs (modified) (4 diffs)
• UserStatusHandler.cs (modified) (2 diffs)

binary-improvements2/WebServer/src/UrlHandlers/ApiHandler.cs

@@ -45 +45 @@
                 private void addApi (AbsWebAPI _api) {
                         apis.Add (_api.Name, _api);
-                        WebPermissions.Instance.AddKnownModule ("webapi." + _api.Name, _api.DefaultPermissionLevel ());
+                        WebPermissions.Instance.AddKnownModule ($"webapi.{_api.Name}", _api.DefaultPermissionLevel ());
                 }
 
@@ -92 +92 @@
 
                 private bool IsAuthorizedForApi (string _apiName, int _permissionLevel) {
-                        return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + _apiName, _permissionLevel);
+                        return WebPermissions.Instance.ModuleAllowedWithLevel ($"webapi.{_apiName}", _permissionLevel);
                 }
         }

binary-improvements2/WebServer/src/UrlHandlers/ItemIconHandler.cs

@@ -3 +3 @@
 using System.IO;
 using System.Net;
-using AllocsFixes;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -45 +44 @@
                                 _context.Response.StatusCode = (int) HttpStatusCode.NotFound;
                                 if (logMissingFiles) {
-                                        Log.Out ("[Web] IconHandler: FileNotFound: \"" + _context.RequestPath + "\" ");
+                                        Log.Out ($"[Web] IconHandler: FileNotFound: \"{_context.RequestPath}\" ");
                                 }
                         }
+                }
+
+                private class LoadingStats {
+                        public int Files;
+                        public int Tints;
+                        public readonly MicroStopwatch MswTotal = new MicroStopwatch (false);
+                        public readonly MicroStopwatch MswLoading = new MicroStopwatch (false);
+                        public readonly MicroStopwatch MswEncoding = new MicroStopwatch (false);
+                        public readonly MicroStopwatch MswTinting = new MicroStopwatch (false);
                 }
 
@@ -57 +65 @@
                                 }
 
-                                MicroStopwatch microStopwatch = new MicroStopwatch ();
+                                LoadingStats stats = new LoadingStats ();
+                                stats?.MswTotal.Start ();
 
                                 // Get list of used tints for all items
@@ -72 +81 @@
 
                                         string name = ic.GetIconName ();
-                                        if (!tintedIcons.ContainsKey (name)) {
-                                                tintedIcons.Add (name, new List<Color> ());
+                                        if (!tintedIcons.TryGetValue (name, out List<Color> tintsList)) {
+                                                tintsList = new List<Color> ();
+                                                tintedIcons.Add (name, tintsList);
                                         }
 
-                                        List<Color> list = tintedIcons [name];
-                                        list.Add (tintColor);
+                                        tintsList.Add (tintColor);
                                 }
 
                                 try {
-                                        loadIconsFromFolder (GameIO.GetGameDir ("Data/ItemIcons"), tintedIcons);
+                                        loadIconsFromFolder (GameIO.GetGameDir ("Data/ItemIcons"), tintedIcons, stats);
                                 } catch (Exception e) {
                                         Log.Error ("[Web] Failed loading icons from base game");
@@ -90 +99 @@
                                 foreach (Mod mod in ModManager.GetLoadedMods ()) {
                                         try {
-                                                string modIconsPath = mod.Path + "/ItemIcons";
-                                                loadIconsFromFolder (modIconsPath, tintedIcons);
+                                                string modIconsPath = $"{mod.Path}/ItemIcons";
+                                                loadIconsFromFolder (modIconsPath, tintedIcons, stats);
                                         } catch (Exception e) {
-                                                Log.Error ("[Web] Failed loading icons from mod " + mod.ModInfo.Name.Value);
+                                                Log.Error ($"[Web] Failed loading icons from mod {mod.Name}");
                                                 Log.Exception (e);
                                         }
                                 }
+                                
+                                loaded = true;
 
-                                loaded = true;
-                                Log.Out ("[Web] IconHandler: Icons loaded - {0} ms", microStopwatch.ElapsedMilliseconds);
+                                if (stats == null) {
+                                        Log.Out ($"[Web] IconHandler: Loaded {icons.Count} icons");
+                                } else {
+                                        stats?.MswTotal.Stop ();
+                                        Log.Out ($"[Web] IconHandler: Loaded {icons.Count} icons ({stats.Files} source images with {stats.Tints} tints applied)");
+                                        Log.Out ($"[Web] IconHandler: Total time {stats.MswTotal.ElapsedMilliseconds} ms, loading files {stats.MswLoading.ElapsedMilliseconds} ms, tinting files {stats.MswTinting.ElapsedMilliseconds} ms, encoding files {stats.MswEncoding.ElapsedMilliseconds} ms");
+
+                                        int totalSize = 0;
+                                        foreach ((string _, byte[] iconData) in icons) {
+                                                totalSize += iconData.Length;
+                                        }
+                                        
+                                        Log.Out ($"[Web] IconHandler: Cached {totalSize / 1024} KiB");
+                                }
 
                                 return true;
@@ -105 +128 @@
                 }
 
-                private void loadIconsFromFolder (string _path, Dictionary<string, List<Color>> _tintedIcons) {
+                private void loadIconsFromFolder (string _path, Dictionary<string, List<Color>> _tintedIcons, LoadingStats _stats) {
                         if (!Directory.Exists (_path)) {
                                 return;
@@ -118 +141 @@
                                         string name = Path.GetFileNameWithoutExtension (file);
                                         Texture2D tex = new Texture2D (1, 1, TextureFormat.ARGB32, false);
-                                        if (!tex.LoadImage (File.ReadAllBytes (file))) {
+                                        
+                                        _stats?.MswLoading.Start ();
+                                        byte[] sourceBytes = File.ReadAllBytes (file);
+                                        if (!tex.LoadImage (sourceBytes)) {
+                                                _stats?.MswLoading.Stop ();
                                                 continue;
                                         }
+                                        _stats?.MswLoading.Stop ();
 
-                                        AddIcon (name, tex, _tintedIcons);
+                                        AddIcon (name, sourceBytes, tex, _tintedIcons, _stats);
 
                                         Object.Destroy (tex);
@@ -131 +159 @@
                 }
 
-                private void AddIcon (string _name, Texture2D _tex, Dictionary<string, List<Color>> _tintedIcons) {
-                        icons [_name + "__FFFFFF"] = _tex.EncodeToPNG ();
+                private void AddIcon (string _name, byte[] _sourceBytes, Texture2D _tex, Dictionary<string, List<Color>> _tintedIcons, LoadingStats _stats) {
+                        _stats?.MswEncoding.Start ();
+                        icons [$"{_name}__FFFFFF"] = _sourceBytes;
+                        _stats?.MswEncoding.Stop ();
 
-                        if (!_tintedIcons.ContainsKey (_name)) {
+                        if (_stats != null) {
+                                _stats.Files++;
+                        }
+
+                        if (!_tintedIcons.TryGetValue (_name, out List<Color> tintsList)) {
                                 return;
                         }
 
-                        foreach (Color c in _tintedIcons [_name]) {
-                                string tintedName = _name + "__" + AllocsUtils.ColorToHex (c);
+                        foreach (Color c in tintsList) {
+                                string tintedName = $"{_name}__{c.ToHexCode ()}";
                                 if (icons.ContainsKey (tintedName)) {
                                         continue;
@@ -146 +180 @@
                                 Texture2D tintedTex = new Texture2D (_tex.width, _tex.height, TextureFormat.ARGB32, false);
 
-                                for (int x = 0; x < _tex.width; x++) {
-                                        for (int y = 0; y < _tex.height; y++) {
-                                                tintedTex.SetPixel (x, y, _tex.GetPixel (x, y) * c);
-                                        }
-                                }
+                                _stats?.MswTinting.Start ();
+                                TextureUtils.ApplyTint (_tex, tintedTex, c);
+                                _stats?.MswTinting.Stop ();
 
+                                _stats?.MswEncoding.Start ();
                                 icons [tintedName] = tintedTex.EncodeToPNG ();
+                                _stats?.MswEncoding.Stop ();
 
                                 Object.Destroy (tintedTex);
+
+                                if (_stats != null) {
+                                        _stats.Tints++;
+                                }
                         }
                 }
+                
         }
 }

binary-improvements2/WebServer/src/UrlHandlers/RewriteHandler.cs

@@ -10 +10 @@
 
                 public override void HandleRequest (RequestContext _context) {
-                        _context.RequestPath = fixedTarget ? target : target + _context.RequestPath.Remove (0, urlBasePath.Length);
+                        _context.RequestPath = fixedTarget ? target : $"{target}{_context.RequestPath.Remove (0, urlBasePath.Length)}";
                         parent.ApplyPathHandler (_context);
                 }

binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Net;
+using Platform.Steam;
+using Utf8Json;
 
 namespace Webserver.UrlHandlers {
@@ -6 +10 @@
                 private const string pageBasePath = "/app";
                 private const string pageErrorPath = "/app/error/";
+                
                 private const string steamOpenIdVerifyUrl = "verifysteamopenid";
                 private const string steamLoginUrl = "loginsteam";
+                private const string userPassLoginUrl = "login";
 
                 private readonly ConnectionHandler connectionHandler;
@@ -37 +43 @@
                                 return;
                         }
+                        
+                        if (subpath.StartsWith (userPassLoginUrl)) {
+                                HandleUserPassLogin (_context);
+                                return;
+                        }
 
                         _context.Response.Redirect (pageErrorPath + "InvalidSessionsCommand");
                 }
 
+                private void HandleUserPassLogin (RequestContext _context) {
+                        if (!_context.Request.HasEntityBody) {
+                                _context.Response.Redirect (pageErrorPath + "NoLoginData");
+                                return;
+                        }
+
+                        Stream requestInputStream = _context.Request.InputStream;
+
+                        byte[] jsonInputData = new byte[_context.Request.ContentLength64];
+                        requestInputStream.Read (jsonInputData, 0, (int)_context.Request.ContentLength64);
+
+                        IDictionary<string, object> inputJson;
+                        try {
+                                inputJson = JsonSerializer.Deserialize<IDictionary<string, object>> (jsonInputData);
+                        } catch (Exception e) {
+                                Log.Error ("Error deserializing JSON from user/password login:");
+                                Log.Exception (e);
+                                _context.Response.Redirect (pageErrorPath + "InvalidLoginJson");
+                                return;
+                        }
+
+                        if (!inputJson.TryGetValue ("username", out object fieldNode) || fieldNode is not string username) {
+                                _context.Response.Redirect (pageErrorPath + "InvalidLoginJson");
+                                return;
+                        }
+
+                        if (!inputJson.TryGetValue ("password", out fieldNode) || fieldNode is not string password) {
+                                _context.Response.Redirect (pageErrorPath + "InvalidLoginJson");
+                                return;
+                        }
+
+                        // TODO: Apply login
+
+                        string remoteEndpointString = _context.Request.RemoteEndPoint!.ToString ();
+
+                        if (username != "test" || password != "123") {
+                                // TODO: failed login
+                                Log.Out ($"[Web] User/pass login failed from {remoteEndpointString}");
+                                _context.Response.Redirect (pageErrorPath + "UserPassInvalid");
+                                return;
+                        }
+                        
+                        try {
+                                // TODO: Match username/password to UserIdentifierAbs / serveradmins.xml
+                                
+                                WebConnection con = connectionHandler.LogIn (new UserIdentifierSteam (76561198066968172ul), _context.Request.RemoteEndPoint.Address);
+                                int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
+                                Log.Out ($"[Web] User/pass login from {remoteEndpointString} with ID {con.UserId}, permission level {level}");
+
+                                Cookie cookie = new Cookie ("sid", con.SessionID, "/") {
+                                        Expired = false,
+                                        Expires = DateTime.MinValue,
+                                        HttpOnly = true,
+                                        Secure = false
+                                };
+                                _context.Response.AppendCookie (cookie);
+                                _context.Response.Redirect (pageBasePath);
+
+                                return;
+                        } catch (Exception e) {
+                                Log.Error ("[Web] Error during user/pass login:");
+                                Log.Exception (e);
+                        }
+
+                        _context.Response.Redirect (pageErrorPath + "UserPassLoginFailed");
+                }
+
                 private void HandleSteamLogin (RequestContext _context) {
-                        string host = (WebUtils.IsSslRedirected (_context.Request) ? "https://" : "http://") + _context.Request.UserHostName;
-                        string url = OpenID.GetOpenIdLoginUrl (host, host + urlBasePath + steamOpenIdVerifyUrl);
+                        string host = $"{(WebUtils.IsSslRedirected (_context.Request) ? "https://" : "http://")}{_context.Request.UserHostName}";
+                        string url = OpenID.GetOpenIdLoginUrl (host, $"{host}{urlBasePath}{steamOpenIdVerifyUrl}");
                         _context.Response.Redirect (url);
                 }
@@ -68 +146 @@
                                 ulong id = OpenID.Validate (_context.Request);
                                 if (id > 0) {
-                                        WebConnection con = connectionHandler.LogIn (id, _context.Request.RemoteEndPoint.Address);
+                                        WebConnection con = connectionHandler.LogIn (new UserIdentifierSteam (id), _context.Request.RemoteEndPoint.Address);
                                         int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
-                                        Log.Out ("[Web] Steam OpenID login from {0} with ID {1}, permission level {2}",
-                                                remoteEndpointString, con.UserId, level);
+                                        Log.Out ($"[Web] Steam OpenID login from {remoteEndpointString} with ID {con.UserId}, permission level {level}");
 
                                         Cookie cookie = new Cookie ("sid", con.SessionID, "/") {

binary-improvements2/WebServer/src/UrlHandlers/SseHandler.cs

@@ -39 +39 @@
                         base.SetBasePathAndParent (_parent, _relativePath);
 
-                        queueThead = ThreadManager.StartThread ("SSE-Processing_" + urlBasePath, QueueProcessThread, ThreadPriority.BelowNormal,
+                        queueThead = ThreadManager.StartThread ($"SSE-Processing_{urlBasePath}", QueueProcessThread, ThreadPriority.BelowNormal,
                                 _useRealThread: true);
                 }
@@ -49 +49 @@
                 }
 
+                // ReSharper disable once MemberCanBePrivate.Global
                 public void AddEvent (string _eventName, AbsEvent _eventInstance) {
                         events.Add (_eventName, _eventInstance);
-                        WebPermissions.Instance.AddKnownModule ("webevent." + _eventName, _eventInstance.DefaultPermissionLevel ());
+                        WebPermissions.Instance.AddKnownModule ($"webevent.{_eventName}", _eventInstance.DefaultPermissionLevel ());
                 }
 
@@ -88 +89 @@
 
                 private bool IsAuthorizedForEvent (string _eventName, int _permissionLevel) {
-                        return WebPermissions.Instance.ModuleAllowedWithLevel ("webevent." + _eventName, _permissionLevel);
+                        return WebPermissions.Instance.ModuleAllowedWithLevel ($"webevent.{_eventName}", _permissionLevel);
                 }
 

binary-improvements2/WebServer/src/UrlHandlers/StaticHandler.cs

@@ -1 +1 @@
 using System.IO;
 using System.Net;
-using AllocsFixes.FileCache;
+using Webserver.FileCache;
 
 namespace Webserver.UrlHandlers {
@@ -11 +11 @@
                 public StaticHandler (string _filePath, AbstractCache _cache, bool _logMissingFiles,
                         string _moduleName = null) : base (_moduleName) {
-                        datapath = _filePath + (_filePath [_filePath.Length - 1] == '/' ? "" : "/");
+                        datapath = $"{_filePath}{(_filePath [^1] == '/' ? "" : "/")}";
                         cache = _cache;
                         logMissingFiles = _logMissingFiles;
@@ -19 +19 @@
                         string fn = _context.RequestPath.Remove (0, urlBasePath.Length);
 
-                        byte[] content = cache.GetFileContent (datapath + fn);
+                        byte[] content = cache.GetFileContent ($"{datapath}{fn}");
 
                         if (content != null) {
@@ -28 +28 @@
                                 _context.Response.StatusCode = (int) HttpStatusCode.NotFound;
                                 if (logMissingFiles) {
-                                        Log.Warning ("[Web] Static: FileNotFound: \"" + _context.RequestPath + "\" @ \"" + datapath + fn + "\"");
+                                        Log.Warning ($"[Web] Static: FileNotFound: \"{_context.RequestPath}\" @ \"{datapath}{fn}\"");
                                 }
                         }

binary-improvements2/WebServer/src/UrlHandlers/UserStatusHandler.cs

@@ -1 @@
-using AllocsFixes.JSON;
+using Utf8Json;
 
 namespace Webserver.UrlHandlers {
@@ -6 +6 @@
                 }
 
+                private static readonly byte[] jsonLoggedInKey = JsonWriter.GetEncodedPropertyNameWithBeginObject ("loggedIn");
+                private static readonly byte[] jsonUsernameKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("username");
+                private static readonly byte[] jsonPermissionsKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("permissions");
+
+                private static readonly byte[] jsonModuleKey = JsonWriter.GetEncodedPropertyNameWithBeginObject ("module");
+                private static readonly byte[] jsonAllowedKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("allowed");
+
                 public override void HandleRequest (RequestContext _context) {
-                        JsonObject result = new JsonObject ();
+                        WebUtils.PrepareEnvelopedResult (out JsonWriter writer);
+                        
+                        writer.WriteRaw (jsonLoggedInKey);
+                        writer.WriteBoolean (_context.Connection != null);
+                        
+                        writer.WriteRaw (jsonUsernameKey);
+                        writer.WriteString (_context.Connection != null ? _context.Connection.UserId.ToString () : string.Empty);
+                        
+                        writer.WriteRaw (jsonPermissionsKey);
+                        writer.WriteBeginArray ();
 
-                        result.Add ("loggedin", new JsonBoolean (_context.Connection != null));
-                        result.Add ("username", new JsonString (_context.Connection != null ? _context.Connection.UserId.ToString () : string.Empty));
+                        bool first = true;
+                        foreach (WebPermissions.WebModulePermission perm in WebPermissions.Instance.GetModules ()) {
+                                if (!first) {
+                                        writer.WriteValueSeparator ();
+                                }
 
-                        JsonArray perms = new JsonArray ();
-                        foreach (WebPermissions.WebModulePermission perm in WebPermissions.Instance.GetModules ()) {
-                                JsonObject permObj = new JsonObject ();
-                                permObj.Add ("module", new JsonString (perm.module));
-                                permObj.Add ("allowed", new JsonBoolean (perm.permissionLevel >= _context.PermissionLevel));
-                                perms.Add (permObj);
+                                first = false;
+                                
+                                writer.WriteRaw (jsonModuleKey);
+                                writer.WriteString (perm.module);
+                                
+                                writer.WriteRaw (jsonAllowedKey);
+                                writer.WriteBoolean (perm.permissionLevel >= _context.PermissionLevel);
+                                
+                                writer.WriteEndObject ();
                         }
 
-                        result.Add ("permissions", perms);
-
-                        WebUtils.WriteJson (_context.Response, result);
+                        writer.WriteEndArray ();
+                        
+                        writer.WriteEndObject ();
+                        
+                        WebUtils.SendEnvelopedResult (_context, ref writer);
                 }
         }