update 优化xss注解处理逻辑

2.X
疯狂的狮子li 3 years ago
parent 1b7cde73f3
commit 24a8719d4c

@ -16,9 +16,8 @@ import java.lang.annotation.Target;
@Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER}) @Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER})
@Constraint(validatedBy = {XssValidator.class}) @Constraint(validatedBy = {XssValidator.class})
public @interface Xss { public @interface Xss {
String message()
default "不允许任何脚本运行"; String message() default "不允许任何脚本运行";
Class<?>[] groups() default {}; Class<?>[] groups() default {};

@ -1,26 +1,21 @@
package com.ruoyi.common.core.xss; package com.ruoyi.common.core.xss;
import cn.hutool.core.util.ReUtil;
import cn.hutool.http.HtmlUtil;
import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext; import javax.validation.ConstraintValidatorContext;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* xss * xss
* *
* @author ruoyi * @author Lion Li
*/ */
public class XssValidator implements ConstraintValidator<Xss, String> { public class XssValidator implements ConstraintValidator<Xss, String> {
private final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />";
@Override @Override
public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) { public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
return !containsHtml(value); return !ReUtil.contains(HtmlUtil.RE_HTML_MARK, value);
} }
public boolean containsHtml(String value) {
Pattern pattern = Pattern.compile(HTML_PATTERN);
Matcher matcher = pattern.matcher(value);
return matcher.matches();
}
} }
Loading…
Cancel
Save