Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix xFirewall if CIDR notation used for LocalAddress/RemoteAddress - Fixes #169 #173

Merged
merged 19 commits into from
Jan 15, 2017
Merged

Fix xFirewall if CIDR notation used for LocalAddress/RemoteAddress - Fixes #169 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f184ea6
Work to fix xFirewall issue with CIDR notation - issue #169
PlagueHO Dec 26, 2016
e9aa3fb
Fix unit tests for xNetworking
PlagueHO Dec 26, 2016
d1859f6
Fix unit tests for xFirewall and clean up Mandatory parameter format
PlagueHO Dec 26, 2016
e7f3ff5
Merge branch 'dev' into Issue-151-and-169/xFirewall-Bug-and-Example
PlagueHO Jan 6, 2017
9b32ac1
Merge upstream and fix conflicts
PlagueHO Jan 11, 2017
c167120
Fix merge
PlagueHO Jan 11, 2017
9b57711
Fixes after merge
PlagueHO Jan 11, 2017
293afd2
Work on Moving Common Modules to Modules folder
PlagueHO Jan 11, 2017
c021905
Fix Resource Helper to load from DSC resource path
PlagueHO Jan 11, 2017
293a038
One more attempt at fix
PlagueHO Jan 11, 2017
5bb953e
Fix NetowkingDsc.Common
PlagueHO Jan 11, 2017
019491a
Fix Example
PlagueHO Jan 12, 2017
32fcc9f
Fix path to Resource Module in Networking Common
PlagueHO Jan 12, 2017
8edfe80
Fix name of NetworkingDsc.Common strings
PlagueHO Jan 12, 2017
43f5c61
Suppressed PSAvoidUsingInvokeExpression.
PlagueHO Jan 12, 2017
1c03d48
Remove Suppression of PSAvoidUsingInvokeExpression
PlagueHO Jan 12, 2017
03277df
Fixed example. Tweaked Firewall Integration tests
PlagueHO Jan 13, 2017
bfd1168
Fix xFirewall Integration tests
PlagueHO Jan 13, 2017
6a6e6c7
Tweak integration tests
PlagueHO Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@
value) to "Block"
- Added support for auto generating wiki, help files, markdown linting
and checking examples.
- Added NetworkingDsc.ResourceHelper module based on copy from [PSDscResources](https://github.com/PowerShell/PSDscResources/blob/dev/DscResources/CommonResourceHelper.psm1).
- MSFT_xFirewall:
- Cleaned up ParameterList table layout and moved into a new file
(MSFT_xFirewall.data.psd1).
- Separated Localization strings into strings file.
- Added standard help blocks to all functions to meet HQRM standards.
- Added CmdletBinding attribute to all functions to meet HQRM standards.
- Style changes to meet HQRM standards.
- Fixed issue using CIDR notation for LocalAddress or RemoteAddress.
See [GitHub issue](https://github.com/PowerShell/xNetworking/issues/169).
- Fixed integration tests so that values being set are correctly tested.
- Added integration tests for Removal of Firewall rule.
- Added NetworkingDsc.Common module to contain shared networking functions.

## 3.1.0.0

Expand Down
36 changes: 36 additions & 0 deletions Modules/xNetworking/DSCResources/MSFT_xFirewall/MSFT_xFirewall.data.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
@{
ParameterList = @(
@{ Name = 'Name'; Source = '$FirewallRule.Name'; Type = 'String' }
@{ Name = 'DisplayName'; Source = '$FirewallRule.DisplayName'; Type = 'String' }
@{ Name = 'Group'; Source = '$FirewallRule.Group'; Type = 'String' }
@{ Name = 'DisplayGroup'; Source = '$FirewallRule.DisplayGroup'; Type = '' }
@{ Name = 'Enabled'; Source = '$FirewallRule.Enabled'; Type = 'String' }
@{ Name = 'Action'; Source = '$FirewallRule.Action'; Type = 'String' }
@{ Name = 'Profile'; Source = '$firewallRule.Profile'; Type = 'Array'; Delimiter = ', ' }
@{ Name = 'Direction'; Source = '$FirewallRule.Direction'; Type = 'String' }
@{ Name = 'Description'; Source = '$FirewallRule.Description'; Type = 'String' }
@{ Name = 'RemotePort'; Source = '$properties.PortFilters.RemotePort'; Type = 'Array' }
@{ Name = 'LocalPort'; Source = '$properties.PortFilters.LocalPort'; Type = 'Array' }
@{ Name = 'Protocol'; Source = '$properties.PortFilters.Protocol'; Type = 'String' }
@{ Name = 'Program'; Source = '$properties.ApplicationFilters.Program'; Type = 'String' }
@{ Name = 'Service'; Source = '$properties.ServiceFilters.Service'; Type = 'String' }
@{ Name = 'Authentication'; Source = '$properties.SecurityFilters.Authentication'; Type = 'String' }
@{ Name = 'Encryption'; Source = '$properties.SecurityFilters.Encryption'; Type = 'String' }
@{ Name = 'InterfaceAlias'; Source = '$properties.InterfaceFilters.InterfaceAlias'; Type = 'Array' }
@{ Name = 'InterfaceType'; Source = '$properties.InterfaceTypeFilters.InterfaceType'; Type = 'String' }
@{ Name = 'LocalAddress'; Source = '$properties.AddressFilters.LocalAddress'; Type = 'ArrayIP' }
@{ Name = 'LocalUser'; Source = '$properties.SecurityFilters.LocalUser'; Type = 'String' }
@{ Name = 'Package'; Source = '$properties.ApplicationFilters.Package'; Type = 'String' }
@{ Name = 'Platform'; Source = '$firewallRule.Platform'; Type = 'Array' }
@{ Name = 'RemoteAddress'; Source = '$properties.AddressFilters.RemoteAddress'; Type = 'ArrayIP' }
@{ Name = 'RemoteMachine'; Source = '$properties.SecurityFilters.RemoteMachine'; Type = 'String' }
@{ Name = 'RemoteUser'; Source = '$properties.SecurityFilters.RemoteUser'; Type = 'String' }
@{ Name = 'DynamicTransport'; Source = '$properties.PortFilters.DynamicTransport'; Type = 'String' }
@{ Name = 'EdgeTraversalPolicy'; Source = '$FirewallRule.EdgeTraversalPolicy'; Type = 'String' }
@{ Name = 'IcmpType'; Source = '$properties.PortFilters.IcmpType'; Type = 'Array' }
@{ Name = 'LocalOnlyMapping'; Source = '$FirewallRule.LocalOnlyMapping'; Type = 'Boolean' }
@{ Name = 'LooseSourceMapping'; Source = '$FirewallRule.LooseSourceMapping'; Type = 'Boolean' }
@{ Name = 'OverrideBlockRules'; Source = '$properties.SecurityFilters.OverrideBlockRules'; Type = 'Boolean' }
@{ Name = 'Owner'; Source = '$FirewallRule.Owner'; Type = 'String' }
)
}
Loading