[jboss-cvs] JBossAS SVN: r65643 - in projects/security/security-jboss-sx/trunk: src/main/org/jboss/security/auth/container/modules and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 27 01:01:01 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-09-27 01:01:01 -0400 (Thu, 27 Sep 2007)
New Revision: 65643
Added:
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/SecurityActions.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SecurityActions.java
projects/security/security-jboss-sx/trunk/src/resources/java.policy
projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/SecurityActions.java
Modified:
projects/security/security-jboss-sx/trunk/pom.xml
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/container/modules/SecurityActions.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/Util.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/JBossAuthenticationManagerUnitTestCase.java
projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/WebJASPIAuthMgrUnitTestCase.java
projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/jaspi/JASPILoginModuleDelgateUnitTestCase.java
projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/jaspi/JASPIWorkflowUnitTestCase.java
projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authorization/xacml/EJBXACMLUnitTestCase.java
projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authorization/xacml/WebXACMLUnitTestCase.java
projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/security/identitytrust/IdentityTrustUnitTestCase.java
projects/security/security-jboss-sx/trunk/src/tests/resources/log4j.xml
projects/security/security-jboss-sx/trunk/src/tests/resources/opends/
projects/security/security-jboss-sx/trunk/src/tests/resources/opends/locks/
projects/security/security-jboss-sx/trunk/src/tests/resources/opends/logs/
Log:
SECURITY-77:Privileged Blocks
Modified: projects/security/security-jboss-sx/trunk/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/pom.xml 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/pom.xml 2007-09-27 05:01:01 UTC (rev 65643)
@@ -22,12 +22,39 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
+ <profiles>
+ <!-- mvn install -Psecurity-manager -->
+ <profile>
+ <id>security-manager</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <test.env>-Dtest.basedir=${basedir}/target/test-classes</test.env>
+ <policy.file>${basedir}/src/resources/java.policy</policy.file>
+ <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=${policy.file} ${test.env}</surefire.jvm.args>
+ </properties>
+ </profile>
+ <!-- mvn install -Psecurity-manager-debug -->
+ <!-- Best Practice: mvn install -Psecurity-manager-debug 2>&1 > logfile2>&1 > logfile -->
+ <profile>
+ <id>security-manager-debug</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <test.env>-Dtest.basedir=${basedir}/target/test-classes</test.env>
+ <policy.file>${basedir}/src/resources/java.policy</policy.file>
+ <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=${policy.file} -Djava.security.debug=failure,access ${test.env}</surefire.jvm.args>
+ </properties>
+ </profile>
+ </profiles>
<repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
+ <repository>
+ <id>jboss</id>
+ <name>JBoss Inc. Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.com/maven2/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
@@ -142,6 +169,9 @@
<include>**/**TestCase.java</include>
</includes>
<forkMode>pertest</forkMode>
+ <argLine>${surefire.jvm.args}</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<plugin>
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -21,6 +21,8 @@
*/
package org.jboss.security.auth.container.modules;
+import java.security.PrivilegedActionException;
+
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
@@ -80,14 +82,14 @@
{
try
{
- loginContext = new LoginContext(getSecurityDomainName(), clientSubject, this.callbackHandler);
+ loginContext = SecurityActions.createLoginContext(getSecurityDomainName(), clientSubject, this.callbackHandler);
loginContext.login();
return true;
}
- catch (LoginException e)
+ catch (Exception e)
{
throw new AuthException(e.getLocalizedMessage());
- }
+ }
}
private String getSecurityDomainName()
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/container/modules/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/container/modules/SecurityActions.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/container/modules/SecurityActions.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -23,7 +23,14 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+
//$Id$
/**
@@ -44,4 +51,17 @@
}
});
}
+
+ public static LoginContext createLoginContext(final String configName,
+ final Subject subject, final CallbackHandler cbh) throws PrivilegedActionException
+ {
+ return (LoginContext) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ {
+ public Object run() throws LoginException
+ {
+ return new LoginContext(configName, subject, cbh);
+ }
+ });
+ }
+
}
Added: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/SecurityActions.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/SecurityActions.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security.auth.spi;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+//$Id$
+
+/**
+ * Privileged Blocks
+ * @author Anil.Saldhana at redhat.com
+ * @since Sep 26, 2007
+ * @version $Revision$
+ */
+public class SecurityActions
+{
+ public static ClassLoader getContextClassloader()
+ {
+ return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+ public static URL findResource(final URLClassLoader cl, final String name)
+ {
+ return (URL) AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return cl.findResource(name);
+ }
+ });
+ }
+
+ public static InputStream openStream(final URL url) throws PrivilegedActionException
+ {
+ return (InputStream) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ {
+ public Object run() throws IOException
+ {
+ return url.openStream();
+ }
+ });
+ }
+}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/Util.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/Util.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/Util.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -21,30 +21,30 @@
*/
package org.jboss.security.auth.spi;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-import java.util.HashMap;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.security.acl.Group;
import java.security.MessageDigest;
import java.security.Principal;
+import java.security.PrivilegedActionException;
+import java.security.acl.Group;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.StringTokenizer;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.login.FailedLoginException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.login.LoginException;
import javax.sql.DataSource;
-import javax.transaction.InvalidTransactionException;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
@@ -54,7 +54,6 @@
import org.jboss.security.Base64Encoder;
import org.jboss.security.Base64Utils;
import org.jboss.security.SimpleGroup;
-//import org.jboss.tm.TransactionDemarcationSupport;
import org.jboss.security.plugins.TransactionManagerLocator;
/**
@@ -341,15 +340,15 @@
throws IOException
{
Properties bundle = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = SecurityActions.getContextClassloader();
URL defaultUrl = null;
URL url = null;
// First check for local visibility via a URLClassLoader.findResource
if( loader instanceof URLClassLoader )
{
URLClassLoader ucl = (URLClassLoader) loader;
- defaultUrl = ucl.findResource(defaultsName);
- url = ucl.findResource(propertiesName);
+ defaultUrl = SecurityActions.findResource(ucl,defaultsName);
+ url = SecurityActions.findResource(ucl,propertiesName);
log.trace("findResource: "+url);
}
// Do a general resource search
@@ -384,7 +383,16 @@
bundle = new Properties(defaults);
if( url != null )
{
- InputStream is = url.openStream();
+ InputStream is = null;
+ try
+ {
+ is = SecurityActions.openStream(url);
+ }
+ catch (PrivilegedActionException e)
+ {
+ log.trace("Open stream error", e);
+ throw new IOException(e.getLocalizedMessage());
+ }
if (is != null)
{
bundle.load(is);
@@ -416,13 +424,13 @@
static Properties loadProperties(String propertiesName, Logger log)
throws IOException
{
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = SecurityActions.getContextClassloader();
URL url = null;
// First check for local visibility via a URLClassLoader.findResource
if( loader instanceof URLClassLoader )
{
URLClassLoader ucl = (URLClassLoader) loader;
- url = ucl.findResource(propertiesName);
+ url = SecurityActions.findResource(ucl,propertiesName);
log.trace("findResource: "+url);
}
if( url == null )
@@ -437,7 +445,16 @@
Properties bundle = new Properties();
if( url != null )
{
- InputStream is = url.openStream();
+ InputStream is = null;
+ try
+ {
+ is = SecurityActions.openStream(url);
+ }
+ catch (PrivilegedActionException e)
+ {
+ log.trace("open stream error:", e);
+ throw new IOException(e.getLocalizedMessage());
+ }
if (is != null)
{
bundle.load(is);
@@ -445,7 +462,7 @@
}
else
{
- throw new IOException("Properties file " + propertiesName + " not avilable");
+ throw new IOException("Properties file " + propertiesName + " not available");
}
log.debug("Loaded properties, users="+bundle.keySet());
}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -53,8 +53,8 @@
try
{
// Setup the state machine config
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- URL states = loader.getResource("org/jboss/security/jacc/jacc-policy-config-states.xml");
+ ClassLoader loader = SecurityActions.getContextClassloader();
+ URL states = SecurityActions.getResource(loader,"org/jboss/security/jacc/jacc-policy-config-states.xml");
StateMachineParser smp = new StateMachineParser();
configStateMachine = smp.parse(states);
}
@@ -65,7 +65,7 @@
throw ex;
}
// Get the DelegatingPolicy
- Policy p = Policy.getPolicy();
+ Policy p = SecurityActions.getPolicy();
if( (p instanceof DelegatingPolicy) == false )
{
// Assume that the installed policy delegates to the DelegatingPolicy
Added: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SecurityActions.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SecurityActions.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security.jacc;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.Policy;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+//$Id$
+
+/**
+ * Privileged Blocks
+ * @author Anil.Saldhana at redhat.com
+ * @since Sep 26, 2007
+ * @version $Revision$
+ */
+public class SecurityActions
+{
+ public static ClassLoader getContextClassloader()
+ {
+ return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+ public static URL findResource(final URLClassLoader cl, final String name)
+ {
+ return (URL) AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return cl.findResource(name);
+ }
+ });
+ }
+
+ public static Policy getPolicy()
+ {
+ return (Policy) AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Policy.getPolicy();
+ }
+ });
+ }
+
+ public static URL getResource(final ClassLoader cl, final String name)
+ {
+ return (URL) AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return cl.getResource(name);
+ }
+ });
+ }
+
+ public static InputStream openStream(final URL url) throws PrivilegedActionException
+ {
+ return (InputStream) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ {
+ public Object run() throws IOException
+ {
+ return url.openStream();
+ }
+ });
+ }
+}
Added: projects/security/security-jboss-sx/trunk/src/resources/java.policy
===================================================================
--- projects/security/security-jboss-sx/trunk/src/resources/java.policy (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/resources/java.policy 2007-09-27 05:01:01 UTC (rev 65643)
@@ -0,0 +1,16 @@
+/* AUTOMATICALLY GENERATED ON Wed Sep 26 20:32:37 CDT 2007*/
+/* DO NOT EDIT */
+
+grant codeBase "file:${user.home}/.m2/repository/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${test.basedir}/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${test.basedir}/../classes/-" {
+ permission java.io.FilePermission "<<ALL FILES>>", "read, write, delete, execute";
+ permission java.security.SecurityPermission "getPolicy";
+};
+
Added: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/SecurityActions.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/SecurityActions.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test;
+
+import java.security.AccessController;
+import java.security.Principal;
+import java.security.PrivilegedAction;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.Configuration;
+import javax.security.jacc.PolicyContext;
+
+//$Id$
+
+/**
+ * Privileged Blocks
+ * @author Anil.Saldhana at redhat.com
+ * @since Sep 25, 2007
+ * @version $Revision$
+ */
+public class SecurityActions
+{
+ public static void addPrincipalToSubject(final Subject subj, final Principal p)
+ {
+ AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ subj.getPrincipals().add(p);
+ return null;
+ }
+ });
+ }
+
+ public static void setJAASConfiguration(final Configuration configuration)
+ {
+ AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ Configuration.setConfiguration(configuration);
+ return null;
+ }
+ });
+ }
+
+ public static void setPolicyContextID(final String contextID)
+ {
+ AccessController.doPrivileged(new PrivilegedAction()
+ {
+ public Object run()
+ {
+ PolicyContext.setContextID(contextID);
+ return null;
+ }
+ });
+ }
+}
Modified: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/JBossAuthenticationManagerUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/JBossAuthenticationManagerUnitTestCase.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/JBossAuthenticationManagerUnitTestCase.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -32,6 +32,7 @@
import org.jboss.security.SimplePrincipal;
import org.jboss.security.auth.callback.AppCallbackHandler;
import org.jboss.security.plugins.JBossAuthenticationManager;
+import org.jboss.test.SecurityActions;
import junit.framework.TestCase;
@@ -125,7 +126,7 @@
private void establishSecurityConfiguration()
{
- Configuration.setConfiguration(new TestConfig());
+ SecurityActions.setJAASConfiguration((Configuration)new TestConfig());
}
public class TestConfig extends Configuration
Modified: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/WebJASPIAuthMgrUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/WebJASPIAuthMgrUnitTestCase.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/WebJASPIAuthMgrUnitTestCase.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -37,6 +37,7 @@
import org.jboss.security.plugins.JBossAuthenticationManager;
import org.jboss.security.plugins.JBossSecurityContext;
import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.test.SecurityActions;
import org.jboss.test.util.TestHttpServletRequest;
@@ -94,7 +95,7 @@
private void establishSecurityConfiguration()
{
XMLLoginConfigImpl xli = new XMLLoginConfigImpl();
- Configuration.setConfiguration(xli);
+ SecurityActions.setJAASConfiguration((Configuration)xli);
URL configURL = Thread.currentThread().getContextClassLoader().getResource("config/jaspi-config.xml");
assertNotNull("Config URL",configURL);
xli.setConfigURL(configURL);
Modified: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/jaspi/JASPILoginModuleDelgateUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/jaspi/JASPILoginModuleDelgateUnitTestCase.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/jaspi/JASPILoginModuleDelgateUnitTestCase.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -41,6 +41,7 @@
import org.jboss.security.auth.message.config.JBossAuthConfigProvider;
import org.jboss.security.plugins.JBossSecurityContext;
import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.test.SecurityActions;
import junit.framework.TestCase;
@@ -72,7 +73,7 @@
SecurityContextAssociation.setSecurityContext(jsc);
XMLLoginConfigImpl xli = new XMLLoginConfigImpl();
- Configuration.setConfiguration(xli);
+ SecurityActions.setJAASConfiguration((Configuration)xli);
URL configURL = Thread.currentThread().getContextClassLoader().getResource(configFile);
assertNotNull("Config URL",configURL);
Modified: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/jaspi/JASPIWorkflowUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/jaspi/JASPIWorkflowUnitTestCase.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authentication/jaspi/JASPIWorkflowUnitTestCase.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -40,6 +40,7 @@
import org.jboss.security.auth.message.config.JBossAuthConfigProvider;
import org.jboss.security.plugins.JBossSecurityContext;
import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.test.SecurityActions;
import junit.framework.TestCase;
@@ -70,7 +71,7 @@
SecurityContextAssociation.setSecurityContext(jsc);
XMLLoginConfigImpl xli = new XMLLoginConfigImpl();
- Configuration.setConfiguration(xli);
+ SecurityActions.setJAASConfiguration((Configuration)xli);
URL configURL = Thread.currentThread().getContextClassLoader().getResource(configFile);
assertNotNull("Config URL",configURL);
Modified: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authorization/xacml/EJBXACMLUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authorization/xacml/EJBXACMLUnitTestCase.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authorization/xacml/EJBXACMLUnitTestCase.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -47,6 +47,7 @@
import org.jboss.security.plugins.JBossAuthorizationManager;
import org.jboss.security.plugins.SecurityContextAssociation;
import org.jboss.security.SecurityContextFactory;
+import org.jboss.test.SecurityActions;
//$Id$
@@ -113,6 +114,7 @@
private void setSecurityContext()
{
Subject subj = new Subject();
+ SecurityActions.addPrincipalToSubject(subj, p);
subj.getPrincipals().add(p);
SecurityContext sc = null;
try
Modified: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authorization/xacml/WebXACMLUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authorization/xacml/WebXACMLUnitTestCase.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/authorization/xacml/WebXACMLUnitTestCase.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -48,6 +48,7 @@
import org.jboss.security.plugins.JBossAuthorizationManager;
import org.jboss.security.plugins.SecurityContextAssociation;
import org.jboss.security.SecurityContextFactory;
+import org.jboss.test.SecurityActions;
import org.jboss.test.util.TestHttpServletRequest;
//$Id$
@@ -115,7 +116,7 @@
private void setSecurityContext()
{
Subject subj = new Subject();
- subj.getPrincipals().add(p);
+ SecurityActions.addPrincipalToSubject(subj, p);
SecurityContext sc = null;
try
{
@@ -132,7 +133,7 @@
private void setUpPolicyContext() throws Exception
{
- PolicyContext.setContextID(contextID);
+ SecurityActions.setPolicyContextID(contextID);
PolicyContext.registerHandler(SecurityConstants.SUBJECT_CONTEXT_KEY,
new SubjectPolicyContextHandler(), true);
}
Modified: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/security/identitytrust/IdentityTrustUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/security/identitytrust/IdentityTrustUnitTestCase.java 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/security/identitytrust/IdentityTrustUnitTestCase.java 2007-09-27 05:01:01 UTC (rev 65643)
@@ -33,6 +33,7 @@
import org.jboss.security.identitytrust.IdentityTrustManager;
import org.jboss.security.identitytrust.IdentityTrustManager.TrustDecision;
import org.jboss.security.plugins.JBossSecurityContext;
+import org.jboss.test.SecurityActions;
//$Id$
@@ -49,7 +50,7 @@
protected void setUp() throws Exception
{
XMLLoginConfigImpl xli = new XMLLoginConfigImpl();
- Configuration.setConfiguration(xli);
+ SecurityActions.setJAASConfiguration((Configuration)xli);
URL configURL = Thread.currentThread().getContextClassLoader().getResource(configFile);
assertNotNull("Config URL",configURL);
Modified: projects/security/security-jboss-sx/trunk/src/tests/resources/log4j.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/resources/log4j.xml 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/log4j.xml 2007-09-27 05:01:01 UTC (rev 65643)
@@ -55,46 +55,6 @@
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
</layout>
</appender>
-
-
- <!-- ====================== -->
- <!-- More Appender examples -->
- <!-- ====================== -->
-
- <!-- Buffer events and log them asynchronously
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="FILE"/>
- <appender-ref ref="CONSOLE"/>
- </appender>
- -->
-
- <!-- EMail events to an administrator
- <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
- <param name="Threshold" value="ERROR"/>
- <param name="To" value="admin at myhost.domain.com"/>
- <param name="From" value="nobody at myhost.domain.com"/>
- <param name="Subject" value="JBoss Sever Errors"/>
- <param name="SMTPHost" value="localhost"/>
- <param name="BufferSize" value="10"/>
- </appender>
- -->
-
- <!-- Syslog events
- <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
- <param name="Facility" value="LOCAL7"/>
- <param name="FacilityPrinting" value="true"/>
- <param name="SyslogHost" value="localhost"/>
- </appender>
- -->
-
- <!-- Log events to JMS (requires a topic to be created)
- <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
- <param name="Threshold" value="ERROR"/>
- <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
- <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
- </appender>
- -->
-
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -105,31 +65,10 @@
</category>
-->
- <!-- Increase the priority threshold for the DefaultDS category
- <category name="DefaultDS">
- <priority value="FATAL"/>
- </category>
- -->
-
- <!-- Decrease the priority threshold for the org.jboss.varia category
- <category name="org.jboss.varia">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- | An example of enabling the custom TRACE level priority that is used
- | by the JBoss internals to diagnose low level details. This example
- | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
- | subpackages. This will produce A LOT of logging output.
- <category name="org.jboss.system">
+ <category name="org.jboss.security">
<priority value="TRACE" class="org.jboss.logging.XLevel"/>
</category>
- -->
- <!--category name="org.jboss.tm">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category-->
<!-- ======================= -->
<!-- Setup the Root category -->
<!-- ======================= -->
Property changes on: projects/security/security-jboss-sx/trunk/src/tests/resources/opends
___________________________________________________________________
Name: svn:ignore
- db
+ db
logs
Property changes on: projects/security/security-jboss-sx/trunk/src/tests/resources/opends/locks
___________________________________________________________________
Name: svn:ignore
-
+ backend-backup.lock
backend-tasks.lock
backend-monitor.lock
backend-schema.lock
server.lock
backend-userRoot.lock
Property changes on: projects/security/security-jboss-sx/trunk/src/tests/resources/opends/logs
___________________________________________________________________
Name: svn:ignore
-
+ access
replication
errors
More information about the jboss-cvs-commits
mailing list