fix: optimized rules allowList count #36
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yousong
requested changes
Nov 13, 2019
util/secrules/secruleset.go
Outdated
| @@ -59,6 +62,8 @@ func (srs SecurityRuleSet) equals(srs1 SecurityRuleSet) bool { | |||
| if len(srs) != len(srs1) { | |||
| return false | |||
| } | |||
| sort.Sort(srs) | |||
| sort.Sort(srs1) | |||
util/secrules/secruleset.go
Outdated
| @@ -190,6 +195,120 @@ func (srs SecurityRuleSet) collapse() SecurityRuleSet { | |||
| } | |||
| // save that contains, intersects | |||
| } | |||
| if srs1[i].PortStart <= 1 && srs1[i].PortEnd >= 65535 && len(srs1[i].Ports) == 0 { | |||
| srs1[i].PortStart = -1 | |||
| srs1[i].PortEnd = -1 | |||
| if sr0.GetPortsString() != sr1.GetPortsString() { | ||
| return sr0.GetPortsString() < sr1.GetPortsString() | ||
| } | ||
| return sr0.Priority < sr1.Priority |
util/secrules/secruleset.go
Outdated
| for j := range addrRanges { | ||
| _merged = compareRange(addrRanges[i], addrRanges[j]) | ||
| if _merged != nil { | ||
| addrRanges[i] = *_merged |
There was a problem hiding this comment.
这个复杂度太高，可以简化。相邻rule若protocol, port相同，只需要考虑range.IsOverlap()的情况，直接merge就可以。考虑给IPV4AddrRange添加一个Merge方法，返回指针
ioito
force-pushed
the
hotfix/qx-secgroup-optimized
branch
2 times, most recently
from
dafef6b
to
b3bddc8
Compare
ioito
force-pushed
the
hotfix/qx-secgroup-optimized
branch
from
b3bddc8
to
3aa6b83
Compare
yousong
requested changes
Nov 14, 2019
util/secrules/secruleset.go
Outdated
| } | ||
| range0 := netutils.NewIPV4AddrRangeFromIPNet(sr0.IPNet) | ||
| range1 := netutils.NewIPV4AddrRangeFromIPNet(sr1.IPNet) | ||
| return range0.EndIp() < range1.StartIp() |
There was a problem hiding this comment.
startip同endip比无法保证full order，是鸡同鸭比
ioito
force-pushed
the
hotfix/qx-secgroup-optimized
branch
2 times, most recently
from
c15bf24
to
5b17d5d
Compare
yousong
reviewed
Nov 15, 2019
util/secrules/secruleset.go
Outdated
| preNet := ranges[len(ranges)-1] | ||
| nextNet := netutils.NewIPV4AddrRangeFromIPNet(srs[i].IPNet) | ||
| if preNet.IsOverlap(nextNet) || preNet.EndIp()+1 == nextNet.StartIp() { | ||
| ranges[len(ranges)-1] = netutils.NewIPV4AddrRange(preNet.StartIp(), nextNet.EndIp()) |
ioito
force-pushed
the
hotfix/qx-secgroup-optimized
branch
2 times, most recently
from
dd751ca
to
e6b64d6
Compare
yousong
reviewed
Nov 15, 2019
util/secrules/secruleset_test.go
Outdated
| } | ||
| rules := srs0.AllowList() | ||
| for _, rule := range rules { | ||
| t.Logf("rule: %s", rule.String()) |
ioito
force-pushed
the
hotfix/qx-secgroup-optimized
branch
from
e6b64d6
to
a1b1426
Compare
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: yousong The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
wanyaoqi
pushed a commit
to wanyaoqi/pkg
that referenced
this pull request
Jan 2, 2020
…/add-signal-handler to master * commit '557c3fe63902e89b894a3c6dd95a1932d9cc7883': add profiler add signal utils
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
优化AllowList输出数量
/cc @yousong @swordqiu