[Jboss-cvs] JBossAS SVN: r56581 - in trunk/ejb3: . src/resources/test/servlet src/resources/test/servlet/META-INF src/resources/test/servlet/WEB-INF src/test/org/jboss/ejb3/test/servlet src/test/org/jboss/ejb3/test/servlet/servlets src/test/org/jboss/ejb3/test/servlet/unit
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 5 16:21:04 EDT 2006
Author: bdecoste
Date: 2006-09-05 16:21:00 -0400 (Tue, 05 Sep 2006)
New Revision: 56581
Added:
trunk/ejb3/src/resources/test/servlet/servlet-security-service.xml
Modified:
trunk/ejb3/build-test.xml
trunk/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml
trunk/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml
trunk/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java
Log:
added webauthentication test for support ticket 10923
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/build-test.xml 2006-09-05 20:21:00 UTC (rev 56581)
@@ -1491,8 +1491,15 @@
</fileset>
<fileset dir="${resources}/test/servlet">
<include name="META-INF/jboss-app.xml"/>
+ <include name="servlet-security-service.xml"/>
</fileset>
</ear>
+
+ <copy todir="${build.lib}">
+ <fileset dir="${resources}/test/servlet">
+ <include name="servlet-security-service.xml"/>
+ </fileset>
+ </copy>
</target>
<target name="ejbthree440"
Modified: trunk/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml
===================================================================
--- trunk/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/resources/test/servlet/META-INF/jboss-app.xml 2006-09-05 20:21:00 UTC (rev 56581)
@@ -1,3 +1,7 @@
<jboss-app>
<loader-repository>jboss.test:war=servlet.war</loader-repository>
+
+ <module>
+ <service>servlet-security-service.xml</service>
+ </module>
</jboss-app>
Modified: trunk/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml
===================================================================
--- trunk/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/resources/test/servlet/WEB-INF/jboss-web.xml 2006-09-05 20:21:00 UTC (rev 56581)
@@ -14,6 +14,8 @@
</loader-repository>
</class-loading-->
+ <security-domain>java:/jaas/userinrole</security-domain>
+
<ejb-ref>
<ejb-ref-name>ejb/remote/Session30</ejb-ref-name>
<jndi-name>ejb/Session30Home</jndi-name>
Modified: trunk/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml
===================================================================
--- trunk/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/resources/test/servlet/WEB-INF/test-web.xml 2006-09-05 20:21:00 UTC (rev 56581)
@@ -7,6 +7,16 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<description>EJB3 Servlet Access Test</description>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Restricted</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>allowed</role-name>
+ </auth-constraint>
+ </security-constraint>
<servlet>
<servlet-name>EJBServlet</servlet-name>
@@ -32,5 +42,14 @@
<local-home>org.jboss.ejb3.test.servlet.Session30LocalHome</local-home>
<local>org.jboss.ejb3.test.servlet.Session30</local>
</ejb-local-ref>
+
+ <security-role>
+ <role-name>allowed</role-name>
+ </security-role>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBossTest Servlets</realm-name>
+ </login-config>
</web-app>
Added: trunk/ejb3/src/resources/test/servlet/servlet-security-service.xml
===================================================================
--- trunk/ejb3/src/resources/test/servlet/servlet-security-service.xml 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/resources/test/servlet/servlet-security-service.xml 2006-09-05 20:21:00 UTC (rev 56581)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <!-- The custom JAAS login configuration that installs
+ a Configuration capable of dynamically updating the
+ config settings
+ -->
+ <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+ name="jboss.security.tests:service=LoginConfig">
+ <attribute name="PolicyConfig" serialDataType="jbxb">
+ <jaas:policy
+ xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd"
+ xmlns:jaas="urn:jboss:security-config:4.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ >
+ <jaas:application-policy name="userinrole">
+ <jaas:authentication>
+ <jaas:login-module code="org.jboss.security.auth.spi.XMLLoginModule"
+ flag="required">
+ <jaas:module-option name="userInfo">
+ <ur:users
+ xsi:schemaLocation="urn:jboss:user-roles:1.0 resource:user-roles_1_0.xsd"
+ xmlns:ur="urn:jboss:user-roles:1.0">
+ <ur:user name="somebody" password="password">
+ <ur:role name="allowed"/>
+ <ur:role name="allowed" group="CallerPrincipal"/>
+ </ur:user>
+ </ur:users>
+ </jaas:module-option>
+ <jaas:module-option name="unauthenticatedIdentity">guest</jaas:module-option>
+ </jaas:login-module>
+ </jaas:authentication>
+ </jaas:application-policy>
+ </jaas:policy>
+ </attribute>
+ <depends optional-attribute-name="LoginConfigService">
+ jboss.security:service=XMLLoginConfig
+ </depends>
+ <depends optional-attribute-name="SecurityManagerService">
+ jboss.security:service=JaasSecurityManager
+ </depends>
+ </mbean>
+
+</server>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30.java 2006-09-05 20:21:00 UTC (rev 56581)
@@ -27,6 +27,10 @@
*/
public interface Session30
{
+ void hello();
+
+ void goodbye();
+
String access(TestObject o);
TestObject createTestObject();
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/Session30Bean.java 2006-09-05 20:21:00 UTC (rev 56581)
@@ -28,6 +28,8 @@
import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
+import javax.annotation.security.RolesAllowed;
+
import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.security.SecurityDomain;
@@ -46,7 +48,7 @@
@LocalBinding(jndiBinding = "ejb/Session30Local")
@RemoteHome(Session30Home.class)
@LocalHome(Session30LocalHome.class)
- at SecurityDomain("other")
+ at SecurityDomain("userinrole")
public class Session30Bean implements Session30
{
private static final Logger log = Logger.getLogger(Session30Bean.class);
@@ -55,6 +57,16 @@
private TestObject testObject;
+ @RolesAllowed({"allowed"})
+ public void hello()
+ {
+ }
+
+ @RolesAllowed({"allowed"})
+ public void goodbye()
+ {
+ }
+
public String access(TestObject o)
{
return stateful.access(o);
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/StatefulBean.java 2006-09-05 20:21:00 UTC (rev 56581)
@@ -39,7 +39,7 @@
@Local(StatefulLocal.class)
@RemoteBinding(jndiBinding = "StatefulRemote")
@LocalBinding(jndiBinding = "StatefulLocal")
- at SecurityDomain("other")
+ at SecurityDomain("userinrole")
public class StatefulBean implements StatefulRemote, StatefulLocal
{
private static final Logger log = Logger.getLogger(Session30Bean.class);
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java 2006-09-05 20:21:00 UTC (rev 56581)
@@ -64,6 +64,10 @@
InitialContext ctx = new InitialContext();
Session30 session = (Session30)ctx.lookup("ejb/Session30");
+
+ session.hello();
+ session.goodbye();
+
TestObject o = new TestObject();
session.access(o);
o = session.createTestObject();
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/EarServletUnitTestCase.java 2006-09-05 20:21:00 UTC (rev 56581)
@@ -38,7 +38,7 @@
public class EarServletUnitTestCase extends JBossTestCase
{
private static String REALM = "JBossTest Servlets";
- private String baseURL = HttpUtils.getBaseURL();
+ private String baseURL = HttpUtils.getBaseURL("somebody", "password");
private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth();
private static final String USE_JBOSS = "UseJBossWebLoader";
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/HttpUtils.java 2006-09-05 20:21:00 UTC (rev 56581)
@@ -63,7 +63,7 @@
}
public static String getBaseURL(String username, String password)
{
- String url = "http://"+username+":"+password+"@"+ System.getProperty("jboss.bind.address") + ":"
+ String url = "http://"+username+":"+password+"@localhost:"
+ Integer.getInteger("web.port", 8080) + "/";
return url;
}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java 2006-09-05 19:39:02 UTC (rev 56580)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/servlet/unit/ServletUnitTestCase.java 2006-09-05 20:21:00 UTC (rev 56581)
@@ -38,7 +38,7 @@
public class ServletUnitTestCase extends JBossTestCase
{
private static String REALM = "JBossTest Servlets";
- private String baseURL = HttpUtils.getBaseURL();
+ private String baseURL = HttpUtils.getBaseURL("somebody", "password");
private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth();
private static final String USE_JBOSS = "UseJBossWebLoader";
@@ -72,7 +72,7 @@
*/
public static Test suite() throws Exception
{
- return getDeploySetup(ServletUnitTestCase.class, "servlet-client.jar, servlet-ejbs.jar, servlet.war");
+ return getDeploySetup(ServletUnitTestCase.class, "servlet-security-service.xml, servlet-client.jar, servlet-ejbs.jar, servlet.war");
}
More information about the jboss-cvs-commits
mailing list