Use the correct case for firewall attribute values
Rob Mensching committed
Mar 24, 2024 at 13:20 UTC
8db36166ee5a051983025c3311ebb654e5c2e5d9
3 files changed
+14
-8
src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingFirewall/PackageComponents.wxs
+3
-3
@@ -12,9 +12,9 @@
12
</File>
13
14
<fw:FirewallException Description="A port-based firewall exception" Name="ExamplePort" Port="42" Outbound="yes" Scope="localSubnet" OnUpdate="enableOnly" />
15
- <fw:FirewallException Description="DNS scope firewall exception" Name="ExampleDNSScope" Port="356" Protocol="udp" Scope="DNS" />
16
- <fw:FirewallException Description="DHCP scope firewall exception" Name="ExampleDHCPScope" Program="test.exe" Protocol="211" Scope="DHCP" Profile="public" />
17
- <fw:FirewallException Description="WINS scope firewall exception" Name="ExampleWINSScope" Port="6573" Scope="WINS" Profile="domain"/>
15
+ <fw:FirewallException Description="DNS scope firewall exception" Name="ExampleDNSScope" Port="356" Protocol="udp" Scope="dns" />
16
+ <fw:FirewallException Description="DHCP scope firewall exception" Name="ExampleDHCPScope" Program="test.exe" Protocol="211" Scope="dhcp" Profile="public" />
17
+ <fw:FirewallException Description="WINS scope firewall exception" Name="ExampleWINSScope" Port="6573" Scope="wins" Profile="domain"/>
18
<fw:FirewallException Description="defaultGateway scope firewall exception" Name="ExampleDefaultGatewayScope" Port="4432" Scope="defaultGateway" Profile="private" />
19
20
<fw:FirewallException Description="Defer to user edge traversal" Name="defertouser" Program="fw.exe" EdgeTraversal="deferToUser" />
src/ext/Firewall/wixext/FirewallCompiler.cs
+8
-2
@@ -227,12 +227,15 @@ namespace WixToolset.Firewall
227
remoteAddresses = "LocalSubnet";
228
break;
229
case "DNS":
230
+ case "dns":
231
remoteAddresses = "dns";
232
break;
233
case "DHCP":
234
+ case "dhcp":
235
remoteAddresses = "dhcp";
236
break;
237
case "WINS":
238
+ case "wins":
239
remoteAddresses = "wins";
240
break;
241
case "defaultGateway":
@@ -242,7 +245,7 @@ namespace WixToolset.Firewall
245
remoteAddresses = scope;
246
if (!this.ParseHelper.ContainsProperty(scope))
247
{
245
- this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Scope", scope, "any", "localSubnet", "DNS", "DHCP", "WINS", "defaultGateway"));
248
+ this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Scope", scope, "any", "localSubnet", "dns", "dhcp", "wins", "defaultGateway"));
249
}
250
break;
251
}
@@ -384,12 +387,15 @@ namespace WixToolset.Firewall
387
localAddresses = "LocalSubnet";
388
break;
389
case "DNS":
390
+ case "dns":
391
localAddresses = "dns";
392
break;
393
case "DHCP":
394
+ case "dhcp":
395
localAddresses = "dhcp";
396
break;
397
case "WINS":
398
+ case "wins":
399
localAddresses = "wins";
400
break;
401
case "defaultGateway":
@@ -399,7 +405,7 @@ namespace WixToolset.Firewall
405
default:
406
if (!this.ParseHelper.ContainsProperty(localScope))
407
{
402
- this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "LocalScope", localScope, "any", "localSubnet", "DNS", "DHCP", "WINS", "defaultGateway"));
408
+ this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "LocalScope", localScope, "any", "localSubnet", "dns", "dhcp", "wins", "defaultGateway"));
409
}
410
else
411
{
src/test/msi/TestData/FirewallExtensionTests/ScopeRules/product.wxs
+3
-3
@@ -18,13 +18,13 @@
18
Name="WiXToolset401 Test - 0013" Scope="localSubnet" Port="1300" />
19
<fw:FirewallException Id="FirewallException14"
20
Description="WiX Toolset firewall exception rule integration test - scope DNS"
21
- Name="WiXToolset401 Test - 0014" Scope="DNS" Port="1400" />
21
+ Name="WiXToolset401 Test - 0014" Scope="dns" Port="1400" />
22
<fw:FirewallException Id="FirewallException15"
23
Description="WiX Toolset firewall exception rule integration test - scope DHCP"
24
- Name="WiXToolset401 Test - 0015" Scope="DHCP" Port="1500" />
24
+ Name="WiXToolset401 Test - 0015" Scope="dhcp" Port="1500" />
25
<fw:FirewallException Id="FirewallException16"
26
Description="WiX Toolset firewall exception rule integration test - scope WINS"
27
- Name="WiXToolset401 Test - 0016" Scope="WINS" Port="1600" />
27
+ Name="WiXToolset401 Test - 0016" Scope="wins" Port="1600" />
28
<fw:FirewallException Id="FirewallException17"
29
Description="WiX Toolset firewall exception rule integration test - scope default gateway"
30
Name="WiXToolset401 Test - 0017" Scope="defaultGateway" Port="1700" />