Merge pull request #184 from micahmo/release/v2.1.1

micahmo · web-flow · commit b82d0e12a044 · 2025-01-30T10:16:15.000-05:00
Release/v2.1.1
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
         <!-- Keep in sync with WS4WSetupScript.iss and VersionInfo.xml -->
-        <AssemblyVersion>2.1.0.0</AssemblyVersion>
-        <FileVersion>2.1.0.0</FileVersion>
-        <InformationalVersion>2.1.0.0</InformationalVersion>
+        <AssemblyVersion>2.1.1.0</AssemblyVersion>
+        <FileVersion>2.1.1.0</FileVersion>
+        <InformationalVersion>2.1.1.0</InformationalVersion>
         <Authors>Micah Morrison</Authors>
         <Product>WS4W</Product>
     </PropertyGroup>
diff --git a/Installer/WS4WSetupScript.iss b/Installer/WS4WSetupScript.iss
@@ -1,6 +1,6 @@
 #define MyAppNameOld "WireGuard Server For Windows"
 #define MyAppName "Wg Server for Windows"
-#define MyAppVersion "2.1.0"
+#define MyAppVersion "2.1.1"
 #define MyAppPublisher "Micah Morrison"
 #define MyAppURL "https://github.com/micahmo/WgServerforWindows"
 #define MyAppExeName "WgServerforWindows.exe"
