Adding complement string representation for conns

pkg/netpol/internal/common/connectionset.go

@@ -313,6 +313,8 @@ const (
 	connsAndPortRangeSeparator = ","
 	allConnsStr                = "All Connections"
 	noConnsStr                 = "No Connections"
+	complemetPrefix            = "All but: "
+	empty                      = "Empty"
 )
 
 func ConnStrFromConnProperties(allProtocolsAndPorts bool, protocolsAndPorts map[v1.Protocol][]PortRange) string {
@@ -325,16 +327,42 @@ func ConnStrFromConnProperties(allProtocolsAndPorts bool, protocolsAndPorts map[
 	var connStr string
 	// connStrings will contain the string of given conns protocols and ports as is
 	connStrings := make([]string, len(protocolsAndPorts))
+	// connAsComplementStr will contain the conns' as "All but" + conns complement to the All conns
+	connAsComplementStr := make([]string, 0)
 	index := 0
 	for protocol, ports := range protocolsAndPorts {
 		connStrings[index] = protocolAndPortsStr(protocol, portsString(ports))
 		index++
+		// complement conn string
+		complementPortsStr := getComplementPorts(ports)
+		if complementPortsStr == empty || complementPortsStr == "" { // ports is full range
+			continue
+		}
+		connAsComplementStr = append(connAsComplementStr, protocolAndPortsStr(protocol, complementPortsStr))
 	}
 	sort.Strings(connStrings)
+	sort.Strings(connAsComplementStr)
 	connStr = strings.Join(connStrings, connsAndPortRangeSeparator)
+	complementStr := complemetPrefix + strings.Join(connAsComplementStr, connsAndPortRangeSeparator)
+	// return the shorter string as the representation
+	if len(complementStr) < len(connStr) {
+		return complementStr
+	}
 	return connStr
 }
 
+// getComplementPorts computes and returns string representation of the complement intervals of given ports
+func getComplementPorts(ports []PortRange) string {
+	// create canonicalSet with all possible port ranges
+	complementCanonicalSet := interval.New(minPort, maxPort).ToSet()
+	// loop ports and subtract them from the full canonicalSet to get the complement
+	for i := range ports {
+		currCanonicalSet := (ports[i].(*portRange).Interval).ToSet()
+		complementCanonicalSet = complementCanonicalSet.Subtract(currCanonicalSet)
+	}
+	return complementCanonicalSet.String()
+}
+
 // get string representation for a list of port ranges
 func portsString(ports []PortRange) string {
 	portsStr := make([]string, len(ports))

test_outputs/connlist/anp_demo_connlist_output.csv

@@ -4,10 +4,10 @@ src,dst,conn
 gryffindor/harry-potter[StatefulSet],0.0.0.0-255.255.255.255,All Connections
 gryffindor/harry-potter[StatefulSet],hufflepuff/cedric-diggory[StatefulSet],"SCTP 9003,TCP 8080,UDP 5353"
 gryffindor/harry-potter[StatefulSet],ravenclaw/luna-lovegood[StatefulSet],UDP 52
-gryffindor/harry-potter[StatefulSet],slytherin/draco-malfoy[StatefulSet],"SCTP 1-9002,9004-65535,TCP 1-79,81-65535,UDP 1-52,54-65535"
+gryffindor/harry-potter[StatefulSet],slytherin/draco-malfoy[StatefulSet],"All but: SCTP 9003,TCP 80,UDP 53"
 hufflepuff/cedric-diggory[StatefulSet],0.0.0.0-255.255.255.255,All Connections
 hufflepuff/cedric-diggory[StatefulSet],gryffindor/harry-potter[StatefulSet],"SCTP 9003,TCP 80,UDP 5353"
 slytherin/draco-malfoy[StatefulSet],0.0.0.0-255.255.255.255,All Connections
 slytherin/draco-malfoy[StatefulSet],gryffindor/harry-potter[StatefulSet],All Connections
 slytherin/draco-malfoy[StatefulSet],hufflepuff/cedric-diggory[StatefulSet],All Connections
-slytherin/draco-malfoy[StatefulSet],ravenclaw/luna-lovegood[StatefulSet],"TCP 1-79,81-65535"
+slytherin/draco-malfoy[StatefulSet],ravenclaw/luna-lovegood[StatefulSet],All but: TCP 80

test_outputs/connlist/anp_demo_connlist_output.dot

@@ -29,11 +29,11 @@ digraph {
 	"gryffindor/harry-potter[StatefulSet]" -> "0.0.0.0-255.255.255.255" [label="All Connections" color="gold2" fontcolor="darkgreen" weight=1]
 	"gryffindor/harry-potter[StatefulSet]" -> "hufflepuff/cedric-diggory[StatefulSet]" [label="SCTP 9003,TCP 8080,UDP 5353" color="gold2" fontcolor="darkgreen" weight=0.5]
 	"gryffindor/harry-potter[StatefulSet]" -> "ravenclaw/luna-lovegood[StatefulSet]" [label="UDP 52" color="gold2" fontcolor="darkgreen" weight=0.5]
-	"gryffindor/harry-potter[StatefulSet]" -> "slytherin/draco-malfoy[StatefulSet]" [label="SCTP 1-9002,9004-65535,TCP 1-79,81-65535,UDP 1-52,54-65535" color="gold2" fontcolor="darkgreen" weight=0.5]
+	"gryffindor/harry-potter[StatefulSet]" -> "slytherin/draco-malfoy[StatefulSet]" [label="All but: SCTP 9003,TCP 80,UDP 53" color="gold2" fontcolor="darkgreen" weight=0.5]
 	"hufflepuff/cedric-diggory[StatefulSet]" -> "0.0.0.0-255.255.255.255" [label="All Connections" color="gold2" fontcolor="darkgreen" weight=1]
 	"hufflepuff/cedric-diggory[StatefulSet]" -> "gryffindor/harry-potter[StatefulSet]" [label="SCTP 9003,TCP 80,UDP 5353" color="gold2" fontcolor="darkgreen" weight=1]
 	"slytherin/draco-malfoy[StatefulSet]" -> "0.0.0.0-255.255.255.255" [label="All Connections" color="gold2" fontcolor="darkgreen" weight=1]
 	"slytherin/draco-malfoy[StatefulSet]" -> "gryffindor/harry-potter[StatefulSet]" [label="All Connections" color="gold2" fontcolor="darkgreen" weight=1]
 	"slytherin/draco-malfoy[StatefulSet]" -> "hufflepuff/cedric-diggory[StatefulSet]" [label="All Connections" color="gold2" fontcolor="darkgreen" weight=1]
-	"slytherin/draco-malfoy[StatefulSet]" -> "ravenclaw/luna-lovegood[StatefulSet]" [label="TCP 1-79,81-65535" color="gold2" fontcolor="darkgreen" weight=1]
+	"slytherin/draco-malfoy[StatefulSet]" -> "ravenclaw/luna-lovegood[StatefulSet]" [label="All but: TCP 80" color="gold2" fontcolor="darkgreen" weight=1]
 }