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

monitoring param host with http head will not be error reported #1155

Merged
merged 8 commits into from
Aug 8, 2023
Merged

monitoring param host with http head will not be error reported #1155

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dab18bd
feature:monitor brearer token api, ignore letter case to comparison
Jul 21, 2023
eacf380
feature:enter the domain name in host, including http://or https://, …
Aug 4, 2023
9652492
Merge branch 'dromara:master' into loyal_dev
littlezhongzer Aug 8, 2023
d019c04
monitoring param host with http head will not be error reported
Aug 8, 2023
934c511
change notice info when input host with / character at the end
Aug 8, 2023
56c4410
Apply suggestions from code review
tomsun28 Aug 8, 2023
da2ebfb
Update common/src/main/java/org/dromara/hertzbeat/common/support/vali…
tomsun28 Aug 8, 2023
1b1dc32
fix pmd error
tomsun28 Aug 8, 2023
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
11 changes: 11 additions & 0 deletions common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostParamValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,21 @@
*
*/
public class HostParamValidator implements ConstraintValidator<HostValid, String> {
public static final String HTTP = "http://";
public static final String HTTPS = "https://";
tomsun28 marked this conversation as resolved.
Show resolved Hide resolved
public static final String BLANK = "";
public static final String patternHttp = "(?i)http://";
public static final String patternHttps = "(?i)https://";

@Override
public boolean isValid(String value, ConstraintValidatorContext context) {
// 判断value是否满足ipv4 ipv5 域名 格式
if(value.toLowerCase().contains(HTTP)){
value = value.replaceAll(patternHttp,BLANK);
}
if(value.toLowerCase().contains(HTTPS)){
value = value.replace(patternHttps,BLANK);
}
tomsun28 marked this conversation as resolved.
Show resolved Hide resolved
tomsun28 marked this conversation as resolved.
Show resolved Hide resolved
return IpDomainUtil.validateIpDomain(value);
}
}
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 @@ -38,7 +38,7 @@
@Constraint(validatedBy = HostParamValidator.class)
public @interface HostValid {

String message() default "监控Host必须是ipv4,ipv6或域名";
String message() default "监控Host必须是ipv4,ipv6或域名,<br>EX:192.168.53.27 或者 http://192.168.53.27";
tomsun28 marked this conversation as resolved.
Show resolved Hide resolved

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

Expand Down
12 changes: 12 additions & 0 deletions manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MonitorServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@
public class MonitorServiceImpl implements MonitorService {
private static final Long MONITOR_ID_TMP = 1000000000L;

public static final String HTTP = "http://";
public static final String HTTPS = "https://";
public static final String BLANK = "";
public static final String patternHttp = "(?i)http://";
public static final String patternHttps = "(?i)https://";
tomsun28 marked this conversation as resolved.
Show resolved Hide resolved

private static final Gson GSON = new Gson();

@Autowired
Expand Down Expand Up @@ -379,6 +385,12 @@ public void validate(MonitorDto monitorDto, Boolean isModify) throws IllegalArgu
break;
case "host":
String hostValue = param.getValue();
if(hostValue.toLowerCase().contains(HTTP)){
hostValue = hostValue.replaceAll(patternHttp,BLANK);
}
if(hostValue.toLowerCase().contains(HTTPS)){
hostValue = hostValue.replace(patternHttps,BLANK);
}
tomsun28 marked this conversation as resolved.
Show resolved Hide resolved
if (!IpDomainUtil.validateIpDomain(hostValue)) {
throw new IllegalArgumentException("Params field " + field + " value "
+ hostValue + " is invalid host value.");
Expand Down