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

Timestamp:

Feb 16, 2023, 3:50:53 PM (21 months ago)

Author:

alloc

Message:

Latest state including reworking to the permissions system

File:

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

binary-improvements2/WebServer/src/Web.cs

@@ -6 +6 @@
 using UnityEngine;
 using Webserver.FileCache;
+using Webserver.Permissions;
 using Webserver.UrlHandlers;
 using Cookie = System.Net.Cookie;
@@ -25 +26 @@
                 private readonly Version httpProtocolVersion = new Version(1, 1);
 
+                private readonly AsyncCallback handleRequestDelegate;
+
                 public Web (string _modInstancePath) {
                         try {
@@ -81 +84 @@
                                 // listener.Prefixes.Add ($"http://[::1]:{webPort}/");
                                 listener.Start ();
-                                listener.BeginGetContext (HandleRequest, listener);
+                                handleRequestDelegate = HandleRequest;
+                                listener.BeginGetContext (handleRequestDelegate, listener);
 
                                 SdtdConsole.Instance.RegisterServer (this);
@@ -250 +254 @@
 #if ENABLE_PROFILER
                         } finally {
-                                listenerInstance.BeginGetContext (HandleRequest, listenerInstance);
+                                listenerInstance.BeginGetContext (handleRequestDelegate, listenerInstance);
                                 UnityEngine.Profiling.Profiler.EndThreadProfiling ();
                         }
@@ -297 +301 @@
                                 _con = connectionHandler.IsLoggedIn (sessionId, reqRemoteEndPoint.Address);
                                 if (_con != null) {
-                                        return GameManager.Instance.adminTools.GetUserPermissionLevel (_con.UserId);
-                                }
-                        }
-
-                        if (_req.QueryString ["adminuser"] == null || _req.QueryString ["admintoken"] == null) {
+                                        int level1 = GameManager.Instance.adminTools.Users.GetUserPermissionLevel (_con.UserId);
+                                        int level2 = int.MaxValue;
+                                        if (_con.CrossplatformUserId != null) {
+                                                level2 = GameManager.Instance.adminTools.Users.GetUserPermissionLevel (_con.CrossplatformUserId);
+                                        }
+
+                                        return Math.Min (level1, level2);
+                                }
+                        }
+
+                        if (!_req.Headers.TryGetValue ("X-SDTD-API-TOKENNAME", out string apiTokenName) ||
+                            !_req.Headers.TryGetValue ("X-SDTD-API-SECRET", out string apiTokenSecret)) {
                                 return guestPermissionLevel;
                         }
 
-                        WebPermissions.AdminToken admin = WebPermissions.Instance.GetWebAdmin (_req.QueryString ["adminuser"],
-                                _req.QueryString ["admintoken"]);
-                        if (admin != null) {
-                                return admin.permissionLevel;
+                        int adminLevel = AdminApiTokens.Instance.GetPermissionLevel (apiTokenName, apiTokenSecret);
+                        if (adminLevel < int.MaxValue) {
+                                return adminLevel;
                         }