Skip to content

add xss filter logic #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baihui212 wants to merge 15 commits into
base: master
Choose a base branch
from
Open

add xss filter logic #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
28d94d0
test content fetch
baihui212 Nov 20, 2017
93919db
add xss
baihui212 Nov 20, 2017
fb5489c
add xss filter logic
baihui212 Nov 20, 2017
a69f2a4
add xss filter logic
baihui212 Nov 20, 2017
389f53e
test
baihui212 Nov 20, 2017
f867b26
test
baihui212 Nov 20, 2017
8d0f100
test
baihui212 Nov 20, 2017
78a6b22
test
baihui212 Nov 20, 2017
cf02534
test
baihui212 Nov 20, 2017
af8e409
fix bug
baihui212 Nov 20, 2017
dffa032
revert
baihui212 Nov 20, 2017
cc550a7
revert
baihui212 Nov 20, 2017
9cd9d4f
add xss filter logic
baihui212 Nov 21, 2017
8d05b4e
fix editer xss bug
baihui212 Nov 21, 2017
ab16a3f
fix
baihui212 Nov 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public static function Editor()
$options = Helper::options();
$cssUrl = $options->pluginUrl.'/EditorMD/css/editormd.css';
$jsUrl = $options->pluginUrl.'/EditorMD/js/editormd.js';
$xssjsUrl = $options->pluginUrl.'/EditorMD/js/xss.js';
$editormd = Typecho_Widget::widget('Widget_Options')->plugin('EditorMD');
?>
<link rel="stylesheet" href="<?php echo $cssUrl; ?>" />
Expand All @@ -87,9 +88,14 @@ public static function Editor()
var uploadURL = '<?php Helper::security()->index('/action/upload?cid=CID'); ?>';
</script>
<script type="text/javascript" src="<?php echo $jsUrl; ?>"></script>
<script type="text/javascript" src="<?php echo $xssjsUrl; ?>"></script>
<script>
$(document).ready(function() {

//xss filter logic
var originalContent = filterXSS($('#text').html().replace('&lt;','<').replace('&gt;','>'));
$('#text').html(originalContent);

var textarea = $('#text').parent("p");
var isMarkdown = $('[name=markdown]').val()?1:0;
if (!isMarkdown) {
Expand Down
6 changes: 3 additions & 3 deletions js/editormd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1756,7 +1756,7 @@
}

cm.on("change", function(_cm, changeObj) {

if (settings.watch)
{
_this.previewContainer.css("padding", settings.autoHeight ? "20px 20px 50px 40px" : "20px");
Expand Down Expand Up @@ -1961,8 +1961,8 @@
var _this = this;
var state = this.state;
var settings = this.settings;
var cm = this.cm;
var cmValue = cm.getValue();
var cm = this.cm;
var cmValue = filterXSS(cm.getValue().replace('&lt;','<').replace('&gt;','>'));
var previewContainer = this.previewContainer;

if (settings.mode !== "gfm" && settings.mode !== "markdown")
Expand Down
Loading