Commit 47ff2bf9225ae31b89c44e6f5de3415d9fb07820
1 parent
4a8c485b
fix:Xss 开启不生效的问题 https://t.zsxq.com/qq02q
Showing
1 changed file
with
2 additions
and
3 deletions
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/YudaoXssAutoConfiguration.java
| @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.xss.core.clean.JsoupXssCleaner; | @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.xss.core.clean.JsoupXssCleaner; | ||
| 5 | import cn.iocoder.yudao.framework.xss.core.clean.XssCleaner; | 5 | import cn.iocoder.yudao.framework.xss.core.clean.XssCleaner; |
| 6 | import cn.iocoder.yudao.framework.xss.core.filter.XssFilter; | 6 | import cn.iocoder.yudao.framework.xss.core.filter.XssFilter; |
| 7 | import cn.iocoder.yudao.framework.xss.core.json.XssStringJsonDeserializer; | 7 | import cn.iocoder.yudao.framework.xss.core.json.XssStringJsonDeserializer; |
| 8 | -import com.fasterxml.jackson.databind.ObjectMapper; | ||
| 9 | import org.springframework.boot.autoconfigure.AutoConfiguration; | 8 | import org.springframework.boot.autoconfigure.AutoConfiguration; |
| 10 | import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; | 9 | import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; |
| 11 | import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | 10 | import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; |
| @@ -42,13 +41,13 @@ public class YudaoXssAutoConfiguration implements WebMvcConfigurer { | @@ -42,13 +41,13 @@ public class YudaoXssAutoConfiguration implements WebMvcConfigurer { | ||
| 42 | */ | 41 | */ |
| 43 | @Bean | 42 | @Bean |
| 44 | @ConditionalOnMissingBean(name = "xssJacksonCustomizer") | 43 | @ConditionalOnMissingBean(name = "xssJacksonCustomizer") |
| 45 | - @ConditionalOnBean(ObjectMapper.class) | ||
| 46 | @ConditionalOnProperty(value = "yudao.xss.enable", havingValue = "true") | 44 | @ConditionalOnProperty(value = "yudao.xss.enable", havingValue = "true") |
| 47 | public Jackson2ObjectMapperBuilderCustomizer xssJacksonCustomizer(XssProperties properties, | 45 | public Jackson2ObjectMapperBuilderCustomizer xssJacksonCustomizer(XssProperties properties, |
| 48 | PathMatcher pathMatcher, | 46 | PathMatcher pathMatcher, |
| 49 | XssCleaner xssCleaner) { | 47 | XssCleaner xssCleaner) { |
| 50 | // 在反序列化时进行 xss 过滤,可以替换使用 XssStringJsonSerializer,在序列化时进行处理 | 48 | // 在反序列化时进行 xss 过滤,可以替换使用 XssStringJsonSerializer,在序列化时进行处理 |
| 51 | - return builder -> builder.deserializerByType(String.class, new XssStringJsonDeserializer(properties, pathMatcher, xssCleaner)); | 49 | + return builder -> |
| 50 | + builder.deserializerByType(String.class, new XssStringJsonDeserializer(properties, pathMatcher, xssCleaner)); | ||
| 52 | } | 51 | } |
| 53 | 52 | ||
| 54 | /** | 53 | /** |