Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-1733: Support explicit zero netmask correctly.

Browse Source
This commit is contained in:
Luke Taylor
2011-06-07 12:15:07 +01:00
parent c9b328d8c7
commit 685f12c5a0
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/src/test/java/org/springframework/security/web/util/IpAddressMatcherTests.java
View File

@@ -28,7 +28,6 @@ public class IpAddressMatcherTests {
assertTrue(v6matcher.matches(ipv6Request));
}
@Test
public void ipv6MatcherDoesntMatchIpv4Address() {
assertFalse(v6matcher.matches(ipv4Request));
@@ -48,4 +47,27 @@ public class IpAddressMatcherTests {
ipv4Request.setRemoteAddr("192.168.1.159"); // 159 = 0x9f
assertTrue(matcher.matches(ipv4Request));
}
@Test
public void ipv6RangeMatches() throws Exception {
IpAddressMatcher matcher = new IpAddressMatcher("2001:DB8::/48");
assertTrue(matcher.matches("2001:DB8:0:0:0:0:0:0"));
assertTrue(matcher.matches("2001:DB8:0:0:0:0:0:1"));
assertTrue(matcher.matches("2001:DB8:0:FFFF:FFFF:FFFF:FFFF:FFFF"));
assertFalse(matcher.matches("2001:DB8:1:0:0:0:0:0"));
}
// SEC-1733
@Test
public void zeroMaskMatchesAnything() throws Exception {
IpAddressMatcher matcher = new IpAddressMatcher("0.0.0.0/0");
assertTrue(matcher.matches("123.4.5.6"));
assertTrue(matcher.matches("192.168.0.159"));
matcher = new IpAddressMatcher("192.168.0.159/0");
assertTrue(matcher.matches("123.4.5.6"));
assertTrue(matcher.matches("192.168.0.159"));
}
}