Merge pull request #4 from hermesdj/dev

Package improvements

ApiPlugin.cs

@@ -1,15 +1,13 @@
 #nullable enable
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using BepInEx;
-using BepInEx.Configuration;
 using BepInEx.Logging;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
 using Il2CppInterop.Runtime.Injection;
 using UnityEngine;
 using VRisingServerApiPlugin.command;
+using VRisingServerApiPlugin.http.security;
 using VRisingServerApiPlugin.query;
 
 namespace VRisingServerApiPlugin;
@@ -25,15 +23,15 @@ public class ApiPlugin : BasePlugin
     public static ApiPlugin Instance { get; private set; }
 #nullable enable
 
-    private ConfigEntry<string> _authorizedUsers;
-
     public ApiPlugin() : base()
     {
         Instance = this;
         Logger = Log;
 
-        _authorizedUsers = Config.Bind("Authentication", "AuthorizedUsers", "",
+        var authorizedUsers = Config.Bind("Authentication", "AuthorizedUsers", "",
             "A list of comma separated username:password entries that defines the accounts allowed to query the API");
+
+        HttpSecuritySingleton.GetInstance().Initialize(authorizedUsers);
     }
 
     public override void Load()
@@ -65,36 +63,4 @@ public override bool Unload()
 
         return true;
     }
-
-    public List<AuthorizedUser> GetAuthorizedUserList()
-    {
-        return AuthorizedUser.ParseConfig(this._authorizedUsers.Value);
-    }
-
-    public bool CheckAuthenticationOfUser(string username, string password)
-    {
-        return GetAuthorizedUserList()
-            .Count(user => user.Username.Equals(username) && user.Password.Equals(password)) == 1;
-    }
-
-    public class AuthorizedUser
-    {
-        public string Username { get; set; }
-        public string Password { get; set; }
-
-        private AuthorizedUser(string username, string password)
-        {
-            Username = username;
-            Password = password;
-        }
-
-        public static List<AuthorizedUser> ParseConfig(string authorizedUsers)
-        {
-            return (from user in authorizedUsers.Split(",")
-                select user.Split(':')
-                into parts
-                where parts.Length == 2
-                select new AuthorizedUser(parts[0].Trim(), parts[1].Trim())).ToList();
-        }
-    }
 }

VRisingServerApiPlugin.csproj

@@ -23,9 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include=".github\release.yaml" />
-    <Content Include=".github\workflows\build.yaml" />
-    <Content Include=".github\workflows\release.yaml" />
     <None Include="README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 

http/HttpRequestParser.cs

@@ -3,6 +3,7 @@
 using Il2CppSystem.Net;
 using Il2CppSystem.Security.Principal;
 using VRisingServerApiPlugin.command;
+using VRisingServerApiPlugin.http.security;
 
 namespace VRisingServerApiPlugin.http;
 
@@ -64,7 +65,7 @@ public static HttpRequest ParseHttpRequest(HttpListenerContext context, Command
         var username = identity.Name;
         var password = identity.password;
 
-        var isAuthorized = ApiPlugin.Instance.CheckAuthenticationOfUser(username, password);
+        var isAuthorized = HttpSecuritySingleton.GetInstance().CheckAuthenticationOfUser(username, password);
 
         return new AuthenticatedUser(Username: identity.Name, Password: identity.password,
             IsAuthorized: isAuthorized);

http/security/AuthorizedUser.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace VRisingServerApiPlugin.http.security;
+
+public class AuthorizedUser
+{
+    public string Username { get; set; }
+    public string Password { get; set; }
+
+    private AuthorizedUser(string username, string password)
+    {
+        Username = username;
+        Password = password;
+    }
+
+    public static IEnumerable<AuthorizedUser> ParseConfig(string authorizedUsers)
+    {
+        return (from user in authorizedUsers.Split(",")
+            select user.Split(':')
+            into parts
+            where parts.Length == 2
+            select new AuthorizedUser(parts[0].Trim(), parts[1].Trim())).ToList();
+    }
+}

http/security/HttpSecuritySingleton.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Linq;
+using BepInEx.Configuration;
+
+namespace VRisingServerApiPlugin.http.security;
+
+public class HttpSecuritySingleton
+{
+    private static HttpSecuritySingleton _instance;
+
+    private IEnumerable<AuthorizedUser> _authorizedUsers;
+
+    public static HttpSecuritySingleton GetInstance()
+    {
+        return _instance ??= new HttpSecuritySingleton();
+    }
+
+    public void Initialize(ConfigEntry<string> authorizedUsers)
+    {
+        authorizedUsers.SettingChanged += (_, args) =>
+        {
+            var changedArgs = (SettingChangedEventArgs)args;
+            var changedSettings = (ConfigEntry<string>)changedArgs.ChangedSetting;
+
+            _authorizedUsers = GetAuthorizedUserList(changedSettings.Value);
+        };
+        _authorizedUsers = GetAuthorizedUserList(authorizedUsers.Value);
+    }
+
+    private static IEnumerable<AuthorizedUser> GetAuthorizedUserList(string authorizedUsers)
+    {
+        return AuthorizedUser.ParseConfig(authorizedUsers);
+    }
+
+    public bool CheckAuthenticationOfUser(string username, string password)
+    {
+        return _authorizedUsers
+            .Count(user => user.Username.Equals(username) && user.Password.Equals(password)) == 1;
+    }
+}