Skip to content

[bugfix ACL-plugin] Support empty source/destination port range. #114

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
Oct 20, 2017
Merged

[bugfix ACL-plugin] Support empty source/destination port range. #114

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
15 changes: 11 additions & 4 deletions plugins/policy/config_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,13 @@ func (pp *ConfigProcessor) Close() error {
return nil
}

func getHostIPNet(ip string) string {
if ip == "" {
return ip
}
return ip + "/32"
}

func getIngressRule(proto policy.Policy_Port_Protocol, dstPort int32, srcIPAddr string, ruleName string) *acl.AccessLists_Acl_Rule {

lowerDstPort := uint32(dstPort)
Expand All @@ -368,7 +375,7 @@ func getIngressRule(proto policy.Policy_Port_Protocol, dstPort int32, srcIPAddr
matches = &acl.AccessLists_Acl_Rule_Matches{
IpRule: &acl.AccessLists_Acl_Rule_Matches_IpRule{
Ip: &acl.AccessLists_Acl_Rule_Matches_IpRule_Ip{
SourceNetwork: srcIPAddr + "/32",
SourceNetwork: getHostIPNet(srcIPAddr),
},
Tcp: &acl.AccessLists_Acl_Rule_Matches_IpRule_Tcp{
DestinationPortRange: &acl.AccessLists_Acl_Rule_Matches_IpRule_Tcp_DestinationPortRange{
Expand All @@ -382,7 +389,7 @@ func getIngressRule(proto policy.Policy_Port_Protocol, dstPort int32, srcIPAddr
matches = &acl.AccessLists_Acl_Rule_Matches{
IpRule: &acl.AccessLists_Acl_Rule_Matches_IpRule{
Ip: &acl.AccessLists_Acl_Rule_Matches_IpRule_Ip{
SourceNetwork: srcIPAddr + "/32",
SourceNetwork: getHostIPNet(srcIPAddr),
},
Udp: &acl.AccessLists_Acl_Rule_Matches_IpRule_Udp{
DestinationPortRange: &acl.AccessLists_Acl_Rule_Matches_IpRule_Udp_DestinationPortRange{
Expand Down Expand Up @@ -449,14 +456,14 @@ func getFromRule(srcIPAddr string, ruleName string) *acl.AccessLists_Acl_Rule {
matches = &acl.AccessLists_Acl_Rule_Matches{
IpRule: &acl.AccessLists_Acl_Rule_Matches_IpRule{
Ip: &acl.AccessLists_Acl_Rule_Matches_IpRule_Ip{
SourceNetwork: srcIPAddr + "/32",
SourceNetwork: getHostIPNet(srcIPAddr),
},
},
}
matches = &acl.AccessLists_Acl_Rule_Matches{
IpRule: &acl.AccessLists_Acl_Rule_Matches_IpRule{
Ip: &acl.AccessLists_Acl_Rule_Matches_IpRule_Ip{
SourceNetwork: srcIPAddr + "/32",
SourceNetwork: getHostIPNet(srcIPAddr),
},
},
}
Expand Down
12 changes: 8 additions & 4 deletions vendor/github.com/ligato/vpp-agent/plugins/defaultplugins/aclplugin/vppcalls/acl_vppcalls.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.