Skip to content

fix(action): Fix isolate action #457

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
rabbitstack merged 3 commits into from
Mar 13, 2025
Merged

fix(action): Fix isolate action #457

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbfa249
fix(action): Declare WFP session as dynamic
rabbitstack Mar 11, 2025
7b6f483
fix(action): Prevent deadlock when adding whitelist IP addresses
rabbitstack Mar 12, 2025
d41bff3
fix(action): Add single IP condition
rabbitstack Mar 13, 2025
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
93 changes: 43 additions & 50 deletions pkg/rules/action/isolate_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ type firewall struct {
}

func newFirewall() (*firewall, error) {
opts := &wf.Options{}
opts := &wf.Options{
Dynamic: true, // remove filters when the process terminates
}

sess, err := wf.New(opts)
if err != nil {
Expand All @@ -67,25 +69,28 @@ func (f *firewall) allow(whitelist []net.IP) error {
f.mu.Lock()
defer f.mu.Unlock()
f.inbound = &wf.Rule{
ID: inboundAllowRuleID,
Name: inboundAllowRuleName,
Layer: wf.LayerInboundIPPacketV4,
Action: wf.ActionPermit,
Conditions: []*wf.Match{
{Field: wf.FieldIPLocalAddress, Op: wf.MatchTypeEqual, Value: netip.AddrFrom4([4]byte{127, 0, 0, 1})},
{Field: wf.FieldIPRemoteAddress, Op: wf.MatchTypeEqual, Value: netip.AddrFrom4([4]byte{127, 0, 0, 1})},
},
ID: inboundAllowRuleID,
Name: inboundAllowRuleName,
Layer: wf.LayerInboundIPPacketV4,
Action: wf.ActionPermit,
Conditions: make([]*wf.Match, 0),
}

f.outbound = &wf.Rule{
ID: outboundAllowRuleID,
Name: outboundAllowRuleName,
Layer: wf.LayerOutboundIPPacketV4,
Action: wf.ActionPermit,
Conditions: []*wf.Match{
{Field: wf.FieldIPLocalAddress, Op: wf.MatchTypeEqual, Value: netip.AddrFrom4([4]byte{127, 0, 0, 1})},
{Field: wf.FieldIPRemoteAddress, Op: wf.MatchTypeEqual, Value: netip.AddrFrom4([4]byte{127, 0, 0, 1})},
},
ID: outboundAllowRuleID,
Name: outboundAllowRuleName,
Layer: wf.LayerOutboundIPPacketV4,
Action: wf.ActionPermit,
Conditions: make([]*wf.Match, 0),
}

// The current limitation of the fw
// library, makes it impossible to
// install a filter with multiple IP
// addresses, so we shrink the list
// to use a single item
if len(whitelist) > 0 {
whitelist = whitelist[:1]
}

for _, addr := range whitelist {
Expand Down Expand Up @@ -142,6 +147,7 @@ func (f *firewall) findAllowRules() error {
return nil
}

//nolint:unused
func (f *firewall) removeAllowRules() error {
f.mu.Lock()
defer f.mu.Unlock()
Expand All @@ -155,15 +161,16 @@ func (f *firewall) hasAllowRules() bool {
}

func (f *firewall) addIPCondition(addr net.IP) {
f.mu.Lock()
defer f.mu.Unlock()
ip := netip.AddrFrom4([4]byte(addr))
f.inbound.Conditions = append(f.inbound.Conditions, &wf.Match{Field: wf.FieldIPLocalAddress, Op: wf.MatchTypeEqual, Value: ip})
f.inbound.Conditions = append(f.inbound.Conditions, &wf.Match{Field: wf.FieldIPRemoteAddress, Op: wf.MatchTypeEqual, Value: ip})
f.outbound.Conditions = append(f.outbound.Conditions, &wf.Match{Field: wf.FieldIPLocalAddress, Op: wf.MatchTypeEqual, Value: ip})
f.outbound.Conditions = append(f.outbound.Conditions, &wf.Match{Field: wf.FieldIPRemoteAddress, Op: wf.MatchTypeEqual, Value: ip})
ip, err := netip.ParseAddr(addr.String())
if err == nil {
f.inbound.Conditions = append(f.inbound.Conditions, &wf.Match{Field: wf.FieldIPLocalAddress, Op: wf.MatchTypeEqual, Value: ip})
f.inbound.Conditions = append(f.inbound.Conditions, &wf.Match{Field: wf.FieldIPRemoteAddress, Op: wf.MatchTypeEqual, Value: ip})
f.outbound.Conditions = append(f.outbound.Conditions, &wf.Match{Field: wf.FieldIPLocalAddress, Op: wf.MatchTypeEqual, Value: ip})
f.outbound.Conditions = append(f.outbound.Conditions, &wf.Match{Field: wf.FieldIPRemoteAddress, Op: wf.MatchTypeEqual, Value: ip})
}
}

//nolint:unused
func (f *firewall) hasIPCondition(addr net.IP) bool {
f.mu.Lock()
defer f.mu.Unlock()
Expand All @@ -177,7 +184,12 @@ func (f *firewall) hasIPCondition(addr net.IP) bool {
continue
}

if netip.AddrFrom4([4]byte(addr)) == address {
netaddr, err := netip.ParseAddr(addr.String())
if err != nil {
continue
}

if netaddr == address {
return true
}
}
Expand All @@ -192,7 +204,12 @@ func (f *firewall) hasIPCondition(addr net.IP) bool {
continue
}

if netip.AddrFrom4([4]byte(addr)) == address {
netaddr, err := netip.ParseAddr(addr.String())
if err != nil {
continue
}

if netaddr == address {
return true
}
}
Expand Down Expand Up @@ -223,30 +240,6 @@ func Isolate(whitelist []net.IP) error {
}

switch {
case fw.hasAllowRules() && len(whitelist) > 0:
// rules were added and the whitelist
// is given in the action. Check if
// the given permitted addresses contain
// an item that is not already in the
// allowed rules conditions.
refresh := true
for _, addr := range whitelist {
if fw.hasIPCondition(addr) {
refresh = false
break
} else {
fw.addIPCondition(addr)
}
}

if refresh {
if err := fw.removeAllowRules(); err != nil {
return err
}
return fw.allow(whitelist)
}

return nil
case fw.hasAllowRules():
// rules were added and no new permitted
// addresses are supplied in the action
Expand Down