Changeset 440 for TFP-WebServer/WebServer/src

Timestamp:

May 24, 2023, 4:53:49 PM (18 months ago)

Author:

alloc

Message:

*Added: Allow specifying a single level 0 API token on the command line

Location:

TFP-WebServer/WebServer/src

Files:

• Permissions/AdminApiTokens.cs (modified) (1 diff)
• UrlHandlers/AbsHandler.cs (modified) (1 diff)
• Web.cs (modified) (1 diff)

TFP-WebServer/WebServer/src/Permissions/AdminApiTokens.cs

@@ -117 +117 @@
                         }
 
+                        if (IsCommandlineToken (_name, _secret)) {
+                                return 0;
+                        }
+
                         return int.MaxValue;
+                }
+
+                private bool commandlineChecked;
+                private string commandlineTokenName;
+                private string commandlineTokenSecret;
+
+                private bool IsCommandlineToken (string _name, string _secret) {
+                        if (!commandlineChecked) {
+                                commandlineTokenName = GameUtils.GetLaunchArgument ("webapitokenname");
+                                commandlineTokenSecret = GameUtils.GetLaunchArgument ("webapitokensecret");
+
+                                commandlineChecked = true;
+                        }
+
+                        if (string.IsNullOrEmpty (commandlineTokenName) || string.IsNullOrEmpty (commandlineTokenSecret)) {
+                                return false;
+                        }
+
+                        return _name == commandlineTokenName && _secret == commandlineTokenSecret;
                 }
 

TFP-WebServer/WebServer/src/UrlHandlers/AbsHandler.cs

@@ -16 +16 @@
                 public abstract void HandleRequest (RequestContext _context);
 
-                public virtual bool IsAuthorizedForHandler (WebConnection _user, int _permissionLevel) {
-                        return ModuleName == null || AdminWebModules.Instance.ModuleAllowedWithLevel (ModuleName, _permissionLevel);
+                public virtual bool IsAuthorizedForHandler (RequestContext _context) {
+                        return ModuleName == null || AdminWebModules.Instance.ModuleAllowedWithLevel (ModuleName, _context.PermissionLevel);
                 }
 

TFP-WebServer/WebServer/src/Web.cs

@@ -271 +271 @@
                                 }
 
-                                if (!handler.IsAuthorizedForHandler (_context.Connection, _context.PermissionLevel)) {
+                                if (!handler.IsAuthorizedForHandler (_context)) {
                                         _context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                                         if (_context.Connection != null) {