Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.3.x'

This commit is contained in:
Josh Cummings 2024-07-01 11:43:19 -06:00
parent e076a4b838 8917cdb404
commit 9f0b2a29ee
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ package org.springframework.security.web.util.matcher;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.Scanner; import java.util.regex.Pattern;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
@ -37,6 +37,8 @@ import org.springframework.util.StringUtils;
*/ */
public final class IpAddressMatcher implements RequestMatcher { public final class IpAddressMatcher implements RequestMatcher {
private static Pattern IPV4 = Pattern.compile("\\d{0,3}.\\d{0,3}.\\d{0,3}.\\d{0,3}(/\\d{0,3})?");
private final int nMaskBits; private final int nMaskBits;
private final InetAddress requiredAddress; private final InetAddress requiredAddress;
@ -93,16 +95,13 @@ public final class IpAddressMatcher implements RequestMatcher {
} }
private void assertNotHostName(String ipAddress) { private void assertNotHostName(String ipAddress) {
boolean isIpv4 = IPV4.matcher(ipAddress).matches();
if (isIpv4) {
return;
}
String error = "ipAddress " + ipAddress + " doesn't look like an IP Address. Is it a host name?"; String error = "ipAddress " + ipAddress + " doesn't look like an IP Address. Is it a host name?";
Assert.isTrue(ipAddress.charAt(0) == '[' || ipAddress.charAt(0) == ':' Assert.isTrue(ipAddress.charAt(0) == '[' || ipAddress.charAt(0) == ':'
|| Character.digit(ipAddress.charAt(0), 16) != -1, error); || (Character.digit(ipAddress.charAt(0), 16) != -1 && ipAddress.contains(":")), error);
if (!ipAddress.contains(":")) {
Scanner parts = new Scanner(ipAddress);
parts.useDelimiter("[./]");
while (parts.hasNext()) {
Assert.isTrue(parts.hasNextInt() && parts.nextInt() >> 8 == 0, error);
}
}
} }
private InetAddress parseAddress(String address) { private InetAddress parseAddress(String address) {