Changeset 418 for binary-improvements2/WebServer/src/Permissions/AdminWebModules.cs

Timestamp:

Feb 27, 2023, 9:40:12 PM (21 months ago)

Author:

alloc

Message:

Refactored API authorization to support per-HTTP-method permission levels

File:

• binary-improvements2/WebServer/src/Permissions/AdminWebModules.cs (modified) (6 diffs)

binary-improvements2/WebServer/src/Permissions/AdminWebModules.cs

@@ -41 +41 @@
 
                 public void AddModule (string _module, int _permissionLevel) {
-                        WebModule p = new WebModule (_module, _permissionLevel);
+                        WebModule p = new WebModule (_module, _permissionLevel, false);
                         lock (this) {
                                 allModulesList.Clear ();
@@ -84 +84 @@
                         public readonly string Name;
                         public readonly int PermissionLevel;
+                        public readonly bool IsDefault;
 
-                        public WebModule (string _name, int _permissionLevel) {
+                        public WebModule (string _name, int _permissionLevel, bool _isDefault) {
                                 Name = _name;
                                 PermissionLevel = _permissionLevel;
+                                IsDefault = _isDefault;
                         }
                         
@@ -116 +118 @@
                                 }
                                 
-                                _result = new WebModule (name, permissionLevel);
+                                _result = new WebModule (name, permissionLevel, false);
                                 return true;
                         }
@@ -139 +141 @@
                         }
 
-                        WebModule p = new WebModule (_module, _defaultPermission);
+                        WebModule p = new WebModule (_module, _defaultPermission, true);
 
                         lock (this) {
@@ -158 +160 @@
 
                 public bool ModuleAllowedWithLevel (string _module, int _level) {
-                        WebModule permInfo = GetModule (_module);
+                        WebModule permInfo = GetModule (_module)!.Value;
                         return permInfo.PermissionLevel >= _level;
                 }
 
-                public WebModule GetModule (string _module) {
+                public WebModule? GetModule (string _module, bool _returnDefaults = true) {
                         if (modules.TryGetValue (_module, out WebModule result)) {
                                 return result;
+                        }
+
+                        if (!_returnDefaults) {
+                                return null;
                         }
 
@@ -170 +176 @@
                 }
 
-                private readonly WebModule defaultModulePermission = new WebModule ("", 0);
+                private readonly WebModule defaultModulePermission = new WebModule ("", 0, true);
                 
 #endregion