Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/utils/JSoupXssFilter.java

@@ -20,18 +20,23 @@
import org.jsoup.safety.Cleaner;
import org.jsoup.safety.Whitelist;

import com.google.inject.Inject;
import com.google.inject.Singleton;

/**
 * Implementation of an XSS filter based on JSoup.
 *
 * @author James Moger
 *
 */
@Singleton
public class JSoupXssFilter implements XssFilter {

    private final Cleaner none;

    private final Cleaner relaxed;

    @Inject
    public JSoupXssFilter() {
       none = new Cleaner(Whitelist.none());
       relaxed = new Cleaner(getRelaxedWhiteList());