Skip to content

Add getRequiredAddress() and getMaskBits() to IpAddressMatcher.java #16794

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

Closed
wants to merge 1 commit into from
+21 −0
Closed

Add getRequiredAddress() and getMaskBits() to IpAddressMatcher.java #16794

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
8 changes: 8 additions & 0 deletions web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,12 @@ private InetAddress parseAddress(String address) {
}
}

public InetAddress getRequiredAddress() {
return this.requiredAddress;
}

public int getMaskBits() {
return this.nMaskBits;
}

}
13 changes: 13 additions & 0 deletions web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,5 +152,18 @@ public void constructorWhenRequiredAddressIsEmptyThenThrowsIllegalArgumentExcept
assertThatIllegalArgumentException().isThrownBy(() -> new IpAddressMatcher(""))
.withMessage("ipAddress cannot be empty");
}
// gh-16693
@Test
public void getRequiredAddressWhenCidrIsValidThenReturnsHostAddress() {
IpAddressMatcher ipAddressMatcher = new IpAddressMatcher("192.168.1.0/24");
assertThat(ipAddressMatcher.getRequiredAddress().getHostAddress()).isEqualTo("192.168.1.0");
}

// gh-16693
@Test
public void getRequiredAddressWhenCidrIsValidThenReturnsMaskBits() {
IpAddressMatcher ipAddressMatcher = new IpAddressMatcher("192.168.1.0/24");
assertThat(ipAddressMatcher.getMaskBits()).isEqualTo(24);
}

}