Merge pull request #151 from micahmo/release/v2.0.11

Release/v2.0.11

Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
         <!-- Keep in sync with WS4WSetupScript.iss and VersionInfo.xml -->
-        <AssemblyVersion>2.0.10.0</AssemblyVersion>
-        <FileVersion>2.0.10.0</FileVersion>
-        <InformationalVersion>2.0.10.0</InformationalVersion>
+        <AssemblyVersion>2.0.11.0</AssemblyVersion>
+        <FileVersion>2.0.11.0</FileVersion>
+        <InformationalVersion>2.0.11.0</InformationalVersion>
         <Authors>Micah Morrison</Authors>
         <Product>WS4W</Product>
     </PropertyGroup>

Installer/WS4WSetupScript.iss

@@ -1,6 +1,6 @@
 #define MyAppNameOld "WireGuard Server For Windows"
 #define MyAppName "Wg Server for Windows"
-#define MyAppVersion "2.0.10"
+#define MyAppVersion "2.0.11"
 #define MyAppPublisher "Micah Morrison"
 #define MyAppURL "https://github.com/micahmo/WgServerforWindows"
 #define MyAppExeName "WgServerforWindows.exe"

WgServerforWindows/Models/ClientConfiguration.cs

@@ -36,7 +36,6 @@ public ClientConfiguration(ClientConfigurationList parentList)
             // Server properties
             PresharedKeyProperty.TargetTypes.Add(typeof(ServerConfiguration));
             PublicKeyProperty.TargetTypes.Add(typeof(ServerConfiguration));
-            ServerPersistentKeepaliveProperty.TargetTypes.Add(typeof(ServerConfiguration));
 
             ServerConfigurationPrerequisite.EnsureConfigFile();
             var serverConfiguration = new ServerConfiguration().Load<ServerConfiguration>(Configuration.LoadFromFile(ServerConfigurationPrerequisite.ServerDataPath));
@@ -195,6 +194,39 @@ public ClientConfiguration(ClientConfigurationList parentList)
             };
             Properties.Add(allowedIpsProperty);
 
+            // This is a client property which goes in the client's (peer) section of the server's config,
+            // so it should be defined and configured here, and should be targeted to the server's config.
+            ConfigurationProperty PersistentKeepaliveProperty = new ConfigurationProperty(this)
+            {
+                PersistentPropertyName = "PersistentKeepalive",
+                Name = nameof(PersistentKeepaliveProperty),
+                DefaultValue = 0.ToString(),
+                Validation = new ConfigurationPropertyValidation
+                {
+                    Validate = prop =>
+                    {
+                        string result = default;
+
+                        if (string.IsNullOrEmpty(prop.Value) || int.TryParse(prop.Value, out _) == false)
+                        {
+                            result = Resources.PersistentKeepaliveValidationError;
+                        }
+
+                        return result;
+                    }
+                }
+            };
+            // On load, do a migration of the old value from the server config, if needed.
+            PersistentKeepaliveProperty.OnLoadAction = _ =>
+            {
+                if (string.IsNullOrEmpty(PersistentKeepaliveProperty.Value))
+                {
+                    PersistentKeepaliveProperty.Value = serverConfiguration.ServerPersistentKeepaliveProperty.Value ?? 0.ToString();
+                }
+            };
+            Properties.Add(PersistentKeepaliveProperty);
+            PersistentKeepaliveProperty.TargetTypes.Add(typeof(ServerConfiguration));
+
             // Adjust index of properties and resort
             AddressProperty.Index = 1;
             DnsProperty.Index = 2;
@@ -347,16 +379,6 @@ public ClientConfiguration(ClientConfigurationList parentList)
         };
         private ConfigurationProperty _fullDnsProperty;
 
-        // Note: This is really a server property, but it goes in the in the (peer) client section of the server's config.
-        // So we'll trick the config generator by putting it in the client, targeting it to the server, and returning the server's value,
-        // which the server will set on the client while saving
-        public ConfigurationProperty ServerPersistentKeepaliveProperty => _persistentKeepaliveProperty ??= new ConfigurationProperty(this)
-        {
-            PersistentPropertyName = "PersistentKeepalive",
-            IsHidden = true
-        };
-        private ConfigurationProperty _persistentKeepaliveProperty;
-
         // Note: This is a client-specific property. It goes in the peer (client) section of the server's config, and is thus targeted to the server config type.
         // However, it also goes in the peer (server) section of the client config.
         // Therefore, it must also be defined on the server, targeted to the client, and return this client's value.

