Changeset 474 for TFP-WebServer/WebServer/src/Permissions/AdminWebUsers.cs

Timestamp:

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

Author:

alloc

Message:

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

File:

• TFP-WebServer/WebServer/src/Permissions/AdminWebUsers.cs (modified) (2 diffs)

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;
                 }