Author: pauls
Date: Fri Apr 28 09:11:19 2017
New Revision: 1793022
URL: http://svn.apache.org/viewvc?rev=1793022&view=rev
Log:
Add a xss.compat bundle based on the latest release of the xss bundle. This new
bundle is intented to bridge the gap until all clients updated to the upcomming
xss 2.0 api.
Added:
sling/trunk/bundles/extensions/xss.compat/
- copied from r1793012, sling/tags/org.apache.sling.xss-1.0.8/
Modified:
sling/trunk/bundles/extensions/xss.compat/README.md
sling/trunk/bundles/extensions/xss.compat/pom.xml
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/JSONUtil.java
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/XSSAPI.java
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/package-info.java
Modified: sling/trunk/bundles/extensions/xss.compat/README.md
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss.compat/README.md?rev=1793022&r1=1793012&r2=1793022&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/xss.compat/README.md (original)
+++ sling/trunk/bundles/extensions/xss.compat/README.md Fri Apr 28 09:11:19 2017
@@ -1,8 +1,10 @@
-Apache Sling XSS Bundle
+Apache Sling XSS Compat Bundle
====
-The Apache Sling XSS Bundle provides two services for escaping and filtering
XSS-prone user submitted content:
+The Apache Sling XSS Compat Bundle provides two services for escaping and
filtering XSS-prone user submitted content:
1. org.apache.sling.xss.XSSAPI
2. org.apache.sling.xss.XSSFilter
+It is intended for users of the 1.x version of the org.apache.sling.xss
package that can not or did not yet update to version 2.x (provided by the
Apache Sling XSS Bundle).
+
Please check the JavaDoc of each service to find out what methods they provide.
Modified: sling/trunk/bundles/extensions/xss.compat/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss.compat/pom.xml?rev=1793022&r1=1793012&r2=1793022&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/xss.compat/pom.xml (original)
+++ sling/trunk/bundles/extensions/xss.compat/pom.xml Fri Apr 28 09:11:19 2017
@@ -30,19 +30,19 @@
<!--
======================================================================= -->
<!-- P R O J E C T
-->
<!--
======================================================================= -->
- <artifactId>org.apache.sling.xss</artifactId>
+ <artifactId>org.apache.sling.xss.compat</artifactId>
<packaging>bundle</packaging>
- <version>1.0.8</version>
+ <version>1.0.0-SNAPSHOT</version>
- <name>Apache Sling XSS Protection Bundle</name>
+ <name>Apache Sling XSS Protection Compat Bundle</name>
<description>
- Apache Sling XSS Protection Bundle providing XSS protection based on
the OWASP AntiSamy and OWASP Java Encoder libraries.
+ Apache Sling XSS Protection Compat Bundle providing XSS protection
based on the OWASP AntiSamy and OWASP Java Encoder libraries.
</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss-1.0.8</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss-1.0.8</developerConnection>
-
<url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.xss-1.0.8</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss.compat</developerConnection>
+
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss.compat</url>
</scm>
Modified:
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/JSONUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/JSONUtil.java?rev=1793022&r1=1793012&r2=1793022&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/JSONUtil.java
(original)
+++
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/JSONUtil.java
Fri Apr 28 09:11:19 2017
@@ -25,6 +25,7 @@ import org.apache.sling.commons.json.io.
* <p>
* Support for handling xss protected values with JSON objects and JSON
writers.
*/
+@Deprecated
public final class JSONUtil {
/**
Modified:
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/XSSAPI.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/XSSAPI.java?rev=1793022&r1=1793012&r2=1793022&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/XSSAPI.java
(original)
+++
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/XSSAPI.java
Fri Apr 28 09:11:19 2017
@@ -241,6 +241,7 @@ public interface XSSAPI {
* @param request the request from which to obtain the {@link
org.apache.sling.xss.XSSAPI}
* @return an XSSAPI service capable of validating hrefs.
*/
+ @Deprecated
XSSAPI getRequestSpecificAPI(SlingHttpServletRequest request);
/**
@@ -250,6 +251,7 @@ public interface XSSAPI {
* @param resourceResolver the resolver from which to obtain the {@link
org.apache.sling.xss.XSSAPI}
* @return an XSSAPI service capable of validating hrefs.
*/
+ @Deprecated
XSSAPI getResourceResolverSpecificAPI(ResourceResolver resourceResolver);
}
Modified:
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/package-info.java?rev=1793022&r1=1793012&r2=1793022&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/package-info.java
(original)
+++
sling/trunk/bundles/extensions/xss.compat/src/main/java/org/apache/sling/xss/package-info.java
Fri Apr 28 09:11:19 2017
@@ -19,7 +19,7 @@
*
* @version 1.1.0
*/
-@Version("1.1.0")
+@Version("1.1.1")
package org.apache.sling.xss;
import aQute.bnd.annotation.Version;
