Skip to content

Fix InetAddressMatchers#matchExternal to exclude null and any local addresses #19073

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
therepanic wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −0
Open

Fix InetAddressMatchers#matchExternal to exclude null and any local addresses #19073

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
7 changes: 7 additions & 0 deletions core/src/main/java/org/springframework/security/util/matcher/InetAddressMatchers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
* strategies for IP addresses.
*
* @author Rob Winch
* @author Andrey Litvitski
* @since 7.1
*/
public final class InetAddressMatchers {
Expand Down Expand Up @@ -256,6 +257,9 @@ public boolean matches(@Nullable InetAddress address) {
if (address == null) {
return false;
}
if (address.isAnyLocalAddress()) {
return true;
}
if (address.isLoopbackAddress() || address.isLinkLocalAddress() || address.isSiteLocalAddress()) {
Comment on lines 259 to 263
Copy link
Copy Markdown
Contributor Author

@therepanic therepanic Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would probably be more elegant than adding the same check but on matchExternal, since the logic of matchExternal is to return the response back from matchInternal.

return true;
}
Expand Down Expand Up @@ -335,6 +339,9 @@ private ExternalInetAddressMatcher() {

@Override
public boolean matches(@Nullable InetAddress address) {
if (address == null) {
return false;
}
return !this.internalMatcher.matches(address);
}

Expand Down
14 changes: 14 additions & 0 deletions core/src/test/java/org/springframework/security/util/matcher/InetAddressMatchersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
* Tests for {@link InetAddressMatchers}.
*
* @author Rob Winch
* @author Andrey Litvitski
*/
class InetAddressMatchersTests {

Expand All @@ -51,6 +52,12 @@ void matchInternalWhenInvokedThenReturnsBuilder() {
assertThat(builder).isNotNull();
}

@Test
void matchesWhenInetAddressNullThenReturnsFalse() {
InetAddressMatcher matcher = InetAddressMatchers.matchExternal().build();
assertThat(matcher.matches((InetAddress) null)).isFalse();
}

@Nested
class BuilderTests {

Expand Down Expand Up @@ -410,6 +417,13 @@ void matchesWhenIpv6PublicThenReturnsFalse() throws Exception {
assertThat(matcher.matches(InetAddress.getByName("2001:4860:4860::8888"))).isFalse();
}

@ParameterizedTest
@ValueSource(strings = { "0.0.0.0", "::" })
void matchesWhenWildcardAddressThenReturnsFalse(String address) throws Exception {
InetAddressMatcher matcher = InetAddressMatchers.matchExternal().build();
assertThat(matcher.matches(InetAddress.getByName(address))).isFalse();
}

}

@Nested
Expand Down
Loading