Skip to content

fix(firewall): do not require --startport for ICMP rules #585

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
giornetta merged 3 commits into from
May 12, 2026
Merged

fix(firewall): do not require --startport for ICMP rules #585

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
889ba83
fix(firewall): do not require --startport for ICMP rules
alubbock Apr 22, 2026
51929f3
Merge branch 'master' into fix/icmp-firewall-rule-no-startport
dippydocus May 11, 2026
d776b8c
Merge branch 'master' into fix/icmp-firewall-rule-no-startport
giornetta May 11, 2026
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: 0 additions & 2 deletions cmd/firewall/firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ func init() {
firewallRuleCreateCmd.Flags().StringVarP(&direction, "direction", "d", "ingress", "the direction of the rule can be ingress or egress (default is ingress)")
firewallRuleCreateCmd.Flags().StringVarP(&action, "action", "a", "allow", "the action of the rule can be allow or deny (default is allow)")
firewallRuleCreateCmd.Flags().StringVarP(&label, "label", "l", "", "a string that will be the displayed as the name/reference for this rule")
_ = firewallRuleCreateCmd.MarkFlagRequired("startport")

// Mark the create-rules flag as deprecated
_ = firewallCreateCmd.Flags().MarkDeprecated("create-rules", "it will be removed in future versions. Default firewall rules are created by default. Use --no-default-rules flag to create firewalls without them.\n")
}
26 changes: 19 additions & 7 deletions cmd/firewall/firewall_rule_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,15 @@ var firewallRuleCreateCmd = &cobra.Command{
os.Exit(1)
}

isICMP := strings.EqualFold(protocol, "icmp")
if !isICMP && startPort == "" {
utility.Error("'--startport' flag is required for protocol %s", strings.ToUpper(protocol))
os.Exit(1)
}

newRuleConfig := &civogo.FirewallRuleConfig{
FirewallID: firewall.ID,
Protocol: protocol,
Protocol: strings.ToLower(protocol),
StartPort: startPort,
Cidr: strings.Split(cidr, ","),
Label: label,
Expand All @@ -71,10 +77,12 @@ var firewallRuleCreateCmd = &cobra.Command{
os.Exit(1)
}

if endPort == "" {
newRuleConfig.EndPort = startPort
} else {
newRuleConfig.EndPort = endPort
if !isICMP {
if endPort == "" {
newRuleConfig.EndPort = startPort
} else {
newRuleConfig.EndPort = endPort
}
}

rule, err := client.NewFirewallRule(newRuleConfig)
Expand All @@ -92,13 +100,17 @@ var firewallRuleCreateCmd = &cobra.Command{
ow.WriteCustomOutput(common.OutputFields)
default:
if rule.Label == "" {
if newRuleConfig.EndPort == newRuleConfig.StartPort {
if isICMP {
fmt.Printf("Created a firewall rule to %s, %s access for %s %s %s with ID %s\n", utility.Green(newRuleConfig.Action), utility.Green(newRuleConfig.Direction), utility.Green(strings.ToUpper(newRuleConfig.Protocol)), directionValue, utility.Green(strings.Join(newRuleConfig.Cidr, ", ")), rule.ID)
} else if newRuleConfig.EndPort == newRuleConfig.StartPort {
fmt.Printf("Created a firewall rule to %s, %s access to port %s %s %s with ID %s\n", utility.Green(newRuleConfig.Action), utility.Green(newRuleConfig.Direction), utility.Green(newRuleConfig.StartPort), directionValue, utility.Green(strings.Join(newRuleConfig.Cidr, ", ")), rule.ID)
} else {
fmt.Printf("Created a firewall rule to %s, %s access to ports %s-%s %s %s with ID %s\n", utility.Green(newRuleConfig.Action), utility.Green(newRuleConfig.Direction), utility.Green(newRuleConfig.StartPort), utility.Green(newRuleConfig.EndPort), directionValue, utility.Green(strings.Join(newRuleConfig.Cidr, ", ")), rule.ID)
}
} else {
if newRuleConfig.EndPort == newRuleConfig.StartPort {
if isICMP {
fmt.Printf("Created a firewall rule called %s to %s, %s access for %s %s %s with ID %s\n", utility.Green(rule.Label), utility.Green(newRuleConfig.Action), utility.Green(newRuleConfig.Direction), utility.Green(strings.ToUpper(newRuleConfig.Protocol)), directionValue, utility.Green(strings.Join(newRuleConfig.Cidr, ", ")), rule.ID)
} else if newRuleConfig.EndPort == newRuleConfig.StartPort {
fmt.Printf("Created a firewall rule called %s to %s, %s access to port %s %s %s with ID %s\n", utility.Green(rule.Label), utility.Green(newRuleConfig.Action), utility.Green(newRuleConfig.Direction), utility.Green(newRuleConfig.StartPort), directionValue, utility.Green(strings.Join(newRuleConfig.Cidr, ", ")), rule.ID)
} else {
fmt.Printf("Created a firewall rule called %s to %s, %s access to ports %s-%s %s %s with ID %s\n", utility.Green(rule.Label), utility.Green(newRuleConfig.Action), utility.Green(newRuleConfig.Direction), utility.Green(newRuleConfig.StartPort), utility.Green(newRuleConfig.EndPort), directionValue, utility.Green(strings.Join(newRuleConfig.Cidr, ", ")), rule.ID)
Expand Down
Loading