Skip to content

Allow External for Empty Ingress/Egress Rules #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 2, 2020
Merged

Allow External for Empty Ingress/Egress Rules #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions npm/translatePolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ func translateIngress(ns string, targetSelector metav1.LabelSelector, rules []ne
targetSelectorComment := craftPartialIptablesCommentFromSelector(ns, &targetSelector, false)

for _, rule := range rules {
allowExternal, portRuleExists, fromRuleExists := false, false, false
portRuleExists = rule.Ports != nil && len(rule.Ports) > 0
allowExternal := false
portRuleExists := rule.Ports != nil && len(rule.Ports) > 0
fromRuleExists := false
addedPortEntry = addedPortEntry || portRuleExists

if rule.From != nil {
Expand All @@ -180,6 +181,8 @@ func translateIngress(ns string, targetSelector metav1.LabelSelector, rules []ne
break
}
}
} else if !portRuleExists {
allowExternal = true
}

if !portRuleExists && !fromRuleExists && !allowExternal {
Expand Down Expand Up @@ -644,8 +647,9 @@ func translateEgress(ns string, targetSelector metav1.LabelSelector, rules []net
targetSelectorIptEntrySpec := craftPartialIptEntrySpecFromOpsAndLabels(ns, ops, labels, util.IptablesSrcFlag, false)
targetSelectorComment := craftPartialIptablesCommentFromSelector(ns, &targetSelector, false)
for _, rule := range rules {
allowExternal, portRuleExists, toRuleExists := false, false, false
portRuleExists = rule.Ports != nil && len(rule.Ports) > 0
allowExternal := false
portRuleExists := rule.Ports != nil && len(rule.Ports) > 0
toRuleExists := false
addedPortEntry = addedPortEntry || portRuleExists

if rule.To != nil {
Expand All @@ -662,6 +666,8 @@ func translateEgress(ns string, targetSelector metav1.LabelSelector, rules []net
break
}
}
} else if !portRuleExists {
allowExternal = true
}

if !portRuleExists && !toRuleExists && !allowExternal {
Expand Down
43 changes: 22 additions & 21 deletions npm/translatePolicy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@ func TestTranslatePolicy(t *testing.T) {
}
allowToFrontendPolicy := &networkingv1.NetworkPolicy{
ObjectMeta: metav1.ObjectMeta{
Name: "ALLOW-all-TO-app:frontend-FROM-all-namespaces-policy",
Name: "ALLOW-all-TO-app:frontend-policy",
Namespace: "testnamespace",
},
Spec: networkingv1.NetworkPolicySpec{
Expand All @@ -1269,16 +1269,14 @@ func TestTranslatePolicy(t *testing.T) {
"ns-testnamespace",
}
if !reflect.DeepEqual(sets, expectedSets) {
t.Errorf("translatedPolicy failed @ ALLOW-all-TO-app:frontend-FROM-all-namespaces-policy sets comparison")
t.Errorf("translatedPolicy failed @ ALLOW-all-TO-app:frontend-policy sets comparison")
t.Errorf("sets: %v", sets)
t.Errorf("expectedSets: %v", expectedSets)
}

expectedLists = []string{
util.KubeAllNamespacesFlag,
}
expectedLists = []string{}
if !reflect.DeepEqual(lists, expectedLists) {
t.Errorf("translatedPolicy failed @ ALLOW-all-TO-app:frontend-FROM-all-namespaces-policy lists comparison")
t.Errorf("translatedPolicy failed @ ALLOW-all-TO-app:frontend-policy lists comparison")
t.Errorf("lists: %v", lists)
t.Errorf("expectedLists: %v", expectedLists)
}
Expand All @@ -1289,11 +1287,6 @@ func TestTranslatePolicy(t *testing.T) {
&iptm.IptEntry{
Chain: util.IptablesAzureIngressPortChain,
Specs: []string{
util.IptablesModuleFlag,
util.IptablesSetModuleFlag,
util.IptablesMatchSetFlag,
util.GetHashedName(util.KubeAllNamespacesFlag),
util.IptablesSrcFlag,
util.IptablesModuleFlag,
util.IptablesSetModuleFlag,
util.IptablesMatchSetFlag,
Expand All @@ -1304,14 +1297,14 @@ func TestTranslatePolicy(t *testing.T) {
util.IptablesModuleFlag,
util.IptablesCommentModuleFlag,
util.IptablesCommentFlag,
"ALLOW-ALL-TO-app:frontend-FROM-all-namespaces",
"ALLOW-ALL-TO-app:frontend",
},
},
}
expectedIptEntries = append(expectedIptEntries, nonKubeSystemEntries...)
expectedIptEntries = append(expectedIptEntries, getDefaultDropEntries("testnamespace", targetSelector, false, false)...)
if !reflect.DeepEqual(iptEntries, expectedIptEntries) {
t.Errorf("translatedPolicy failed @ ALLOW-all-TO-app:frontend-FROM-all-namespaces-policy policy comparison")
t.Errorf("translatedPolicy failed @ ALLOW-all-TO-app:frontend-policy policy comparison")
marshalledIptEntries, _ := json.Marshal(iptEntries)
marshalledExpectedIptEntries, _ := json.Marshal(expectedIptEntries)
t.Errorf("iptEntries: %s", marshalledIptEntries)
Expand Down Expand Up @@ -2633,9 +2626,7 @@ func TestTranslatePolicy(t *testing.T) {
t.Errorf("expectedSets: %v", expectedSets)
}

expectedLists = []string{
util.KubeAllNamespacesFlag,
}
expectedLists = []string{}
if !reflect.DeepEqual(lists, expectedLists) {
t.Errorf("translatedPolicy failed @ ALLOW-all-FROM-app:backend-policy lists comparison")
t.Errorf("lists: %v", lists)
Expand All @@ -2652,18 +2643,28 @@ func TestTranslatePolicy(t *testing.T) {
util.IptablesMatchSetFlag,
util.GetHashedName("app:backend"),
util.IptablesSrcFlag,
util.IptablesJumpFlag,
util.IptablesAccept,
util.IptablesModuleFlag,
util.IptablesCommentModuleFlag,
util.IptablesCommentFlag,
"ALLOW-ALL-FROM-app:backend",
},
},
&iptm.IptEntry{
Chain: util.IptablesAzureEgressPortChain,
Specs: []string{
util.IptablesModuleFlag,
util.IptablesSetModuleFlag,
util.IptablesMatchSetFlag,
util.GetHashedName(util.KubeAllNamespacesFlag),
util.IptablesDstFlag,
util.GetHashedName("app:backend"),
util.IptablesSrcFlag,
util.IptablesJumpFlag,
util.IptablesAccept,
util.IptablesAzureTargetSetsChain,
util.IptablesModuleFlag,
util.IptablesCommentModuleFlag,
util.IptablesCommentFlag,
"ALLOW-ALL-FROM-app:backend-TO-" +
util.KubeAllNamespacesFlag,
"ALLOW-ALL-FROM-app:backend-TO-JUMP-TO-AZURE-NPM-TARGET-SETS",
},
},
}
Expand Down