diff --git a/WgServerforWindows/Models/ClientConfiguration.cs b/WgServerforWindows/Models/ClientConfiguration.cs
@@ -290,7 +290,7 @@ public ClientConfiguration(ClientConfigurationList parentList)
                     // Support CSV allowed IPs
                     foreach (string address in obj.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(a => a.Trim()))
                     {
-                        if (IPNetwork.TryParse(address, out _) == false)
+                        if (IPNetwork2.TryParse(address, out _) == false)
                         {
                             return Resources.NetworkAddressValidationError;
                         }
diff --git a/WgServerforWindows/Models/NetNatRangeSubCommand.cs b/WgServerforWindows/Models/NetNatRangeSubCommand.cs
@@ -38,14 +38,14 @@ public override void Configure()
             {
                 if (!string.IsNullOrWhiteSpace(selectionWindowModel.SelectedItem.BackingObject))
                 {
-                    if (!IPNetwork.TryParse(selectionWindowModel.SelectedItem.BackingObject, out _))
+                    if (!IPNetwork2.TryParse(selectionWindowModel.SelectedItem.BackingObject, out _))
                     {
                         selectionWindowModel.ValidationError = Resources.NetworkAddressValidationError;
                         return false;
                     }
-                    // IPNetwork.TryParse recognizes single IP addresses as CIDR (with 8 mask).
+                    // IPNetwork2.TryParse recognizes single IP addresses as CIDR (with 8 mask).
                     // This is not good, because we want an explicit CIDR for the server.
-                    // Therefore, if IPNetwork.TryParse succeeds, and IPAddress.TryParse also succeeds, we have a problem.
+                    // Therefore, if IPNetwork2.TryParse succeeds, and IPAddress.TryParse also succeeds, we have a problem.
                     if (IPAddress.TryParse(selectionWindowModel.SelectedItem.BackingObject, out _))
                     {
                         // This is just a regular address. We want CIDR.
diff --git a/WgServerforWindows/Models/ServerConfiguration.cs b/WgServerforWindows/Models/ServerConfiguration.cs
@@ -37,13 +37,13 @@ public ServerConfiguration()
                     // Multiple server addresses are supported, so validate all of them
                     foreach (string address in obj.Value.Split(',').Select(a => a.Trim()))
                     {
-                        if (IPNetwork.TryParse(address, out _) == false)
+                        if (IPNetwork2.TryParse(address, out _) == false)
                         {
                             return Resources.NetworkAddressValidationError;
                         }
-                        // IPNetwork.TryParse recognizes single IP addresses as CIDR (with 8 mask).
+                        // IPNetwork2.TryParse recognizes single IP addresses as CIDR (with 8 mask).
                         // This is not good, because we want an explicit CIDR for the server.
-                        // Therefore, if IPNetwork.TryParse succeeds, and IPAddress.TryParse also succeeds, we have a problem.
+                        // Therefore, if IPNetwork2.TryParse succeeds, and IPAddress.TryParse also succeeds, we have a problem.
                         if (IPAddress.TryParse(address, out _))
                         {
                             // This is just a regular address. We want CIDR.
@@ -167,7 +167,7 @@ public ServerConfiguration()
                     // Support CSV allowed IPs
                     foreach (string address in obj.Value.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Select(a => a.Trim()))
                     {
-                        if (IPNetwork.TryParse(address, out _) == false)
+                        if (IPNetwork2.TryParse(address, out _) == false)
                         {
                             return Resources.NetworkAddressValidationError;
                         }
diff --git a/WireGuardServerForWindows/VersionInfo2.xml b/WireGuardServerForWindows/VersionInfo2.xml
@@ -2,13 +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.1.0.0</Version>
-  <ReleaseDate>2025-01-17</ReleaseDate>
+  <Version>2.1.1.0</Version>
+  <ReleaseDate>2025-01-30</ReleaseDate>
   <!-- Default download -->
-  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.1.0/WS4WSetup-2.1.0.exe</DownloadLink>
-  <DownloadFileName>WS4WSetup-2.1.0.exe</DownloadFileName>
+  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.1.1/WS4WSetup-2.1.1.exe</DownloadLink>
+  <DownloadFileName>WS4WSetup-2.1.1.exe</DownloadFileName>
   <!-- Release notes -->
-  <VersionNotes> - Upgraded to .NET 8 (Please be on the lookout for broken functionality and report any issues on GitHub!)
- - Added the ability to view the names of clients in the server status</VersionNotes>
+  <VersionNotes> - This is a quick update which fixes an IP address validation issue reported in #182</VersionNotes>
   <ReleaseNotes></ReleaseNotes>
 </AppUpdate>

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ public ClientConfiguration(ClientConfigurationList parentList)`
`290`	`290`	`// Support CSV allowed IPs`
`291`	`291`	`foreach (string address in obj.Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(a => a.Trim()))`
`292`	`292`	`{`
`293`		`- if (IPNetwork.TryParse(address, out _) == false)`
	`293`	`+ if (IPNetwork2.TryParse(address, out _) == false)`
`294`	`294`	`{`
`295`	`295`	`return Resources.NetworkAddressValidationError;`
`296`	`296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,14 @@ public override void Configure()`
`38`	`38`	`{`
`39`	`39`	`if (!string.IsNullOrWhiteSpace(selectionWindowModel.SelectedItem.BackingObject))`
`40`	`40`	`{`
`41`		`- if (!IPNetwork.TryParse(selectionWindowModel.SelectedItem.BackingObject, out _))`
	`41`	`+ if (!IPNetwork2.TryParse(selectionWindowModel.SelectedItem.BackingObject, out _))`
`42`	`42`	`{`
`43`	`43`	`selectionWindowModel.ValidationError = Resources.NetworkAddressValidationError;`
`44`	`44`	`return false;`
`45`	`45`	`}`
`46`		`- // IPNetwork.TryParse recognizes single IP addresses as CIDR (with 8 mask).`
	`46`	`+ // IPNetwork2.TryParse recognizes single IP addresses as CIDR (with 8 mask).`
`47`	`47`	`// This is not good, because we want an explicit CIDR for the server.`
`48`		`- // Therefore, if IPNetwork.TryParse succeeds, and IPAddress.TryParse also succeeds, we have a problem.`
	`48`	`+ // Therefore, if IPNetwork2.TryParse succeeds, and IPAddress.TryParse also succeeds, we have a problem.`
`49`	`49`	`if (IPAddress.TryParse(selectionWindowModel.SelectedItem.BackingObject, out _))`
`50`	`50`	`{`
`51`	`51`	`// This is just a regular address. We want CIDR.`
Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,13 @@ public ServerConfiguration()`
`37`	`37`	`// Multiple server addresses are supported, so validate all of them`
`38`	`38`	`foreach (string address in obj.Value.Split(',').Select(a => a.Trim()))`
`39`	`39`	`{`
`40`		`- if (IPNetwork.TryParse(address, out _) == false)`
	`40`	`+ if (IPNetwork2.TryParse(address, out _) == false)`
`41`	`41`	`{`
`42`	`42`	`return Resources.NetworkAddressValidationError;`
`43`	`43`	`}`
`44`		`- // IPNetwork.TryParse recognizes single IP addresses as CIDR (with 8 mask).`
	`44`	`+ // IPNetwork2.TryParse recognizes single IP addresses as CIDR (with 8 mask).`
`45`	`45`	`// This is not good, because we want an explicit CIDR for the server.`
`46`		`- // Therefore, if IPNetwork.TryParse succeeds, and IPAddress.TryParse also succeeds, we have a problem.`
	`46`	`+ // Therefore, if IPNetwork2.TryParse succeeds, and IPAddress.TryParse also succeeds, we have a problem.`
`47`	`47`	`if (IPAddress.TryParse(address, out _))`
`48`	`48`	`{`
`49`	`49`	`// This is just a regular address. We want CIDR.`
`@@ -167,7 +167,7 @@ public ServerConfiguration()`
`167`	`167`	`// Support CSV allowed IPs`
`168`	`168`	`foreach (string address in obj.Value.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Select(a => a.Trim()))`
`169`	`169`	`{`
`170`		`- if (IPNetwork.TryParse(address, out _) == false)`
	`170`	`+ if (IPNetwork2.TryParse(address, out _) == false)`
`171`	`171`	`{`
`172`	`172`	`return Resources.NetworkAddressValidationError;`
`173`	`173`	`}`