You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by as...@apache.org on 2015/09/01 10:55:04 UTC
svn commit: r1700424 - in /sling/trunk/contrib/extensions/security/src:
main/java/org/apache/sling/security/impl/ContentDispositionFilter.java
test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java
Author: asanso
Date: Tue Sep 1 08:55:03 2015
New Revision: 1700424
URL: http://svn.apache.org/r1700424
Log:
SLING-4982 - NPE in ContentDispositionFilter
Modified:
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java
sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java
Modified: sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java?rev=1700424&r1=1700423&r2=1700424&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java (original)
+++ sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java Tue Sep 1 08:55:03 2015
@@ -285,13 +285,13 @@ public class ContentDispositionFilter im
boolean jcrData = false;
if (resource!= null) {
ValueMap props = resource.adaptTo(ValueMap.class);
- if (props.containsKey(PROP_JCR_DATA) ) {
+ if (props != null && props.containsKey(PROP_JCR_DATA) ) {
jcrData = true;
} else {
Resource jcrContent = resource.getChild(JCR_CONTENT_LEAF);
if (jcrContent!= null) {
props = jcrContent.adaptTo(ValueMap.class);
- if (props.containsKey(PROP_JCR_DATA) ) {
+ if (props != null && props.containsKey(PROP_JCR_DATA) ) {
jcrData = true;
}
}
Modified: sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java?rev=1700424&r1=1700423&r2=1700424&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java (original)
+++ sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java Tue Sep 1 08:55:03 2015
@@ -1474,4 +1474,61 @@ public class ContentDispositionFilterTes
Assert.assertTrue(result);
}
+
+ @Test
+ public void test_isJcrData6() throws Throwable {
+ contentDispositionFilter = new ContentDispositionFilter();
+ final SlingHttpServletRequest request = context.mock(SlingHttpServletRequest.class);
+ final SlingHttpServletResponse response = context.mock(SlingHttpServletResponse.class);
+ final ContentDispositionFilter.RewriterResponse rewriterResponse = contentDispositionFilter. new RewriterResponse(request, response);
+
+
+ final Resource resource = context.mock(Resource.class);
+ final ValueMap properties = context.mock(ValueMap.class);
+
+ context.checking(new Expectations() {
+ {
+ allowing(resource).adaptTo(ValueMap.class);
+ will(returnValue(null));
+ allowing(resource).getChild(JCR_CONTENT_LEAF);
+ will(returnValue(null));
+ }
+ });
+
+ Boolean result = (Boolean) PrivateAccessor.invoke(rewriterResponse,"isJcrData", new Class[]{Resource.class},new Object[]{resource});
+
+ Assert.assertFalse(result);
+ }
+
+
+ @Test
+ public void test_isJcrData7() throws Throwable {
+ contentDispositionFilter = new ContentDispositionFilter();
+ final SlingHttpServletRequest request = context.mock(SlingHttpServletRequest.class);
+ final SlingHttpServletResponse response = context.mock(SlingHttpServletResponse.class);
+ final ContentDispositionFilter.RewriterResponse rewriterResponse = contentDispositionFilter. new RewriterResponse(request, response);
+
+ final Resource child = context.mock(Resource.class, "child");
+ final Resource resource = context.mock(Resource.class, "resource" );
+ final ValueMap properties = context.mock(ValueMap.class);
+ final ValueMap childPropoerties = context.mock(ValueMap.class, "childPropoerties");
+
+
+ context.checking(new Expectations() {
+ {
+ allowing(resource).adaptTo(ValueMap.class);
+ will(returnValue(properties));
+ allowing(properties).containsKey(PROP_JCR_DATA);
+ will(returnValue(false));
+ allowing(resource).getChild(JCR_CONTENT_LEAF);
+ will(returnValue(child));
+ allowing(child).adaptTo(ValueMap.class);
+ will(returnValue(null));
+ }
+ });
+
+ Boolean result = (Boolean) PrivateAccessor.invoke(rewriterResponse,"isJcrData", new Class[]{Resource.class},new Object[]{resource});
+
+ Assert.assertFalse(result);
+ }
}
\ No newline at end of file