Add validation IpAddressMatcher

gh-13621

Author: FdHerrera

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

@@ -47,6 +47,7 @@ public final class IpAddressMatcher implements RequestMatcher {
 	 * come.
 	 */
 	public IpAddressMatcher(String ipAddress) {
+		assertStartsWithHexa(ipAddress);
 		if (ipAddress.indexOf('/') > 0) {
 			String[] addressAndMask = StringUtils.split(ipAddress, "/");
 			ipAddress = addressAndMask[0];
@@ -66,6 +67,7 @@ public boolean matches(HttpServletRequest request) {
 	}
 
 	public boolean matches(String address) {
+		assertStartsWithHexa(address);
 		InetAddress remoteAddress = parseAddress(address);
 		if (!this.requiredAddress.getClass().equals(remoteAddress.getClass())) {
 			return false;
@@ -88,6 +90,13 @@ public boolean matches(String address) {
 		return true;
 	}
 
+	private void assertStartsWithHexa(String ipAddress) {
+		Assert.isTrue(
+				ipAddress.charAt(0) == '[' || ipAddress.charAt(0) == ':'
+						|| Character.digit(ipAddress.charAt(0), 16) != -1,
+				"ipAddress must start with a [, :, or a hexadecimal digit");
+	}
+
 	private InetAddress parseAddress(String address) {
 		try {
 			return InetAddress.getByName(address);

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

@@ -105,4 +105,10 @@ public void ipv6RequiredAddressMaskTooLongThenIllegalArgumentException() {
 					"fe80::21f:5bff:fe33:bd68", 129));
 	}
 
+	@Test
+	public void invalidAddressThenIllegalArgumentException() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new IpAddressMatcher("invalid-ip"))
+			.withMessage("ipAddress must start with a [, :, or a hexadecimal digit");
+	}
+
 }