Skip to content
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

Jump to bottom

feat: support hostname target #1455

Merged
merged 7 commits into from
Jan 3, 2024
Merged

feat: support hostname target #1455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6ddb08
Update IpDomainUtil.java to support hostname target.
ldysdu Dec 28, 2023
580e773
Update HostValid.java to update the warning message. (#1)
ldysdu Dec 28, 2023
7443ad8
Update IpDomainUtil.java optimize the domain pattern regex
ldysdu Jan 2, 2024
44b82f6
Update IpDomainUtilTest.java to match hostname pattern
ldysdu Jan 2, 2024
48a1597
Merge branch 'master' into patch-1
ldysdu Jan 2, 2024
09befda
Update IpDomainUtil.java to fix a illegal escape error
ldysdu Jan 3, 2024
00ff345
Merge branch 'master' into patch-1
tomsun28 Jan 3, 2024
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
2 changes: 1 addition & 1 deletion common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostValid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
@Constraint(validatedBy = HostParamValidator.class)
public @interface HostValid {

String message() default "Host need ipv4,ipv6 or domain,<br>EG:127.0.0.1 hertzbeat.com";
String message() default "Host need ipv4,ipv6,hostname or domain,<br>EG:127.0.0.1 hertzbeat.com";

Class<?>[] groups() default {};

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/dromara/hertzbeat/common/util/IpDomainUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
public class IpDomainUtil {

private static final Pattern DOMAIN_PATTERN =
Pattern.compile("^(?=^.{3,255}$)[_a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})+$");
Pattern.compile("^[-\\w]+(\\.[-\\w]+)*$");

private static final String LOCALHOST = "localhost";

Expand Down
9 changes: 6 additions & 3 deletions common/src/test/java/org/dromara/hertzbeat/common/util/IpDomainUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,14 @@ void validateIpDomain() {
assertTrue(IpDomainUtil.validateIpDomain("good.didi"));
assertTrue(IpDomainUtil.validateIpDomain("spider_rds.sogou"));
assertTrue(IpDomainUtil.validateIpDomain("_redis.hn.sogou"));
assertFalse(IpDomainUtil.validateIpDomain("tmp"));
assertFalse(IpDomainUtil.validateIpDomain("good"));
assertTrue(IpDomainUtil.validateIpDomain("host"));
assertTrue(IpDomainUtil.validateIpDomain("host-1"));
assertFalse(IpDomainUtil.validateIpDomain("www.baidu.com."));
assertFalse(IpDomainUtil.validateIpDomain("good."));
assertFalse(IpDomainUtil.validateIpDomain(".good."));
assertFalse(IpDomainUtil.validateIpDomain("www.baidu..com"));
assertFalse(IpDomainUtil.validateIpDomain("www.baidu*com"));
assertFalse(IpDomainUtil.validateIpDomain("host$-1"));
}

@Test
Expand All @@ -54,4 +57,4 @@ void isHasSchema() {
assertFalse(IpDomainUtil.isHasSchema("www.baidu.com"));
assertFalse(IpDomainUtil.isHasSchema("https_www.baidu.com"));
}
}
}
Loading