Changeset 474

Timestamp:

Aug 24, 2023, 12:48:17 PM (16 months ago)

Author:

alloc

Message:

Added locks on AdminTools instead of local to the individual permission systems

Location:

TFP-WebServer/WebServer/src

Files:

• Permissions/AdminApiTokens.cs (modified) (2 diffs)
• Permissions/AdminWebModules.cs (modified) (6 diffs)
• Permissions/AdminWebUsers.cs (modified) (2 diffs)
• Web.cs (modified) (1 diff)

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

@@ -40 +40 @@
 
                 public void AddToken (string _name, string _secret, int _permissionLevel) {
-                        ApiToken apiToken = new ApiToken (_name, _secret, _permissionLevel);
-                        tokens [_name] = apiToken;
-                        Parent.Save ();
+                        lock (Parent) {
+                                ApiToken apiToken = new ApiToken (_name, _secret, _permissionLevel);
+                                tokens[_name] = apiToken;
+                                Parent.Save ();
+                        }
                 }
 
                 public bool RemoveToken (string _name) {
-                        bool removed = tokens.Remove (_name);
-                        if (removed) {
-                                Parent.Save ();
+                        lock (Parent) {
+                                bool removed = tokens.Remove (_name);
+                                if (removed) {
+                                        Parent.Save ();
+                                }
+
+                                return removed;
                         }
-
-                        return removed;
                 }
 
                 public Dictionary<string, ApiToken> GetTokens () {
-                        return tokens;
+                        lock (Parent) {
+                                return tokens;
+                        }
                 }
 
@@ -113 +119 @@
 
                 public int GetPermissionLevel (string _name, string _secret) {
-                        if (tokens.TryGetValue (_name, out ApiToken apiToken) && apiToken.Secret == _secret) {
-                                return apiToken.PermissionLevel;
+                        lock (Parent) {
+                                if (tokens.TryGetValue (_name, out ApiToken apiToken) && apiToken.Secret == _secret) {
+                                        return apiToken.PermissionLevel;
+                                }
+
+                                if (IsCommandlineToken (_name, _secret)) {
+                                        return 0;
+                                }
+
+                                return int.MaxValue;
                         }
-
-                        if (IsCommandlineToken (_name, _secret)) {
-                                return 0;
-                        }
-
-                        return int.MaxValue;
                 }
 

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

@@ -41 +41 @@
 
                 public void AddModule (WebModule _module) {
-                        lock (this) {
+                        lock (Parent) {
                                 allModulesList.Clear ();
                                 
@@ -50 +50 @@
 
                 public bool RemoveModule (string _module) {
-                        lock (this) {
+                        lock (Parent) {
                                 allModulesList.Clear ();
                                 
@@ -63 +63 @@
 
                 public List<WebModule> GetModules () {
-                        lock (this) {
+                        lock (Parent) {
                                 if (allModulesList.Count != 0) {
                                         return allModulesList;
@@ -259 +259 @@
                         _module.IsDefault = true;
                         
-                        lock (this) {
+                        lock (Parent) {
                                 allModulesList.Clear ();
                                 knownModules [_module.Name] = _module;
@@ -270 +270 @@
                         }
 
-                        lock (this) {
+                        lock (Parent) {
                                 return knownModules.ContainsKey (_module);
                         }
@@ -276 +276 @@
 
                 public bool ModuleAllowedWithLevel (string _module, int _level) {
-                        return GetModule (_module).LevelGlobal >= _level;
+                        lock (Parent) {
+                                return GetModule (_module).LevelGlobal >= _level;
+                        }
                 }
 
                 public WebModule GetModule (string _module) {
-                        if (modules.TryGetValue (_module, out WebModule result)) {
-                                return result;
-                        }
-
-                        return knownModules.TryGetValue (_module, out result) ? result : defaultModulePermission;
+                        lock (Parent) {
+                                if (modules.TryGetValue (_module, out WebModule result)) {
+                                        return result;
+                                }
+
+                                return knownModules.TryGetValue (_module, out result) ? result : defaultModulePermission;
+                        }
                 }
 

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

@@ -43 +43 @@
 
                 public void AddUser (string _name, string _password, PlatformUserIdentifierAbs _userIdentifier, PlatformUserIdentifierAbs _crossPlatformIdentifier) {
-                        WebUser p = new WebUser (_name, _password, _userIdentifier, _crossPlatformIdentifier);
-                        
-                        // TODO: Check if another name exists with the same (crossplatform)identifier, remove that
-                        users [_name] = p;
-                        
-                        Parent.Save ();
+                        lock (Parent) {
+                                WebUser p = new WebUser (_name, _password, _userIdentifier, _crossPlatformIdentifier);
+
+                                // TODO: Check if another name exists with the same (crossplatform)identifier, remove that
+                                users[_name] = p;
+
+                                Parent.Save ();
+                        }
                 }
 
                 public bool RemoveUser (string _name) {
-                        bool removed = users.Remove (_name);
-                        if (removed) {
-                                Parent.Save ();
+                        lock (Parent) {
+                                bool removed = users.Remove (_name);
+                                if (removed) {
+                                        Parent.Save ();
+                                }
+
+                                return removed;
                         }
-
-                        return removed;
                 }
 
                 public Dictionary<string, WebUser> GetUsers () {
-                        return users;
+                        lock (Parent) {
+                                return users;
+                        }
                 }
 
@@ -134 +140 @@
 
                 public bool TryGetUser (string _name, string _password, out WebUser _result) {
-                        if (users.TryGetValue (_name, out _result) && _result.ValidatePassword (_password)) {
-                                return true;
+                        lock (Parent) {
+                                if (users.TryGetValue (_name, out _result) && _result.ValidatePassword (_password)) {
+                                        return true;
+                                }
+
+                                _result = default;
+                                return false;
                         }
-
-                        _result = default;
-                        return false;
                 }
 
                 public bool HasUser (PlatformUserIdentifierAbs _platformUser, PlatformUserIdentifierAbs _crossPlatformUser, out WebUser _result) {
-                        _result = default;
-                        
-                        foreach ((string _, WebUser webUser) in users) {
-                                if (!PlatformUserIdentifierAbs.Equals (webUser.PlatformUser, _platformUser) ||
-                                    !PlatformUserIdentifierAbs.Equals (webUser.CrossPlatformUser, _crossPlatformUser)) {
-                                        continue;
+                        lock (Parent) {
+                                _result = default;
+
+                                foreach ((string _, WebUser webUser) in users) {
+                                        if (!PlatformUserIdentifierAbs.Equals (webUser.PlatformUser, _platformUser) ||
+                                            !PlatformUserIdentifierAbs.Equals (webUser.CrossPlatformUser, _crossPlatformUser)) {
+                                                continue;
+                                        }
+
+                                        _result = webUser;
+                                        return true;
                                 }
 
-                                _result = webUser;
-                                return true;
+                                return false;
                         }
-
-                        return false;
                 }
 

TFP-WebServer/WebServer/src/Web.cs

@@ -236 +236 @@
                                 }
 
+                                // Force parsing the URL path as UTF8 so special characters get decoded properly
                                 request.ContentEncoding = Encoding.UTF8;
                                 RequestContext context = new RequestContext (requestPath, request, response, conn, permissionLevel);