You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/02/06 10:17:23 UTC

svn commit: r1781864 - in /sling/trunk/bundles/extensions/xss: pom.xml src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java

Author: olli
Date: Mon Feb  6 10:17:22 2017
New Revision: 1781864

URL: http://svn.apache.org/viewvc?rev=1781864&view=rev
Log:
SLING-6509 Use ServiceUserMapped to ensure presence of service user mapping

Modified:
    sling/trunk/bundles/extensions/xss/pom.xml
    sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java

Modified: sling/trunk/bundles/extensions/xss/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/pom.xml?rev=1781864&r1=1781863&r2=1781864&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/xss/pom.xml (original)
+++ sling/trunk/bundles/extensions/xss/pom.xml Mon Feb  6 10:17:22 2017
@@ -261,6 +261,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+          <groupId>org.apache.sling</groupId>
+          <artifactId>org.apache.sling.serviceusermapper</artifactId>
+          <version>1.2.0</version>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
             <version>2.0.0</version>

Modified: sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java?rev=1781864&r1=1781863&r2=1781864&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java (original)
+++ sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java Mon Feb  6 10:17:22 2017
@@ -38,6 +38,7 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.observation.ExternalResourceChangeListener;
 import org.apache.sling.api.resource.observation.ResourceChange;
 import org.apache.sling.api.resource.observation.ResourceChangeListener;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.apache.sling.xss.ProtectionContext;
 import org.apache.sling.xss.XSSFilter;
 import org.owasp.validator.html.model.Attribute;
@@ -86,6 +87,9 @@ public class XSSFilterImpl implements XS
     @Reference
     private ResourceResolverFactory resourceResolverFactory = null;
 
+    @Reference
+    private ServiceUserMapped serviceUserMapped;
+
     @Override
     public void onChange(List<ResourceChange> resourceChanges) {
         for (ResourceChange change : resourceChanges) {