[sling-org-apache-sling-app-cms] branch master updated: Update the security filter tests to fix issue where it was not fully executing the test

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c7f1fc  Update the security filter tests to fix issue where it was not fully executing the test
5c7f1fc is described below

commit 5c7f1fc6ed17159fadfc32a74416f637a54c7e88
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Sep 24 13:40:06 2020 -0400

    Update the security filter tests to fix issue where it was not fully executing the test
---
 .../apache/sling/cms/core/internal/filters/CMSSecurityFilter.java    | 2 +-
 .../sling/cms/core/internal/filters/CMSSecurityFilterTest.java       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/filters/CMSSecurityFilter.java b/core/src/main/java/org/apache/sling/cms/core/internal/filters/CMSSecurityFilter.java
index 64dd950..0042435 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/filters/CMSSecurityFilter.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/filters/CMSSecurityFilter.java
@@ -103,7 +103,7 @@ public class CMSSecurityFilter implements Filter {
         }
 
         PublishableResource publishableResource = slingRequest.getResource().adaptTo(PublishableResource.class);
-        if (publishableResource.isPublished()) {
+        if (publishableResource != null && publishableResource.isPublished()) {
             log.trace("Resource is published");
             allowed = true;
         }
diff --git a/core/src/test/java/org/apache/sling/cms/core/internal/filters/CMSSecurityFilterTest.java b/core/src/test/java/org/apache/sling/cms/core/internal/filters/CMSSecurityFilterTest.java
index c8c853a..b12353f 100644
--- a/core/src/test/java/org/apache/sling/cms/core/internal/filters/CMSSecurityFilterTest.java
+++ b/core/src/test/java/org/apache/sling/cms/core/internal/filters/CMSSecurityFilterTest.java
@@ -46,6 +46,7 @@ public class CMSSecurityFilterTest {
     @Before
     public void init() throws UnsupportedRepositoryOperationException, RepositoryException, IOException {
         SlingCMSTestHelper.initAuthContext(context);
+        context.currentResource("/content");
     }
 
     @Test
@@ -137,7 +138,7 @@ public class CMSSecurityFilterTest {
 
         securityFilter = context.registerInjectActivateService(new CMSSecurityFilter());
 
-        context.request().setRemoteHost("cms.apache.org");
+        context.request().setServerName("cms.apache.org");
         context.request().setServletPath("/static/test1.txt");
 
         securityFilter.doFilter(context.request(), context.response(), Mockito.mock(FilterChain.class));
@@ -179,7 +180,7 @@ public class CMSSecurityFilterTest {
 
         securityFilter = context.registerInjectActivateService(new CMSSecurityFilter());
 
-        context.request().setRemoteHost("cms.apache.org");
+        context.request().setServerName("cms.apache.org");
         context.request().setServletPath("/content/test1.txt");
 
         PublishableResource published = Mockito.mock(PublishableResource.class);