adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Usignregex to determine if it os ipv6 or not

Browse Source
This commit is contained in:
Paulo Nascimento 2021-03-20 19:25:25 -03:00
parent 283705a54b
commit 832360a02c
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/iptables/iptables.go
View File

@ -73,6 +73,8 @@ type rule struct {
proto Protocol proto Protocol
} }
var ipv6Regex,_ = regexp.Compile("[-]d\\s(.*:.*\\s[-]m\\scomment)")
// NewRule creates a new iptables or ip6tables rule in the given table and chain // NewRule creates a new iptables or ip6tables rule in the given table and chain
// depending on the given protocol. // depending on the given protocol.
func NewRule(proto Protocol, table, chain string, spec ...string) Rule { func NewRule(proto Protocol, table, chain string, spec ...string) Rule {
@ -125,7 +127,14 @@ func (r *rule) String() string {
} }
func (r *rule) Proto() Protocol { func (r *rule) Proto() Protocol {
return r.proto proto := ProtocolIPv4
ruleString := r.String()
if ipv6Regex.MatchString(ruleString) {
proto = ProtocolIPv6
}
return proto
} }
// chain represents an iptables chain. // chain represents an iptables chain.
@ -190,7 +199,14 @@ func (c *chain) String() string {
} }
func (c *chain) Proto() Protocol { func (c *chain) Proto() Protocol {
return c.proto proto := ProtocolIPv4
chainString := c.String()
if ipv6Regex.MatchString(chainString) {
proto = ProtocolIPv6
}
return proto
} }
func chainToString(table, chain string) string { func chainToString(table, chain string) string {
@ -355,8 +371,6 @@ func (c *Controller) Set(rules []Rule) error {
defer c.Unlock() defer c.Unlock()
var i int var i int
ipv6Regex,_ := regexp.Compile("[-]d\\s(.*:.*\\s[-]m\\scomment)")
for ; i < len(rules); i++ { for ; i < len(rules); i++ {
if i < len(c.rules) { if i < len(c.rules) {
if rules[i].String() != c.rules[i].String() { if rules[i].String() != c.rules[i].String() {
@ -366,12 +380,7 @@ func (c *Controller) Set(rules []Rule) error {
} }
} }
if i >= len(c.rules) { if i >= len(c.rules) {
proto := ProtocolIPv4 proto := rules[i].Proto()
ruleString := rules[i].String()
if ipv6Regex.MatchString(ruleString) {
proto = ProtocolIPv6
}
protocolName := "ipv4" protocolName := "ipv4"
@ -379,6 +388,7 @@ func (c *Controller) Set(rules []Rule) error {
protocolName = "ipv6" protocolName = "ipv6"
} }
var ruleString = rules[i].String()
level.Debug(c.logger).Log("msg", "Applying Firewall Rule...", "Rule", ruleString, "Protocol", protocolName) level.Debug(c.logger).Log("msg", "Applying Firewall Rule...", "Rule", ruleString, "Protocol", protocolName)
if err := rules[i].Add(c.v4); err != nil { if err := rules[i].Add(c.v4); err != nil {
return fmt.Errorf("failed to add rule: %v", err) return fmt.Errorf("failed to add rule: %v", err)