Repository: tomee
Updated Branches:
  refs/heads/fb_tomee8 153034edd -> ff4b30f2f


TOMEE-2170 tomcat requires a preemptiveAuthentication= in the context.xml

Not sure how this worked before. But for the LoginModules to work one
must either have a <security-constraint> in web.xml or tell Tomcat to
enable JAAS for ALL requests -> preemptiveAuthentication="true"


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ff4b30f2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ff4b30f2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ff4b30f2

Branch: refs/heads/fb_tomee8
Commit: ff4b30f2f3e8c534fb447279b6cb54404229724b
Parents: 153034e
Author: Mark Struberg <strub...@apache.org>
Authored: Mon Feb 19 13:22:08 2018 +0100
Committer: Mark Struberg <strub...@apache.org>
Committed: Mon Feb 19 13:22:08 2018 +0100

----------------------------------------------------------------------
 .../groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy  | 2 --
 .../org/apache/tomee/webaccess/test/units/ScriptingTest.groovy   | 2 --
 tomee/tomee-webaccess/src/test/resources/test/context.xml        | 2 +-
 tomee/tomee-webaccess/src/test/resources/test/login.config       | 4 ++--
 4 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/ff4b30f2/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy
----------------------------------------------------------------------
diff --git 
a/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy
 
b/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy
index 7183641..cfd4b79 100644
--- 
a/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy
+++ 
b/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy
@@ -34,11 +34,9 @@ import org.jboss.shrinkwrap.api.ShrinkWrap
 import org.jboss.shrinkwrap.api.asset.UrlAsset
 import org.jboss.shrinkwrap.api.spec.WebArchive
 import org.junit.Assert
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@Ignore //X TODO TOMEE-2170
 @RunWith(Arquillian)
 class LogTest {
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ff4b30f2/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
----------------------------------------------------------------------
diff --git 
a/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
 
b/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
index 615e714..2a737b6 100644
--- 
a/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
+++ 
b/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
@@ -32,11 +32,9 @@ import org.jboss.arquillian.test.api.ArquillianResource
 import org.jboss.shrinkwrap.api.ShrinkWrap
 import org.jboss.shrinkwrap.api.spec.WebArchive
 import org.junit.Assert
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@Ignore //X TODO TOMEE-2170
 @RunWith(Arquillian)
 class ScriptingTest {
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ff4b30f2/tomee/tomee-webaccess/src/test/resources/test/context.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webaccess/src/test/resources/test/context.xml 
b/tomee/tomee-webaccess/src/test/resources/test/context.xml
index 9cecec6..e457304 100644
--- a/tomee/tomee-webaccess/src/test/resources/test/context.xml
+++ b/tomee/tomee-webaccess/src/test/resources/test/context.xml
@@ -16,7 +16,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<Context antiJARLocking="true" path="/webaccess">
+<Context antiJARLocking="true" path="/webaccess" 
preemptiveAuthentication="true">
   <Realm className="org.apache.catalina.realm.JAASRealm" appName="ScriptLogin"
          userClassNames="org.apache.openejb.core.security.jaas.UserPrincipal"
          roleClassNames="org.apache.openejb.core.security.jaas.GroupPrincipal">

http://git-wip-us.apache.org/repos/asf/tomee/blob/ff4b30f2/tomee/tomee-webaccess/src/test/resources/test/login.config
----------------------------------------------------------------------
diff --git a/tomee/tomee-webaccess/src/test/resources/test/login.config 
b/tomee/tomee-webaccess/src/test/resources/test/login.config
index 1a475e7..aa5b229 100644
--- a/tomee/tomee-webaccess/src/test/resources/test/login.config
+++ b/tomee/tomee-webaccess/src/test/resources/test/login.config
@@ -1,5 +1,5 @@
 ScriptLogin {
     org.apache.openejb.core.security.jaas.ScriptLoginModule required
-       engineName="js"
-       scriptURI="loginScript.js";
+        engineName="js"
+        scriptURI="loginScript.js";
 };

Reply via email to