diff options
author | Bob Arnson <bob@firegiant.com> | 2024-02-26 22:17:10 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2024-02-27 12:28:30 -0500 |
commit | 58d81bb1b6f7d7c6104914b3070dac95f16877c4 (patch) | |
tree | 01ba734d3d17087560e02f57a062b4712dc48f4b /src/ext/Firewall/wixext/FirewallDecompiler.cs | |
parent | 6067839ba180f2f4bcd5eac67f839f68f513ccd2 (diff) | |
download | wix-58d81bb1b6f7d7c6104914b3070dac95f16877c4.tar.gz wix-58d81bb1b6f7d7c6104914b3070dac95f16877c4.tar.bz2 wix-58d81bb1b6f7d7c6104914b3070dac95f16877c4.zip |
Use camelCase attribute values.
Diffstat (limited to 'src/ext/Firewall/wixext/FirewallDecompiler.cs')
-rw-r--r-- | src/ext/Firewall/wixext/FirewallDecompiler.cs | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/src/ext/Firewall/wixext/FirewallDecompiler.cs b/src/ext/Firewall/wixext/FirewallDecompiler.cs index 7fafab17..46ab2bd1 100644 --- a/src/ext/Firewall/wixext/FirewallDecompiler.cs +++ b/src/ext/Firewall/wixext/FirewallDecompiler.cs | |||
@@ -4,6 +4,8 @@ namespace WixToolset.Firewall | |||
4 | { | 4 | { |
5 | using System; | 5 | using System; |
6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
7 | using System.Reflection; | ||
8 | using System.Security; | ||
7 | using System.Xml.Linq; | 9 | using System.Xml.Linq; |
8 | using WixToolset.Data; | 10 | using WixToolset.Data; |
9 | using WixToolset.Data.WindowsInstaller; | 11 | using WixToolset.Data.WindowsInstaller; |
@@ -161,11 +163,11 @@ namespace WixToolset.Firewall | |||
161 | 163 | ||
162 | if ((attr & 0x2) == 0x2) | 164 | if ((attr & 0x2) == 0x2) |
163 | { | 165 | { |
164 | firewallException.Add(new XAttribute("OnUpdate", "DoNothing")); | 166 | firewallException.Add(new XAttribute("OnUpdate", "doNothing")); |
165 | } | 167 | } |
166 | else if ((attr & 0x4) == 0x4) | 168 | else if ((attr & 0x4) == 0x4) |
167 | { | 169 | { |
168 | firewallException.Add(new XAttribute("OnUpdate", "EnableOnly")); | 170 | firewallException.Add(new XAttribute("OnUpdate", "enableOnly")); |
169 | } | 171 | } |
170 | } | 172 | } |
171 | 173 | ||
@@ -222,10 +224,10 @@ namespace WixToolset.Firewall | |||
222 | case FirewallConstants.IntegerNotSetString: | 224 | case FirewallConstants.IntegerNotSetString: |
223 | break; | 225 | break; |
224 | case "1": | 226 | case "1": |
225 | firewallException.Add(new XAttribute("Action", "Allow")); | 227 | firewallException.Add(new XAttribute("Action", "allow")); |
226 | break; | 228 | break; |
227 | case "0": | 229 | case "0": |
228 | firewallException.Add(new XAttribute("Action", "Block")); | 230 | firewallException.Add(new XAttribute("Action", "block")); |
229 | break; | 231 | break; |
230 | default: | 232 | default: |
231 | firewallException.Add(new XAttribute("Action", action)); | 233 | firewallException.Add(new XAttribute("Action", action)); |
@@ -241,16 +243,16 @@ namespace WixToolset.Firewall | |||
241 | case FirewallConstants.IntegerNotSetString: | 243 | case FirewallConstants.IntegerNotSetString: |
242 | break; | 244 | break; |
243 | case "0": | 245 | case "0": |
244 | firewallException.Add(new XAttribute("EdgeTraversal", "Deny")); | 246 | firewallException.Add(new XAttribute("EdgeTraversal", "deny")); |
245 | break; | 247 | break; |
246 | case "1": | 248 | case "1": |
247 | firewallException.Add(new XAttribute("EdgeTraversal", "Allow")); | 249 | firewallException.Add(new XAttribute("EdgeTraversal", "allow")); |
248 | break; | 250 | break; |
249 | case "2": | 251 | case "2": |
250 | firewallException.Add(new XAttribute("EdgeTraversal", "DeferToApp")); | 252 | firewallException.Add(new XAttribute("EdgeTraversal", "deferToApp")); |
251 | break; | 253 | break; |
252 | case "3": | 254 | case "3": |
253 | firewallException.Add(new XAttribute("EdgeTraversal", "DeferToUser")); | 255 | firewallException.Add(new XAttribute("EdgeTraversal", "deferToUser")); |
254 | break; | 256 | break; |
255 | default: | 257 | default: |
256 | firewallException.Add(new XAttribute("EdgeTraversal", edgeTraversal)); | 258 | firewallException.Add(new XAttribute("EdgeTraversal", edgeTraversal)); |
@@ -292,13 +294,13 @@ namespace WixToolset.Firewall | |||
292 | string[] interfaces = row.FieldAsString(16).Split(new[] { FirewallConstants.FORBIDDEN_FIREWALL_CHAR }, StringSplitOptions.RemoveEmptyEntries); | 294 | string[] interfaces = row.FieldAsString(16).Split(new[] { FirewallConstants.FORBIDDEN_FIREWALL_CHAR }, StringSplitOptions.RemoveEmptyEntries); |
293 | if (interfaces.Length == 1) | 295 | if (interfaces.Length == 1) |
294 | { | 296 | { |
295 | firewallException.Add(new XAttribute("Interface", interfaces[0])); | 297 | firewallException.Add(new XAttribute("Interface", interfaces[0].ToCamelCase())); |
296 | } | 298 | } |
297 | else | 299 | else |
298 | { | 300 | { |
299 | foreach (var interfaceItem in interfaces) | 301 | foreach (var interfaceItem in interfaces) |
300 | { | 302 | { |
301 | FirewallDecompiler.AddInterface(firewallException, interfaceItem); | 303 | FirewallDecompiler.AddInterface(firewallException, interfaceItem.ToCamelCase()); |
302 | } | 304 | } |
303 | } | 305 | } |
304 | } | 306 | } |
@@ -308,13 +310,13 @@ namespace WixToolset.Firewall | |||
308 | string[] interfaceTypes = row.FieldAsString(17).Split(','); | 310 | string[] interfaceTypes = row.FieldAsString(17).Split(','); |
309 | if (interfaceTypes.Length == 1) | 311 | if (interfaceTypes.Length == 1) |
310 | { | 312 | { |
311 | firewallException.Add(new XAttribute("InterfaceType", interfaceTypes[0])); | 313 | firewallException.Add(new XAttribute("InterfaceType", interfaceTypes[0].ToCamelCase())); |
312 | } | 314 | } |
313 | else | 315 | else |
314 | { | 316 | { |
315 | foreach (var interfaceType in interfaceTypes) | 317 | foreach (var interfaceType in interfaceTypes) |
316 | { | 318 | { |
317 | FirewallDecompiler.AddInterfaceType(firewallException, interfaceType); | 319 | FirewallDecompiler.AddInterfaceType(firewallException, interfaceType.ToCamelCase()); |
318 | } | 320 | } |
319 | } | 321 | } |
320 | } | 322 | } |
@@ -408,19 +410,19 @@ namespace WixToolset.Firewall | |||
408 | case FirewallConstants.IntegerNotSetString: | 410 | case FirewallConstants.IntegerNotSetString: |
409 | break; | 411 | break; |
410 | case "0": | 412 | case "0": |
411 | firewallException.Add(new XAttribute("IPSecSecureFlags", "None")); | 413 | firewallException.Add(new XAttribute("IPSecSecureFlags", "none")); |
412 | break; | 414 | break; |
413 | case "1": | 415 | case "1": |
414 | firewallException.Add(new XAttribute("IPSecSecureFlags", "NoEncapsulation")); | 416 | firewallException.Add(new XAttribute("IPSecSecureFlags", "noEncapsulation")); |
415 | break; | 417 | break; |
416 | case "2": | 418 | case "2": |
417 | firewallException.Add(new XAttribute("IPSecSecureFlags", "WithIntegrity")); | 419 | firewallException.Add(new XAttribute("IPSecSecureFlags", "withIntegrity")); |
418 | break; | 420 | break; |
419 | case "3": | 421 | case "3": |
420 | firewallException.Add(new XAttribute("IPSecSecureFlags", "NegotiateEncryption")); | 422 | firewallException.Add(new XAttribute("IPSecSecureFlags", "negotiateEncryption")); |
421 | break; | 423 | break; |
422 | case "4": | 424 | case "4": |
423 | firewallException.Add(new XAttribute("IPSecSecureFlags", "Encrypt")); | 425 | firewallException.Add(new XAttribute("IPSecSecureFlags", "encrypt")); |
424 | break; | 426 | break; |
425 | default: | 427 | default: |
426 | firewallException.Add(new XAttribute("IPSecSecureFlags", secureFlags)); | 428 | firewallException.Add(new XAttribute("IPSecSecureFlags", secureFlags)); |
@@ -499,4 +501,14 @@ namespace WixToolset.Firewall | |||
499 | } | 501 | } |
500 | } | 502 | } |
501 | } | 503 | } |
504 | |||
505 | internal static class StringExtensions | ||
506 | { | ||
507 | public static string ToCamelCase(this string str) | ||
508 | { | ||
509 | var camelCase = str[0].ToString().ToLowerInvariant() + str.Substring(1); | ||
510 | |||
511 | return camelCase; | ||
512 | } | ||
513 | } | ||
502 | } | 514 | } |