summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/utils
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-09-17 13:59:09 -0400
committerJames Moger <james.moger@gitblit.com>2014-09-17 13:59:09 -0400
commit61865af823fe31f477eac413e9cc7cb6390241c3 (patch)
treeaf088989384b25c9559ff2782cf5bf2cb10447ba /src/main/java/com/gitblit/utils
parentad3d2ca074cd3cf9c554f57c53b22f0de6abede9 (diff)
parenta5962734a421184fef072d805424e15518633973 (diff)
downloadgitblit-61865af823fe31f477eac413e9cc7cb6390241c3.tar.gz
gitblit-61865af823fe31f477eac413e9cc7cb6390241c3.zip
Merge branch 'ticket/181' into develop
Diffstat (limited to 'src/main/java/com/gitblit/utils')
-rw-r--r--src/main/java/com/gitblit/utils/JSoupXssFilter.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/com/gitblit/utils/JSoupXssFilter.java b/src/main/java/com/gitblit/utils/JSoupXssFilter.java
index a0b3da21..b5ac59f6 100644
--- a/src/main/java/com/gitblit/utils/JSoupXssFilter.java
+++ b/src/main/java/com/gitblit/utils/JSoupXssFilter.java
@@ -73,16 +73,18 @@ public class JSoupXssFilter implements XssFilter {
"sub", "sup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "tt", "u",
"ul", "var")
- .addAttributes("a", "href", "title")
+ .addAttributes("a", "class", "href", "style", "title")
.addAttributes("blockquote", "cite")
.addAttributes("col", "span", "width")
.addAttributes("colgroup", "span", "width")
+ .addAttributes("div", "class", "style")
.addAttributes("img", "align", "alt", "height", "src", "title", "width")
.addAttributes("ol", "start", "type")
.addAttributes("q", "cite")
- .addAttributes("table", "summary", "width")
- .addAttributes("td", "abbr", "axis", "colspan", "rowspan", "width")
- .addAttributes("th", "abbr", "axis", "colspan", "rowspan", "scope", "width")
+ .addAttributes("span", "class", "style")
+ .addAttributes("table", "class", "style", "summary", "width")
+ .addAttributes("td", "abbr", "axis", "class", "colspan", "rowspan", "style", "width")
+ .addAttributes("th", "abbr", "axis", "class", "colspan", "rowspan", "scope", "style", "width")
.addAttributes("ul", "type")
.addEnforcedAttribute("a", "rel", "nofollow")