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

Timestamp:

Aug 8, 2022, 8:07:44 PM (2 years ago)

Author:

alloc

Message:

SessionHandler cleanup + redirect to /app/error/:code
Some profiler usage cleanup

Location:

binary-improvements2/WebServer/src/UrlHandlers

Files:

• ApiHandler.cs (modified) (2 diffs)
• SessionHandler.cs (modified) (2 diffs)

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

@@ -48 +48 @@
                 }
 
-#if ENABLE_PROFILER
                 private static readonly UnityEngine.Profiling.CustomSampler apiHandlerSampler = UnityEngine.Profiling.CustomSampler.Create ("API_Handler");
-#endif
 
                 public override void HandleRequest (RequestContext _context) {
@@ -83 +81 @@
 
                         try {
-#if ENABLE_PROFILER
                                 apiHandlerSampler.Begin ();
-#endif
                                 api.HandleRequest (_context);
-#if ENABLE_PROFILER
                                 apiHandlerSampler.End ();
-#endif
                         } catch (Exception e) {
                                 Log.Error ($"Error in {nameof(ApiHandler)}.HandleRequest(): Handler {api.Name} threw an exception:");

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

@@ -1 +1 @@
 using System;
-using System.IO;
 using System.Net;
-using System.Text;
 
 namespace Webserver.UrlHandlers {
         public class SessionHandler : AbsHandler {
-                private const string pageBasePath = "/";
+                private const string pageBasePath = "/app";
+                private const string pageErrorPath = "/app/error/";
                 private const string steamOpenIdVerifyUrl = "verifysteamopenid";
                 private const string steamLoginUrl = "loginsteam";
-                
-                private readonly string footer = "";
-                private readonly string header = "";
 
                 private readonly ConnectionHandler connectionHandler;
 
-                public SessionHandler (string _dataFolder, ConnectionHandler _connectionHandler) : base (null) {
+                public SessionHandler (ConnectionHandler _connectionHandler) : base (null) {
                         connectionHandler = _connectionHandler;
-                        
-                        if (File.Exists (_dataFolder + "/sessionheader.tmpl")) {
-                                header = File.ReadAllText (_dataFolder + "/sessionheader.tmpl");
-                        }
-
-                        if (File.Exists (_dataFolder + "/sessionfooter.tmpl")) {
-                                footer = File.ReadAllText (_dataFolder + "/sessionfooter.tmpl");
-                        }
                 }
 
                 public override void HandleRequest (RequestContext _context) {
-                        
-                        IPEndPoint reqRemoteEndPoint = _context.Request.RemoteEndPoint;
-                        if (reqRemoteEndPoint == null) {
-                                _context.Response.Redirect (pageBasePath);
+                        if (_context.Request.RemoteEndPoint == null) {
+                                _context.Response.Redirect (pageErrorPath + "NoRemoteEndpoint");
                                 return;
                         }
@@ -37 +23 @@
                         string subpath = _context.RequestPath.Remove (0, urlBasePath.Length);
 
-                        StringBuilder result = new StringBuilder ();
-                        result.Append (header);
+                        if (subpath.StartsWith (steamOpenIdVerifyUrl)) {
+                                HandleSteamVerification (_context);
+                                return;
+                        }
 
-                        if (subpath.StartsWith (steamOpenIdVerifyUrl)) {
-                                string remoteEndpointString = reqRemoteEndPoint.ToString ();
+                        if (subpath.StartsWith ("logout")) {
+                                HandleLogout (_context);
+                                return;
+                        }
 
-                                try {
-                                        ulong id = OpenID.Validate (_context.Request);
-                                        if (id > 0) {
-                                                WebConnection con = connectionHandler.LogIn (id, reqRemoteEndPoint.Address);
-                                                int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
-                                                Log.Out ("Steam OpenID login from {0} with ID {1}, permission level {2}",
-                                                        remoteEndpointString, con.UserId, 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);
+                        if (subpath.StartsWith (steamLoginUrl)) {
+                                HandleSteamLogin (_context);
+                                return;
+                        }
 
-                                                return;
-                                        }
-                                } catch (Exception e) {
-                                        Log.Error ("Error validating login:");
-                                        Log.Exception (e);
-                                }
+                        _context.Response.Redirect (pageErrorPath + "InvalidSessionsCommand");
+                }
 
-                                Log.Out ($"Steam OpenID login failed from {remoteEndpointString}");
-                                result.Append ($"<h1>Login failed, <a href=\"{pageBasePath}\">click to return to main page</a>.</h1>");
-                        } else if (subpath.StartsWith ("logout")) {
-                                if (_context.Connection != null) {
-                                        connectionHandler.LogOut (_context.Connection.SessionID);
-                                        Cookie cookie = new Cookie ("sid", "", "/") {
-                                                Expired = true
+                private void HandleSteamLogin (RequestContext _context) {
+                        string host = (WebUtils.IsSslRedirected (_context.Request) ? "https://" : "http://") + _context.Request.UserHostName;
+                        string url = OpenID.GetOpenIdLoginUrl (host, host + urlBasePath + steamOpenIdVerifyUrl);
+                        _context.Response.Redirect (url);
+                }
+
+                private void HandleLogout (RequestContext _context) {
+                        Cookie cookie = new Cookie ("sid", "", "/") {
+                                Expired = true
+                        };
+                        _context.Response.AppendCookie (cookie);
+
+                        if (_context.Connection == null) {
+                                _context.Response.Redirect (pageErrorPath + "NotLoggedIn");
+                                return;
+                        }
+
+                        connectionHandler.LogOut (_context.Connection.SessionID);
+                        _context.Response.Redirect (pageBasePath);
+                }
+
+                private void HandleSteamVerification (RequestContext _context) {
+                        string remoteEndpointString = _context.Request.RemoteEndPoint!.ToString ();
+
+                        try {
+                                ulong id = OpenID.Validate (_context.Request);
+                                if (id > 0) {
+                                        WebConnection con = connectionHandler.LogIn (id, _context.Request.RemoteEndPoint.Address);
+                                        int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
+                                        Log.Out ("Steam OpenID login from {0} with ID {1}, permission level {2}",
+                                                remoteEndpointString, con.UserId, 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;
                                 }
-
-                                result.Append ($"<h1>Not logged in, <a href=\"{pageBasePath}\">click to return to main page</a>.</h1>");
-                        } else if (subpath.StartsWith (steamLoginUrl)) {
-                                string host = (WebUtils.IsSslRedirected (_context.Request) ? "https://" : "http://") + _context.Request.UserHostName;
-                                string url = OpenID.GetOpenIdLoginUrl (host, host + urlBasePath + steamOpenIdVerifyUrl);
-                                _context.Response.Redirect (url);
-                                return;
-                        } else {
-                                result.Append ($"<h1>Unknown command, <a href=\"{pageBasePath}\">click to return to main page</a>.</h1>");
+                        } catch (Exception e) {
+                                Log.Error ("Error validating login:");
+                                Log.Exception (e);
                         }
 
-                        result.Append (footer);
+                        Log.Out ($"Steam OpenID login failed from {remoteEndpointString}");
+                        _context.Response.Redirect (pageErrorPath + "SteamLoginFailed");
+                }
 
-                        WebUtils.WriteText (_context.Response, result.ToString (), _mimeType: WebUtils.MimeHtml);
-                }
         }
 }