added ipv4 address octet range validation

models/bannedips.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -59,11 +60,11 @@ func (t *ipv4AddressTrie) insertIpv4AddressToTrie(ipv4Address string) error {
 	addressIndex := 0
 	addressSegments := strings.Split(ipv4Address, ".")
 	for _, segment := range addressSegments {
-		octet, err := strconv.Atoi(segment)
+		curAddressOctet, err := getIpv4AddressOctet(segment)
 		if err != nil {
 			return err
 		}
-		curAddressOctet := byte(octet)
+
 		if cur.children[curAddressOctet] == nil {
 			addressIndex++
 			cur.children[curAddressOctet] = &ipv4AddressTrieNode{
@@ -99,15 +100,26 @@ func (t *ipv4AddressTrie) traverseAllNodesInTheIpv4Address(ipv4Address string) (
 	cur := t.root
 	addressSegments := strings.Split(ipv4Address, ".")
 	for _, segment := range addressSegments {
-		octet, err := strconv.Atoi(segment)
+		curAddressOctet, err := getIpv4AddressOctet(segment)
 		if err != nil {
 			return nil, err
 		}
-		curAddressOctet := byte(octet)
+
 		if cur.children[curAddressOctet] == nil {
 			return nil, nil
 		}
 		cur = cur.children[curAddressOctet]
 	}
 	return cur, nil
 }
+
+func getIpv4AddressOctet(addressSegment string) (byte, error) {
+	addressOctet, err := strconv.Atoi(addressSegment)
+	if err != nil {
+		return 0, err
+	}
+	if addressOctet < 0 || addressOctet > 255 {
+		return 0, fmt.Errorf("error ipv4 address octet %d exceeds expected range ", addressOctet)
+	}
+	return byte(addressOctet), nil
+}

tests/ipfilter_test.go

@@ -105,6 +105,25 @@ func Test_Trie_Based_IpAddress_Search_For_EmptyIpAddress(t *testing.T) {
 	}
 }
 
+func Test_Trie_Based_IpAddress_Search_For_Invalid_Address_Octet(t *testing.T) {
+
+	ipList1 := []string{"192.555.0.1"}
+	domainId1 := 1
+	bannedIpsByDomain := map[int][]string{
+		domainId1: ipList1,
+	}
+
+	bannedIpv4AddressTriesPerDomain, err := models.CreateIpv4BannedAddressTriePerDomain(bannedIpsByDomain)
+	if err != nil {
+		t.Logf("Failed to create trie model for banned ipv4 addresses as expected : %s", err.Error())
+	}
+
+	trieToBeSearched := bannedIpv4AddressTriesPerDomain[domainId1]
+	if trieToBeSearched == nil {
+		t.Logf("Failed to create trie for the specified domain %d as expected", domainId1)
+	}
+}
+
 func Tes_Trie_Based_IpAddress_Search_For_InvalidInput(t *testing.T) {
 
 	ipList1 := []string{"axyz"}