WgServerforWindows/Models/ConfigurationBase.cs

@@ -53,6 +53,7 @@ public ConfigurationBase Load(Configuration configuration)
             }
 
             TopLevelActions.ForEach(a => a.OnLoadAction?.Invoke(this));
+            Properties.ForEach(p => p.OnLoadAction?.Invoke(this));
 
             return this;
         }

WgServerforWindows/Models/ConfigurationProperty.cs

@@ -73,6 +73,11 @@ public string DefaultValue
 
         public HashSet<Type> TargetTypes { get; } = new HashSet<Type>();
 
+        /// <summary>
+        /// An action to be invoked after the configuration has been loaded
+        /// </summary>
+        public Action<ConfigurationBase> OnLoadAction { get; set; }
+
         #region Commands
 
         public ICommand ExecuteActionCommand => _executeActionCommand ??= new RelayCommand(() =>

WgServerforWindows/Models/ServerConfiguration.cs

@@ -215,28 +215,12 @@ public ServerConfiguration()
         };
         private EndpointConfigurationProperty _endpointProperty;
 
-        // Note: Although this property is configured on the server, it goes in the peer (client) section of the server's config,
-        // which means it also has to be defined on the client, targeted to the server's config.
-        // The client should return the server's value, and the server should not target this property to any config type.
-        public ConfigurationProperty PersistentKeepaliveProperty => _persistentKeepaliveProperty ??= new ConfigurationProperty(this)
+        // This property is now configured on the client (and targeted to the client's (peer) section in the server config).
+        // It exists here only for backwards compatibility, since it used to be configured here.
+        public ConfigurationProperty ServerPersistentKeepaliveProperty => _persistentKeepaliveProperty ??= new ConfigurationProperty(this)
         {
-            PersistentPropertyName = "PersistentKeepalive", // Don't really need this since it isn't saved from here
-            Name = nameof(PersistentKeepaliveProperty),
-            DefaultValue = 0.ToString(),
-            Validation = new ConfigurationPropertyValidation
-            {
-                Validate = prop =>
-                {
-                    string result = default;
-
-                    if (string.IsNullOrEmpty(prop.Value) || int.TryParse(prop.Value, out _) == false)
-                    {
-                        result = Resources.PersistentKeepaliveValidationError;
-                    }
-
-                    return result;
-                }
-            }
+            PersistentPropertyName = "PersistentKeepalive",
+            IsHidden = true
         };
         private ConfigurationProperty _persistentKeepaliveProperty;
 

WgServerforWindows/Models/ServerConfigurationPrerequisite.cs

@@ -181,7 +181,6 @@ private void SaveWG(ServerConfiguration serverConfiguration)
 
                     if (clientConfiguration.IsEnabledProperty.Value == true.ToString())
                     {
-                        clientConfiguration.ServerPersistentKeepaliveProperty.Value = serverConfiguration.PersistentKeepaliveProperty.Value;
                         configuration = configuration.Merge(clientConfiguration.ToConfiguration<ServerConfiguration>());
                     }
                 }

WireGuardServerForWindows/VersionInfo2.xml

@@ -2,12 +2,12 @@
 <!-- Things to update: Version, Date, Release Notes -->
 <AppUpdate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/micahmo/WgServerforWindows/master/WireGuardServerForWindows/AppUpdate.xsd">
-  <Version>2.0.10.0</Version>
-  <ReleaseDate>2023-04-19</ReleaseDate>
+  <Version>2.0.11.0</Version>
+  <ReleaseDate>2024-02-05</ReleaseDate>
   <!-- Default download -->
-  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.10/WS4WSetup-2.0.10.exe</DownloadLink>
-  <DownloadFileName>WS4WSetup-2.0.10.exe</DownloadFileName>
+  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.11/WS4WSetup-2.0.11.exe</DownloadLink>
+  <DownloadFileName>WS4WSetup-2.0.11.exe</DownloadFileName>
   <!-- Release notes -->
-  <VersionNotes> - Specify a custom subnet range for NAT network</VersionNotes>
+  <VersionNotes> - Allow PersistentKeepalive to be configured per client</VersionNotes>
   <ReleaseNotes></ReleaseNotes>
 </AppUpdate>