unistack-org/micro
3
0
Fork 3
Code Issues 14 Pull Requests 2 Actions Packages Projects Releases 242 Wiki Activity

move addr extractor to misc

Browse Source
This commit is contained in:
Asim Aslam 2017-01-12 13:20:34 +00:00
parent fd78e1d432
commit a9889730d6
6 changed files with 6 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
broker/extractor.go
View File

@ -1,70 +0,0 @@
package broker
import (
"fmt"
"net"
)
var (
privateBlocks []*net.IPNet
)
func init() {
for _, b := range []string{"10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"} {
if _, block, err := net.ParseCIDR(b); err == nil {
privateBlocks = append(privateBlocks, block)
}
}
}
func extractAddress(addr string) (string, error) {
if len(addr) > 0 && (addr != "0.0.0.0" && addr != "[::]") {
return addr, nil
}
addrs, err := net.InterfaceAddrs()
if err != nil {
return "", fmt.Errorf("Failed to get interface addresses! Err: %v", err)
}
var ipAddr []byte
for _, rawAddr := range addrs {
var ip net.IP
switch addr := rawAddr.(type) {
case *net.IPAddr:
ip = addr.IP
case *net.IPNet:
ip = addr.IP
default:
continue
}
if ip.To4() == nil {
continue
}
if !isPrivateIP(ip.String()) {
continue
}
ipAddr = ip
break
}
if ipAddr == nil {
return "", fmt.Errorf("No private IP address found, and explicit IP not provided")
}
return net.IP(ipAddr).String(), nil
}
func isPrivateIP(ipAddr string) bool {
ip := net.ParseIP(ipAddr)
for _, priv := range privateBlocks {
if priv.Contains(ip) {
return true
}
}
return false
}

38
broker/extractor_test.go
View File

@ -1,38 +0,0 @@
package broker
import (
"net"
"testing"
)
func TestExtractor(t *testing.T) {
testData := []struct {
addr string
expect string
parse bool
}{
{"127.0.0.1", "127.0.0.1", false},
{"10.0.0.1", "10.0.0.1", false},
{"", "", true},
{"0.0.0.0", "", true},
{"[::]", "", true},
}
for _, d := range testData {
addr, err := extractAddress(d.addr)
if err != nil {
t.Errorf("Unexpected error %v", err)
}
if d.parse {
ip := net.ParseIP(addr)
if ip == nil {
t.Error("Unexpected nil IP")
}
} else if addr != d.expect {
t.Errorf("Expected %s got %s", d.expect, addr)
}
}
}

3
broker/http_broker.go
View File

@ -20,6 +20,7 @@ import (
"github.com/micro/go-micro/broker/codec/json"
"github.com/micro/go-micro/errors"
"github.com/micro/go-micro/registry"
"github.com/micro/misc/lib/addr"
mls "github.com/micro/misc/lib/tls"
"github.com/pborman/uuid"
@ -411,7 +412,7 @@ func (h *httpBroker) Subscribe(topic string, handler Handler, opts ...SubscribeO
host := strings.Join(parts[:len(parts)-1], ":")
port, _ := strconv.Atoi(parts[len(parts)-1])
addr, err := extractAddress(host)
addr, err := addr.Extract(host)
if err != nil {
return nil, err
}

65
server/extractor.go
View File

@ -2,25 +2,12 @@ package server
import (
"fmt"
"net"
"reflect"
"strings"
"github.com/micro/go-micro/registry"
)
var (
privateBlocks []*net.IPNet
)
func init() {
for _, b := range []string{"10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"} {
if _, block, err := net.ParseCIDR(b); err == nil {
privateBlocks = append(privateBlocks, block)
}
}
}
func extractValue(v reflect.Type, d int) *registry.Value {
if d == 3 {
return nil
@ -128,55 +115,3 @@ func extractSubValue(typ reflect.Type) *registry.Value {
}
return extractValue(reqType, 0)
}
func extractAddress(addr string) (string, error) {
if len(addr) > 0 && (addr != "0.0.0.0" && addr != "[::]") {
return addr, nil
}
addrs, err := net.InterfaceAddrs()
if err != nil {
return "", fmt.Errorf("Failed to get interface addresses! Err: %v", err)
}
var ipAddr []byte
for _, rawAddr := range addrs {
var ip net.IP
switch addr := rawAddr.(type) {
case *net.IPAddr:
ip = addr.IP
case *net.IPNet:
ip = addr.IP
default:
continue
}
if ip.To4() == nil {
continue
}
if !isPrivateIP(ip.String()) {
continue
}
ipAddr = ip
break
}
if ipAddr == nil {
return "", fmt.Errorf("No private IP address found, and explicit IP not provided")
}
return net.IP(ipAddr).String(), nil
}
func isPrivateIP(ipAddr string) bool {
ip := net.ParseIP(ipAddr)
for _, priv := range privateBlocks {
if priv.Contains(ip) {
return true
}
}
return false
}

19
server/extractor_test.go
View File

@ -18,25 +18,6 @@ func (t *testHandler) Test(ctx context.Context, req *testRequest, rsp *testRespo
return nil
}
func TestExtractAddress(t *testing.T) {
data := []struct {
Input string
Output string
}{
{"10.0.0.1", "10.0.0.1"},
}
for _, d := range data {
addr, err := extractAddress(d.Input)
if err != nil {
t.Errorf("Expected %s: %v", d.Output, err)
}
if addr != d.Output {
t.Errorf("Expected %s, got %s", d.Output, addr)
}
}
}
func TestExtractEndpoint(t *testing.T) {
handler := &testHandler{}
typ := reflect.TypeOf(handler)

6
server/rpc_server.go
View File

@ -15,6 +15,8 @@ import (
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/transport"
"github.com/micro/misc/lib/addr"
"golang.org/x/net/context"
)
@ -204,7 +206,7 @@ func (s *rpcServer) Register() error {
host = parts[0]
}
addr, err := extractAddress(host)
addr, err := addr.Extract(host)
if err != nil {
return err
}
@ -308,7 +310,7 @@ func (s *rpcServer) Deregister() error {
host = parts[0]
}
addr, err := extractAddress(host)
addr, err := addr.Extract(host)
if err != nil {
return err
}