Skip to content

Validate VPC CIDR network size #2353

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
merged 3 commits into from
Jul 17, 2021
Merged

Validate VPC CIDR network size #2353

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
2cc053d
Validate VPC CIDR network size
RobertLucian Jul 17, 2021
a466e0a
Merge branch 'master' into fix/cidr-network-range
RobertLucian Jul 17, 2021
03e8ddd
Address PR comments
RobertLucian Jul 17, 2021
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
12 changes: 11 additions & 1 deletion pkg/types/clusterconfig/cluster_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ var (
_maxIOPSToVolumeSizeRatioForGP3 = int64(500)
_minIOPSToThroughputRatioForGP3 = int64(4)

_minSubnetMask = 16
_maxSubnetMask = 24

// This regex is stricter than the actual S3 rules
_strictS3BucketRegex = regexp.MustCompile(`^([a-z0-9])+(-[a-z0-9]+)*$`)
)
Expand Down Expand Up @@ -1467,11 +1470,18 @@ func (ng *NodeGroup) FillEmptySpotFields(region string) {
}

func validateCIDR(cidr string) (string, error) {
_, _, err := net.ParseCIDR(cidr)
_, network, err := net.ParseCIDR(cidr)
if err != nil {
return "", errors.WithStack(err)
}

if network != nil {
maskSize, _ := network.Mask.Size()
if maskSize < _minSubnetMask || maskSize > _maxSubnetMask {
return "", ErrorSubnetMaskOutOfRange(maskSize, _minSubnetMask, _maxSubnetMask)
}
}

return cidr, nil
}

Expand Down
8 changes: 8 additions & 0 deletions pkg/types/clusterconfig/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const (
ErrUnsupportedAvailabilityZone = "clusterconfig.unsupported_availability_zone"
ErrNotEnoughValidDefaultAvailibilityZones = "clusterconfig.not_enough_valid_default_availability_zones"
ErrNoNATGatewayWithSubnets = "clusterconfig.no_nat_gateway_with_subnets"
ErrSubnetMaskOutOfRange = "clusterconfig.subnet_mask_out_of_range"
ErrConfigCannotBeChangedOnConfigure = "clusterconfig.config_cannot_be_changed_on_configure"
ErrNodeGroupCanOnlyBeScaled = "clusterconfig.node_group_can_only_be_scaled"
ErrSpecifyOneOrNone = "clusterconfig.specify_one_or_none"
Expand Down Expand Up @@ -309,6 +310,13 @@ func ErrorNoNATGatewayWithSubnets() error {
})
}

func ErrorSubnetMaskOutOfRange(requestedMaskSize, minMaskSize, maxMaskSize int) error {
return errors.WithStack(&errors.Error{
Kind: ErrSubnetMaskOutOfRange,
Message: fmt.Sprintf("invalid network size /%d; the network size must be between /%d and /%d", requestedMaskSize, minMaskSize, maxMaskSize),
})
}

func ErrorConfigCannotBeChangedOnConfigure() error {
return errors.WithStack(&errors.Error{
Kind: ErrConfigCannotBeChangedOnConfigure,
Expand Down