[jboss-cvs] JBossAS SVN: r65760 - in projects/security/security-jboss-sx/trunk/src: main/org/jboss/security/auth/message/config and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 2 09:38:38 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-10-02 09:38:38 -0400 (Tue, 02 Oct 2007)
New Revision: 65760
Added:
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/SecurityActions.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/SecurityActions.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/SecurityActions.java
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/message/config/SecurityActions.java
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/config/ApplicationPolicyContainer.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java
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/plugins/audit/JBossAuditManager.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/authorization/SecurityActions.java
projects/security/security-jboss-sx/trunk/src/tests/resources/java.policy
Log:
privileged actions
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-10-02 13:37:55 UTC (rev 65759)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/container/modules/SecurityActions.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -39,9 +39,9 @@
* @since Jul 26, 2007
* @version $Revision$
*/
-public class SecurityActions
+class SecurityActions
{
- public static ClassLoader getContextClassloader()
+ static ClassLoader getContextClassloader()
{
return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
{
@@ -52,7 +52,7 @@
});
}
- public static LoginContext createLoginContext(final String configName,
+ static LoginContext createLoginContext(final String configName,
final Subject subject, final CallbackHandler cbh) throws PrivilegedActionException
{
return (LoginContext) AccessController.doPrivileged(new PrivilegedExceptionAction()
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/message/config/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/message/config/SecurityActions.java 2007-10-02 13:37:55 UTC (rev 65759)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/message/config/SecurityActions.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -35,9 +35,9 @@
* @since Jul 17, 2007
* @version $Revision$
*/
-public class SecurityActions
+class SecurityActions
{
- public static ClassLoader getContextClassloader()
+ static ClassLoader getContextClassloader()
{
return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
{
@@ -49,7 +49,7 @@
}
- public static SecurityContext getSecurityContext()
+ static SecurityContext getSecurityContext()
{
return (SecurityContext) AccessController.doPrivileged(new PrivilegedAction()
{
Modified: 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 2007-10-02 13:37:55 UTC (rev 65759)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/SecurityActions.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -38,9 +38,9 @@
* @since Sep 26, 2007
* @version $Revision$
*/
-public class SecurityActions
+class SecurityActions
{
- public static ClassLoader getContextClassloader()
+ static ClassLoader getContextClassloader()
{
return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
{
@@ -51,7 +51,7 @@
});
}
- public static URL findResource(final URLClassLoader cl, final String name)
+ static URL findResource(final URLClassLoader cl, final String name)
{
return (URL) AccessController.doPrivileged(new PrivilegedAction()
{
@@ -62,7 +62,7 @@
});
}
- public static InputStream openStream(final URL url) throws PrivilegedActionException
+ static InputStream openStream(final URL url) throws PrivilegedActionException
{
return (InputStream) AccessController.doPrivileged(new PrivilegedExceptionAction()
{
@@ -72,4 +72,4 @@
}
});
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/ApplicationPolicyContainer.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/ApplicationPolicyContainer.java 2007-10-02 13:37:55 UTC (rev 65759)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/ApplicationPolicyContainer.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -21,6 +21,8 @@
*/
package org.jboss.security.config;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -184,19 +186,19 @@
if(isJAASAuthentication)
{
binfo = new AuthenticationInfo(authName);
- binfo.add(authenticationModuleEntries);
+ SecurityActions.addModules(binfo, authenticationModuleEntries);
info.setAuthenticationInfo(binfo);
}
if(isJASPIAuthentication)
{
binfo = new JASPIAuthenticationInfo(authName);
- binfo.add(authenticationModuleEntries);
+ SecurityActions.addModules(binfo, authenticationModuleEntries);
info.setAuthenticationInfo(binfo);
}
if(isAuthorization)
{
ainfo = new AuthorizationInfo(authName);
- ainfo.add(authorizationModuleEntries);
+ SecurityActions.addModules(ainfo, authorizationModuleEntries);
info.setAuthorizationInfo(ainfo);
}
if(containsRoleMapping)
@@ -206,13 +208,13 @@
if(containsAudit)
{
auditInfo = new AuditInfo(authName);
- auditInfo.add(auditProviderEntries);
+ SecurityActions.addModules(auditInfo, auditProviderEntries);
info.setAuditInfo(auditInfo);
}
if(containsIdentityTrust)
{
identityTrustInfo = new IdentityTrustInfo(authName);
- identityTrustInfo.add(identityTrustModuleEntries);
+ SecurityActions.addModules(identityTrustInfo, identityTrustModuleEntries);
info.setIdentityTrustInfo(identityTrustInfo);
}
return info;
Added: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/SecurityActions.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/SecurityActions.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -0,0 +1,51 @@
+/*
+ * 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.config;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.List;
+
+//$Id$
+
+/**
+ * Privileged Blocks
+ * @author Anil.Saldhana at redhat.com
+ * @since Oct 2, 2007
+ * @version $Revision$
+ */
+class SecurityActions
+{
+ static void addModules(final BaseSecurityInfo binfo, final List authenticationModuleEntries)
+ {
+ AccessController.doPrivileged(new PrivilegedAction()
+ {
+
+ public Object run()
+ {
+ binfo.add(authenticationModuleEntries);
+ return null;
+ }
+ });
+ }
+
+}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java 2007-10-02 13:37:55 UTC (rev 65759)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -33,8 +33,7 @@
import org.jboss.security.config.IdentityTrustInfo;
import org.jboss.security.config.SecurityConfiguration;
import org.jboss.security.identitytrust.IdentityTrustManager.TrustDecision;
-import org.jboss.security.identitytrust.config.IdentityTrustModuleEntry;
-import org.jboss.security.plugins.authorization.SecurityActions;
+import org.jboss.security.identitytrust.config.IdentityTrustModuleEntry;
//$Id$
Added: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/SecurityActions.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/SecurityActions.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -0,0 +1,66 @@
+/*
+ * 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.identitytrust;
+
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+//$Id$
+
+/**
+ * Privileged Blocks
+ * @author Anil.Saldhana at redhat.com
+ * @since May 11, 2007
+ * @version $Revision$
+ */
+class SecurityActions
+{
+ static ClassLoader getContextClassLoader() throws PrivilegedActionException
+ {
+ return (ClassLoader) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+ static Class loadClass(final String name) throws PrivilegedActionException
+ {
+ return (Class) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ {
+ public Object run() throws PrivilegedActionException
+ {
+ try
+ {
+ return getContextClassLoader().loadClass(name);
+ }
+ catch ( Exception e)
+ {
+ throw new PrivilegedActionException(e);
+ }
+ }
+ });
+ }
+}
\ No newline at end of file
Modified: 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 2007-10-02 13:37:55 UTC (rev 65759)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/jacc/SecurityActions.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -39,9 +39,9 @@
* @since Sep 26, 2007
* @version $Revision$
*/
-public class SecurityActions
+class SecurityActions
{
- public static ClassLoader getContextClassloader()
+ static ClassLoader getContextClassloader()
{
return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
{
@@ -52,7 +52,7 @@
});
}
- public static URL findResource(final URLClassLoader cl, final String name)
+ static URL findResource(final URLClassLoader cl, final String name)
{
return (URL) AccessController.doPrivileged(new PrivilegedAction()
{
@@ -63,7 +63,7 @@
});
}
- public static Policy getPolicy()
+ static Policy getPolicy()
{
return (Policy) AccessController.doPrivileged(new PrivilegedAction()
{
@@ -74,7 +74,7 @@
});
}
- public static URL getResource(final ClassLoader cl, final String name)
+ static URL getResource(final ClassLoader cl, final String name)
{
return (URL) AccessController.doPrivileged(new PrivilegedAction()
{
@@ -85,7 +85,7 @@
});
}
- public static InputStream openStream(final URL url) throws PrivilegedActionException
+ static InputStream openStream(final URL url) throws PrivilegedActionException
{
return (InputStream) AccessController.doPrivileged(new PrivilegedExceptionAction()
{
@@ -95,4 +95,4 @@
}
});
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/JBossAuditManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/JBossAuditManager.java 2007-10-02 13:37:55 UTC (rev 65759)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/JBossAuditManager.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -21,7 +21,6 @@
import org.jboss.security.config.ApplicationPolicy;
import org.jboss.security.config.AuditInfo;
import org.jboss.security.config.SecurityConfiguration;
-import org.jboss.security.plugins.authorization.SecurityActions;
/**
* Manages a set of AuditContext
Added: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/SecurityActions.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/audit/SecurityActions.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -0,0 +1,66 @@
+/*
+ * 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.plugins.audit;
+
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+//$Id$
+
+/**
+ * Privileged Blocks
+ * @author Anil.Saldhana at redhat.com
+ * @since May 11, 2007
+ * @version $Revision$
+ */
+class SecurityActions
+{
+ static ClassLoader getContextClassLoader() throws PrivilegedActionException
+ {
+ return (ClassLoader) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+ static Class loadClass(final String name) throws PrivilegedActionException
+ {
+ return (Class) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ {
+ public Object run() throws PrivilegedActionException
+ {
+ try
+ {
+ return getContextClassLoader().loadClass(name);
+ }
+ catch ( Exception e)
+ {
+ throw new PrivilegedActionException(e);
+ }
+ }
+ });
+ }
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/authorization/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/authorization/SecurityActions.java 2007-10-02 13:37:55 UTC (rev 65759)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/authorization/SecurityActions.java 2007-10-02 13:38:38 UTC (rev 65760)
@@ -33,9 +33,9 @@
* @since May 11, 2007
* @version $Revision$
*/
-public class SecurityActions
+class SecurityActions
{
- public static ClassLoader getContextClassLoader() throws PrivilegedActionException
+ static ClassLoader getContextClassLoader() throws PrivilegedActionException
{
return (ClassLoader) AccessController.doPrivileged(new PrivilegedExceptionAction()
{
@@ -46,7 +46,7 @@
});
}
- public static Class loadClass(final String name) throws PrivilegedActionException
+ static Class loadClass(final String name) throws PrivilegedActionException
{
return (Class) AccessController.doPrivileged(new PrivilegedExceptionAction()
{
@@ -63,5 +63,4 @@
}
});
}
-
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/src/tests/resources/java.policy
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/resources/java.policy 2007-10-02 13:37:55 UTC (rev 65759)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/java.policy 2007-10-02 13:38:38 UTC (rev 65760)
@@ -12,5 +12,6 @@
grant codeBase "file:${test.basedir}/../classes/-" {
permission java.io.FilePermission "<<ALL FILES>>", "read, write, delete, execute";
permission java.security.SecurityPermission "getPolicy";
+ permission javax.security.auth.AuthPermission "setLoginConfiguration";
};
More information about the jboss-cvs-commits
mailing list