Skip to content

Merge Multiple Network Policies #468

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 3, 2020
Merged

Merge Multiple Network Policies #468

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
7 changes: 6 additions & 1 deletion npm/iptm/iptm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ type IptEntry struct {
Chain string
Flag string
LockWaitTimeInSeconds string
IsJumpEntry bool
Specs []string
}

Expand Down Expand Up @@ -300,7 +301,11 @@ func (iptMgr *IptablesManager) Add(entry *IptEntry) error {
return nil
}

iptMgr.OperationFlag = util.IptablesAppendFlag
if entry.IsJumpEntry {
iptMgr.OperationFlag = util.IptablesAppendFlag
} else {
iptMgr.OperationFlag = util.IptablesInsertionFlag
}
if _, err := iptMgr.Run(entry); err != nil {
log.Errorf("Error: failed to create iptables rules.")
return err
Expand Down
138 changes: 74 additions & 64 deletions npm/translatePolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,31 +239,6 @@ func translateIngress(ns string, targetSelector metav1.LabelSelector, rules []ne
for _, fromRule := range rule.From {
// Handle IPBlock field of NetworkPolicyPeer
if fromRule.IPBlock != nil {
if len(fromRule.IPBlock.Except) > 0 {
for _, except := range fromRule.IPBlock.Except {
exceptEntry := &iptm.IptEntry{
Chain: util.IptablesAzureIngressFromChain,
}
exceptEntry.Specs = append(
exceptEntry.Specs,
util.IptablesSFlag,
except,
)
exceptEntry.Specs = append(exceptEntry.Specs, targetSelectorIptEntrySpec...)
exceptEntry.Specs = append(
exceptEntry.Specs,
util.IptablesJumpFlag,
util.IptablesDrop,
util.IptablesModuleFlag,
util.IptablesCommentModuleFlag,
util.IptablesCommentFlag,
"DROP-"+except+
"-TO-"+targetSelectorComment,
)
fromRuleEntries = append(fromRuleEntries, exceptEntry)
}
addedIngressFromEntry = true
}
if len(fromRule.IPBlock.CIDR) > 0 {
if portRuleExists {
for _, portRule := range rule.Ports {
Expand Down Expand Up @@ -316,6 +291,31 @@ func translateIngress(ns string, targetSelector metav1.LabelSelector, rules []ne
fromRuleEntries = append(fromRuleEntries, cidrEntry)
addedIngressFromEntry = true
}
if len(fromRule.IPBlock.Except) > 0 {
for _, except := range fromRule.IPBlock.Except {
exceptEntry := &iptm.IptEntry{
Chain: util.IptablesAzureIngressFromChain,
}
exceptEntry.Specs = append(
exceptEntry.Specs,
util.IptablesSFlag,
except,
)
exceptEntry.Specs = append(exceptEntry.Specs, targetSelectorIptEntrySpec...)
exceptEntry.Specs = append(
exceptEntry.Specs,
util.IptablesJumpFlag,
util.IptablesDrop,
util.IptablesModuleFlag,
util.IptablesCommentModuleFlag,
util.IptablesCommentFlag,
"DROP-"+except+
"-TO-"+targetSelectorComment,
)
fromRuleEntries = append(fromRuleEntries, exceptEntry)
}
addedIngressFromEntry = true
}
}
continue
}
Expand Down Expand Up @@ -565,14 +565,17 @@ func translateIngress(ns string, targetSelector metav1.LabelSelector, rules []ne
}
}

// prepending fromRuleEntries (which is in reverse order) so that they will retain correct ordering
// of drop->allow... when the rules are beind prepended to their corresponding chain
if len(fromRuleEntries) > 0 {
entries = append(entries, fromRuleEntries...)
entries = append(fromRuleEntries, entries...)
}

if addedPortEntry && !addedIngressFromEntry {
entry := &iptm.IptEntry{
Chain: util.IptablesAzureIngressPortChain,
Specs: targetSelectorIptEntrySpec,
Chain: util.IptablesAzureIngressPortChain,
Specs: targetSelectorIptEntrySpec,
IsJumpEntry: true,
}
entry.Specs = append(
entry.Specs,
Expand All @@ -588,8 +591,9 @@ func translateIngress(ns string, targetSelector metav1.LabelSelector, rules []ne
entries = append(entries, entry)
} else if addedIngressFromEntry {
portEntry := &iptm.IptEntry{
Chain: util.IptablesAzureIngressPortChain,
Specs: targetSelectorIptEntrySpec,
Chain: util.IptablesAzureIngressPortChain,
Specs: targetSelectorIptEntrySpec,
IsJumpEntry: true,
}
portEntry.Specs = append(
portEntry.Specs,
Expand All @@ -604,8 +608,9 @@ func translateIngress(ns string, targetSelector metav1.LabelSelector, rules []ne
)
entries = append(entries, portEntry)
entry := &iptm.IptEntry{
Chain: util.IptablesAzureIngressFromChain,
Specs: targetSelectorIptEntrySpec,
Chain: util.IptablesAzureIngressFromChain,
Specs: targetSelectorIptEntrySpec,
IsJumpEntry: true,
}
entry.Specs = append(
entry.Specs,
Expand Down Expand Up @@ -718,31 +723,6 @@ func translateEgress(ns string, targetSelector metav1.LabelSelector, rules []net
for _, toRule := range rule.To {
// Handle IPBlock field of NetworkPolicyPeer
if toRule.IPBlock != nil {
if len(toRule.IPBlock.Except) > 0 {
for _, except := range toRule.IPBlock.Except {
exceptEntry := &iptm.IptEntry{
Chain: util.IptablesAzureEgressToChain,
Specs: targetSelectorIptEntrySpec,
}
exceptEntry.Specs = append(
exceptEntry.Specs,
util.IptablesDFlag,
except,
)
exceptEntry.Specs = append(
exceptEntry.Specs,
util.IptablesJumpFlag,
util.IptablesDrop,
util.IptablesModuleFlag,
util.IptablesCommentModuleFlag,
util.IptablesCommentFlag,
"DROP-"+except+
"-FROM-"+targetSelectorComment,
)
toRuleEntries = append(toRuleEntries, exceptEntry)
}
addedEgressToEntry = true
}
if len(toRule.IPBlock.CIDR) > 0 {
if portRuleExists {
for _, portRule := range rule.Ports {
Expand Down Expand Up @@ -798,6 +778,31 @@ func translateEgress(ns string, targetSelector metav1.LabelSelector, rules []net
toRuleEntries = append(toRuleEntries, cidrEntry)
addedEgressToEntry = true
}
if len(toRule.IPBlock.Except) > 0 {
for _, except := range toRule.IPBlock.Except {
exceptEntry := &iptm.IptEntry{
Chain: util.IptablesAzureEgressToChain,
Specs: targetSelectorIptEntrySpec,
}
exceptEntry.Specs = append(
exceptEntry.Specs,
util.IptablesDFlag,
except,
)
exceptEntry.Specs = append(
exceptEntry.Specs,
util.IptablesJumpFlag,
util.IptablesDrop,
util.IptablesModuleFlag,
util.IptablesCommentModuleFlag,
util.IptablesCommentFlag,
"DROP-"+except+
"-FROM-"+targetSelectorComment,
)
toRuleEntries = append(toRuleEntries, exceptEntry)
}
addedEgressToEntry = true
}
}
continue
}
Expand Down Expand Up @@ -1048,14 +1053,17 @@ func translateEgress(ns string, targetSelector metav1.LabelSelector, rules []net
}
}

// prepending toRuleEntries (which is in reverse order) so that they will retain correct ordering
// of drop->allow... when the rules are beind prepended to their corresponding chain
if len(toRuleEntries) > 0 {
entries = append(entries, toRuleEntries...)
entries = append(toRuleEntries, entries...)
}

if addedPortEntry && !addedEgressToEntry {
entry := &iptm.IptEntry{
Chain: util.IptablesAzureEgressPortChain,
Specs: targetSelectorIptEntrySpec,
Chain: util.IptablesAzureEgressPortChain,
Specs: targetSelectorIptEntrySpec,
IsJumpEntry: true,
}
entry.Specs = append(
entry.Specs,
Expand All @@ -1071,8 +1079,9 @@ func translateEgress(ns string, targetSelector metav1.LabelSelector, rules []net
entries = append(entries, entry)
} else if addedEgressToEntry {
portEntry := &iptm.IptEntry{
Chain: util.IptablesAzureEgressPortChain,
Specs: targetSelectorIptEntrySpec,
Chain: util.IptablesAzureEgressPortChain,
Specs: targetSelectorIptEntrySpec,
IsJumpEntry: true,
}
portEntry.Specs = append(
portEntry.Specs,
Expand All @@ -1087,8 +1096,9 @@ func translateEgress(ns string, targetSelector metav1.LabelSelector, rules []net
)
entries = append(entries, portEntry)
entry := &iptm.IptEntry{
Chain: util.IptablesAzureEgressToChain,
Specs: targetSelectorIptEntrySpec,
Chain: util.IptablesAzureEgressToChain,
Specs: targetSelectorIptEntrySpec,
IsJumpEntry: true,
}
entry.Specs = append(
entry.Specs,
Expand Down
Loading