ZCS-7498:Creating signature through ZCO puts extra space within sign

Zimbra · Jul 5, 2019 · 056d031 · 056d031
1 parent a25acca
commit 056d031
Show file tree

Hide file tree

Showing 12 changed files with 5,700 additions and 277 deletions.
diff --git a/store-conf/conf/antisamy.xml b/store-conf/conf/antisamy.xml
diff --git a/store-conf/conf/owasp_policy.xml b/store-conf/conf/owasp_policy.xml
@@ -5,8 +5,8 @@
      KBD = accesshtml,tabindex-->
 <owasp_policy>
   <url_protocols>cid,http,https,mailto,data,smb</url_protocols>
-  <disallow_text_in>applet,frameset,object,script,style,title</disallow_text_in>
-  <allow_text_in></allow_text_in>
+  <disallow_text_in>applet,frameset,object,script,title</disallow_text_in>
+  <allow_text_in>style</allow_text_in>
   <element name="a">
     <attributes>KBD,charset,coords,href,hreflang,name,rel,rev,shape,target,type</attributes>
     <url_protocols>cid,http,https,mailto,smb</url_protocols>
@@ -212,7 +212,7 @@
     <attributes>CORE,LANG,align,background,char,charoff,valign</attributes>
   </element>
   <element name="tr">
-    <attributes>CORE,LANG,align,background,bgcolor,char,charoff,valign</attributes>
+    <attributes>CORE,LANG,align,background,bgcolor,char,charoff,valign,height</attributes>
   </element>
   <element name="area">
     <attributes>CORE,LANG,KBD,alt,coords,href,nohref,shape,target</attributes>

diff --git a/store/build.xml b/store/build.xml
@@ -282,7 +282,12 @@
     <ivy:install organisation="org.apache.curator" module="curator-framework" revision="2.0.1-incubating" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
     <ivy:install organisation="asm" module="asm" revision="3.3.1" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
     <ivy:install organisation="oauth" module="oauth" revision="1.4" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
-    <ivy:install organisation="com.googlecode.owasp-java-html-sanitizer" module="owasp-java-html-sanitizer" revision="20190503.1" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
+    <ivy:install organisation="com.googlecode.owasp-java-html-sanitizer" module="owasp-java-html-sanitizer" revision="r239" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
+	<ivy:install organisation="org.owasp.antisamy" module="antisamy" revision="1.5.3" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
+	<ivy:install organisation="org.apache.xmlgraphics" module="batik-css" revision="1.7" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
+	<ivy:install organisation="org.w3c.css" module="sac" revision="1.3" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
+    <ivy:install organisation="org.apache.xmlgraphics" module="batik-i18n" revision="1.9" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
+	<ivy:install organisation="org.apache.xmlgraphics" module="batik-util" revision="1.8" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
   	<ivy:install organisation="org.springframework" module="spring-aop" revision="3.0.7.RELEASE" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
   	<ivy:install organisation="org.springframework" module="spring-asm" revision="3.0.7.RELEASE" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>
   	<ivy:install organisation="org.springframework" module="spring-beans" revision="3.0.7.RELEASE" settingsRef="dev.settings" from="chain-resolver" to="build-tmp" overwrite="true" transitive="true" type="jar"/>

diff --git a/store/conf/owasp_policy.xml b/store/conf/owasp_policy.xml
diff --git a/store/ivy.xml b/store/ivy.xml
@@ -43,7 +43,7 @@
   <dependency org="com.101tec" name="zkclient" rev="0.1.0"/>
   <dependency org="xerces" name="xercesImpl" rev="2.9.1-patch-01"/>
   <dependency org="net.sourceforge.nekohtml" name="nekohtml" rev="1.9.13.1z"/>
-  <dependency org="com.googlecode.owasp-java-html-sanitizer" name="owasp-java-html-sanitizer" rev="20190503.1"/>
+  <dependency org="com.googlecode.owasp-java-html-sanitizer" name="owasp-java-html-sanitizer" rev="r239"/>
   <dependency org="org.ehcache" name="ehcache" rev="3.1.2"/>
   <dependency org="ant-1.7.0-ziputil-patched" name="ant-1.7.0-ziputil-patched" rev="1.0"/>
   <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="9.4.18.v20190429"/>
@@ -114,5 +114,10 @@
   <dependency org="org.apache.commons" name="commons-rng-simple" rev="1.0"/>
   <dependency org="com.google.javascript" name="closure-compiler" rev="v20180204"/>
   <dependency org="com.github.zafarkhaja" name="java-semver" rev="0.9.0"/>
+  <dependency org="org.owasp.antisamy" name="antisamy" rev="1.5.3"/>
+  <dependency org="org.apache.xmlgraphics" name="batik-css" rev="1.7"/>
+  <dependency org="org.w3c.css" name="sac" rev="1.3"/>
+  <dependency org="org.apache.xmlgraphics" name="batik-i18n" rev="1.9"/>
+  <dependency org="org.apache.xmlgraphics" name="batik-util" rev="1.8"/>
  </dependencies>
 </ivy-module>