xss 注入问题

zhima1234 · zhima1234 · commit ba6532a7e22b · 2017-07-24T12:45:07.000+08:00
diff --git a/config/env.sample.ini b/config/env.sample.ini
@@ -23,7 +23,7 @@ port = 3306
 user = root
 password = 
 dbname = studygolang
-charset = utf8
+charset = utf8mb4
 
 ; 最大空闲连接数
 max_idle = 2
diff --git a/static/js/common.js b/static/js/common.js
@@ -78,8 +78,22 @@ SG.replaceSpecialChar = function(str) {
 }
 
 SG.markSetting = function() {
-	// 配置 marked 语法高亮
+	var renderer = new marked.Renderer();
+
+	// 对 html 进行处理
+	renderer.html = function(html) {
+		if (html.indexOf('<video') == 0) {
+			return html;
+		} else if (html.indexOf('<table') == 0) {
+			return html;
+		} else {
+			return html.replace(/</g, '&lt;');
+		}
+	};
+
 	marked.setOptions({
+		renderer: renderer,
+		// 配置 marked 语法高亮
 		highlight: function (code) {
 			code = SG.replaceSpecialChar(code);
 			return hljs.highlightAuto(code).value;
diff --git a/static/js/topics.js b/static/js/topics.js
@@ -16,12 +16,13 @@
 	SG.Topics = function(){}
 	SG.Topics.prototype = new SG.Publisher();
 	SG.Topics.prototype.parseContent = function(selector) {
-		var markdownString = SG.preProcess(selector.text());
+		var markdownString = selector.text();
 		// 配置 marked 语法高亮
 		marked = SG.markSetting();
 
 		var contentHtml = marked(markdownString);
 		contentHtml = SG.replaceCodeChar(contentHtml);
+		
 		selector.html(contentHtml);
 
 		// emoji 表情解析
diff --git a/template/common/layout.html b/template/common/layout.html
@@ -253,7 +253,7 @@
 	}
 	var GLaunchTime = {{timestamp .app.LaunchTime}}*1000;
 	</script>
-	<script src="/static/js/common.js?v=1.4"></script>
+	<script src="/static/js/common.js?v=1.0"></script>
 	{{template "js" .}}
 	<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jsrender/0.9.84/jsrender.min.js"></script>
 	<script type="text/javascript">
diff --git a/template/topics/detail.html b/template/topics/detail.html
@@ -34,7 +34,7 @@ <h1>
 				<div class="outdated">这是一个创建于 <span title="{{.topic.ctime}}" class="timeago"></span> 的主题，其中的信息可能已经有所发展或是发生改变。</div>
 				{{end}}
 				<div class="cell">
-					<div class="content">{{.topic.content | html}}</div>
+					<div class="content">{{.topic.content}}</div>
 				</div>
 				
 				<div class="content-buttons">
@@ -125,7 +125,7 @@ <h1>
 <script type="text/javascript" src="/static/js/libs/emojify.min.js"></script>
 <script type="text/javascript" src="/static/js/libs/emojis.js"></script>
 <script type="text/javascript" src="/static/js/libs/plupload.full.min.js"></script>
-<script type="text/javascript" src="/static/js/topics.js?v=1.2"></script>
+<script type="text/javascript" src="/static/js/topics.js?v=1.1"></script>
 <script type="text/javascript" src="/static/js/comment.js?v=1.23"></script>
 <script type="text/javascript" src="/static/js/puploader.js?v=1.2"></script>
 <script type="text/javascript">

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@`
`253`	`253`	`}`
`254`	`254`	`var GLaunchTime = {{timestamp .app.LaunchTime}}*1000;`
`255`	`255`	`</script>`
`256`		`- <script src="/static/js/common.js?v=1.4"></script>`
	`256`	`+ <script src="/static/js/common.js?v=1.0"></script>`
`257`	`257`	`{{template "js" .}}`
`258`	`258`	`<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jsrender/0.9.84/jsrender.min.js"></script>`
`259`	`259`	`<script type="text/javascript">`