[tomee] 24/48: TOMEE-2365 - Test servlet without authentication.

[ra...@apache.org]

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

radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit a465769f13d2426948fc72d6a84198a613fc9f89
Author: Roberto Cortez <ra...@yahoo.com>
AuthorDate: Wed Dec 26 18:59:38 2018 +0000

    TOMEE-2365 - Test servlet without authentication.
---
 .../org/apache/tomee/security/http/TomEEHttpMessageContext.java   | 3 ++-
 .../java/org/apache/tomee/security/servlet/SimpleServletTest.java | 8 +-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/TomEEHttpMessageContext.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/TomEEHttpMessageContext.java
index 878a550..48a3272 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/TomEEHttpMessageContext.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/TomEEHttpMessageContext.java
@@ -36,6 +36,7 @@ import java.io.IOException;
 import java.security.Principal;
 import java.util.Set;
 
+import static javax.security.enterprise.AuthenticationStatus.NOT_DONE;
 import static javax.security.enterprise.AuthenticationStatus.SEND_FAILURE;
 import static javax.security.enterprise.AuthenticationStatus.SUCCESS;
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
@@ -193,7 +194,7 @@ public class TomEEHttpMessageContext implements HttpMessageContext {
 
     @Override
     public AuthenticationStatus doNothing() {
-        return null;
+        return NOT_DONE;
     }
 
     @Override
diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java
index ab33b9d..5d11cbc 100644
--- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java
+++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java
@@ -20,13 +20,9 @@ import org.apache.openejb.loader.JarLocation;
 import org.apache.openejb.util.NetworkUtil;
 import org.apache.tomee.embedded.Configuration;
 import org.apache.tomee.embedded.Container;
-import org.apache.tomee.security.client.BasicAuthFilter;
 import org.junit.Test;
 
-import javax.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition;
 import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.ServletSecurity;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -51,7 +47,7 @@ public class SimpleServletTest {
                         JarLocation.jarLocation(SimpleServletTest.class),
                         JarLocation.jarLocation(TomEESecurityServletContainerInitializer.class))) {
 
-            final Client client = ClientBuilder.newBuilder().register(new BasicAuthFilter()).build();
+            final Client client = ClientBuilder.newBuilder().build();
             final Response response =
                     client.target("http://localhost:" + container.getConfiguration().getHttpPort() + "/servlet")
                           .request()
@@ -61,8 +57,6 @@ public class SimpleServletTest {
     }
 
     @WebServlet(urlPatterns = "/servlet")
-    @ServletSecurity(@HttpConstraint(rolesAllowed = "tomcat"))
-    @BasicAuthenticationMechanismDefinition
     public static class TestServlet extends HttpServlet {
         @Override
         protected void doGet(final HttpServletRequest req, final HttpServletResponse resp)