veyron/lib/netstat.go: Added SameMachine
Add a SameMachine call on a endpoint that can determine if an address
originates on the same machine (node) as the invoker.
Change-Id: I392258fb4300edb37063b399f6af826a8d957081
diff --git a/lib/netstate/netstate.go b/lib/netstate/netstate.go
index cd9acfb..68ee679 100644
--- a/lib/netstate/netstate.go
+++ b/lib/netstate/netstate.go
@@ -369,3 +369,30 @@
func FindRemoved(a, b AddrList) AddrList {
return diffAB(a, b)
}
+
+// SameMachine returns true if the provided addr is on the node
+// executing this function.
+func SameMachine(addr net.Addr) (bool, error) {
+ // The available interfaces may change between calls.
+ addrs, err := GetAll()
+ if err != nil {
+ return false, err
+ }
+
+ ips := make(map[string]struct{})
+ for _, a := range addrs {
+ ip, _, err := net.ParseCIDR(a.Address().String())
+ if err != nil {
+ return false, err
+ }
+ ips[ip.String()] = struct{}{}
+ }
+
+ client, _, err := net.SplitHostPort(addr.String())
+ if err != nil {
+ return false, err
+ }
+
+ _, islocal := ips[client]
+ return islocal, nil
+}
diff --git a/lib/netstate/netstate_test.go b/lib/netstate/netstate_test.go
index 1bf4b8a..dba0635 100644
--- a/lib/netstate/netstate_test.go
+++ b/lib/netstate/netstate_test.go
@@ -369,3 +369,80 @@
t.Errorf("got %s, want %s", got, want)
}
}
+
+// buildNonLocalhostTestAddress constructs a selection of test addresses
+// that are local.
+func buildNonLocalhostTestAddress(t *testing.T) []string {
+ addrs, err := net.InterfaceAddrs()
+ if err != nil {
+ t.Errorf("InterfaceAddrs() failed: %v\n", err)
+ }
+
+ ips := make([]string, 0, len(addrs))
+ for _, a := range addrs {
+ ip, _, err := net.ParseCIDR(a.String())
+ if err != nil {
+ t.Errorf("ParseCIDR() failed: %v\n", err)
+ }
+ ips = append(ips, net.JoinHostPort(ip.String(), "111"))
+ }
+ return ips
+}
+
+func TestSameMachine(t *testing.T) {
+ cases := []struct {
+ Addr *ma
+ Same bool
+ Err error
+ }{
+ {
+ Addr: &ma{
+ n: "tcp",
+ a: "batman.com:4444",
+ },
+ Same: false,
+ Err: nil,
+ },
+ {
+ Addr: &ma{
+ n: "tcp",
+ a: "127.0.0.1:1000",
+ },
+ Same: true,
+ Err: nil,
+ },
+ {
+ Addr: &ma{
+ n: "tcp",
+ a: "::1/128",
+ },
+ Same: false,
+ Err: &net.AddrError{Err: "too many colons in address", Addr: "::1/128"},
+ },
+ }
+
+ for _, a := range buildNonLocalhostTestAddress(t) {
+ cases = append(cases, struct {
+ Addr *ma
+ Same bool
+ Err error
+ }{
+ Addr: &ma{
+ n: "tcp",
+ a: a,
+ },
+ Same: true,
+ Err: nil,
+ })
+ }
+
+ for _, v := range cases {
+ issame, err := netstate.SameMachine(v.Addr)
+ if !reflect.DeepEqual(err, v.Err) {
+ t.Errorf("Bad error: got %#v, expected %#v\n", err, v.Err)
+ }
+ if issame != v.Same {
+ t.Errorf("for Endpoint address %v: got %v, expected %v\n", v.Addr.a, issame, v.Same)
+ }
+ }
+}
