Browse Source

Add toString() to IpAddressMatcher.java

Closes gh-16795

Signed-off-by: wtigerhyunsu <jack951@naver.com>
pull/16838/head
wtigerhyunsu 10 months ago committed by Josh Cummings
parent
commit
bdbf6a2be3
  1. 7
      web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java
  2. 14
      web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java

7
web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java

@ -130,4 +130,11 @@ public final class IpAddressMatcher implements RequestMatcher { @@ -130,4 +130,11 @@ public final class IpAddressMatcher implements RequestMatcher {
}
}
@Override
public String toString() {
String hostAddress = this.requiredAddress.getHostAddress();
return (this.nMaskBits < 0) ? "IpAddress [" + hostAddress + "]"
: "IpAddress [" + hostAddress + "/" + this.nMaskBits + "]";
}
}

14
web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java

@ -153,4 +153,18 @@ public class IpAddressMatcherTests { @@ -153,4 +153,18 @@ public class IpAddressMatcherTests {
.withMessage("ipAddress cannot be empty");
}
// gh-16795
@Test
public void toStringWhenCidrIsProvidedThenReturnsIpAddressWithCidr() {
IpAddressMatcher matcher = new IpAddressMatcher("192.168.1.0/24");
assertThat(matcher.toString()).hasToString("IpAddress [192.168.1.0/24]");
}
// gh-16795
@Test
public void toStringWhenOnlyIpIsProvidedThenReturnsIpAddressOnly() {
IpAddressMatcher matcher = new IpAddressMatcher("127.0.0.1");
assertThat(matcher.toString()).hasToString("IpAddress [127.0.0.1]");
}
}

Loading…
Cancel
Save