Skip to content

[ISSUE #407] Support wildcard IPs in ACL whitelist #10596

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

Open
itxaiohanglover wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −0
Open

[ISSUE #407] Support wildcard IPs in ACL whitelist #10596

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
5 changes: 5 additions & 0 deletions common/src/main/java/org/apache/rocketmq/common/utils/IPAddressUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ public static boolean isValidIPv6Cidr(String cidr) {

public static boolean isIPInRange(String ip, String cidr) {
try {
if (StringUtils.equals(cidr, "*") || StringUtils.equals(cidr, "0.0.0.0")
|| StringUtils.equals(cidr, "0.0.0.0/0") || StringUtils.equals(cidr, "::")
|| StringUtils.equals(cidr, "::/0")) {
return true;
}
String[] parts = cidr.split(SLASH);
if (parts.length == 1) {
return StringUtils.equals(ip, cidr);
Expand Down
11 changes: 11 additions & 0 deletions common/src/test/java/org/apache/rocketmq/common/utils/IPAddressUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ public void isIPInRange() {
assert IPAddressUtils.isIPInRange(ipv6Address, ipv6Cidr);
}

@Test
public void isIPInRangeWildcard() {
assert IPAddressUtils.isIPInRange("192.168.1.10", "0.0.0.0");
assert IPAddressUtils.isIPInRange("10.0.0.1", "0.0.0.0/0");
assert IPAddressUtils.isIPInRange("192.168.1.10", "*");
assert IPAddressUtils.isIPInRange("2001:0db8:85a3::8a2e:0370:7334", "::");
assert IPAddressUtils.isIPInRange("2001:0db8:85a3::8a2e:0370:7334", "::/0");
assert IPAddressUtils.isIPInRange("192.168.1.10", "::/0");
assert IPAddressUtils.isIPInRange("2001:0db8::1", "0.0.0.0/0");
}

@Test
public void isValidCidr() {
String ipv4Cidr = "192.168.1.0/24";
Expand Down