Skip to content

fix: deny ranges take precedence over allow ranges #296

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

Open
AruneshDwivedi wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −3
Open

fix: deny ranges take precedence over allow ranges #296

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
6 changes: 3 additions & 3 deletions pkg/smokescreen/smokescreen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,10 @@ func classifyAddr(config *Config, addr *net.TCPAddr) ipType {
}
}

if addrIsInRuleRange(config.AllowRanges, addr) {
return ipAllowUserConfigured
} else if addrIsInRuleRange(config.DenyRanges, addr) {
if addrIsInRuleRange(config.DenyRanges, addr) {
return ipDenyUserConfigured
} else if addrIsInRuleRange(config.AllowRanges, addr) {
return ipAllowUserConfigured
} else if addrHasIPv6Embedding(addr) {
// Block IPv6 addresses that embed IPv4 addresses (NAT64, 6to4, Teredo, IPv4-mapped)
// These can bypass IPv4 safety checks and enable SSRF attacks
Expand Down
23 changes: 23 additions & 0 deletions pkg/smokescreen/smokescreen_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ func TestSelectTargetAddr(t *testing.T) {
temporarilyDeferredIPs []string
allowRanges []string
denyRanges []string
denyAddresses []string
expectedIP string
expectError bool
errorContains string
Expand Down Expand Up @@ -312,6 +313,23 @@ func TestSelectTargetAddr(t *testing.T) {
expectedIP: "8.8.8.8",
expectError: false,
},
{
name: "Deny address takes precedence over allow range",
ips: []string{"192.168.1.5", "192.168.1.6"},
port: 80,
allowRanges: []string{"192.168.0.0/16"},
denyAddresses: []string{"192.168.1.5"},
expectedIP: "192.168.1.6",
expectError: false,
},
{
name: "Deny address blocks all IPs even inside allow range",
ips: []string{"192.168.1.5"},
port: 80,
allowRanges: []string{"192.168.0.0/16"},
denyAddresses: []string{"192.168.1.5"},
expectError: true,
},
{
name: "Deny range forces fallback to deferred IP",
ips: []string{"1.1.1.1", "8.8.8.8"},
Expand Down Expand Up @@ -340,6 +358,11 @@ func TestSelectTargetAddr(t *testing.T) {
require.NoError(t, err)
}

if len(tt.denyAddresses) > 0 {
err := config.SetDenyAddresses(tt.denyAddresses)
require.NoError(t, err)
}

config.TemporarilyDeferredIPs = tt.temporarilyDeferredIPs

// Convert string IPs to net.IP
Expand Down