BUG: Filters out non-network IPs (#66)

Author: thomasjpfan

server/cert.go

@@ -112,6 +112,9 @@ func (m *cert) Init() error {
 	if err != nil {
 		return err
 	}
+
+	ips = filterNetworkIPs(ips)
+
 	certs := []cert{}
 	for _, ip := range ips {
 		hostPort := ip

server/cert_test.go

@@ -19,10 +19,19 @@ import (
 
 type CertTestSuite struct {
 	suite.Suite
-	serviceName string
+	serviceName         string
+	filterNetworkIPsOrg func(ips []string) []string
 }
 
 func (s *CertTestSuite) SetupTest() {
+	s.filterNetworkIPsOrg = filterNetworkIPs
+	filterNetworkIPs = func(ips []string) []string {
+		return ips
+	}
+}
+
+func (s *CertTestSuite) TearDownTest() {
+	filterNetworkIPs = s.filterNetworkIPsOrg
 }
 
 func TestCertUnitTestSuite(t *testing.T) {

server/util.go

@@ -2,20 +2,22 @@ package server
 
 import (
 	"fmt"
-	"github.com/gorilla/schema"
 	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
 	"os"
 	"strings"
+
+	"github.com/gorilla/schema"
 )
 
 var httpWriterSetContentType = func(w http.ResponseWriter, value string) {
 	w.Header().Set("Content-Type", value)
 }
 var logPrintf = log.Printf
 var lookupHost = net.LookupHost
+var interfaceAddrs = net.InterfaceAddrs
 
 var decoder = schema.NewDecoder()
 
@@ -76,3 +78,36 @@ var getSecretOrEnvVar = func(key, defaultValue string) string {
 	return defaultValue
 }
 var readSecretsFile = ioutil.ReadFile
+
+// filterNetworkIPs filters out ips that are not contained
+// in one of the network interfaces
+var filterNetworkIPs = func(ipStrs []string) []string {
+	if len(ipStrs) == 0 {
+		return ipStrs
+	}
+	networkAddrs, err := interfaceAddrs()
+	if err != nil {
+		return ipStrs
+	}
+	networkIPs := []*net.IPNet{}
+	for _, addr := range networkAddrs {
+		_, netIP, err := net.ParseCIDR(addr.String())
+		if err != nil {
+			continue
+		}
+		networkIPs = append(networkIPs, netIP)
+	}
+
+	output := []string{}
+	for _, ipStr := range ipStrs {
+		ip := net.ParseIP(ipStr)
+		for _, netIP := range networkIPs {
+			if netIP.Contains(ip) {
+				output = append(output, ip.String())
+				continue
+			}
+		}
+	}
+
+	return output
+}

server/util_test.go

@@ -2,13 +2,15 @@ package server
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/suite"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/suite"
 )
 
 type UtilTestSuite struct {
@@ -173,3 +175,73 @@ func (s *UtilTestSuite) Test_SendDistributeRequests_ReturnsError_WhenProxyIPsAre
 	s.Assertions.Equal(http.StatusBadRequest, actualStatus)
 	s.Assertions.Error(err)
 }
+
+func (s *UtilTestSuite) Test_FilterIPs_NoIps() {
+	s.Equal([]string{}, filterNetworkIPs([]string{}))
+}
+func (s *UtilTestSuite) Test_FilterIPs_NoFiltering() {
+	interfaceAddrsOrg := interfaceAddrs
+	defer func() {
+		interfaceAddrs = interfaceAddrsOrg
+	}()
+	interfaceAddrs = func() ([]net.Addr, error) {
+		output := make([]net.Addr, 2)
+		_, netIP1, _ := net.ParseCIDR("10.0.0.1/24")
+		output[0] = netIP1
+		_, netIP2, _ := net.ParseCIDR("12.0.0.1/24")
+		output[1] = netIP2
+		return output, nil
+	}
+
+	ips := []string{
+		"10.0.0.2", "10.0.0.3", "10.0.0.8", "12.0.0.3",
+	}
+	fitlerIPs := filterNetworkIPs(ips)
+
+	s.Equal(fitlerIPs, ips)
+}
+func (s *UtilTestSuite) Test_FilterIPs_FiltersEverything() {
+
+	interfaceAddrsOrg := interfaceAddrs
+	defer func() {
+		interfaceAddrs = interfaceAddrsOrg
+	}()
+	interfaceAddrs = func() ([]net.Addr, error) {
+		output := make([]net.Addr, 2)
+		_, netIP1, _ := net.ParseCIDR("11.0.0.1/24")
+		output[0] = netIP1
+		_, netIP2, _ := net.ParseCIDR("12.0.0.1/24")
+		output[1] = netIP2
+		return output, nil
+	}
+
+	ips := []string{
+		"10.0.0.2", "10.0.0.3", "10.0.0.8",
+	}
+	fitlerIPs := filterNetworkIPs(ips)
+
+	s.Equal([]string{}, fitlerIPs)
+}
+
+func (s *UtilTestSuite) Test_FilterIPs_FiltersHalf() {
+
+	interfaceAddrsOrg := interfaceAddrs
+	defer func() {
+		interfaceAddrs = interfaceAddrsOrg
+	}()
+	interfaceAddrs = func() ([]net.Addr, error) {
+		output := make([]net.Addr, 2)
+		_, netIP1, _ := net.ParseCIDR("11.0.0.1/24")
+		output[0] = netIP1
+		_, netIP2, _ := net.ParseCIDR("12.0.0.1/24")
+		output[1] = netIP2
+		return output, nil
+	}
+
+	ips := []string{
+		"10.0.0.2", "10.0.0.3", "12.0.0.8", "11.0.0.3",
+	}
+	fitlerIPs := filterNetworkIPs(ips)
+
+	s.Equal([]string{"12.0.0.8", "11.0.0.3"}, fitlerIPs)
+}