Skip to content

Fixed SNAT private ranges IP validation bug #18857

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

Merged
BethanyZhou merged 3 commits into from
Jul 7, 2022
Merged

Fixed SNAT private ranges IP validation bug #18857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4f48c6
Fixed SNAT private ranges IP validation bug
Jul 1, 2022
0b807d2
Updated Changelog
Jul 1, 2022
1db403f
updated session records
Jul 6, 2022
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
2 changes: 1 addition & 1 deletion src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,7 +1492,7 @@ function Test-AzureFirewallPolicyPrivateRangeCRUD {
$location = "westus2"
$vnetName = Get-ResourceName
$privateRange2 = @("IANAPrivateRanges", "0.0.0.0/0", "66.92.0.0/16")
$privateRange1 = @("3.3.0.0/24", "98.0.0.0/8")
$privateRange1 = @("3.3.0.0/24", "98.0.0.0/8","10.227.16.0/20")
Copy link
Contributor

@BethanyZhou BethanyZhou Jul 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The value of $privateRange1 changes, these two test cases need to re-record.

Copy link
Contributor Author

@Gizachew-Eshetie Gizachew-Eshetie Jul 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BethanyZhou updated session records.

$privateRange2Translated = @("0.0.0.0/0", "66.92.0.0/16", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "100.64.0.0/10")

try {
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Network.Test/ScenarioTests/AzureFirewallTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,7 @@ function Test-AzureFirewallPrivateRangeCRUD {
$publicIpName = Get-ResourceName

$privateRange1 = @("IANAPrivateRanges", "0.0.0.0/0", "66.92.0.0/16")
$privateRange2 = @("3.3.0.0/24", "98.0.0.0/8")
$privateRange2 = @("3.3.0.0/24", "98.0.0.0/8","10.227.16.0/20","10.226.0.0/16")

try {
# Create the resource group
Expand Down
470 changes: 235 additions & 235 deletions ....Test.ScenarioTests.AzureFirewallPolicyTests/TestAzureFirewallPolicyPrivateRangeCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

1,114 changes: 480 additions & 634 deletions ...ands.Network.Test.ScenarioTests.AzureFirewallTests/TestAzureFirewallPrivateRangeCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/Network/Network/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
--->

## Upcoming Release
* Fixed bug that causes an overflow due to incorrect SNAT private ranges IP validation.
* Added new cmdlets to create/manage L4(TCP/TLS) objects for ApplicationGateway:
- `Get-AzApplicationGatewayListener`
- `New-AzApplicationGatewayListener`
Expand Down
4 changes: 2 additions & 2 deletions src/Network/Network/Models/AzureFirewall/PSAzureFirewall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,8 @@ private void ValidateMaskedIpAddress(string ipAddress)

// validated that unmasked bits are 0
var splittedIp = split[0].Split('.');
var ip = Int32.Parse(splittedIp[0]) << 24;
ip = ip + Int32.Parse(splittedIp[1]) << 16 + Int32.Parse(splittedIp[2]) << 8 + Int32.Parse(splittedIp[3]);
var ip = Int32.Parse(splittedIp[0]) << 24;
ip += (Int32.Parse(splittedIp[1]) << 16) + (Int32.Parse(splittedIp[2]) << 8) + Int32.Parse(splittedIp[3]);
if (ip << bit != 0)
throw new PSArgumentException(String.Format("\'{0}\' is not a valid private range ip address, bits not covered by subnet mask should be all 0", ipAddress));
}
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Network/Models/AzureFirewallPolicy/PSAzureFirewallPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private void ValidateMaskedIpAddress(string ipAddress)
// validated that unmasked bits are 0
var splittedIp = split[0].Split('.');
var ip = Int32.Parse(splittedIp[0]) << 24;
ip = ip + Int32.Parse(splittedIp[1]) << 16 + Int32.Parse(splittedIp[2]) << 8 + Int32.Parse(splittedIp[3]);
ip += (Int32.Parse(splittedIp[1]) << 16) + (Int32.Parse(splittedIp[2]) << 8) + Int32.Parse(splittedIp[3]);
if (ip << bit != 0)
throw new AzPSArgumentException(String.Format(Resources.InvalidPrivateIPRangeUnmaskedBits, ipAddress), nameof(ipAddress), ErrorKind.UserError);
}
Expand Down