Actually fix the damn config bug

Author: Enovale

Alibi/ClientSession.cs

@@ -87,7 +87,7 @@ protected override void OnDisconnected()
 
         protected override void OnReceived(byte[] buffer, long offset, long size)
         {
-            if (offset + size >= buffer.Length)
+            if (offset + size >= buffer.Length || Client == null)
                 return;
             var msg = Encoding.UTF8.GetString(buffer, (int) offset, (int) size);
             var disallowedRequests = "GET;HEAD;POST;PUT;DELETE;TRACE;OPTIONS;CONNECT;PATCH".Split(';');

Alibi/Configuration.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Runtime.Serialization;
 using Alibi.Helpers;
 using Alibi.Plugins.API;
 using Newtonsoft.Json;
@@ -13,8 +14,8 @@ public class Configuration : IConfiguration
 #pragma warning disable CA2235 // Mark all non-serializable fields
         public string ServerName { get; internal set; } = "Test ServerRef";
         public string ServerDescription { get; internal set; } = "Example server description.";
-        public string Motd { get; internal set; } = "Welcome to my test server! Type /help for a list of commands you can run.";
-
+        public string Motd { get; internal set; } =
+            "Welcome to my test server! Type /help for a list of commands you can run.";
         public IPAddress BoundIpAddress { get; internal set; } = IPAddress.Parse("0.0.0.0");
         public int Port { get; internal set; } = 27016;
         public int WebsocketPort { get; internal set; } = 27017;
@@ -54,7 +55,7 @@ public void SaveToFile(string path)
 
         public static Configuration LoadFromFile(string path)
         {
-            var jsonSettings = new JsonSerializerSettings();
+            var jsonSettings = new JsonSerializerSettings() {ContractResolver = new JsonResolver()};
             jsonSettings.Converters.Add(new IpConverter());
             var conf = JsonConvert.DeserializeObject<Configuration>(File.ReadAllText(path), jsonSettings);
             File.WriteAllText(path, JsonConvert.SerializeObject(conf, Formatting.Indented, jsonSettings));

Alibi/Helpers/JsonResolver.cs

@@ -0,0 +1,21 @@
+using System.Reflection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace Alibi.Helpers
+{
+    public class JsonResolver : DefaultContractResolver
+    {
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            var prop = base.CreateProperty(member, memberSerialization);
+
+            if (member.DeclaringType == typeof(Configuration))
+            {
+                prop.Writable = true;
+            }
+
+            return prop;
+        }
+    }
+}

Alibi/Program.cs

@@ -20,8 +20,7 @@ static Program()
             CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
             ResetEvent = new ManualResetEvent(false);
             Environment.CurrentDirectory = GetRealProcessDirectory();
-            if (!File.Exists(Server.ConfigPath)
-                || new FileInfo(Server.ConfigPath).Length <= 0)
+            if (!File.Exists(Server.ConfigPath) || new FileInfo(Server.ConfigPath).Length <= 0)
                 new Configuration().SaveToFile(Server.ConfigPath);
             _server = new Server(Configuration.LoadFromFile(Server.ConfigPath));
             Console.Title = "Alibi - Running";