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

Timestamp:

Apr 24, 2023, 2:40:34 PM (19 months ago)

Author:

alloc

Message:

*Updated web permissions system
*Fixed webpermissions command
*Moved API "webmods" to "mods", also lists non-webmod mods

File:

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

binary-improvements2/WebServer/src/Web.cs

@@ -16 +16 @@
                 public static event Action<Web> ServerInitialized;
                 
-                private const int guestPermissionLevel = 2000;
                 private const string indexPageUrl = "/app";
                 
@@ -51 +50 @@
                                 }
 
-                                // TODO: Read from config
-                                bool useCacheForStatic = StringParsers.ParseBool ("false");
-
-                                string webfilesFolder = DetectWebserverFolder (_modInstancePath);
-
                                 ConnectionHandler = new ConnectionHandler ();
                                 
-                                RegisterPathHandler ("/", new RewriteHandler ("/files/"));
-
-                                // React virtual routing
-                                RegisterPathHandler ("/app", new RewriteHandler ("/files/index.html", true));
-                                
-                                // Do mods relatively early as they should not be requested a lot, unlike the later registrations, especially for API and map tiles
-                                RegisterWebMods (useCacheForStatic);
-
-                                RegisterPathHandler ("/session/", new SessionHandler (ConnectionHandler));
-                                RegisterPathHandler ("/userstatus", new UserStatusHandler ());
-                                RegisterPathHandler ("/sse/", new SseHandler ());
-                                RegisterPathHandler ("/files/", new StaticHandler (
-                                        webfilesFolder,
-                                        useCacheForStatic ? new SimpleCache () : new DirectAccess (),
-                                        false)
-                                );
-                                RegisterPathHandler ("/itemicons/", new ItemIconHandler (true));
-                                RegisterPathHandler ("/api/", new ApiHandler ());
+                                RegisterDefaultHandlers (_modInstancePath);
                                 
                                 // Allow other code to add their stuff
@@ -94 +71 @@
                 }
 
+                private void RegisterDefaultHandlers (string _modInstancePath) {
+                        // TODO: Read from config
+                        bool useCacheForStatic = StringParsers.ParseBool ("false");
+
+                        string webfilesFolder = DetectWebserverFolder (_modInstancePath);
+
+                        RegisterPathHandler ("/", new RewriteHandler ("/files/"));
+
+                        // React virtual routing
+                        RegisterPathHandler ("/app", new RewriteHandler ("/files/index.html", true));
+                                
+                        // Do mods relatively early as they should not be requested a lot, unlike the later registrations, especially for API and map tiles
+                        RegisterWebMods (useCacheForStatic);
+
+                        RegisterPathHandler ("/session/", new SessionHandler (ConnectionHandler));
+                        RegisterPathHandler ("/userstatus", new UserStatusHandler ());
+                        RegisterPathHandler ("/sse/", new SseHandler ());
+                        RegisterPathHandler ("/files/", new StaticHandler (
+                                webfilesFolder,
+                                useCacheForStatic ? new SimpleCache () : new DirectAccess (),
+                                false)
+                        );
+                        RegisterPathHandler ("/itemicons/", new ItemIconHandler (true));
+                        RegisterPathHandler ("/api/", new ApiHandler ());
+                }
+
                 private static string DetectWebserverFolder (string _modInstancePath) {
                         string webserverFolder = $"{_modInstancePath}/webserver";
@@ -127 +130 @@
                         foreach (Mod mod in ModManager.GetLoadedMods ()) {
                                 try {
-                                        string webModPath = $"{mod.Path}/WebMod";
-                                        if (!Directory.Exists (webModPath)) {
-                                                continue;
-                                        }
-
                                         try {
                                                 WebMod webMod = new WebMod (this, mod, _useStaticCache);
@@ -298 +296 @@
                         if (reqRemoteEndPoint == null) {
                                 Log.Warning ("[Web] No RemoteEndPoint on web request");
-                                return guestPermissionLevel;
+                                return AdminWebModules.PermissionLevelGuest;
                         }
                         
@@ -316 +314 @@
                         if (!_req.Headers.TryGetValue ("X-SDTD-API-TOKENNAME", out string apiTokenName) ||
                             !_req.Headers.TryGetValue ("X-SDTD-API-SECRET", out string apiTokenSecret)) {
-                                return guestPermissionLevel;
+                                return AdminWebModules.PermissionLevelGuest;
                         }
 
@@ -326 +324 @@
                         Log.Warning ($"[Web] Invalid Admintoken used from {reqRemoteEndPoint}");
 
-                        return guestPermissionLevel;
+                        return AdminWebModules.PermissionLevelGuest;
                 }
         }