github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Treat 127.0.0.0/8 and 169.254.0.0/16 as private network

pull/948/head
William Tisäter 2015-09-02 12:24:14 +02:00
parent 80d26f9156
commit 0a2b8cee85
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
consul/util.go
View File

@ -20,8 +20,10 @@ import (
* Contains an entry for each private block: * Contains an entry for each private block:
* 10.0.0.0/8 * 10.0.0.0/8
* 100.64.0.0/10 * 100.64.0.0/10
* 127.0.0.0/8
* 169.254.0.0/16
* 172.16.0.0/12 * 172.16.0.0/12
* 192.168/16 * 192.168.0.0/16
*/ */
var privateBlocks []*net.IPNet var privateBlocks []*net.IPNet
@ -42,7 +44,7 @@ func (s *serverParts) String() string {
func init() { func init() {
// Add each private block // Add each private block
privateBlocks = make([]*net.IPNet, 4) privateBlocks = make([]*net.IPNet, 6)
_, block, err := net.ParseCIDR("10.0.0.0/8") _, block, err := net.ParseCIDR("10.0.0.0/8")
if err != nil { if err != nil {
@ -50,23 +52,35 @@ func init() {
} }
privateBlocks[0] = block privateBlocks[0] = block
_, block, err = net.ParseCIDR("172.16.0.0/12") _, block, err = net.ParseCIDR("100.64.0.0/10")
if err != nil { if err != nil {
panic(fmt.Sprintf("Bad cidr. Got %v", err)) panic(fmt.Sprintf("Bad cidr. Got %v", err))
} }
privateBlocks[1] = block privateBlocks[1] = block
_, block, err = net.ParseCIDR("192.168.0.0/16") _, block, err = net.ParseCIDR("127.0.0.0/8")
if err != nil { if err != nil {
panic(fmt.Sprintf("Bad cidr. Got %v", err)) panic(fmt.Sprintf("Bad cidr. Got %v", err))
} }
privateBlocks[2] = block privateBlocks[2] = block
_, block, err = net.ParseCIDR("100.64.0.0/10") _, block, err = net.ParseCIDR("169.254.0.0/16")
if err != nil { if err != nil {
panic(fmt.Sprintf("Bad cidr. Got %v", err)) panic(fmt.Sprintf("Bad cidr. Got %v", err))
} }
privateBlocks[3] = block privateBlocks[3] = block
_, block, err = net.ParseCIDR("172.16.0.0/12")
if err != nil {
panic(fmt.Sprintf("Bad cidr. Got %v", err))
}
privateBlocks[4] = block
_, block, err = net.ParseCIDR("192.168.0.0/16")
if err != nil {
panic(fmt.Sprintf("Bad cidr. Got %v", err))
}
privateBlocks[5] = block
} }
// strContains checks if a list contains a string // strContains checks if a list contains a string

2
consul/util_test.go
View File

@ -113,7 +113,7 @@ func TestIsPrivateIP(t *testing.T) {
if isPrivateIP("8.8.8.8") { if isPrivateIP("8.8.8.8") {
t.Fatalf("bad") t.Fatalf("bad")
} }
if isPrivateIP("127.0.0.1") { if !isPrivateIP("127.0.0.1") {
t.Fatalf("bad") t.Fatalf("bad")
} }
} }