From ac247f8e6829768cf2e172cb43be46dda750dfc0 Mon Sep 17 00:00:00 2001 From: ronger Date: Wed, 11 May 2022 09:17:02 +0800 Subject: [PATCH] =?UTF-8?q?:lock:=20xss=20=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArticleServiceImpl.java | 11 +- .../service/impl/CommentServiceImpl.java | 8 +- .../service/impl/PortfolioServiceImpl.java | 2 + .../forest/service/impl/TagServiceImpl.java | 2 + .../forest/service/impl/TopicServiceImpl.java | 3 + .../java/com/rymcu/forest/util/XssUtils.java | 110 ++++++++++++++++++ 6 files changed, 126 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/rymcu/forest/util/XssUtils.java diff --git a/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java index 7113a57..5890793 100644 --- a/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java @@ -12,10 +12,7 @@ import com.rymcu.forest.mapper.ArticleMapper; import com.rymcu.forest.service.ArticleService; import com.rymcu.forest.service.TagService; import com.rymcu.forest.service.UserService; -import com.rymcu.forest.util.Html2TextUtil; -import com.rymcu.forest.util.NotificationUtils; -import com.rymcu.forest.util.UserUtils; -import com.rymcu.forest.util.Utils; +import com.rymcu.forest.util.*; import com.rymcu.forest.web.api.exception.BaseApiException; import com.rymcu.forest.web.api.exception.ErrorCode; import lombok.extern.slf4j.Slf4j; @@ -112,7 +109,7 @@ public class ArticleServiceImpl extends AbstractService
implements Arti String articleTitle = article.getArticleTitle(); String articleTags = article.getArticleTags(); String articleContent = article.getArticleContent(); - String articleContentHtml = article.getArticleContentHtml(); + String articleContentHtml = XssUtils.replaceHtmlCode(article.getArticleContentHtml()); User user = UserUtils.getCurrentUserByToken(); if (Objects.isNull(user)) { throw new BaseApiException(ErrorCode.INVALID_TOKEN); @@ -358,7 +355,7 @@ public class ArticleServiceImpl extends AbstractService
implements Arti if (!type.equals(articleList)) { ArticleContent articleContent = articleMapper.selectArticleContent(article.getIdArticle()); if (type.equals(articleView)) { - article.setArticleContent(articleContent.getArticleContentHtml()); + article.setArticleContent(XssUtils.replaceHtmlCode(articleContent.getArticleContentHtml())); // 获取所属作品集列表数据 List portfolioArticleDTOList = articleMapper.selectPortfolioArticles(article.getIdArticle()); portfolioArticleDTOList.forEach(this::genPortfolioArticles); @@ -366,7 +363,7 @@ public class ArticleServiceImpl extends AbstractService
implements Arti } else if (type.equals(articleEdit)) { article.setArticleContent(articleContent.getArticleContent()); } else { - article.setArticleContent(articleContent.getArticleContentHtml()); + article.setArticleContent(XssUtils.replaceHtmlCode(articleContent.getArticleContentHtml())); } } return article; diff --git a/src/main/java/com/rymcu/forest/service/impl/CommentServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/CommentServiceImpl.java index 0602e87..f3838be 100644 --- a/src/main/java/com/rymcu/forest/service/impl/CommentServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/CommentServiceImpl.java @@ -12,6 +12,7 @@ import com.rymcu.forest.service.CommentService; import com.rymcu.forest.util.Html2TextUtil; import com.rymcu.forest.util.NotificationUtils; import com.rymcu.forest.util.Utils; +import com.rymcu.forest.util.XssUtils; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +43,7 @@ public class CommentServiceImpl extends AbstractService implements Comm private List genComments(List commentDTOList) { commentDTOList.forEach(commentDTO -> { commentDTO.setTimeAgo(Utils.getTimeAgo(commentDTO.getCreatedTime())); + commentDTO.setCommentContent(XssUtils.replaceHtmlCode(commentDTO.getCommentContent())); if (commentDTO.getCommentAuthorId() != null) { Author author = commentMapper.selectAuthor(commentDTO.getCommentAuthorId()); if (author != null) { @@ -87,10 +89,10 @@ public class CommentServiceImpl extends AbstractService implements Comm comment.setCommentIP(ip); comment.setCommentUA(ua); comment.setCreatedTime(new Date()); + comment.setCommentContent(XssUtils.replaceHtmlCode(comment.getCommentContent())); commentMapper.insertSelective(comment); - StringBuilder commentSharpUrl = new StringBuilder(article.getArticlePermalink()); - commentSharpUrl.append("#comment-").append(comment.getIdComment()); - commentMapper.updateCommentSharpUrl(comment.getIdComment(), commentSharpUrl.toString()); + String commentSharpUrl = article.getArticlePermalink() + "#comment-" + comment.getIdComment(); + commentMapper.updateCommentSharpUrl(comment.getIdComment(), commentSharpUrl); String commentContent = comment.getCommentContent(); if(StringUtils.isNotBlank(commentContent)){ diff --git a/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java index ea40a5f..08492dc 100644 --- a/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java @@ -15,6 +15,7 @@ import com.rymcu.forest.service.PortfolioService; import com.rymcu.forest.service.UserService; import com.rymcu.forest.util.UserUtils; import com.rymcu.forest.util.Utils; +import com.rymcu.forest.util.XssUtils; import com.rymcu.forest.web.api.common.UploadController; import com.rymcu.forest.web.api.exception.BaseApiException; import org.apache.commons.lang.StringUtils; @@ -75,6 +76,7 @@ public class PortfolioServiceImpl extends AbstractService implements portfolio.setPortfolioAuthorId(user.getIdUser()); portfolio.setCreatedTime(new Date()); portfolio.setUpdatedTime(portfolio.getCreatedTime()); + portfolio.setPortfolioDescriptionHtml(XssUtils.replaceHtmlCode(portfolio.getPortfolioDescription())); portfolioMapper.insertSelective(portfolio); PortfolioIndexUtil.addIndex( PortfolioLucene.builder() diff --git a/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java index 09b4680..8524506 100644 --- a/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java @@ -13,6 +13,7 @@ import com.rymcu.forest.service.TagService; import com.rymcu.forest.util.BaiDuAipUtils; import com.rymcu.forest.util.CacheUtils; import com.rymcu.forest.util.UserUtils; +import com.rymcu.forest.util.XssUtils; import com.rymcu.forest.web.api.common.UploadController; import com.rymcu.forest.web.api.exception.BaseApiException; import org.apache.commons.lang.StringUtils; @@ -127,6 +128,7 @@ public class TagServiceImpl extends AbstractService implements TagService { Integer result; Map map = new HashMap(1); + tag.setTagDescription(XssUtils.replaceHtmlCode(tag.getTagDescription())); if (tag.getIdTag() == null) { if (StringUtils.isBlank(tag.getTagTitle())) { map.put("message", "标签名不能为空!"); diff --git a/src/main/java/com/rymcu/forest/service/impl/TopicServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/TopicServiceImpl.java index 8ee2856..8d261b3 100644 --- a/src/main/java/com/rymcu/forest/service/impl/TopicServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/TopicServiceImpl.java @@ -1,5 +1,6 @@ package com.rymcu.forest.service.impl; +import cn.hutool.http.HtmlUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.rymcu.forest.core.service.AbstractService; @@ -10,6 +11,7 @@ import com.rymcu.forest.entity.Tag; import com.rymcu.forest.entity.Topic; import com.rymcu.forest.mapper.TopicMapper; import com.rymcu.forest.service.TopicService; +import com.rymcu.forest.util.XssUtils; import com.rymcu.forest.web.api.common.UploadController; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; @@ -48,6 +50,7 @@ public class TopicServiceImpl extends AbstractService implements TopicSer @Transactional(rollbackFor = Exception.class) public Map saveTopic(Topic topic) { Integer result = 0; + topic.setTopicDescriptionHtml(XssUtils.replaceHtmlCode(topic.getTopicDescriptionHtml())); Map map = new HashMap(1); if (topic.getIdTopic() == null) { if (StringUtils.isBlank(topic.getTopicTitle())) { diff --git a/src/main/java/com/rymcu/forest/util/XssUtils.java b/src/main/java/com/rymcu/forest/util/XssUtils.java new file mode 100644 index 0000000..d35f4c8 --- /dev/null +++ b/src/main/java/com/rymcu/forest/util/XssUtils.java @@ -0,0 +1,110 @@ +package com.rymcu.forest.util; + +import cn.hutool.http.HtmlUtil; +import org.apache.commons.lang.StringUtils; + +/** + * Created on 2022/5/10 17:06. + * + * @author ronger + * @email ronger-x@outlook.com + * @packageName com.rymcu.forest.util + */ +public class XssUtils { + + /** + * 滤除content中的危险 HTML 代码, 主要是脚本代码, 滚动字幕代码以及脚本事件处理代码 + * @param content 需要滤除的字符串 + * @return 过滤的结果 + */ + public static String replaceHtmlCode(String content) { + if (StringUtils.isBlank(content)) { + return null; + } + if (0 == content.length()) { + return ""; + } + // 需要滤除的脚本事件关键字 + String[] eventKeywords = { + "onmouseover", "onmouseout", "onmousedown", "onmouseup", "onmousemove", "onclick", "ondblclick", + "onkeypress", "onkeydown", "onkeyup", "ondragstart", "onerrorupdate", "onhelp", "onreadystatechange", + "onrowenter", "onrowexit", "onselectstart", "onload", "onunload", "onbeforeunload", "onblur", + "onerror", "onfocus", "onresize", "onscroll", "oncontextmenu", "alert" + }; +// content = replace(content, " -1) { + int b = 0; + String str1, str2, str3, str4, strA, strB; + str1 = source; + str2 = str1.toLowerCase(); + str3 = oldStr; + str4 = str3.toLowerCase(); + if (matchCase) { + strA = str1; + strB = str3; + } else { + strA = str2; + strB = str4; + } + a = strA.indexOf(strB, findStartPos); + if (a > -1) { + b = oldStr.length(); + findStartPos = a + b; + StringBuilder stringBuilder = new StringBuilder(source); + source = stringBuilder.replace(a, a + b, newStr) + ""; + // 新的查找开始点位于替换后的字符串的结尾 + findStartPos = findStartPos + newStr.length() - b; + } + } + return source; + } + +} + +