flarectl/firewall_rules: ensure we return errors and halt

[jacobbednarz]

Updates the error handling in the flarectl firewall rules to return
the exception should we recieve one and not continue on triggering a
panic due to resp.Result being nil.

Fixes #585

[jacobbednarz]

@jsha would you mind pulling this one locally and confirming it fixes your issue? in the other thread, i see you mentioned you got a different authentication error however i suspect mine is just due to missing permissions which should demonstrate the same codepath.

[jacobbednarz]

in the linked issue, i also think --value='{"target":"ip","value","198.51.100.4"}' is wrong. by the looks, the getConfiguration method automagically works this out for you when you provide the string value.

cloudflare-go/cmd/flarectl/firewall.go

Lines 356 to 378 in 9f836c4

	func getConfiguration(c *cli.Context) cloudflare.AccessRuleConfiguration {
	configuration := cloudflare.AccessRuleConfiguration{}
	if c.String("value") != "" {
	ip := net.ParseIP(c.String("value"))
	_, cidr, cidrErr := net.ParseCIDR(c.String("value"))
	_, asnErr := strconv.ParseInt(c.String("value"), 10, 32)
	if ip != nil {
	configuration.Target = "ip"
	configuration.Value = ip.String()
	} else if cidrErr == nil {
	cidr.IP = cidr.IP.Mask(cidr.Mask)
	configuration.Target = "ip_range"
	configuration.Value = cidr.String()
	} else if asnErr == nil {
	configuration.Target = "asn"
	configuration.Value = c.String("value")
	} else {
	configuration.Target = "country"
	configuration.Value = c.String("value")
	}
	}
	return configuration
	}

i think --value="198.51.100.4" should do the job you're after.

[jsha]

Works like a charm! And you're right about the --value flag, thanks.

[jacobbednarz]

awesome, i'll tee this up for the next release.