From 1bde32814a0e287e335f47c902e6fbe7b94351c2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 28 七月 2020 17:26:07 +0800
Subject: [PATCH] HTML过滤器改为将html转义
---
src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java | 5 +++--
src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
index 8989ca1..121681b 100644
--- a/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
@@ -144,7 +144,10 @@
public static void main(String[] args)
{
- String html = "alert('11111');";
+ String html = "<script>alert(1);</script>";
+ // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
+ // String html = "<123";
+ // String html = "123>";
System.out.println(EscapeUtil.clean(html));
System.out.println(EscapeUtil.escape(html));
System.out.println(EscapeUtil.unescape(html));
diff --git a/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
index 4173956..3de26bb 100644
--- a/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
+++ b/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
@@ -131,7 +131,7 @@
vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" };
stripComment = true;
encodeQuotes = true;
- alwaysMakeTags = true;
+ alwaysMakeTags = false;
}
/**
@@ -208,7 +208,7 @@
s = processRemoveBlanks(s);
- s = validateEntities(s);
+ // s = validateEntities(s);
return s;
}
@@ -245,6 +245,7 @@
// try and form html
//
s = regexReplace(P_END_ARROW, "", s);
+ // 涓嶈拷鍔犵粨鏉熸爣绛�
s = regexReplace(P_BODY_TO_END, "<$1>", s);
s = regexReplace(P_XML_CONTENT, "$1<$2", s);
--
Gitblit v1.9.3