Skip to content

Commit 86fc671

Browse files
committed
address nits
1 parent abb8760 commit 86fc671

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

internal/mode/static/state/dataplane/configuration_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2198,7 +2198,7 @@ func TestBuildConfiguration(t *testing.T) {
21982198
Spec: ngfAPI.NginxProxySpec{
21992199
RewriteClientIP: &ngfAPI.RewriteClientIP{
22002200
SetIPRecursively: helpers.GetPointer(true),
2201-
TrustedAddresses: []ngfAPI.TrustedAddress{"0.0.0.0/0"},
2201+
TrustedAddresses: []ngfAPI.TrustedAddress{"1.1.1.1/32"},
22022202
Mode: helpers.GetPointer(ngfAPI.RewriteClientIPModeProxyProtocol),
22032203
},
22042204
},
@@ -2214,7 +2214,7 @@ func TestBuildConfiguration(t *testing.T) {
22142214
IPFamily: Dual,
22152215
RewriteClientIPSettings: RewriteClientIPSettings{
22162216
IPRecursive: true,
2217-
TrustedAddresses: []string{"0.0.0.0/0"},
2217+
TrustedAddresses: []string{"1.1.1.1/32"},
22182218
Mode: RewriteIPModeProxyProtocol,
22192219
},
22202220
}
@@ -3620,7 +3620,7 @@ func TestBuildRewriteIPSettings(t *testing.T) {
36203620
Spec: ngfAPI.NginxProxySpec{
36213621
RewriteClientIP: &ngfAPI.RewriteClientIP{
36223622
Mode: helpers.GetPointer(ngfAPI.RewriteClientIPModeProxyProtocol),
3623-
TrustedAddresses: []ngfAPI.TrustedAddress{"0.0.0.0/0"},
3623+
TrustedAddresses: []ngfAPI.TrustedAddress{"10.9.9.4"},
36243624
SetIPRecursively: helpers.GetPointer(true),
36253625
},
36263626
},
@@ -3629,7 +3629,7 @@ func TestBuildRewriteIPSettings(t *testing.T) {
36293629
},
36303630
expRewriteIPSettings: RewriteClientIPSettings{
36313631
Mode: RewriteIPModeProxyProtocol,
3632-
TrustedAddresses: []string{"0.0.0.0/0"},
3632+
TrustedAddresses: []string{"10.9.9.4"},
36333633
IPRecursive: true,
36343634
},
36353635
},
@@ -3642,7 +3642,7 @@ func TestBuildRewriteIPSettings(t *testing.T) {
36423642
Spec: ngfAPI.NginxProxySpec{
36433643
RewriteClientIP: &ngfAPI.RewriteClientIP{
36443644
Mode: helpers.GetPointer(ngfAPI.RewriteClientIPModeXForwardedFor),
3645-
TrustedAddresses: []ngfAPI.TrustedAddress{"0.0.0.0/0"},
3645+
TrustedAddresses: []ngfAPI.TrustedAddress{"76.89.90.11"},
36463646
SetIPRecursively: helpers.GetPointer(true),
36473647
},
36483648
},
@@ -3651,7 +3651,7 @@ func TestBuildRewriteIPSettings(t *testing.T) {
36513651
},
36523652
expRewriteIPSettings: RewriteClientIPSettings{
36533653
Mode: RewriteIPModeXForwardedFor,
3654-
TrustedAddresses: []string{"0.0.0.0/0"},
3654+
TrustedAddresses: []string{"76.89.90.11"},
36553655
IPRecursive: true,
36563656
},
36573657
},
@@ -3664,7 +3664,7 @@ func TestBuildRewriteIPSettings(t *testing.T) {
36643664
Spec: ngfAPI.NginxProxySpec{
36653665
RewriteClientIP: &ngfAPI.RewriteClientIP{
36663666
Mode: helpers.GetPointer(ngfAPI.RewriteClientIPModeXForwardedFor),
3667-
TrustedAddresses: []ngfAPI.TrustedAddress{"0.0.0.0/0", "1.1.1.1/32", "2.2.2.2/32", "3.3.3.3/24"},
3667+
TrustedAddresses: []ngfAPI.TrustedAddress{"5.5.5.5", "1.1.1.1/32", "2.2.2.2/32", "3.3.3.3/24"},
36683668
SetIPRecursively: helpers.GetPointer(false),
36693669
},
36703670
},
@@ -3673,7 +3673,7 @@ func TestBuildRewriteIPSettings(t *testing.T) {
36733673
},
36743674
expRewriteIPSettings: RewriteClientIPSettings{
36753675
Mode: RewriteIPModeXForwardedFor,
3676-
TrustedAddresses: []string{"0.0.0.0/0", "1.1.1.1/32", "2.2.2.2/32", "3.3.3.3/24"},
3676+
TrustedAddresses: []string{"5.5.5.5", "1.1.1.1/32", "2.2.2.2/32", "3.3.3.3/24"},
36773677
IPRecursive: false,
36783678
},
36793679
},

internal/mode/static/state/graph/nginxproxy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ func TestValidateRewriteClientIP(t *testing.T) {
402402
"Invalid value: \"2001:db8::/129\": must be a valid IP address or CIDR range",
403403
},
404404
{
405-
name: "invalid IP and CIDR in trustedAddresses",
405+
name: "invalid IP and valid CIDR in trustedAddresses",
406406
validator: createInvalidValidator(),
407407
np: &ngfAPI.NginxProxy{
408408
Spec: ngfAPI.NginxProxySpec{

0 commit comments

Comments
 (0)