Unverified Commit a7c102c6 authored by Zerouali's avatar Zerouali Committed by GitHub
Browse files

Bump antisamy version (#554)

parent 9abe6b4b
......@@ -436,6 +436,7 @@
</overlay>
</overlays>
<packagingExcludes>
WEB-INF/lib/slf4j-simple-1.7.31.jar,
WEB-INF/lib/log4j-api-*.jar,
WEB-INF/lib/log4j-jul-*.jar,
WEB-INF/lib/log4j-core-*.jar,
......
......@@ -43,9 +43,9 @@ import java.io.UnsupportedEncodingException;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.NOPLoggerFactory;
import ch.qos.logback.classic.Logger;
import fr.gouv.vitamui.commons.api.exception.InternalServerException;
import fr.gouv.vitamui.commons.api.identity.ServerIdentityConfiguration;
import org.slf4j.Logger;
/**
* The <code>VitamUILoggerFactory</code> is a utility class producing Loggers for VITAMUI.
......@@ -74,7 +74,7 @@ public final class VitamUILoggerFactory {
if (!VitamUILoggerFactory.initialized) {
new VitamUILoggerFactory();
}
final Logger logger = (Logger) LoggerFactory.getLogger(clazz.getName()); // NOSONAR
final Logger logger = LoggerFactory.getLogger(clazz.getName()); // NOSONAR
return new VitamUILoggerImpl(logger);
}
......
......@@ -10,8 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
import org.slf4j.LoggerFactory;
import org.springframework.test.annotation.DirtiesContext;
import ch.qos.logback.classic.Logger;
import fr.gouv.vitamui.commons.api.exception.InternalServerException;
import org.slf4j.Logger;
import fr.gouv.vitamui.commons.api.identity.ServerIdentityConfiguration;
/**
......@@ -33,7 +32,7 @@ public class VitamUILoggerImplWithoutConfigurationTest {
public void testMessagePrependWithoutServerIdentity() {
PowerMock.mockStatic(ServerIdentityConfiguration.class);
final Logger logger = (Logger) LoggerFactory.getLogger(VitamUILoggerImplWithoutConfigurationTest.class);
final Logger logger = LoggerFactory.getLogger(VitamUILoggerImplWithoutConfigurationTest.class);
final VitamUILogger vitamuiLogger = new VitamUILoggerImpl(logger);
EasyMock.expect(ServerIdentityConfiguration.getInstance()).andReturn(null);
......
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:element name="anti-samy-rules">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="directives" type="Directives"
maxOccurs="1" minOccurs="1" />
<xsd:element name="common-regexps" type="CommonRegexps"
maxOccurs="1" minOccurs="1" />
<xsd:element name="common-attributes" type="AttributeList"
maxOccurs="1" minOccurs="1" />
<xsd:element name="global-tag-attributes" type="AttributeList"
maxOccurs="1" minOccurs="1" />
<xsd:element name="tags-to-encode" type="TagsToEncodeList"
minOccurs="0" maxOccurs="1" />
<xsd:element name="tag-rules" type="TagRules" minOccurs="1"
maxOccurs="1" />
<xsd:element name="css-rules" type="CSSRules" minOccurs="1"
maxOccurs="1" />
<xsd:element name="html-entities" type="HTMLEntities"
minOccurs="1" maxOccurs="1" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="Directives">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="directive" type="Directive" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Directive">
<xsd:attribute name="name" use="required" />
<xsd:attribute name="value" use="required" />
</xsd:complexType>
<xsd:complexType name="CommonRegexps">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="regexp" type="RegExp" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AttributeList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="attribute" type="Attribute" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="TagsToEncodeList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="tag" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="TagRules">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="tag" type="Tag" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Tag">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="attribute" type="Attribute" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" />
<xsd:attribute name="action" use="required" />
</xsd:complexType>
<xsd:complexType name="Attribute">
<xsd:sequence>
<xsd:element name="regexp-list" type="RegexpList"
minOccurs="0" />
<xsd:element name="literal-list" type="LiteralList"
minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" />
<xsd:attribute name="description" />
<xsd:attribute name="onInvalid" />
</xsd:complexType>
<xsd:complexType name="RegexpList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="regexp" type="RegExp" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="RegExp">
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="value" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="LiteralList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="literal" type="Literal" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Literal">
<xsd:attribute name="value" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="CSSRules">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="property" type="Property" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="HTMLEntities">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="entity" type="Entity" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Property">
<xsd:sequence>
<xsd:element name="category-list" type="CategoryList"
minOccurs="0" />
<xsd:element name="literal-list" type="LiteralList"
minOccurs="0" />
<xsd:element name="regexp-list" type="RegexpList"
minOccurs="0" />
<xsd:element name="shorthand-list" type="ShorthandList"
minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="default" type="xsd:string" />
<xsd:attribute name="description" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="ShorthandList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="shorthand" type="Shorthand" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Shorthand">
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
<xsd:complexType name="CategoryList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="category" type="Category" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Category">
<xsd:attribute name="value" type="xsd:string" use="required" />
</xsd:complexType>
<xsd:complexType name="Entity">
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="cdata" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:schema>
\ No newline at end of file
<xsd:element name="anti-samy-rules">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="include" type="Include" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="directives" type="Directives"/>
<xsd:element name="common-regexps" type="CommonRegexps"/>
<xsd:element name="common-attributes" type="AttributeList"/>
<xsd:element name="global-tag-attributes" type="AttributeList"/>
<xsd:element name="dynamic-tag-attributes" type="AttributeList" minOccurs="0"/>
<xsd:element name="tags-to-encode" type="TagsToEncodeList" minOccurs="0"/>
<xsd:element name="tag-rules" type="TagRules"/>
<xsd:element name="css-rules" type="CSSRules"/>
<xsd:element name="allowed-empty-tags" type="AllowedEmptyTags" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="Include">
<xsd:attribute name="href" use="required" type="xsd:string"/>
</xsd:complexType>
<xsd:complexType name="Directives">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="directive" type="Directive" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Directive">
<xsd:attribute name="name" use="required"/>
<xsd:attribute name="value" use="required"/>
</xsd:complexType>
<xsd:complexType name="CommonRegexps">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="regexp" type="RegExp" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="AttributeList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="attribute" type="Attribute" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="TagsToEncodeList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="tag" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="TagRules">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="tag" type="Tag" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Tag">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="attribute" type="Attribute" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required"/>
<xsd:attribute name="action" use="required"/>
</xsd:complexType>
<xsd:complexType name="AllowedEmptyTags">
<xsd:sequence>
<xsd:element name="literal-list" type="LiteralList" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Attribute">
<xsd:sequence>
<xsd:element name="regexp-list" type="RegexpList" minOccurs="0"/>
<xsd:element name="literal-list" type="LiteralList" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="name" use="required"/>
<xsd:attribute name="description"/>
<xsd:attribute name="onInvalid"/>
</xsd:complexType>
<xsd:complexType name="RegexpList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="regexp" type="RegExp" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="RegExp">
<xsd:attribute name="name" type="xsd:string"/>
<xsd:attribute name="value" type="xsd:string"/>
</xsd:complexType>
<xsd:complexType name="LiteralList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="literal" type="Literal" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Literal">
<xsd:attribute name="value" type="xsd:string"/>
</xsd:complexType>
<xsd:complexType name="CSSRules">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="property" type="Property" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Property">
<xsd:sequence>
<xsd:element name="category-list" type="CategoryList" minOccurs="0"/>
<xsd:element name="literal-list" type="LiteralList" minOccurs="0"/>
<xsd:element name="regexp-list" type="RegexpList" minOccurs="0"/>
<xsd:element name="shorthand-list" type="ShorthandList" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="default" type="xsd:string"/>
<xsd:attribute name="description" type="xsd:string"/>
</xsd:complexType>
<xsd:complexType name="ShorthandList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="shorthand" type="Shorthand" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Shorthand">
<xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
<xsd:complexType name="CategoryList">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="category" type="Category" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="Category">
<xsd:attribute name="value" type="xsd:string" use="required"/>
</xsd:complexType>
<xsd:complexType name="Entity">
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="cdata" type="xsd:string" use="required"/>
</xsd:complexType>
</xsd:schema>
......@@ -142,8 +142,8 @@
<xom.version>1.3.4</xom.version>
<xdocreport.version>2.0.2</xdocreport.version>
<xerces.version>2.12.1</xerces.version>
<esapi.version>2.1.0.1</esapi.version>
<antisamy.version>1.5.8</antisamy.version>
<esapi.version>2.2.3.1</esapi.version>
<antisamy.version>1.6.4</antisamy.version>
<json-sanitize.version>1.2.2</json-sanitize.version>
<freemarker.upgraded.version>2.3.30</freemarker.upgraded.version>
<mongo.driver.sync.version>4.1.2</mongo.driver.sync.version>
......@@ -615,6 +615,16 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
......
......@@ -117,6 +117,11 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.owasp.antisamy</groupId>
<artifactId>antisamy</artifactId>
</dependency>
<!--TEST -->
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -145,8 +150,6 @@
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
......
......@@ -128,6 +128,11 @@
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>org.owasp.antisamy</groupId>
<artifactId>antisamy</artifactId>
</dependency>
<!--TEST -->
<dependency>
<groupId>org.springframework.boot</groupId>
......
......@@ -55,10 +55,27 @@ ui-identity:
key-path: src/main/resources/dev/truststore_server.jks
key-password: changeme
hostname-verification: false
referential-external-client:
server-host: localhost
server-port: 8087
connect-time-out: 30
read-time-out: 30
write-time-out: 30
secure: true
ssl-configuration:
keystore:
key-path: src/main/resources/dev/keystore_ui-referential.jks
key-password: changeme
type: JKS
truststore:
key-path: src/main/resources/dev/truststore_server.jks
key-password: changeme
hostname-verification: false
base-url:
portal: "https://dev.vitamui.com:4200"
admin-identity: "https://dev.vitamui.com:4201/"
identity: "https://dev.vitamui.com:4201/"
referential: "https://dev.vitamui.com:4202"
customer:
technical-referent-email: contact@programmevitam.fr
website-url: http://www.programmevitam.fr
......
......@@ -115,6 +115,11 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.owasp.antisamy</groupId>
<artifactId>antisamy</artifactId>
</dependency>
<!--TEST -->
<dependency>
<groupId>org.springframework.boot</groupId>
......
......@@ -114,6 +114,11 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.owasp.antisamy</groupId>
<artifactId>antisamy</artifactId>
</dependency>
<!--TEST -->
<dependency>
<groupId>org.springframework.boot</groupId>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment