change firewall extension table name to Wix5FirewallException

3 files changed, 66 insertions, 20 deletions

diff --git a/src/ext/Firewall/wixext/FirewallCompiler.cs b/src/ext/Firewall/wixext/FirewallCompiler.cs
index 19ee0b6d..ed49ba9c 100644
--- a/src/ext/Firewall/wixext/FirewallCompiler.cs
+++ b/src/ext/Firewall/wixext/FirewallCompiler.cs
@@ -135,7 +135,12 @@ namespace WixToolset.Firewall
                                     protocol = FirewallConstants.NET_FW_IP_PROTOCOL_UDP;
                                     break;
                                 default:
-                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Protocol", protocolValue, "tcp", "udp"));
+                                    int parsedProtocol;
+                                    if (!Int32.TryParse(protocolValue, out parsedProtocol) || parsedProtocol > 255 || parsedProtocol < 0)
+                                    {
+                                        this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Protocol", protocolValue, "tcp", "udp", "0-255"));
+                                    }
+                                    protocol = parsedProtocol;
                                     break;
                             }
                             break;
@@ -149,8 +154,20 @@ namespace WixToolset.Firewall
                                 case "localSubnet":
                                     remoteAddresses = "LocalSubnet";
                                     break;
+                                case "DNS":
+                                    remoteAddresses = "dns";
+                                    break;
+                                case "DHCP":
+                                    remoteAddresses = "dhcp";
+                                    break;
+                                case "WINS":
+                                    remoteAddresses = "wins";
+                                    break;
+                                case "defaultGateway":
+                                    remoteAddresses = "DefaultGateway";
+                                    break;
                                 default:
-                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Scope", scope, "any", "localSubnet"));
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Scope", scope, "any", "localSubnet", "DNS", "DHCP", "WINS", "defaultGateway"));
                                     break;
                             }
                             break;
@@ -251,6 +268,21 @@ namespace WixToolset.Firewall
                 this.Messaging.Write(FirewallErrors.NoExceptionSpecified(sourceLineNumbers));
             }
 
+            // Ports can only be specified if the protocol is TCP or UDP.
+            if (!String.IsNullOrEmpty(port) && protocol.HasValue)
+            {
+                switch(protocol.Value)
+                {
+                    case FirewallConstants.NET_FW_IP_PROTOCOL_TCP:
+                    case FirewallConstants.NET_FW_IP_PROTOCOL_UDP:
+                        break;
+
+                    default:
+                        this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "Port", "Protocol", protocol.Value.ToString()));
+                        break;
+                }
+            }
+
             if (!this.Messaging.EncounteredError)
             {
                 // at this point, File attribute and File parent element are treated the same
@@ -300,8 +332,8 @@ namespace WixToolset.Firewall
                     symbol.Attributes = attributes;
                 }
 
-                this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedFirewallExceptionsInstall", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
-                this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedFirewallExceptionsUninstall", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
+                this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix5SchedFirewallExceptionsInstall", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
+                this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix5SchedFirewallExceptionsUninstall", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
             }
         }
 
