luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent: move isAddrANY to separate package

This commit is contained in:
Frank Schroeder 2017-05-15 22:10:36 +02:00 committed by Frank Schröder
parent d6eb1d434f
commit 69125e3a58
6 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/agent/agent.go
View File

@ -22,6 +22,7 @@ import (
"github.com/hashicorp/consul/consul"
"github.com/hashicorp/consul/consul/state"
"github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/ipaddr"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/logger"
"github.com/hashicorp/consul/types"
@ -316,12 +317,12 @@ func (a *Agent) consulConfig() (*consul.Config, error) {
}
a.config.AdvertiseAddr = ipStr
case a.config.BindAddr != "" && !isAddrANY(a.config.BindAddr):
case a.config.BindAddr != "" && !ipaddr.IsAny(a.config.BindAddr):
a.config.AdvertiseAddr = a.config.BindAddr
default:
ip, err := consul.GetPrivateIP()
if isIPv6ANY(a.config.BindAddr) {
if ipaddr.IsAnyV6(a.config.BindAddr) {
ip, err = consul.GetPublicIPv6()
}
if err != nil {
@ -452,7 +453,7 @@ func (a *Agent) consulConfig() (*consul.Config, error) {
// set the src address for outgoing rpc connections
// Use port 0 so that outgoing connections use a random port.
if !isAddrANY(base.RPCAddr.IP) {
if !ipaddr.IsAny(base.RPCAddr.IP) {
base.RPCSrcAddr = &net.TCPAddr{IP: base.RPCAddr.IP}
}

3
command/agent/agent_endpoint.go
View File

@ -9,6 +9,7 @@ import (
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/ipaddr"
"github.com/hashicorp/consul/logger"
"github.com/hashicorp/consul/types"
"github.com/hashicorp/logutils"
@ -454,7 +455,7 @@ func (s *HTTPServer) AgentRegisterService(resp http.ResponseWriter, req *http.Re
// Check the service address here and in the catalog RPC endpoint
// since service registration isn't sychronous.
if args.Address == "0.0.0.0" || args.Address == "::" || args.Address == "[::]" {
if ipaddr.IsAny(args.Address) {
resp.WriteHeader(400)
fmt.Fprintf(resp, "Invalid service address")
return nil, nil

5
command/agent/command.go
View File

@ -18,6 +18,7 @@ import (
"github.com/hashicorp/consul/command/base"
"github.com/hashicorp/consul/consul"
"github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/ipaddr"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/logger"
"github.com/hashicorp/consul/watch"
@ -372,12 +373,12 @@ func (c *Command) readConfig() *Config {
return nil
}
if isAddrANY(config.AdvertiseAddr) {
if ipaddr.IsAny(config.AdvertiseAddr) {
c.UI.Error("Advertise address cannot be " + config.AdvertiseAddr)
return nil
}
if isAddrANY(config.AdvertiseAddrWan) {
if ipaddr.IsAny(config.AdvertiseAddrWan) {
c.UI.Error("Advertise WAN address cannot be " + config.AdvertiseAddrWan)
return nil
}

28
command/agent/config.go
View File

@ -1968,31 +1968,3 @@ func (d dirEnts) Less(i, j int) bool {
func (d dirEnts) Swap(i, j int) {
d[i], d[j] = d[j], d[i]
}
// isAddrANY checks if the given ip address is an IPv4 or IPv6 ANY address. ip
// can be either a *net.IP or a string. It panics on another type.
func isAddrANY(ip interface{}) bool {
if ip == nil {
return false
}
var ips string
switch x := ip.(type) {
case net.IP:
ips = x.String()
case *net.IP:
ips = x.String()
case string:
ips = x
default:
panic(fmt.Sprintf("invalid type: %T", ip))
}
return isIPv4Any(ips) || isIPv6ANY(ips)
}
func isIPv4Any(ip string) bool {
return ip == "0.0.0.0"
}
func isIPv6ANY(ip string) bool {
return ip == "::" || ip == "[::]"
}

3
consul/catalog_endpoint.go
View File

@ -7,6 +7,7 @@ import (
"github.com/armon/go-metrics"
"github.com/hashicorp/consul/consul/state"
"github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/ipaddr"
"github.com/hashicorp/consul/types"
"github.com/hashicorp/go-memdb"
"github.com/hashicorp/go-uuid"
@ -54,7 +55,7 @@ func (c *Catalog) Register(args *structs.RegisterRequest, reply *struct{}) error
// Check the service address here and in the agent endpoint
// since service registration isn't sychronous.
if args.Service.Address == "0.0.0.0" || args.Service.Address == "::" || args.Service.Address == "[::]" {
if ipaddr.IsAny(args.Service.Address) {
return fmt.Errorf("Invalid service address")
}

41
ipaddr/ipaddr.go Normal file
View File

@ -0,0 +1,41 @@
package ipaddr
import (
"fmt"
"net"
)
// IsAny checks if the given ip address is an IPv4 or IPv6 ANY address. ip
// can be either a *net.IP or a string. It panics on another type.
func IsAny(ip interface{}) bool {
return IsAnyV4(ip) || IsAnyV6(ip)
}
// IsAnyV4 checks if the given ip address is an IPv4 ANY address. ip
// can be either a *net.IP or a string. It panics on another type.
func IsAnyV4(ip interface{}) bool {
return iptos(ip) == "0.0.0.0"
}
// IsAnyV6 checks if the given ip address is an IPv6 ANY address. ip
// can be either a *net.IP or a string. It panics on another type.
func IsAnyV6(ip interface{}) bool {
ips := iptos(ip)
return ips == "::" || ips == "[::]"
}
func iptos(ip interface{}) string {
if ip == nil {
return ""
}
switch x := ip.(type) {
case string:
return x
case net.IP:
return x.String()
case *net.IP:
return x.String()
default:
panic(fmt.Sprintf("invalid type: %T", ip))
}
}