Changeset 394 for binary-improvements2/WebServer/src/Web.cs

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

File:

• binary-improvements2/WebServer/src/Web.cs (modified) (8 diffs)

binary-improvements2/WebServer/src/Web.cs

@@ -63 +63 @@
                                 RegisterWebMods (useStaticCache);
 
-                                RegisterPathHandler ("/session/", new SessionHandler (webfilesFolder, connectionHandler));
+                                RegisterPathHandler ("/session/", new SessionHandler (connectionHandler));
                                 RegisterPathHandler ("/userstatus", new UserStatusHandler ());
                                 RegisterPathHandler ("/sse/", new SseHandler ());
@@ -152 +152 @@
                 }
 
-#if ENABLE_PROFILER
+                private readonly UnityEngine.Profiling.CustomSampler getContextSampler = UnityEngine.Profiling.CustomSampler.Create ("GetCtx");
                 private readonly UnityEngine.Profiling.CustomSampler authSampler = UnityEngine.Profiling.CustomSampler.Create ("Auth");
+                private readonly UnityEngine.Profiling.CustomSampler cookieSampler = UnityEngine.Profiling.CustomSampler.Create ("ConCookie");
                 private readonly UnityEngine.Profiling.CustomSampler handlerSampler = UnityEngine.Profiling.CustomSampler.Create ("Handler");
-#endif
 
                 private void HandleRequest (IAsyncResult _result) {
@@ -165 +165 @@
 #if ENABLE_PROFILER
                         UnityEngine.Profiling.Profiler.BeginThreadProfiling ("AllocsMods", "WebRequest");
+                        getContextSampler.Begin ();
                         HttpListenerContext ctx = listenerInstance.EndGetContext (_result);
+                        getContextSampler.End ();
                         try {
 #else
@@ -189 +191 @@
                                 }
 
-#if ENABLE_PROFILER
                                 authSampler.Begin ();
-#endif
                                 int permissionLevel = DoAuthentication (request, out WebConnection conn);
-#if ENABLE_PROFILER
                                 authSampler.End ();
-#endif
 
                                 //Log.Out ("Login status: conn!=null: {0}, permissionlevel: {1}", conn != null, permissionLevel);
 
+                                cookieSampler.Begin ();
                                 if (conn != null) {
                                         Cookie cookie = new Cookie ("sid", conn.SessionID, "/") {
@@ -208 +207 @@
                                         response.AppendCookie (cookie);
                                 }
+                                cookieSampler.End ();
 
                                 string requestPath = request.Url.AbsolutePath;
@@ -256 +256 @@
                                         }
                                 } else {
-#if ENABLE_PROFILER
                                         handlerSampler.Begin ();
-#endif
                                         handler.HandleRequest (_context);
-#if ENABLE_PROFILER
                                         handlerSampler.End ();
-#endif
                                 }
 
@@ -291 +287 @@
                         }
 
-                        string remoteEndpointString = reqRemoteEndPoint.ToString ();
-
                         if (_req.QueryString ["adminuser"] == null || _req.QueryString ["admintoken"] == null) {
                                 return guestPermissionLevel;
@@ -303 +297 @@
                         }
 
-                        Log.Warning ("Invalid Admintoken used from " + remoteEndpointString);
+                        Log.Warning ("Invalid Admintoken used from " + reqRemoteEndPoint);
 
                         return guestPermissionLevel;