diff --git a/src/ext/Firewall/wixext/FirewallDecompiler.cs b/src/ext/Firewall/wixext/FirewallDecompiler.cs
index 69f2c3f4..9ddd8a9a 100644
--- a/src/ext/Firewall/wixext/FirewallDecompiler.cs
+++ b/src/ext/Firewall/wixext/FirewallDecompiler.cs
@@ -32,7 +32,7 @@ namespace WixToolset.Firewall
         {
             switch (table.Name)
             {
-                case "Wix4FirewallException":
+                case "Wix5FirewallException":
                     this.DecompileWixFirewallExceptionTable(table);
                     break;
                 default:
@@ -69,18 +69,29 @@ namespace WixToolset.Firewall
                     string[] addresses = ((string)row[2]).Split(',');
                     if (addresses.Length == 1)
                     {
-                        // special-case the Scope attribute values
-                        if (addresses[0] == "*")
+                        switch(addresses[0])
                         {
-                            firewallException.Add(new XAttribute("Scope", "any"));
-                        }
-                        else if (addresses[0] == "LocalSubnet")
-                        {
-                            firewallException.Add(new XAttribute("Scope", "localSubnet"));
-                        }
-                        else
-                        {
-                            FirewallDecompiler.AddRemoteAddress(firewallException, addresses[0]);
+                            case "*":
+                                firewallException.Add(new XAttribute("Scope", "any"));
+                                break;
+                            case "LocalSubnet":
+                                firewallException.Add(new XAttribute("Scope", "localSubnet"));
+                                break;
+                            case "dns":
+                                firewallException.Add(new XAttribute("Scope", "DNS"));
+                                break;
+                            case "dhcp":
+                                firewallException.Add(new XAttribute("Scope", "DHCP"));
+                                break;
+                            case "wins":
+                                firewallException.Add(new XAttribute("Scope", "WINS"));
+                                break;
+                            case "DefaultGateway":
+                                firewallException.Add(new XAttribute("Scope", "defaultGateway"));
+                                break;
+                            default:
+                                FirewallDecompiler.AddRemoteAddress(firewallException, addresses[0]);
+                                break;
                         }
                     }
                     else
@@ -107,6 +118,9 @@ namespace WixToolset.Firewall
                         case FirewallConstants.NET_FW_IP_PROTOCOL_UDP:
                             firewallException.Add(new XAttribute("Protocol", "udp"));
                             break;
+                        default:
+                            firewallException.Add(new XAttribute("Protocol", row[4]));
+                            break;
                     }
                 }
 
@@ -183,7 +197,7 @@ namespace WixToolset.Firewall
         /// <param name="tables">Collection of all tables.</param>
         private void FinalizeFirewallExceptionTable(TableIndexedCollection tables)
         {
-            if (tables.TryGetTable("Wix4FirewallException", out var firewallExceptionTable))
+            if (tables.TryGetTable("Wix5FirewallException", out var firewallExceptionTable))
             {
                 foreach (var row in firewallExceptionTable.Rows)
                 {
diff --git a/src/ext/Firewall/wixext/FirewallTableDefinitions.cs b/src/ext/Firewall/wixext/FirewallTableDefinitions.cs
index 04918f5f..26dedbf1 100644
--- a/src/ext/Firewall/wixext/FirewallTableDefinitions.cs
+++ b/src/ext/Firewall/wixext/FirewallTableDefinitions.cs
@@ -7,15 +7,15 @@ namespace WixToolset.Firewall
     public static class FirewallTableDefinitions
     {
         public static readonly TableDefinition WixFirewallException = new TableDefinition(
-            "Wix4FirewallException",
+            "Wix5FirewallException",
             FirewallSymbolDefinitions.WixFirewallException,
             new[]
             {
-                new ColumnDefinition("Wix4FirewallException", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key, a non-localized token.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Wix5FirewallException", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key, a non-localized token.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Localizable display name.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("RemoteAddresses", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Remote address to accept incoming connections from.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Port", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, minValue: 1, description: "Port number.", modularizeType: ColumnModularizeType.Property),
-                new ColumnDefinition("Protocol", ColumnType.Number, 1, primaryKey: false, nullable: true, ColumnCategory.Integer, minValue: 6, maxValue: 17, description: "Protocol (6=TCP; 17=UDP)."),
+                new ColumnDefinition("Protocol", ColumnType.Number, 1, primaryKey: false, nullable: true, ColumnCategory.Integer, minValue: 0, maxValue: 255, description: "Protocol (6=TCP; 17=UDP). https://www.iana.org/assignments/protocol-numbers"),
                 new ColumnDefinition("Program", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Exception for a program (formatted path name).", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Vital=1"),
                 new ColumnDefinition("Profile", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Integer, minValue: 1, maxValue: 2147483647, description: "Profile (1=domain; 2=private; 4=public; 2147483647=all)."),